From 7231d52b9f6b6fbcf68f0d39595859cd2dde2cfa Mon Sep 17 00:00:00 2001 From: Joe Date: Tue, 23 Jun 2020 14:23:23 +0100 Subject: [PATCH] 1.16 --- gradle.properties | 4 ++-- .../java/net/earthcomputer/multiconnect/api/Protocols.java | 2 +- .../net/earthcomputer/multiconnect/impl/ConnectionMode.java | 2 +- .../multiconnect/protocols/v1_12_2/mixin/MixinEntity.java | 2 +- .../v1_13_2/mixin/MixinClientPlayNetworkHandler.java | 2 +- .../multiconnect/protocols/v1_15_2/Protocol_1_15_2.java | 2 +- .../protocols/v1_15_2/mixin/WolfEntityAccessor.java | 4 ++-- 7 files changed, 9 insertions(+), 9 deletions(-) diff --git a/gradle.properties b/gradle.properties index 02527fab..d019ba67 100644 --- a/gradle.properties +++ b/gradle.properties @@ -3,8 +3,8 @@ org.gradle.jvmargs=-Xmx1G # Fabric Properties # check these on https://modmuss50.me/fabric.html - minecraft_version=1.16-rc1 - yarn_mappings=1.16-rc1+build.1 + minecraft_version=1.16 + yarn_mappings=1.16+build.1 # loader version is on Earthcomputer's fork of fabric-loader https://github.com/Earthcomputer/fabric-loader/tree/multiconnect loader_version=a91e71a7 diff --git a/src/api/java/net/earthcomputer/multiconnect/api/Protocols.java b/src/api/java/net/earthcomputer/multiconnect/api/Protocols.java index 32907b3c..b76135ef 100644 --- a/src/api/java/net/earthcomputer/multiconnect/api/Protocols.java +++ b/src/api/java/net/earthcomputer/multiconnect/api/Protocols.java @@ -5,7 +5,7 @@ */ public class Protocols { - public static final int V1_16 = 734; + public static final int V1_16 = 735; public static final int V1_15_2 = 578; public static final int V1_15_1 = 575; public static final int V1_15 = 573; diff --git a/src/main/java/net/earthcomputer/multiconnect/impl/ConnectionMode.java b/src/main/java/net/earthcomputer/multiconnect/impl/ConnectionMode.java index d427842f..ddfb8b2a 100644 --- a/src/main/java/net/earthcomputer/multiconnect/impl/ConnectionMode.java +++ b/src/main/java/net/earthcomputer/multiconnect/impl/ConnectionMode.java @@ -13,7 +13,7 @@ public enum ConnectionMode implements IProtocol { // Protocols should go in reverse chronological order AUTO("Auto", -1, true), - V1_16("1.16-rc1", Protocols.V1_16, true), + V1_16("1.16", Protocols.V1_16, true), V1_15_2("1.15.2", Protocols.V1_15_2), V1_15_1("1.15.1", Protocols.V1_15_1), V1_15("1.15", Protocols.V1_15, true), diff --git a/src/main/java/net/earthcomputer/multiconnect/protocols/v1_12_2/mixin/MixinEntity.java b/src/main/java/net/earthcomputer/multiconnect/protocols/v1_12_2/mixin/MixinEntity.java index 36c03599..07519f08 100644 --- a/src/main/java/net/earthcomputer/multiconnect/protocols/v1_12_2/mixin/MixinEntity.java +++ b/src/main/java/net/earthcomputer/multiconnect/protocols/v1_12_2/mixin/MixinEntity.java @@ -64,7 +64,7 @@ private void modifyFluidMovementBoundingBox(Tag fluidTag, double d, Callb for (int z = minZ; z < maxZ; z++) { mutable.set(x, y, z); FluidState state = world.getFluidState(mutable); - if (state.matches(fluidTag)) { + if (state.isIn(fluidTag)) { double height = y + state.getHeight(world, mutable); if (height >= box.minY - 0.4) waterHeight = Math.max(height - box.minY + 0.4, waterHeight); diff --git a/src/main/java/net/earthcomputer/multiconnect/protocols/v1_13_2/mixin/MixinClientPlayNetworkHandler.java b/src/main/java/net/earthcomputer/multiconnect/protocols/v1_13_2/mixin/MixinClientPlayNetworkHandler.java index 4e7745c1..443197a3 100644 --- a/src/main/java/net/earthcomputer/multiconnect/protocols/v1_13_2/mixin/MixinClientPlayNetworkHandler.java +++ b/src/main/java/net/earthcomputer/multiconnect/protocols/v1_13_2/mixin/MixinClientPlayNetworkHandler.java @@ -145,7 +145,7 @@ private void onOnEntitySpawn(EntitySpawnS2CPacket packet, CallbackInfo ci) { || packet.getEntityTypeId() == EntityType.SPECTRAL_ARROW || packet.getEntityTypeId() == EntityType.TRIDENT) { onVelocityUpdate(new EntityVelocityUpdateS2CPacket(packet.getId(), - new Vec3d(packet.getVelocityX(), packet.getVelocityY(), packet.getVelocityz()))); + new Vec3d(packet.getVelocityX(), packet.getVelocityY(), packet.getVelocityZ()))); } } } diff --git a/src/main/java/net/earthcomputer/multiconnect/protocols/v1_15_2/Protocol_1_15_2.java b/src/main/java/net/earthcomputer/multiconnect/protocols/v1_15_2/Protocol_1_15_2.java index c6b09212..493e7091 100644 --- a/src/main/java/net/earthcomputer/multiconnect/protocols/v1_15_2/Protocol_1_15_2.java +++ b/src/main/java/net/earthcomputer/multiconnect/protocols/v1_15_2/Protocol_1_15_2.java @@ -892,7 +892,7 @@ public boolean acceptEntityData(Class clazz, TrackedData da }); return false; } - if (clazz == WolfEntity.class && data == WolfEntityAccessor.getRemainingAngerTicks()) { + if (clazz == WolfEntity.class && data == WolfEntityAccessor.getAngerTime()) { return false; } return super.acceptEntityData(clazz, data); diff --git a/src/main/java/net/earthcomputer/multiconnect/protocols/v1_15_2/mixin/WolfEntityAccessor.java b/src/main/java/net/earthcomputer/multiconnect/protocols/v1_15_2/mixin/WolfEntityAccessor.java index cefbf12d..f9f3f168 100644 --- a/src/main/java/net/earthcomputer/multiconnect/protocols/v1_15_2/mixin/WolfEntityAccessor.java +++ b/src/main/java/net/earthcomputer/multiconnect/protocols/v1_15_2/mixin/WolfEntityAccessor.java @@ -8,8 +8,8 @@ @Mixin(WolfEntity.class) public interface WolfEntityAccessor { - @Accessor("field_25373") - static TrackedData getRemainingAngerTicks() { + @Accessor("ANGER_TIME") + static TrackedData getAngerTime() { return MixinHelper.fakeInstance(); } }