the renaming (#568)

GTNewHorizons · Sep 3, 2024 · 9e6f78b · 9e6f78b
1 parent 74c52f8
commit 9e6f78b
Show file tree

Hide file tree

Showing 7 changed files with 67 additions and 67 deletions.
diff --git a/dependencies.gradle b/dependencies.gradle
@@ -10,7 +10,7 @@ dependencies {
     compileOnly('com.github.GTNewHorizons:BuildCraft:7.1.39:dev') {transitive = false}
     compileOnly('com.github.GTNewHorizons:ForestryMC:4.9.10:dev') {transitive = false} // required to compile CraftingV2Tests.java now
     compileOnly('com.github.GTNewHorizons:ForgeMultipart:1.5.0:dev') {transitive = false}
-    compileOnly('com.github.GTNewHorizons:GT5-Unofficial:5.09.49.52:dev') {transitive = false}
+    compileOnly('com.github.GTNewHorizons:GT5-Unofficial:5.09.49.56:dev') {transitive = false}
     compileOnly('com.github.GTNewHorizons:Jabba:1.4.6:dev') {transitive = false}
     compileOnly('com.github.GTNewHorizons:inventory-tweaks:1.7.0:api') {transitive = false}
     compileOnly('com.github.GTNewHorizons:OpenComputers:1.10.22-GTNH:api') {transitive = false}
@@ -34,7 +34,7 @@ dependencies {
     functionalTestImplementation('org.junit.platform:junit-platform-engine')
     functionalTestImplementation('org.junit.platform:junit-platform-launcher')
     functionalTestImplementation('org.junit.platform:junit-platform-reporting')
-    functionalTestImplementation('com.github.GTNewHorizons:GT5-Unofficial:5.09.49.52:dev') {
+    functionalTestImplementation('com.github.GTNewHorizons:GT5-Unofficial:5.09.49.56:dev') {
         exclude module: "Applied-Energistics-2-Unofficial"
     }
 

diff --git a/src/functionalTest/java/appeng/test/AppengTestMod.java b/src/functionalTest/java/appeng/test/AppengTestMod.java
@@ -25,7 +25,7 @@
 import cpw.mods.fml.common.Mod.EventHandler;
 import cpw.mods.fml.common.event.FMLPreInitializationEvent;
 import cpw.mods.fml.common.event.FMLServerStartedEvent;
-import gregtech.GT_Mod;
+import gregtech.GTMod;
 
 // Most of these don't matter as this mod never gets published
 @Mod(
@@ -38,8 +38,8 @@ public class AppengTestMod {
     @EventHandler
     public void preInit(FMLPreInitializationEvent ev) {
         // Disable GT5u messing with vanilla recipes for unit tests
-        GT_Mod.gregtechproxy.mNerfedWoodPlank = false;
-        GT_Mod.gregtechproxy.mNerfedVanillaTools = false;
+        GTMod.gregtechproxy.mNerfedWoodPlank = false;
+        GTMod.gregtechproxy.mNerfedVanillaTools = false;
     }
 
     @EventHandler

diff --git a/src/functionalTest/java/appeng/test/CraftingV2Tests.java b/src/functionalTest/java/appeng/test/CraftingV2Tests.java
@@ -27,9 +27,9 @@
 import appeng.util.item.ItemList;
 import gregtech.api.enums.Materials;
 import gregtech.api.enums.OrePrefixes;
-import gregtech.api.util.GT_OreDictUnificator;
-import gregtech.common.items.GT_MetaGenerated_Tool_01;
-import gregtech.common.items.ID_MetaTool_01;
+import gregtech.api.util.GTOreDictUnificator;
+import gregtech.common.items.IDMetaTool01;
+import gregtech.common.items.MetaGeneratedTool01;
 
 public class CraftingV2Tests {
 
@@ -41,10 +41,10 @@ public class CraftingV2Tests {
 
     public CraftingV2Tests() {
         bronzePlate = Materials.Bronze.getPlates(1);
-        bronzeDoublePlate = GT_OreDictUnificator.get(OrePrefixes.plateDouble, Materials.Bronze, 1);
+        bronzeDoublePlate = GTOreDictUnificator.get(OrePrefixes.plateDouble, Materials.Bronze, 1);
         bronzeIngot = Materials.Bronze.getIngots(1);
-        gtHammer = GT_MetaGenerated_Tool_01.INSTANCE
-                .getToolWithStats(ID_MetaTool_01.HARDHAMMER.ID, 1, Materials.VanadiumSteel, null, null);
+        gtHammer = MetaGeneratedTool01.INSTANCE
+                .getToolWithStats(IDMetaTool01.HARDHAMMER.ID, 1, Materials.VanadiumSteel, null, null);
         ironDust = Materials.Iron.getDust(1);
         ironIngot = Materials.Iron.getIngots(1);
         ironPlate = Materials.Iron.getPlates(1);

diff --git a/src/main/java/appeng/block/storage/BlockChest.java b/src/main/java/appeng/block/storage/BlockChest.java
@@ -31,8 +31,8 @@
 import appeng.util.Platform;
 import cpw.mods.fml.relauncher.Side;
 import cpw.mods.fml.relauncher.SideOnly;
-import gregtech.api.GregTech_API;
-import gregtech.api.util.GT_Utility;
+import gregtech.api.GregTechAPI;
+import gregtech.api.util.GTUtility;
 
 public class BlockChest extends AEBaseTileBlock {
 
@@ -58,7 +58,7 @@ public boolean onActivated(final World w, final int x, final int y, final int z,
             }
 
             if (IntegrationRegistry.INSTANCE.isEnabled(IntegrationType.GT)
-                    && GT_Utility.isStackInList(p.getHeldItem(), GregTech_API.sWireCutterList)) {
+                    && GTUtility.isStackInList(p.getHeldItem(), GregTechAPI.sWireCutterList)) {
                 if (tg.lockDigitalSingularityCells()) {
                     p.addChatMessage(PlayerMessages.ChestLocked.get());
                 }

diff --git a/src/main/java/appeng/block/storage/BlockDrive.java b/src/main/java/appeng/block/storage/BlockDrive.java
@@ -28,8 +28,8 @@
 import appeng.util.Platform;
 import cpw.mods.fml.relauncher.Side;
 import cpw.mods.fml.relauncher.SideOnly;
-import gregtech.api.GregTech_API;
-import gregtech.api.util.GT_Utility;
+import gregtech.api.GregTechAPI;
+import gregtech.api.util.GTUtility;
 
 public class BlockDrive extends AEBaseTileBlock {
 
@@ -56,7 +56,7 @@ public boolean onActivated(final World w, final int x, final int y, final int z,
         if (tg != null) {
             if (Platform.isServer()) {
                 if (IntegrationRegistry.INSTANCE.isEnabled(IntegrationType.GT)
-                        && GT_Utility.isStackInList(p.getHeldItem(), GregTech_API.sWireCutterList)) {
+                        && GTUtility.isStackInList(p.getHeldItem(), GregTechAPI.sWireCutterList)) {
                     if (tg.lockDigitalSingularityCells()) {
                         p.addChatMessage(PlayerMessages.DriveLocked.get());
                     }

diff --git a/src/main/java/appeng/helpers/BlockingModeIgnoreList.java b/src/main/java/appeng/helpers/BlockingModeIgnoreList.java
@@ -10,7 +10,7 @@
 import gregtech.api.enums.ItemList;
 import gregtech.api.enums.Materials;
 import gregtech.api.enums.OrePrefixes;
-import gregtech.api.util.GT_OreDictUnificator;
+import gregtech.api.util.GTOreDictUnificator;
 
 public class BlockingModeIgnoreList {
 
@@ -124,37 +124,37 @@ public static void registerIgnoredMaterials() {
             Shapes.add(getUniqueIdentifier(ItemList.White_Dwarf_Shape_Extruder_Small_Gear));
             Shapes.add(getUniqueIdentifier(ItemList.White_Dwarf_Shape_Extruder_ToolHeadDrill));
 
-            Lenses.add(getUniqueIdentifier(GT_OreDictUnificator.get(OrePrefixes.lens, Materials.Emerald, 1)));
-            Lenses.add(getUniqueIdentifier(GT_OreDictUnificator.get(OrePrefixes.lens, Materials.Firestone, 1)));
-            Lenses.add(getUniqueIdentifier(GT_OreDictUnificator.get(OrePrefixes.lens, Materials.Diamond, 1)));
-            Lenses.add(getUniqueIdentifier(GT_OreDictUnificator.get(OrePrefixes.lens, Materials.Ruby, 1)));
-            Lenses.add(getUniqueIdentifier(GT_OreDictUnificator.get(OrePrefixes.lens, Materials.Sapphire, 1)));
-            Lenses.add(getUniqueIdentifier(GT_OreDictUnificator.get(OrePrefixes.lens, Materials.GreenSapphire, 1)));
-            Lenses.add(getUniqueIdentifier(GT_OreDictUnificator.get(OrePrefixes.lens, Materials.Olivine, 1)));
-            Lenses.add(getUniqueIdentifier(GT_OreDictUnificator.get(OrePrefixes.lens, Materials.NetherStar, 1)));
-            Lenses.add(getUniqueIdentifier(GT_OreDictUnificator.get(OrePrefixes.lens, Materials.Topaz, 1)));
-            Lenses.add(getUniqueIdentifier(GT_OreDictUnificator.get(OrePrefixes.lens, Materials.Tanzanite, 1)));
-            Lenses.add(getUniqueIdentifier(GT_OreDictUnificator.get(OrePrefixes.lens, Materials.Amethyst, 1)));
-            Lenses.add(getUniqueIdentifier(GT_OreDictUnificator.get(OrePrefixes.lens, Materials.Opal, 1)));
-            Lenses.add(getUniqueIdentifier(GT_OreDictUnificator.get(OrePrefixes.lens, Materials.Jasper, 1)));
+            Lenses.add(getUniqueIdentifier(GTOreDictUnificator.get(OrePrefixes.lens, Materials.Emerald, 1)));
+            Lenses.add(getUniqueIdentifier(GTOreDictUnificator.get(OrePrefixes.lens, Materials.Firestone, 1)));
+            Lenses.add(getUniqueIdentifier(GTOreDictUnificator.get(OrePrefixes.lens, Materials.Diamond, 1)));
+            Lenses.add(getUniqueIdentifier(GTOreDictUnificator.get(OrePrefixes.lens, Materials.Ruby, 1)));
+            Lenses.add(getUniqueIdentifier(GTOreDictUnificator.get(OrePrefixes.lens, Materials.Sapphire, 1)));
+            Lenses.add(getUniqueIdentifier(GTOreDictUnificator.get(OrePrefixes.lens, Materials.GreenSapphire, 1)));
+            Lenses.add(getUniqueIdentifier(GTOreDictUnificator.get(OrePrefixes.lens, Materials.Olivine, 1)));
+            Lenses.add(getUniqueIdentifier(GTOreDictUnificator.get(OrePrefixes.lens, Materials.NetherStar, 1)));
+            Lenses.add(getUniqueIdentifier(GTOreDictUnificator.get(OrePrefixes.lens, Materials.Topaz, 1)));
+            Lenses.add(getUniqueIdentifier(GTOreDictUnificator.get(OrePrefixes.lens, Materials.Tanzanite, 1)));
+            Lenses.add(getUniqueIdentifier(GTOreDictUnificator.get(OrePrefixes.lens, Materials.Amethyst, 1)));
+            Lenses.add(getUniqueIdentifier(GTOreDictUnificator.get(OrePrefixes.lens, Materials.Opal, 1)));
+            Lenses.add(getUniqueIdentifier(GTOreDictUnificator.get(OrePrefixes.lens, Materials.Jasper, 1)));
             // Spinel
-            Lenses.add(getUniqueIdentifier(GT_OreDictUnificator.get(OrePrefixes.lens, Materials.FoolsRuby, 1)));
-            Lenses.add(getUniqueIdentifier(GT_OreDictUnificator.get(OrePrefixes.lens, Materials.BlueTopaz, 1)));
-            Lenses.add(getUniqueIdentifier(GT_OreDictUnificator.get(OrePrefixes.lens, Materials.Amber, 1)));
-            Lenses.add(getUniqueIdentifier(GT_OreDictUnificator.get(OrePrefixes.lens, Materials.Dilithium, 1)));
-            Lenses.add(getUniqueIdentifier(GT_OreDictUnificator.get(OrePrefixes.lens, Materials.Forcicium, 1)));
-            Lenses.add(getUniqueIdentifier(GT_OreDictUnificator.get(OrePrefixes.lens, Materials.Forcillium, 1)));
-            Lenses.add(getUniqueIdentifier(GT_OreDictUnificator.get(OrePrefixes.lens, Materials.Force, 1)));
-            Lenses.add(getUniqueIdentifier(GT_OreDictUnificator.get(OrePrefixes.lens, Materials.GarnetRed, 1)));
-            Lenses.add(getUniqueIdentifier(GT_OreDictUnificator.get(OrePrefixes.lens, Materials.GarnetYellow, 1)));
-            Lenses.add(getUniqueIdentifier(GT_OreDictUnificator.get(OrePrefixes.lens, Materials.EnderPearl, 1)));
-            Lenses.add(getUniqueIdentifier(GT_OreDictUnificator.get(OrePrefixes.lens, Materials.EnderEye, 1)));
-            Lenses.add(getUniqueIdentifier(GT_OreDictUnificator.get(OrePrefixes.lens, Materials.InfusedAir, 1)));
-            Lenses.add(getUniqueIdentifier(GT_OreDictUnificator.get(OrePrefixes.lens, Materials.InfusedFire, 1)));
-            Lenses.add(getUniqueIdentifier(GT_OreDictUnificator.get(OrePrefixes.lens, Materials.InfusedEarth, 1)));
-            Lenses.add(getUniqueIdentifier(GT_OreDictUnificator.get(OrePrefixes.lens, Materials.InfusedEntropy, 1)));
-            Lenses.add(getUniqueIdentifier(GT_OreDictUnificator.get(OrePrefixes.lens, Materials.InfusedOrder, 1)));
-            Lenses.add(getUniqueIdentifier(GT_OreDictUnificator.get(OrePrefixes.lens, Materials.Glass, 1)));
+            Lenses.add(getUniqueIdentifier(GTOreDictUnificator.get(OrePrefixes.lens, Materials.FoolsRuby, 1)));
+            Lenses.add(getUniqueIdentifier(GTOreDictUnificator.get(OrePrefixes.lens, Materials.BlueTopaz, 1)));
+            Lenses.add(getUniqueIdentifier(GTOreDictUnificator.get(OrePrefixes.lens, Materials.Amber, 1)));
+            Lenses.add(getUniqueIdentifier(GTOreDictUnificator.get(OrePrefixes.lens, Materials.Dilithium, 1)));
+            Lenses.add(getUniqueIdentifier(GTOreDictUnificator.get(OrePrefixes.lens, Materials.Forcicium, 1)));
+            Lenses.add(getUniqueIdentifier(GTOreDictUnificator.get(OrePrefixes.lens, Materials.Forcillium, 1)));
+            Lenses.add(getUniqueIdentifier(GTOreDictUnificator.get(OrePrefixes.lens, Materials.Force, 1)));
+            Lenses.add(getUniqueIdentifier(GTOreDictUnificator.get(OrePrefixes.lens, Materials.GarnetRed, 1)));
+            Lenses.add(getUniqueIdentifier(GTOreDictUnificator.get(OrePrefixes.lens, Materials.GarnetYellow, 1)));
+            Lenses.add(getUniqueIdentifier(GTOreDictUnificator.get(OrePrefixes.lens, Materials.EnderPearl, 1)));
+            Lenses.add(getUniqueIdentifier(GTOreDictUnificator.get(OrePrefixes.lens, Materials.EnderEye, 1)));
+            Lenses.add(getUniqueIdentifier(GTOreDictUnificator.get(OrePrefixes.lens, Materials.InfusedAir, 1)));
+            Lenses.add(getUniqueIdentifier(GTOreDictUnificator.get(OrePrefixes.lens, Materials.InfusedFire, 1)));
+            Lenses.add(getUniqueIdentifier(GTOreDictUnificator.get(OrePrefixes.lens, Materials.InfusedEarth, 1)));
+            Lenses.add(getUniqueIdentifier(GTOreDictUnificator.get(OrePrefixes.lens, Materials.InfusedEntropy, 1)));
+            Lenses.add(getUniqueIdentifier(GTOreDictUnificator.get(OrePrefixes.lens, Materials.InfusedOrder, 1)));
+            Lenses.add(getUniqueIdentifier(GTOreDictUnificator.get(OrePrefixes.lens, Materials.Glass, 1)));
 
             IgnoredItems.add(GameRegistry.findItem("gregtech", "gt.integrated_circuit"));
             IgnoredItems.add(GameRegistry.findItem("miscutils", "item.BioRecipeSelector"));

diff --git a/src/main/java/appeng/parts/p2p/PartP2PGT5Power.java b/src/main/java/appeng/parts/p2p/PartP2PGT5Power.java
@@ -21,10 +21,10 @@
 import cofh.api.energy.IEnergyReceiver;
 import cpw.mods.fml.relauncher.Side;
 import cpw.mods.fml.relauncher.SideOnly;
-import gregtech.api.GregTech_API;
-import gregtech.api.enums.GT_Values;
+import gregtech.api.GregTechAPI;
+import gregtech.api.enums.GTValues;
 import gregtech.api.interfaces.tileentity.IEnergyConnected;
-import gregtech.api.util.GT_Utility;
+import gregtech.api.util.GTUtility;
 import ic2.api.energy.tile.IEnergySink;
 
 public class PartP2PGT5Power extends PartP2PTunnelNormal<PartP2PGT5Power> implements IPartGT5Power {
@@ -177,43 +177,43 @@ private long doOutput(long aVoltage, long aAmperage) {
 
                             return rUsedAmperes;
                         }
-                    } else if (GregTech_API.mOutputRF && te instanceof IEnergyReceiver) {
-                        int rfOut = (int) (aVoltage * (long) GregTech_API.mEUtoRF / 100L);
+                    } else if (GregTechAPI.mOutputRF && te instanceof IEnergyReceiver) {
+                        int rfOut = (int) (aVoltage * (long) GregTechAPI.mEUtoRF / 100L);
                         if (((IEnergyReceiver) te).receiveEnergy(oppositeSide, rfOut, true) == rfOut) {
                             ((IEnergyReceiver) te).receiveEnergy(oppositeSide, rfOut, false);
                             return 1L;
                         }
 
-                        if (GregTech_API.mRFExplosions && GregTech_API.sMachineExplosions
+                        if (GregTechAPI.mRFExplosions && GregTechAPI.sMachineExplosions
                                 && ((IEnergyReceiver) te).getMaxEnergyStored(oppositeSide) < rfOut * 600
-                                && rfOut > 32 * GregTech_API.mEUtoRF / 100) {
-                            float tStrength = (long) rfOut < GT_Values.V[0] ? 1.0F
-                                    : ((long) rfOut < GT_Values.V[1] ? 2.0F
-                                            : ((long) rfOut < GT_Values.V[2] ? 3.0F
-                                                    : ((long) rfOut < GT_Values.V[3] ? 4.0F
-                                                            : ((long) rfOut < GT_Values.V[4] ? 5.0F
-                                                                    : ((long) rfOut < GT_Values.V[4] * 2L ? 6.0F
-                                                                            : ((long) rfOut < GT_Values.V[5] ? 7.0F
-                                                                                    : ((long) rfOut < GT_Values.V[6]
+                                && rfOut > 32 * GregTechAPI.mEUtoRF / 100) {
+                            float tStrength = (long) rfOut < GTValues.V[0] ? 1.0F
+                                    : ((long) rfOut < GTValues.V[1] ? 2.0F
+                                            : ((long) rfOut < GTValues.V[2] ? 3.0F
+                                                    : ((long) rfOut < GTValues.V[3] ? 4.0F
+                                                            : ((long) rfOut < GTValues.V[4] ? 5.0F
+                                                                    : ((long) rfOut < GTValues.V[4] * 2L ? 6.0F
+                                                                            : ((long) rfOut < GTValues.V[5] ? 7.0F
+                                                                                    : ((long) rfOut < GTValues.V[6]
                                                                                             ? 8.0F
                                                                                             : ((long) rfOut
-                                                                                                    < GT_Values.V[7]
+                                                                                                    < GTValues.V[7]
                                                                                                             ? 9.0F
                                                                                                             : 10.0F))))))));
                             int tX = te.xCoord;
                             int tY = te.yCoord;
                             int tZ = te.zCoord;
                             World tWorld = te.getWorldObj();
-                            GT_Utility.sendSoundToPlayers(
+                            GTUtility.sendSoundToPlayers(
                                     tWorld,
-                                    GregTech_API.sSoundList.get(209),
+                                    GregTechAPI.sSoundList.get(209),
                                     1.0F,
                                     -1.0F,
                                     tX,
                                     tY,
                                     tZ);
                             tWorld.setBlock(tX, tY, tZ, Blocks.air);
-                            if (GregTech_API.sMachineExplosions) {
+                            if (GregTechAPI.sMachineExplosions) {
                                 tWorld.createExplosion(
                                         null,
                                         (double) tX + 0.5D,