From 61b9762a22d6f8fd32d6c08bb37d5bc4d01a9423 Mon Sep 17 00:00:00 2001 From: Wagyourtail Date: Wed, 27 Jul 2022 19:59:44 -0600 Subject: [PATCH] 1.19.1 --- fabric/src/main/resources/fabric.mod.json | 2 +- gradle.properties | 8 ++------ .../java/baritone/launch/mixins/MixinNetworkManager.java | 9 +++++---- 3 files changed, 8 insertions(+), 11 deletions(-) diff --git a/fabric/src/main/resources/fabric.mod.json b/fabric/src/main/resources/fabric.mod.json index fbbb1bd43..5b799f845 100644 --- a/fabric/src/main/resources/fabric.mod.json +++ b/fabric/src/main/resources/fabric.mod.json @@ -26,6 +26,6 @@ "depends": { "fabricloader": ">=0.11.0", - "minecraft": "1.19.1-rc.2" + "minecraft": "1.19.1" } } \ No newline at end of file diff --git a/gradle.properties b/gradle.properties index 7c4408303..0b9fad33b 100644 --- a/gradle.properties +++ b/gradle.properties @@ -4,10 +4,6 @@ mod_version=1.9.0-local maven_group=baritone archives_base_name=baritone -minecraft_version=1.19.1-rc2 +minecraft_version=1.19.1 forge_version=1.19.1-41.0.1 -fabric_version=0.14.8 - -# # un comment for forge debugging default (as opposed to fabric) -# baritone.forge_build=true -# loom.platform=forge +fabric_version=0.14.8 \ No newline at end of file diff --git a/src/launch/java/baritone/launch/mixins/MixinNetworkManager.java b/src/launch/java/baritone/launch/mixins/MixinNetworkManager.java index 632bdb4d1..057a49b4b 100644 --- a/src/launch/java/baritone/launch/mixins/MixinNetworkManager.java +++ b/src/launch/java/baritone/launch/mixins/MixinNetworkManager.java @@ -26,6 +26,7 @@ import io.netty.channel.ChannelHandlerContext; import io.netty.util.concurrent.Future; import io.netty.util.concurrent.GenericFutureListener; import net.minecraft.network.Connection; +import net.minecraft.network.PacketSendListener; import net.minecraft.network.protocol.Packet; import net.minecraft.network.protocol.PacketFlow; import org.spongepowered.asm.mixin.Final; @@ -53,14 +54,14 @@ public class MixinNetworkManager { method = "sendPacket", at = @At("HEAD") ) - private void preDispatchPacket(Packet inPacket, final GenericFutureListener> futureListeners, CallbackInfo ci) { + private void preDispatchPacket(Packet packet, PacketSendListener packetSendListener, CallbackInfo ci) { if (this.receiving != PacketFlow.CLIENTBOUND) { return; } for (IBaritone ibaritone : BaritoneAPI.getProvider().getAllBaritones()) { if (ibaritone.getPlayerContext().player() != null && ibaritone.getPlayerContext().player().connection.getConnection() == (Connection) (Object) this) { - ibaritone.getGameEventHandler().onSendPacket(new PacketEvent((Connection) (Object) this, EventState.PRE, inPacket)); + ibaritone.getGameEventHandler().onSendPacket(new PacketEvent((Connection) (Object) this, EventState.PRE, packet)); } } } @@ -69,14 +70,14 @@ public class MixinNetworkManager { method = "sendPacket", at = @At("RETURN") ) - private void postDispatchPacket(Packet inPacket, final GenericFutureListener> futureListeners, CallbackInfo ci) { + private void postDispatchPacket(Packet packet, PacketSendListener packetSendListener, CallbackInfo ci) { if (this.receiving != PacketFlow.CLIENTBOUND) { return; } for (IBaritone ibaritone : BaritoneAPI.getProvider().getAllBaritones()) { if (ibaritone.getPlayerContext().player() != null && ibaritone.getPlayerContext().player().connection.getConnection() == (Connection) (Object) this) { - ibaritone.getGameEventHandler().onSendPacket(new PacketEvent((Connection) (Object) this, EventState.POST, inPacket)); + ibaritone.getGameEventHandler().onSendPacket(new PacketEvent((Connection) (Object) this, EventState.POST, packet)); } } }