From da5bc0bb05224223b889269e0827849852ca36b5 Mon Sep 17 00:00:00 2001 From: modmuss50 Date: Wed, 2 Oct 2019 15:48:19 +0100 Subject: [PATCH] 19w40a --- build.gradle | 4 ++-- fabric-events-interaction-v0/build.gradle | 2 +- .../net/fabricmc/fabric/api/event/player/UseItemCallback.java | 2 +- fabric-networking-blockentity-v0/build.gradle | 2 +- .../networkingblockentity/MixinClientPlayNetworkHandler.java | 4 ++-- fabric-renderer-indigo/build.gradle | 2 +- .../fabricmc/indigo/renderer/render/AbstractQuadRenderer.java | 2 +- 7 files changed, 9 insertions(+), 9 deletions(-) diff --git a/build.gradle b/build.gradle index 2c70eab48..bea803189 100644 --- a/build.gradle +++ b/build.gradle @@ -12,8 +12,8 @@ plugins { def ENV = System.getenv() class Globals { - static def baseVersion = "0.4.2" - static def mcVersion = "19w39a" + static def baseVersion = "0.4.3" + static def mcVersion = "19w40a" static def yarnVersion = "+build.1" } diff --git a/fabric-events-interaction-v0/build.gradle b/fabric-events-interaction-v0/build.gradle index fafec5b5a..33a9ded05 100644 --- a/fabric-events-interaction-v0/build.gradle +++ b/fabric-events-interaction-v0/build.gradle @@ -1,5 +1,5 @@ archivesBaseName = "fabric-events-interaction-v0" -version = getSubprojectVersion(project, "0.2.1") +version = getSubprojectVersion(project, "0.2.2") dependencies { compile project(path: ':fabric-api-base', configuration: 'dev') diff --git a/fabric-events-interaction-v0/src/main/java/net/fabricmc/fabric/api/event/player/UseItemCallback.java b/fabric-events-interaction-v0/src/main/java/net/fabricmc/fabric/api/event/player/UseItemCallback.java index 752eea77c..f11294695 100644 --- a/fabric-events-interaction-v0/src/main/java/net/fabricmc/fabric/api/event/player/UseItemCallback.java +++ b/fabric-events-interaction-v0/src/main/java/net/fabricmc/fabric/api/event/player/UseItemCallback.java @@ -44,7 +44,7 @@ public interface UseItemCallback { } } - return TypedActionResult.method_22430(ItemStack.EMPTY); + return TypedActionResult.pass(ItemStack.EMPTY); } ); diff --git a/fabric-networking-blockentity-v0/build.gradle b/fabric-networking-blockentity-v0/build.gradle index e03e5a7b7..20f3988bc 100644 --- a/fabric-networking-blockentity-v0/build.gradle +++ b/fabric-networking-blockentity-v0/build.gradle @@ -1,5 +1,5 @@ archivesBaseName = "fabric-networking-blockentity-v0" -version = getSubprojectVersion(project, "0.2.0") +version = getSubprojectVersion(project, "0.2.1") dependencies { compile project(path: ':fabric-api-base', configuration: 'dev') diff --git a/fabric-networking-blockentity-v0/src/main/java/net/fabricmc/fabric/mixin/networkingblockentity/MixinClientPlayNetworkHandler.java b/fabric-networking-blockentity-v0/src/main/java/net/fabricmc/fabric/mixin/networkingblockentity/MixinClientPlayNetworkHandler.java index 6ca35c46a..e6af9b8f8 100644 --- a/fabric-networking-blockentity-v0/src/main/java/net/fabricmc/fabric/mixin/networkingblockentity/MixinClientPlayNetworkHandler.java +++ b/fabric-networking-blockentity-v0/src/main/java/net/fabricmc/fabric/mixin/networkingblockentity/MixinClientPlayNetworkHandler.java @@ -38,10 +38,10 @@ public class MixinClientPlayNetworkHandler { @Unique private static Logger FABRIC_LOGGER = LogManager.getLogger(); - @Inject(at = @At(value = "INVOKE", target = "Lnet/minecraft/client/network/packet/BlockEntityUpdateS2CPacket;getActionId()I", ordinal = 0), method = "onBlockEntityUpdate", cancellable = true, locals = LocalCapture.CAPTURE_FAILHARD) + @Inject(at = @At(value = "INVOKE", target = "Lnet/minecraft/client/network/packet/BlockEntityUpdateS2CPacket;getBlockEntityType()I", ordinal = 0), method = "onBlockEntityUpdate", cancellable = true, locals = LocalCapture.CAPTURE_FAILHARD) public void onBlockEntityUpdate(BlockEntityUpdateS2CPacket packet, CallbackInfo info, BlockEntity entity) { if (entity instanceof BlockEntityClientSerializable) { - if (packet.getActionId() == 127) { + if (packet.getBlockEntityType() == 127) { BlockEntityClientSerializable serializable = (BlockEntityClientSerializable) entity; String id = packet.getCompoundTag().getString("id"); if (id != null) { diff --git a/fabric-renderer-indigo/build.gradle b/fabric-renderer-indigo/build.gradle index d33f495f7..2033c7921 100644 --- a/fabric-renderer-indigo/build.gradle +++ b/fabric-renderer-indigo/build.gradle @@ -1,5 +1,5 @@ archivesBaseName = "fabric-renderer-indigo" -version = getSubprojectVersion(project, "0.2.3") +version = getSubprojectVersion(project, "0.2.4") dependencies { compile project(path: ':fabric-api-base', configuration: 'dev') diff --git a/fabric-renderer-indigo/src/main/java/net/fabricmc/indigo/renderer/render/AbstractQuadRenderer.java b/fabric-renderer-indigo/src/main/java/net/fabricmc/indigo/renderer/render/AbstractQuadRenderer.java index 8bc93a61d..64cbb558d 100644 --- a/fabric-renderer-indigo/src/main/java/net/fabricmc/indigo/renderer/render/AbstractQuadRenderer.java +++ b/fabric-renderer-indigo/src/main/java/net/fabricmc/indigo/renderer/render/AbstractQuadRenderer.java @@ -77,7 +77,7 @@ public abstract class AbstractQuadRenderer { buff.method_22918(matrix, quad.x(i), quad.y(i), quad.z(i)); final int color = quad.spriteColor(i, 0); buff.color(color & 0xFF, (color >> 8) & 0xFF, (color >> 16) & 0xFF, (color >> 24) & 0xFF); - buff.method_22913(quad.spriteU(i, 0), quad.spriteV(i, 0)); + buff.texture(quad.spriteU(i, 0), quad.spriteV(i, 0)); buff.method_22916(quad.lightmap(i)); buff.method_22914(quad.normalX(i), quad.normalY(i), quad.normalZ(i)); buff.next();