rename (#67)

GTNewHorizons · Sep 3, 2024 · 820ed8f · 820ed8f
1 parent 79dcece
commit 820ed8f
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 13 deletions.
diff --git a/dependencies.gradle b/dependencies.gradle
@@ -18,7 +18,7 @@ dependencies {
 	compileOnly('com.github.GTNewHorizons:EnderStorage:1.6.0:dev') { transitive = false }
 	compileOnly('com.github.GTNewHorizons:ExtraCells2:2.5.35:api') { transitive = false }
 	compileOnly('com.github.GTNewHorizons:Binnie:2.4.1:dev') { transitive = false }
-	compileOnly('com.github.GTNewHorizons:GT5-Unofficial:5.09.49.47:dev') { transitive = false }
+	compileOnly('com.github.GTNewHorizons:GT5-Unofficial:5.09.49.55:dev') { transitive = false }
 
 	compileOnly('net.industrial-craft:industrialcraft-2:2.2.828-experimental:dev') { transitive = false }
 	compileOnly('thaumcraft:Thaumcraft:1.7.10-4.2.3.5:dev') { transitive = false }

diff --git a/src/main/java/logisticspipes/modules/ModuleTypeFilterItemSink.java b/src/main/java/logisticspipes/modules/ModuleTypeFilterItemSink.java
@@ -16,8 +16,8 @@
 import cpw.mods.fml.relauncher.SideOnly;
 import gregtech.api.enums.OrePrefixes;
 import gregtech.api.objects.ItemData;
-import gregtech.api.util.GT_OreDictUnificator;
-import gregtech.common.tileentities.automation.GT_MetaTileEntity_TypeFilter;
+import gregtech.api.util.GTOreDictUnificator;
+import gregtech.common.tileentities.automation.MTETypeFilter;
 import logisticspipes.gui.hud.modules.HUDStringBasedItemSink;
 import logisticspipes.interfaces.IClientInformationProvider;
 import logisticspipes.interfaces.IHUDModuleHandler;
@@ -81,12 +81,11 @@ public SinkReply sinksItem(ItemIdentifier item, int bestPriority, int bestCustom
 
     private boolean isStackAllowed(ItemIdentifier identifier) {
         ItemStack stack = identifier.makeNormalStackNoTag(1);
-        ItemData data = GT_OreDictUnificator.getItemData(stack);
+        ItemData data = GTOreDictUnificator.getItemData(stack);
 
         for (OrePrefixes prefix : prefixes) {
             if (prefix == OrePrefixes.ore) {
-                if (data != null && data.mPrefix != null
-                        && GT_MetaTileEntity_TypeFilter.OREBLOCK_PREFIXES.contains(data.mPrefix)) {
+                if (data != null && data.mPrefix != null && MTETypeFilter.OREBLOCK_PREFIXES.contains(data.mPrefix)) {
                     return true;
                 }
             }
@@ -205,7 +204,7 @@ public List<String> getStringList() {
 
     @Override
     public String getStringForItem(ItemIdentifier ident) {
-        ItemData data = GT_OreDictUnificator.getAssociation(ident.makeNormalStackNoTag(1));
+        ItemData data = GTOreDictUnificator.getAssociation(ident.makeNormalStackNoTag(1));
         if (data != null && data.hasValidPrefixData()) {
             return data.mPrefix.toString();
         }

diff --git a/src/main/java/logisticspipes/proxy/specialinventoryhandler/QuantumChestInventoryHandler.java b/src/main/java/logisticspipes/proxy/specialinventoryhandler/QuantumChestInventoryHandler.java
@@ -5,14 +5,14 @@
 import net.minecraftforge.common.util.ForgeDirection;
 
 import gregtech.api.interfaces.tileentity.IGregTechTileEntity;
-import gregtech.common.tileentities.storage.GT_MetaTileEntity_QuantumChest;
+import gregtech.common.tileentities.storage.MTEQuantumChest;
 
 public class QuantumChestInventoryHandler extends DSULikeInventoryHandler {
 
-    private final GT_MetaTileEntity_QuantumChest _mte;
+    private final MTEQuantumChest _mte;
 
-    private QuantumChestInventoryHandler(GT_MetaTileEntity_QuantumChest tile, boolean hideOnePerStack, boolean hideOne,
-            int cropStart, int cropEnd) {
+    private QuantumChestInventoryHandler(MTEQuantumChest tile, boolean hideOnePerStack, boolean hideOne, int cropStart,
+            int cropEnd) {
         _mte = tile;
         _hideOnePerStack = hideOnePerStack || hideOne;
     }
@@ -30,14 +30,14 @@ public boolean init() {
     @Override
     public boolean isType(TileEntity tile) {
         if (!(tile instanceof IGregTechTileEntity)) return false;
-        return ((IGregTechTileEntity) tile).getMetaTileEntity() instanceof GT_MetaTileEntity_QuantumChest;
+        return ((IGregTechTileEntity) tile).getMetaTileEntity() instanceof MTEQuantumChest;
     }
 
     @Override
     public SpecialInventoryHandler getUtilForTile(TileEntity tile, ForgeDirection dir, boolean hideOnePerStack,
             boolean hideOne, int cropStart, int cropEnd) {
         return new QuantumChestInventoryHandler(
-                ((GT_MetaTileEntity_QuantumChest) ((IGregTechTileEntity) tile).getMetaTileEntity()),
+                ((MTEQuantumChest) ((IGregTechTileEntity) tile).getMetaTileEntity()),
                 hideOnePerStack,
                 hideOne,
                 cropStart,