Update GT5u

GTMEGA · Jan 6, 2025 · 84968a1 · 84968a1
1 parent c65d9ca
commit 84968a1
Show file tree

Hide file tree

Showing 5 changed files with 19 additions and 18 deletions.
diff --git a/build.gradle.kts b/build.gradle.kts
@@ -45,7 +45,7 @@ dependencies {
     }
 
     implementation ("net.industrial-craft:industrialcraft-2:2.2.828-experimental:dev")
-    implementation("gtmega:gt5u-mc1.7.10:5.40.0-a0004:dev") {
+    implementation("gtmega:gt5u-mc1.7.10:5.41.0-mega:dev") {
         excludeDeps()
     }
 

diff --git a/src/main/java/com/dreammaster/gthandler/IDSU/GT_MetaTileEntity_IDSU.java b/src/main/java/com/dreammaster/gthandler/IDSU/GT_MetaTileEntity_IDSU.java
@@ -5,7 +5,7 @@
 import gregtech.api.interfaces.metatileentity.IMetaTileEntity;
 import gregtech.api.interfaces.tileentity.IGregTechTileEntity;
 import gregtech.api.metatileentity.MetaTileEntity;
-import gregtech.api.objects.GT_RenderedTexture;
+import gregtech.api.render.TextureFactory;
 import net.minecraft.client.renderer.texture.IIconRegister;
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.item.ItemStack;
@@ -72,7 +72,7 @@ public boolean allowPutStack(IGregTechTileEntity aBaseMetaTileEntity, int aIndex
     @Override
     public ITexture[] getTexture(IGregTechTileEntity aBaseMetaTileEntity, byte aSide, byte aFacing, byte aColorIndex, boolean aActive, boolean aRedstone)
     {
-        return new ITexture[]{aSide == aFacing ? new GT_RenderedTexture(_mIDSU_Out) : new GT_RenderedTexture(_mIDSU)};
+        return new ITexture[]{aSide == aFacing ? TextureFactory.of(_mIDSU_Out) : TextureFactory.of(_mIDSU)};
     }
 
     @Override

diff --git a/src/main/java/com/dreammaster/gthandler/accelerator/GT_MetaTileEntity_WorldAccelerator.java b/src/main/java/com/dreammaster/gthandler/accelerator/GT_MetaTileEntity_WorldAccelerator.java
@@ -12,7 +12,7 @@
 import gregtech.api.interfaces.tileentity.IGregTechTileEntity;
 import gregtech.api.metatileentity.MetaTileEntity;
 import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_TieredMachineBlock;
-import gregtech.api.objects.GT_RenderedTexture;
+import gregtech.api.render.TextureFactory;
 import net.minecraft.block.Block;
 import net.minecraft.client.renderer.texture.IIconRegister;
 import net.minecraft.entity.player.EntityPlayer;
@@ -161,9 +161,9 @@ public ITexture[][][] getTextureSet( ITexture[] pTextures )
   public ITexture[] getTexture( IGregTechTileEntity pBaseMetaTileEntity, byte pSide, byte pFacing, byte pColorIndex, boolean pActive, boolean pRedstone )
   {
     if( mMode == 0 ) {
-        return new ITexture[]{Textures.BlockIcons.MACHINE_CASINGS[mTier][pColorIndex + 1], pSide < 2 ? null : pActive ? new GT_RenderedTexture(_mGTIco_Norm_Active) : new GT_RenderedTexture(_mGTIco_Norm_Idle)};
+        return new ITexture[]{Textures.BlockIcons.MACHINE_CASINGS[mTier][pColorIndex + 1], pSide < 2 ? null : pActive ? TextureFactory.of(_mGTIco_Norm_Active) : TextureFactory.of(_mGTIco_Norm_Idle)};
     } else {
-        return new ITexture[]{Textures.BlockIcons.MACHINE_CASINGS[mTier][pColorIndex + 1], pSide < 2 ? null : pActive ? new GT_RenderedTexture(_mGTIco_TE_Active) : new GT_RenderedTexture(_mGTIco_TE_Idle)};
+        return new ITexture[]{Textures.BlockIcons.MACHINE_CASINGS[mTier][pColorIndex + 1], pSide < 2 ? null : pActive ? TextureFactory.of(_mGTIco_TE_Active) : TextureFactory.of(_mGTIco_TE_Idle)};
     }
   }
 

diff --git a/src/main/java/com/dreammaster/gthandler/casings/GT_Block_CasingsNH.java b/src/main/java/com/dreammaster/gthandler/casings/GT_Block_CasingsNH.java
@@ -6,7 +6,7 @@
 import cpw.mods.fml.relauncher.SideOnly;
 import gregtech.api.enums.Dyes;
 import gregtech.api.enums.Textures;
-import gregtech.api.objects.GT_CopiedBlockTexture;
+import gregtech.api.render.TextureFactory;
 import gregtech.api.util.GT_LanguageManager;
 import gregtech.common.blocks.GT_Block_Casings_Abstract;
 import gregtech.common.blocks.GT_Material_Casings;
@@ -16,6 +16,7 @@
 import net.minecraft.world.IBlockAccess;
 import cpw.mods.fml.relauncher.Side;
 import cpw.mods.fml.relauncher.SideOnly;
+import net.minecraftforge.common.util.ForgeDirection;
 
 /**
  * Created by danie_000 on 03.10.2016.
@@ -26,7 +27,7 @@ public class GT_Block_CasingsNH extends GT_Block_Casings_Abstract {
     public GT_Block_CasingsNH() {
         super(GT_Item_CasingsNH.class, "gt.blockcasingsNH", GT_Material_Casings.INSTANCE);
         for (byte b = 0; b < 16; b = (byte) (b + 1)) {
-            Textures.BlockIcons.casingTexturePages[8][b+64] = new GT_CopiedBlockTexture(this, 6, b);
+            Textures.BlockIcons.casingTexturePages[8][b+64] = TextureFactory.of(this, b, ForgeDirection.UNKNOWN);
             /*IMPORTANT for block recoloring*/
         }
 //        GT_LanguageManager.addStringLocalization(getUnlocalizedName() + ".0.name", "Air Filter Turbine Casing");//adding

diff --git a/src/main/java/com/dreammaster/gthandler/nameRemover/NameRemover.java b/src/main/java/com/dreammaster/gthandler/nameRemover/NameRemover.java
@@ -5,7 +5,7 @@
 import gregtech.api.interfaces.tileentity.IGregTechTileEntity;
 import gregtech.api.metatileentity.MetaTileEntity;
 import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_BasicMachine;
-import gregtech.api.objects.GT_RenderedTexture;
+import gregtech.api.render.TextureFactory;
 import gregtech.common.items.GT_IntegratedCircuit_Item;
 import net.minecraft.item.ItemStack;
 import net.minecraft.nbt.NBTTagCompound;
@@ -20,15 +20,15 @@
 public class NameRemover extends GT_MetaTileEntity_BasicMachine {
     public NameRemover(int aID, String aName, String aNameRegional, int aTier) {
         super(aID, aName, aNameRegional, aTier, 1, "It can fix broken ores...and get rid of any disassembly data you don't want!",
-                2, 1, "NameRemover.png", "NameRemover",
-                new GT_RenderedTexture(Textures.BlockIcons.OVERLAY_SIDE_DISASSEMBLER_ACTIVE),
-                new GT_RenderedTexture(Textures.BlockIcons.OVERLAY_SIDE_DISASSEMBLER),
-                new GT_RenderedTexture(Textures.BlockIcons.OVERLAY_FRONT_DISASSEMBLER_ACTIVE),
-                new GT_RenderedTexture(Textures.BlockIcons.OVERLAY_FRONT_DISASSEMBLER),
-                new GT_RenderedTexture(Textures.BlockIcons.OVERLAY_TOP_DISASSEMBLER_ACTIVE),
-                new GT_RenderedTexture(Textures.BlockIcons.OVERLAY_TOP_DISASSEMBLER),
-                new GT_RenderedTexture(Textures.BlockIcons.OVERLAY_BOTTOM_DISASSEMBLER_ACTIVE),
-                new GT_RenderedTexture(Textures.BlockIcons.OVERLAY_BOTTOM_DISASSEMBLER));
+              2, 1, "NameRemover.png", "NameRemover",
+              TextureFactory.of(Textures.BlockIcons.OVERLAY_SIDE_DISASSEMBLER_ACTIVE),
+              TextureFactory.of(Textures.BlockIcons.OVERLAY_SIDE_DISASSEMBLER),
+              TextureFactory.of(Textures.BlockIcons.OVERLAY_FRONT_DISASSEMBLER_ACTIVE),
+              TextureFactory.of(Textures.BlockIcons.OVERLAY_FRONT_DISASSEMBLER),
+              TextureFactory.of(Textures.BlockIcons.OVERLAY_TOP_DISASSEMBLER_ACTIVE),
+              TextureFactory.of(Textures.BlockIcons.OVERLAY_TOP_DISASSEMBLER),
+              TextureFactory.of(Textures.BlockIcons.OVERLAY_BOTTOM_DISASSEMBLER_ACTIVE),
+              TextureFactory.of(Textures.BlockIcons.OVERLAY_BOTTOM_DISASSEMBLER));
     }
 
     public NameRemover(String aName, int aTier, String aDescription, ITexture[][][] aTextures, String aGUIName, String aNEIName) {