Merge pull request #21 from GTNewHorizons/rename

rename, bump gt
GTNewHorizons · Sep 3, 2024 · 487f4c2 · 487f4c2
2 parents f15d39b + f111c3e
commit 487f4c2
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 13 deletions.
diff --git a/dependencies.gradle b/dependencies.gradle
@@ -36,7 +36,7 @@
 dependencies {
     annotationProcessor(project(":processor"))
     compileOnly('com.github.GTNewHorizons:Applied-Energistics-2-Unofficial:rv3-beta-440-GTNH:dev')
-    devOnlyNonPublishable('com.github.GTNewHorizons:GT5-Unofficial:5.09.49.29:dev')
+    devOnlyNonPublishable('com.github.GTNewHorizons:GT5-Unofficial:5.09.49.56:dev')
     compileOnly("com.github.GTNewHorizons:EnderIO:2.8.17:dev")
     compileOnly("com.github.GTNewHorizons:ae2stuff:0.8.2-GTNH:dev")
     compileOnly("com.github.GTNewHorizons:NewHorizonsCoreMod:2.6.8:dev")

diff --git a/src/main/java/com/caedis/duradisplay/overlay/OverlayDurability.java b/src/main/java/com/caedis/duradisplay/overlay/OverlayDurability.java
@@ -13,7 +13,7 @@
 import com.caedis.duradisplay.utils.DurabilityLikeInfo;
 import com.caedis.duradisplay.utils.ModSelfDrawnBar;
 
-import gregtech.api.items.GT_RadioactiveCell_Item;
+import gregtech.api.items.ItemRadioactiveCell;
 import ic2.api.item.ICustomDamageItem;
 import ic2.core.item.armor.ItemArmorFluidTank;
 
@@ -50,8 +50,8 @@ public void postLoadConfig() {
                     return "durability";
                 }
             });
-        addHandler("gregtech.api.items.GT_MetaBase_Item", OverlayDurability::handleGregTech);
-        addHandler("gregtech.api.items.GT_RadioactiveCell_Item", OverlayDurability::handleGregTechRadioactiveCell);
+        addHandler("gregtech.api.items.MetaBaseItem", OverlayDurability::handleGregTech);
+        addHandler("gregtech.api.items.ItemRadioactiveCell", OverlayDurability::handleGregTechRadioactiveCell);
         addHandler("tconstruct.library.weaponry.AmmoItem", i -> null);
         addHandler("appeng.items.tools.powered.powersink.AEBasePoweredItem", i -> null);
         addHandler("ic2.api.item.IElectricItem", i -> null);
@@ -120,7 +120,7 @@ public static DurabilityLikeInfo handleToolCore(@NotNull ItemStack stack) {
     }
 
     public static DurabilityLikeInfo handleGregTechRadioactiveCell(@NotNull ItemStack stack) {
-        GT_RadioactiveCell_Item bei = ((GT_RadioactiveCell_Item) stack.getItem());
+        ItemRadioactiveCell bei = ((ItemRadioactiveCell) stack.getItem());
 
         assert bei != null;
 

diff --git a/src/main/java/com/caedis/duradisplay/overlay/OverlayGadgets.java b/src/main/java/com/caedis/duradisplay/overlay/OverlayGadgets.java
@@ -49,7 +49,7 @@ Gadgets are items that show UseCount(remain) as default
                     return "gadgets";
                 }
             });
-        addHandler("gregtech.common.items.GT_MetaGenerated_Item_01", OverlayGadgets::handleGregtechMeta1);
+        addHandler("gregtech.common.items.MetaGeneratedItem01", OverlayGadgets::handleGregtechMeta1);
         addHandler("buildcraft.core.ItemPaintbrush", OverlayGadgets::handleBCBrush);
         addHandler("tmechworks.items.SpoolOfWire", OverlayGadgets::handleMechworks);
         addHandler("ic2.core.item.tool.ItemToolPainter", OverlayDurability::handleDefault);

diff --git a/src/main/java/com/caedis/duradisplay/utils/ModSelfDrawnBar.java b/src/main/java/com/caedis/duradisplay/utils/ModSelfDrawnBar.java
@@ -4,7 +4,7 @@
 
 import com.caedis.duradisplay.DuraDisplay;
 
-import gregtech.GT_Mod;
+import gregtech.GTMod;
 
 @SuppressWarnings("OptionalUsedAsFieldOrParameterType")
 public final class ModSelfDrawnBar {
@@ -36,17 +36,17 @@ public static void changeEIODurabilitybar(boolean enable) {
     public static void changeGTDurabilitybar(boolean enable) {
         try {
             if (!GTDurabilitybar.isPresent())
-                GTDurabilitybar = Optional.of(GT_Mod.gregtechproxy.mRenderItemDurabilityBar);
-            GT_Mod.gregtechproxy.mRenderItemDurabilityBar = enable;
+                GTDurabilitybar = Optional.of(GTMod.gregtechproxy.mRenderItemDurabilityBar);
+            GTMod.gregtechproxy.mRenderItemDurabilityBar = enable;
         } catch (NoClassDefFoundError e) {
             DuraDisplay.LOG.info("GT not found, skipping Durabilitybar config change");
         }
     }
 
     public static void changeGTChargebar(boolean enable) {
         try {
-            if (!GTChargebar.isPresent()) GTChargebar = Optional.of(GT_Mod.gregtechproxy.mRenderItemChargeBar);
-            GT_Mod.gregtechproxy.mRenderItemChargeBar = enable;
+            if (!GTChargebar.isPresent()) GTChargebar = Optional.of(GTMod.gregtechproxy.mRenderItemChargeBar);
+            GTMod.gregtechproxy.mRenderItemChargeBar = enable;
         } catch (NoClassDefFoundError e) {
             DuraDisplay.LOG.info("GT not found, skipping Charge config change");
         }
@@ -70,15 +70,15 @@ public static void restoreEIODurabilitybar() {
 
     public static void restoreGTDurabilitybar() {
         try {
-            GTDurabilitybar.ifPresent(aBoolean -> GT_Mod.gregtechproxy.mRenderItemDurabilityBar = aBoolean);
+            GTDurabilitybar.ifPresent(aBoolean -> GTMod.gregtechproxy.mRenderItemDurabilityBar = aBoolean);
         } catch (NoClassDefFoundError e) {
             DuraDisplay.LOG.info("GT not found, skipping Durabilitybar config restore");
         }
     }
 
     public static void restoreGTChargebar() {
         try {
-            GTChargebar.ifPresent(aBoolean -> GT_Mod.gregtechproxy.mRenderItemChargeBar = aBoolean);
+            GTChargebar.ifPresent(aBoolean -> GTMod.gregtechproxy.mRenderItemChargeBar = aBoolean);
         } catch (NoClassDefFoundError e) {
             DuraDisplay.LOG.info("GT not found, skipping Charge config restore");
         }