$ Fixed yet another Rendering Derp.

> Moved the McMod.info Again

3 files changed, 13 insertions, 84 deletions

diff --git a/src/Java/miscutil/core/xmod/gregtech/api/enums/GregtechTextures.java b/src/Java/miscutil/core/xmod/gregtech/api/enums/GregtechTextures.java
index c927fea1a3..b11dc385f9 100644
--- a/src/Java/miscutil/core/xmod/gregtech/api/enums/GregtechTextures.java
+++ b/src/Java/miscutil/core/xmod/gregtech/api/enums/GregtechTextures.java
@@ -4,7 +4,6 @@ import gregtech.api.GregTech_API;
 import miscutil.core.lib.CORE;
 import miscutil.core.xmod.gregtech.api.interfaces.internal.Interface_IconContainer;
 import miscutil.core.xmod.gregtech.api.interfaces.internal.Interface_Texture;
-import miscutil.core.xmod.gregtech.api.objects.GregtechRenderedTexture;
 import net.minecraft.client.renderer.texture.TextureMap;
 import net.minecraft.util.IIcon;
 import net.minecraft.util.ResourceLocation;
@@ -135,7 +134,7 @@ public class GregtechTextures {
                         ENERGY_BAR_8,
                 };
 
-        public static final Interface_Texture[] ERROR_RENDERING = new Interface_Texture[]{new GregtechRenderedTexture(RENDERING_ERROR)};
+        //public static final Interface_Texture[] ERROR_RENDERING = new Interface_Texture[]{new GregtechRenderedTexture(RENDERING_ERROR)};
 
         protected IIcon mIcon, mOverlay;
 
diff --git a/src/Java/miscutil/core/xmod/gregtech/api/objects/GregtechRenderedTexture.java b/src/Java/miscutil/core/xmod/gregtech/api/objects/GregtechRenderedTexture.java
index addc346f3e..0f56400d0c 100644
--- a/src/Java/miscutil/core/xmod/gregtech/api/objects/GregtechRenderedTexture.java
+++ b/src/Java/miscutil/core/xmod/gregtech/api/objects/GregtechRenderedTexture.java
@@ -2,17 +2,17 @@ package miscutil.core.xmod.gregtech.api.objects;
 
 import gregtech.api.enums.Dyes;
 import gregtech.api.interfaces.IColorModulationContainer;
+import gregtech.api.interfaces.IIconContainer;
+import gregtech.api.interfaces.ITexture;
 import miscutil.core.util.Utils;
-import miscutil.core.xmod.gregtech.api.interfaces.internal.Interface_IconContainer;
-import miscutil.core.xmod.gregtech.api.interfaces.internal.Interface_Texture;
 import net.minecraft.block.Block;
 import net.minecraft.client.Minecraft;
 import net.minecraft.client.renderer.RenderBlocks;
 import net.minecraft.client.renderer.Tessellator;
 import net.minecraft.util.IIcon;
 
-public class GregtechRenderedTexture implements Interface_Texture, IColorModulationContainer {
-    private final Interface_IconContainer mIconContainer;
+public class GregtechRenderedTexture implements ITexture, IColorModulationContainer {
+    private final IIconContainer mIconContainer;
     private final boolean mAllowAlpha;
     /**
      * DO NOT MANIPULATE THE VALUES INSIDE THIS ARRAY!!!
@@ -22,18 +22,18 @@ public class GregtechRenderedTexture implements Interface_Texture, IColorModulat
      */
     public short[] mRGBa;
 
-    public GregtechRenderedTexture(Interface_IconContainer aIcon, short[] aRGBa, boolean aAllowAlpha) {
+    public GregtechRenderedTexture(IIconContainer aIcon, short[] aRGBa, boolean aAllowAlpha) {
         if (aRGBa.length != 4) throw new IllegalArgumentException("RGBa doesn't have 4 Values @ GT_RenderedTexture");
         mIconContainer = aIcon;
         mAllowAlpha = aAllowAlpha;
         mRGBa = aRGBa;
     }
 
-    public GregtechRenderedTexture(Interface_IconContainer aIcon, short[] aRGBa) {
+    public GregtechRenderedTexture(IIconContainer aIcon, short[] aRGBa) {
         this(aIcon, aRGBa, true);
     }
 
-    public GregtechRenderedTexture(Interface_IconContainer aIcon) {
+    public GregtechRenderedTexture(IIconContainer aIcon) {
         this(aIcon, Dyes._NULL.mRGBa);
     }
 
diff --git a/src/Java/miscutil/core/xmod/gregtech/common/tileentities/machines/multi/GregtechMetaTileEntityIndustrialCentrifuge.java b/src/Java/miscutil/core/xmod/gregtech/common/tileentities/machines/multi/GregtechMetaTileEntityIndustrialCentrifuge.java
index 92e236d782..dd61d22a4e 100644
--- a/src/Java/miscutil/core/xmod/gregtech/common/tileentities/machines/multi/GregtechMetaTileEntityIndustrialCentrifuge.java
+++ b/src/Java/miscutil/core/xmod/gregtech/common/tileentities/machines/multi/GregtechMetaTileEntityIndustrialCentrifuge.java
@@ -7,7 +7,6 @@ import gregtech.api.interfaces.metatileentity.IMetaTileEntity;
 import gregtech.api.interfaces.tileentity.IGregTechTileEntity;
 import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_Hatch;
 import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_Hatch_Maintenance;
-import gregtech.api.objects.GT_RenderedTexture;
 import gregtech.api.util.GT_Recipe;
 import gregtech.api.util.GT_Utility;
 
@@ -19,6 +18,7 @@ import miscutil.core.block.ModBlocks;
 import miscutil.core.util.Utils;
 import miscutil.core.xmod.gregtech.api.gui.GUI_MultiMachine;
 import miscutil.core.xmod.gregtech.api.metatileentity.implementations.base.GregtechMeta_MultiBlockBase;
+import miscutil.core.xmod.gregtech.api.objects.GregtechRenderedTexture;
 import net.minecraft.block.Block;
 import net.minecraft.entity.player.InventoryPlayer;
 import net.minecraft.item.ItemStack;
@@ -71,9 +71,9 @@ extends GregtechMeta_MultiBlockBase {
 	}*/
 
 	@Override
-    public ITexture[] getTexture(IGregTechTileEntity aBaseMetaTileEntity, byte aSide, byte aFacing, byte aColorIndex, boolean aActive, boolean aRedstone) {
-        return new ITexture[]{Textures.BlockIcons.MACHINE_CASINGS[1][aColorIndex + 1], aFacing == aSide ? aActive ? new GT_RenderedTexture(Textures.BlockIcons.LARGETURBINE_ACTIVE5) : new GT_RenderedTexture(Textures.BlockIcons.LARGETURBINE5) : Textures.BlockIcons.CASING_BLOCKS[57]};
-    }
+	public ITexture[] getTexture(IGregTechTileEntity aBaseMetaTileEntity, byte aSide, byte aFacing, byte aColorIndex, boolean aActive, boolean aRedstone) {
+		return new ITexture[]{Textures.BlockIcons.MACHINE_CASINGS[1][aColorIndex + 1], aFacing == aSide ? aActive ? new GregtechRenderedTexture(Textures.BlockIcons.LARGETURBINE_ACTIVE5) : new GregtechRenderedTexture(Textures.BlockIcons.LARGETURBINE5) : Textures.BlockIcons.CASING_BLOCKS[57]};
+	}
 
 	@Override
 	public Object getClientGUI(int aID, InventoryPlayer aPlayerInventory, IGregTechTileEntity aBaseMetaTileEntity) {
@@ -309,75 +309,5 @@ extends GregtechMeta_MultiBlockBase {
 	public boolean explodesOnComponentBreak(ItemStack aStack) {
 		return false;
 	}
-
-	private boolean checkStructure(IGregTechTileEntity aBaseMetaTileEntity, ItemStack aStack){
-
-		Utils.LOG_INFO("structure checking");
-		int x = ForgeDirection.getOrientation(aBaseMetaTileEntity.getBackFacing()).offsetX;
-		int y = ForgeDirection.getOrientation(aBaseMetaTileEntity.getBackFacing()).offsetY;
-		int z = ForgeDirection.getOrientation(aBaseMetaTileEntity.getBackFacing()).offsetZ;
-		Utils.LOG_INFO("X:"+x+" Y:"+y+" Z:"+z);
-
-		//North case
-		int hatchMaintainence[] = {x, y, z+2};
-		int hatchInputBus[] = {x+1, y, z+1};
-		int hatchOutputBus[] = {x-1, y, z+1};
-		int hatchInput[] = {x+1, y+1, z+1};
-		int hatchOutput[] = {x-1, y+1, z+1};
-		int hatchEnergy[] = {x, y+1, z+2};
-
-		//South case
-		int hatchMaintainence0[] = {x, y, z-2};
-		int hatchInputBus0[] = {x-1, y, z-1};
-		int hatchOutputBus0[] = {x+1, y, z-1};
-		int hatchInput0[] = {x-1, y+1, z-1};
-		int hatchOutput0[] = {x+1, y+1, z-1};
-		int hatchEnergy0[] = {x, y+1, z-2};
-
-
-		//East case
-		int hatchMaintainence1[] = {x+2, y, z};
-		int hatchInputBus1[] = {x+1, y, z+1};
-		int hatchOutputBus1[] = {x+1, y, z-1};
-		int hatchInput1[] = {x+1, y+1, z+1};
-		int hatchOutput1[] = {x+1, y+1, z-1};
-		int hatchEnergy1[] = {x+2, y+1, z};
-
-		//West case
-		int hatchMaintainence2[] = {x-2, y, z};
-		int hatchInputBus2[] = {x-1, y, z-1};
-		int hatchOutputBus2[] = {x-1, y, z+1};
-		int hatchInput2[] = {x-1, y+1, z-1};
-		int hatchOutput2[] = {x-1, y+1, z+1};
-		int hatchEnergy2[] = {x-2, y+1, z};
-
-
-
-		/*//Maintenance Hatch
-		IGregTechTileEntity tTileEntityMaintenanceHatch = getBaseMetaTileEntity().getIGregTechTileEntityAtSideAndDistance(getBaseMetaTileEntity().getBackFacing(), 2);
-		if ((tTileEntityMaintenanceHatch != null) && (tTileEntityMaintenanceHatch.getMetaTileEntity() != null)) {
-			if ((tTileEntityMaintenanceHatch.getMetaTileEntity() instanceof GT_MetaTileEntity_Hatch_Maintenance)) {
-				this.mMaintenanceHatches.add((GT_MetaTileEntity_Hatch_Maintenance) tTileEntityMaintenanceHatch.getMetaTileEntity());
-				((GT_MetaTileEntity_Hatch) tTileEntityMaintenanceHatch.getMetaTileEntity()).mMachineBlock = getCasingTextureIndex();
-			} else {
-				return false;
-			}
-		}*/
-
-		/*//Energy Hatch
-		IGregTechTileEntity tTileEntityEnergyHatch = getBaseMetaTileEntity().getIGregTechTileEntity(i, h+1, j+2);
-		if ((tTileEntityEnergyHatch != null) && (tTileEntityEnergyHatch.getMetaTileEntity() != null)) {
-			if ((tTileEntityEnergyHatch.getMetaTileEntity() instanceof GT_MetaTileEntity_Hatch_Energy)) {
-				this.mMaintenanceHatches.add((GT_MetaTileEntity_Hatch_Maintenance) tTileEntityEnergyHatch.getMetaTileEntity());
-				((GT_MetaTileEntity_Hatch) tTileEntityEnergyHatch.getMetaTileEntity()).mMachineBlock = getCasingTextureIndex();
-			} else {
-				return false;
-			}
-		}*/
-
-
-
-
-		return false;
-	}
+	
 }
\ No newline at end of file