From 158f2f480435a2779c3b0d812c1753a7cf5d5279 Mon Sep 17 00:00:00 2001 From: Lyft <127234178+Lyfts@users.noreply.github.com> Date: Mon, 20 Jan 2025 16:44:15 +0100 Subject: [PATCH] Use gtnhlib config sync (#51) --- dependencies.gradle | 4 +-- src/main/java/xonin/backhand/Backhand.java | 2 +- src/main/java/xonin/backhand/CommonProxy.java | 2 -- .../packet/BackhandPacketHandler.java | 1 - .../packet/OffhandConfigSyncPacket.java | 33 ------------------- .../xonin/backhand/utils/BackhandConfig.java | 3 ++ 6 files changed, 6 insertions(+), 39 deletions(-) delete mode 100644 src/main/java/xonin/backhand/packet/OffhandConfigSyncPacket.java diff --git a/dependencies.gradle b/dependencies.gradle index 79e353a..f3662c0 100644 --- a/dependencies.gradle +++ b/dependencies.gradle @@ -34,9 +34,9 @@ * For more details, see https://docs.gradle.org/8.0.1/userguide/java_library_plugin.html#sec:java_library_configurations_graph */ dependencies { - api("com.github.GTNewHorizons:GTNHLib:0.6.2:dev") + api("com.github.GTNewHorizons:GTNHLib:0.6.3:dev") compileOnly("com.github.GTNewHorizons:TinkersConstruct:1.13.4-GTNH:dev") - runtimeOnlyNonPublishable("com.github.GTNewHorizons:NotEnoughItems:2.7.18-GTNH:dev") + runtimeOnlyNonPublishable("com.github.GTNewHorizons:NotEnoughItems:2.7.23-GTNH:dev") compileOnly("com.github.GTNewHorizons:inventory-tweaks:1.7.0:dev") compileOnly(rfg.deobf('maven.modrinth:etfuturum:2.6.2')) } diff --git a/src/main/java/xonin/backhand/Backhand.java b/src/main/java/xonin/backhand/Backhand.java index 2493f40..940e1e4 100644 --- a/src/main/java/xonin/backhand/Backhand.java +++ b/src/main/java/xonin/backhand/Backhand.java @@ -22,7 +22,7 @@ modid = Backhand.MODID, name = "Backhand", version = Tags.VERSION, - dependencies = "required-after:gtnhlib@[0.5.16,)") + dependencies = "required-after:gtnhlib@[0.6.3,)") public class Backhand { public static final String MODID = "backhand"; diff --git a/src/main/java/xonin/backhand/CommonProxy.java b/src/main/java/xonin/backhand/CommonProxy.java index 7454f82..9643f80 100644 --- a/src/main/java/xonin/backhand/CommonProxy.java +++ b/src/main/java/xonin/backhand/CommonProxy.java @@ -13,7 +13,6 @@ import cpw.mods.fml.common.eventhandler.SubscribeEvent; import cpw.mods.fml.common.gameevent.PlayerEvent; import xonin.backhand.api.core.BackhandUtils; -import xonin.backhand.packet.OffhandConfigSyncPacket; import xonin.backhand.packet.OffhandSyncItemPacket; @EventBusSubscriber @@ -26,7 +25,6 @@ public static void onPlayerJoin(PlayerEvent.PlayerLoggedInEvent event) { if (!(event.player instanceof EntityPlayerMP playerMP)) { return; } - Backhand.packetHandler.sendPacketToPlayer(new OffhandConfigSyncPacket().generatePacket(), playerMP); ItemStack offhandItem = BackhandUtils.getOffhandItem(playerMP); if (Backhand.isOffhandBlacklisted(offhandItem)) { BackhandUtils.setPlayerOffhandItem(playerMP, null); diff --git a/src/main/java/xonin/backhand/packet/BackhandPacketHandler.java b/src/main/java/xonin/backhand/packet/BackhandPacketHandler.java index 65ce08e..8248336 100644 --- a/src/main/java/xonin/backhand/packet/BackhandPacketHandler.java +++ b/src/main/java/xonin/backhand/packet/BackhandPacketHandler.java @@ -27,7 +27,6 @@ public BackhandPacketHandler() { map.put(OffhandSyncItemPacket.packetName, new OffhandSyncItemPacket()); map.put(OffhandSwapPacket.packetName, new OffhandSwapPacket()); map.put(OffhandSwapClientPacket.packetName, new OffhandSwapClientPacket()); - map.put(OffhandConfigSyncPacket.packetName, new OffhandConfigSyncPacket()); map.put(OffhandSyncOffhandUse.packetName, new OffhandSyncOffhandUse()); } diff --git a/src/main/java/xonin/backhand/packet/OffhandConfigSyncPacket.java b/src/main/java/xonin/backhand/packet/OffhandConfigSyncPacket.java deleted file mode 100644 index 1250896..0000000 --- a/src/main/java/xonin/backhand/packet/OffhandConfigSyncPacket.java +++ /dev/null @@ -1,33 +0,0 @@ - -package xonin.backhand.packet; - -import net.minecraft.entity.player.EntityPlayer; - -import io.netty.buffer.ByteBuf; -import xonin.backhand.utils.BackhandConfig; - -public final class OffhandConfigSyncPacket extends AbstractPacket { - - public static final String packetName = "MB2|ConfigSync"; - - public OffhandConfigSyncPacket() {} - - @Override - public void process(ByteBuf inputStream, EntityPlayer player) { - BackhandConfig.OffhandAttack = inputStream.readBoolean(); - BackhandConfig.EmptyOffhand = inputStream.readBoolean(); - BackhandConfig.OffhandBreakBlocks = inputStream.readBoolean(); - } - - @Override - public String getChannel() { - return packetName; - } - - @Override - public void write(ByteBuf out) { - out.writeBoolean(BackhandConfig.OffhandAttack); - out.writeBoolean(BackhandConfig.EmptyOffhand); - out.writeBoolean(BackhandConfig.OffhandBreakBlocks); - } -} diff --git a/src/main/java/xonin/backhand/utils/BackhandConfig.java b/src/main/java/xonin/backhand/utils/BackhandConfig.java index d503d98..46b4ee4 100644 --- a/src/main/java/xonin/backhand/utils/BackhandConfig.java +++ b/src/main/java/xonin/backhand/utils/BackhandConfig.java @@ -8,14 +8,17 @@ @Config.Comment("Configs that will be synced with the server's config if playing in multiplayer") public class BackhandConfig { + @Config.Sync @Config.Comment("If set to false, an empty offhand will only be rendered when the player is punching with the offhand. False in vanilla.") @Config.DefaultBoolean(false) public static boolean OffhandAttack; + @Config.Sync @Config.Comment("If set to false, disables offhand actions and rendering if there is no offhand item. False in vanilla.") @Config.DefaultBoolean(false) public static boolean EmptyOffhand; + @Config.Sync @Config.Comment("Determines whether you can break blocks with the offhand or not. False in vanilla.") @Config.DefaultBoolean(false) public static boolean OffhandBreakBlocks;