Various changes (#45)

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.5.12:dev")
-    runtimeOnlyNonPublishable("com.github.GTNewHorizons:NotEnoughItems:2.6.39-GTNH:dev")
+    api("com.github.GTNewHorizons:GTNHLib:0.6.0:dev")
+    runtimeOnlyNonPublishable("com.github.GTNewHorizons:NotEnoughItems:2.7.13-GTNH:dev")
     compileOnly("com.github.GTNewHorizons:inventory-tweaks:1.7.0:dev")
     compileOnly(deobf("https://github.com/Roadhog360/Et-Futurum-Requiem/releases/download/2.6.0/Et_Futurum_Requiem-2.6.0-nomixin.jar", "Et Futurum Requiem"))
-    compileOnly("com.github.GTNewHorizons:CarpentersBlocks:3.6.2-GTNH:dev")
+    compileOnly("com.github.GTNewHorizons:CarpentersBlocks:3.7.0-GTNH:dev")
 }

gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.9-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.11.1-bin.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME

settings.gradle

@@ -17,5 +17,5 @@ pluginManagement {
 }
 
 plugins {
-    id 'com.gtnewhorizons.gtnhsettingsconvention' version '1.0.27'
+    id 'com.gtnewhorizons.gtnhsettingsconvention' version '1.0.30'
 }

src/main/java/xonin/backhand/Backhand.java

@@ -3,11 +3,13 @@
 import net.minecraft.item.ItemStack;
 import net.minecraft.server.MinecraftServer;
 import net.minecraftforge.common.MinecraftForge;
-import net.minecraftforge.common.config.Configuration;
 
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
 
+import com.gtnewhorizon.gtnhlib.config.ConfigException;
+import com.gtnewhorizon.gtnhlib.config.ConfigurationManager;
+
 import cpw.mods.fml.common.FMLCommonHandler;
 import cpw.mods.fml.common.Loader;
 import cpw.mods.fml.common.Mod;
@@ -17,13 +19,13 @@
 import cpw.mods.fml.common.event.FMLServerStoppingEvent;
 import xonin.backhand.packet.BackhandPacketHandler;
 import xonin.backhand.utils.BackhandConfig;
+import xonin.backhand.utils.BackhandConfigClient;
 
 @Mod(
     modid = Backhand.MODID,
     name = "Backhand",
     version = Tags.VERSION,
-    dependencies = "required-after:gtnhlib@[0.3.2,)",
-    guiFactory = "xonin.backhand.client.gui.BackhandGuiFactory")
+    dependencies = "required-after:gtnhlib@[0.5.16,)")
 public class Backhand {
 
     public static final String MODID = "backhand";
@@ -35,25 +37,17 @@ public class Backhand {
     @SidedProxy(clientSide = "xonin.backhand.client.ClientProxy", serverSide = "xonin.backhand.CommonProxy")
     public static CommonProxy proxy;
     public static BackhandPacketHandler packetHandler;
-
-    public static boolean OffhandAttack;
-    public static boolean EmptyOffhand;
-    public static boolean OffhandBreakBlocks;
-    public static boolean UseOffhandArrows;
-    public static boolean UseOffhandBow;
-    public static boolean OffhandTickHotswap;
-    public static int AlternateOffhandSlot;
-    public static boolean UseInventorySlot;
-    public static String[] offhandBlacklist;
-
-    public static boolean RenderEmptyOffhandAtRest;
-
     public static boolean isEFRLoaded;
 
     @Mod.EventHandler
     public void load(FMLPreInitializationEvent event) {
         isEFRLoaded = Loader.isModLoaded("etfuturum");
-        BackhandConfig.getConfig(new Configuration(event.getSuggestedConfigurationFile()));
+        try {
+            ConfigurationManager.registerConfig(BackhandConfig.class);
+            ConfigurationManager.registerConfig(BackhandConfigClient.class);
+        } catch (ConfigException e) {
+            LOGGER.warn("Unable to register config", e);
+        }
 
         proxy.load();
 
@@ -87,7 +81,7 @@ public static MinecraftServer getServer() {
     public static boolean isOffhandBlacklisted(ItemStack stack) {
         if (stack == null) return false;
 
-        for (String itemName : offhandBlacklist) {
+        for (String itemName : BackhandConfig.offhandBlacklist) {
             if (stack.getItem().delegate.name()
                 .equals(itemName)) {
                 return true;

src/main/java/xonin/backhand/HookContainerClass.java

@@ -44,6 +44,7 @@
 import xonin.backhand.packet.OffhandConfigSyncPacket;
 import xonin.backhand.packet.OffhandPlaceBlockPacket;
 import xonin.backhand.packet.OffhandSyncItemPacket;
+import xonin.backhand.utils.BackhandConfig;
 import xonin.backhand.utils.EnumAnimations;
 
 public final class HookContainerClass {
@@ -110,7 +111,7 @@ public static MovingObjectPosition getRaytraceBlock(EntityPlayer p) {
     public void playerInteract(PlayerInteractEvent event) {
         if (isFake(event.entityPlayer)) return;
 
-        if (!Backhand.EmptyOffhand && BackhandUtils.getOffhandItem(event.entityPlayer) == null) {
+        if (!BackhandConfig.EmptyOffhand && BackhandUtils.getOffhandItem(event.entityPlayer) == null) {
             return;
         }
 
@@ -156,7 +157,7 @@ && canBlockBeInteractedWith(event.entityPlayer.worldObj, i, j, k)) {
                 }
             }
             if (event.entityPlayer.worldObj.isRemote && !BackhandUtils.usagePriorAttack(offhandItem)
-                && Backhand.OffhandAttack
+                && BackhandConfig.OffhandAttack
                 && swingHand) {
                 HookContainerClass.sendOffSwingEventNoCheck(event.entityPlayer, mainHandItem, offhandItem);
             }
@@ -226,6 +227,9 @@ public static boolean tryUseItem(EntityPlayer player, ItemStack itemStack, Side
             Backhand.packetHandler.sendPacketToServer(
                 new OffhandPlaceBlockPacket(-1, -1, -1, 255, itemStack, 0.0F, 0.0F, 0.0F).generatePacket());
         }
+
+        if (itemStack == null || player.getCurrentEquippedItem() == null) return false;
+
         final int i = itemStack.stackSize;
         final int j = itemStack.getItemDamage();
         ItemStack prevHeldItem = player.getCurrentEquippedItem();

src/main/java/xonin/backhand/ServerEventsHandler.java

@@ -20,6 +20,7 @@
 import ganymedes01.etfuturum.ModItems;
 import xonin.backhand.api.core.BackhandUtils;
 import xonin.backhand.api.core.OffhandExtendedProperty;
+import xonin.backhand.utils.BackhandConfig;
 
 public class ServerEventsHandler {
 
@@ -88,7 +89,7 @@ public void onItemUseStart(PlayerUseItemEvent.Start event) {
 
     @SubscribeEvent(priority = EventPriority.HIGHEST)
     public void onArrowNock(ArrowNockEvent event) {
-        if (!Backhand.UseOffhandArrows) {
+        if (!BackhandConfig.UseOffhandArrows) {
             return;
         }
         EntityPlayer player = event.entityPlayer;
@@ -138,7 +139,7 @@ public void onItemStop(PlayerUseItemEvent.Stop event) {
             return;
         }
 
-        if (!Backhand.UseOffhandArrows || !(event.item.getItem() instanceof ItemBow)) {
+        if (!BackhandConfig.UseOffhandArrows || !(event.item.getItem() instanceof ItemBow)) {
             return;
         }
 

src/main/java/xonin/backhand/ServerTickHandler.java

@@ -19,6 +19,7 @@
 import xonin.backhand.api.core.BackhandUtils;
 import xonin.backhand.api.core.OffhandExtendedProperty;
 import xonin.backhand.packet.OffhandSyncItemPacket;
+import xonin.backhand.utils.BackhandConfig;
 
 public class ServerTickHandler {
 
@@ -62,7 +63,7 @@ public void onUpdateWorld(TickEvent.WorldTickEvent event) {
             .getEffectiveSide() != Side.SERVER) {
             return;
         }
-        if (Backhand.OffhandTickHotswap) {
+        if (BackhandConfig.OffhandTickHotswap) {
             for (EntityPlayer player : event.world.playerEntities) {
                 if (!(player instanceof EntityPlayerMP playerMP)) continue;
                 OffhandExtendedProperty offhandProp = BackhandUtils.getOffhandEP(player);
@@ -106,7 +107,7 @@ public void onUpdatePlayer(TickEvent.PlayerTickEvent event) {
 
                     boolean foundSlot = false;
                     for (int i = 0; i < player.inventory.getSizeInventory() - 4; i++) {
-                        if (i == Backhand.AlternateOffhandSlot) continue;
+                        if (i == BackhandConfig.AlternateOffhandSlot) continue;
                         if (player.inventory.getStackInSlot(i) == null) {
                             player.inventory.setInventorySlotContents(i, offhand);
                             foundSlot = true;

src/main/java/xonin/backhand/api/core/BackhandUtils.java

@@ -47,6 +47,7 @@
 
 import xonin.backhand.Backhand;
 import xonin.backhand.ServerTickHandler;
+import xonin.backhand.utils.BackhandConfig;
 
 /**
  * Store commonly used method, mostly for the {@link EntityPlayer} {@link ItemStack}s management
@@ -86,7 +87,7 @@ public static void swapOffhandItem(EntityPlayer player, int delayHotswap) {
         final ItemStack offhandItem = getLegalStack(BackhandUtils.getOffhandItem(player));
         BackhandUtils.setPlayerCurrentItem(player, offhandItem);
         BackhandUtils.setPlayerOffhandItem(player, mainhandItem);
-        if (Backhand.UseInventorySlot) {
+        if (BackhandConfig.UseInventorySlot) {
             player.inventoryContainer.detectAndSendChanges();
         }
     }
@@ -97,8 +98,8 @@ public static void setPlayerCurrentItem(EntityPlayer player, ItemStack stack) {
 
     public static void setPlayerOffhandItem(EntityPlayer player, ItemStack stack) {
         if (!Backhand.isOffhandBlacklisted(stack)) {
-            if (Backhand.UseInventorySlot) {
-                player.inventory.setInventorySlotContents(Backhand.AlternateOffhandSlot, stack);
+            if (BackhandConfig.UseInventorySlot) {
+                player.inventory.setInventorySlotContents(BackhandConfig.AlternateOffhandSlot, stack);
             } else {
                 getOffhandEP(player).setOffhandItem(stack);
             }
@@ -108,8 +109,8 @@ public static void setPlayerOffhandItem(EntityPlayer player, ItemStack stack) {
     public static @Nullable ItemStack getOffhandItem(EntityPlayer player) {
         if (player instanceof FakePlayer) return null;
 
-        if (Backhand.UseInventorySlot) {
-            return player.inventory.getStackInSlot(Backhand.AlternateOffhandSlot);
+        if (BackhandConfig.UseInventorySlot) {
+            return player.inventory.getStackInSlot(BackhandConfig.AlternateOffhandSlot);
         } else {
             return getOffhandEP(player).getOffhandItem();
         }
@@ -429,7 +430,7 @@ protected static void writeNBTTagCompound(NBTTagCompound par0NBTTagCompound,
     public static void attackTargetEntityWithCurrentOffItem(EntityPlayer player, Entity par1Entity) {
         final ItemStack oldItem = player.getCurrentEquippedItem();
         final ItemStack offhandItem = BackhandUtils.getOffhandItem(player);
-        if (!Backhand.OffhandAttack || (offhandItem == null && !Backhand.EmptyOffhand)) return;
+        if (!BackhandConfig.OffhandAttack || (offhandItem == null && !BackhandConfig.EmptyOffhand)) return;
 
         BackhandUtils.setPlayerCurrentItem(player, offhandItem);
         refreshAttributes(player.getAttributeMap(), oldItem, player.getCurrentEquippedItem());

src/main/java/xonin/backhand/api/core/InventoryPlayerBackhand.java

@@ -7,6 +7,7 @@
 import net.minecraft.item.ItemStack;
 
 import xonin.backhand.Backhand;
+import xonin.backhand.utils.BackhandConfig;
 
 /**
  * User: nerd-boy
@@ -58,7 +59,7 @@ public boolean addItemStackToInventory(ItemStack itemStack) {
         if (itemStack == null || itemStack.stackSize == 0 || itemStack.getItem() == null) return false;
 
         if (!Backhand.isOffhandBlacklisted(itemStack)) {
-            if (this.getOffhandItem() == null && getFirstEmptyStack() == -1) {
+            if (BackhandConfig.OffhandPickup && this.getOffhandItem() == null && getFirstEmptyStack() == -1) {
                 this.setOffhandItem(ItemStack.copyItemStack(itemStack));
                 itemStack.stackSize = 0;
                 BackhandUtils.getOffhandEP(player).syncOffhand = true;

src/main/java/xonin/backhand/client/BackhandClientTickHandler.java

@@ -39,6 +39,7 @@
 import xonin.backhand.packet.OffhandAttackPacket;
 import xonin.backhand.packet.OffhandPlaceBlockPacket;
 import xonin.backhand.packet.OffhandToServerPacket;
+import xonin.backhand.utils.BackhandConfig;
 
 public final class BackhandClientTickHandler {
 
@@ -107,7 +108,7 @@ public void tryAttackEntity(EntityPlayer player) {
     public boolean tryCheckUseItem(ItemStack offhandItem, EntityPlayer player) {
         MovingObjectPosition mouseOver = mc.objectMouseOver;
 
-        if (offhandItem.getItem() instanceof ItemBow && !Backhand.UseOffhandBow) {
+        if (offhandItem.getItem() instanceof ItemBow && !BackhandConfig.UseOffhandBow) {
             return false;
         }
 

src/main/java/xonin/backhand/client/ClientEventHandler.java

@@ -20,9 +20,9 @@
 
 import cpw.mods.fml.common.eventhandler.EventPriority;
 import cpw.mods.fml.common.eventhandler.SubscribeEvent;
-import xonin.backhand.Backhand;
 import xonin.backhand.api.core.BackhandUtils;
 import xonin.backhand.client.utils.BackhandRenderHelper;
+import xonin.backhand.utils.BackhandConfig;
 
 public class ClientEventHandler {
 
@@ -141,7 +141,7 @@ public void resetPlayerLeftHand(RenderPlayerEvent.Post event) {
 
     @SubscribeEvent
     public void render3rdPersonOffhand(RenderPlayerEvent.Specials.Post event) {
-        if (!Backhand.EmptyOffhand && BackhandUtils.getOffhandItem(event.entityPlayer) == null) {
+        if (!BackhandConfig.EmptyOffhand && BackhandUtils.getOffhandItem(event.entityPlayer) == null) {
             return;
         }
 

src/main/java/xonin/backhand/client/ClientTickHandler.java

@@ -19,6 +19,7 @@
 import xonin.backhand.api.core.BackhandUtils;
 import xonin.backhand.client.utils.BackhandClientUtils;
 import xonin.backhand.packet.OffhandSwapPacket;
+import xonin.backhand.utils.BackhandConfig;
 
 public class ClientTickHandler {
 
@@ -97,11 +98,11 @@ public void clientHelper(TickEvent.PlayerTickEvent event) {
             ClientTickHandler.delay--;
         }
 
-        if (!Backhand.OffhandBreakBlocks) {
+        if (!BackhandConfig.OffhandBreakBlocks) {
             return;
         }
 
-        if (!Backhand.EmptyOffhand && BackhandUtils.getOffhandItem(event.player) == null) {
+        if (!BackhandConfig.EmptyOffhand && BackhandUtils.getOffhandItem(event.player) == null) {
             return;
         }