diff options
31 files changed, 129 insertions, 90 deletions
diff --git a/src/Java/miscutil/core/lib/CORE.java b/src/Java/miscutil/core/lib/CORE.java index fcb6d245f9..1b920fa8bf 100644 --- a/src/Java/miscutil/core/lib/CORE.java +++ b/src/Java/miscutil/core/lib/CORE.java @@ -25,6 +25,24 @@ public class CORE { ENERGYBUFFER, TOOLBUILDER, NULL, NULL1, NULL2 } + /** + * File Paths and Resource Paths + */ + public static final String + TEX_DIR = "textures/", + TEX_DIR_GUI = TEX_DIR + "gui/", + TEX_DIR_ITEM = TEX_DIR + "items/", + TEX_DIR_BLOCK = TEX_DIR + "blocks/", + TEX_DIR_ENTITY = TEX_DIR + "entity/", + TEX_DIR_ASPECTS = TEX_DIR + "aspects/", + RES_PATH = MODID + ":" + TEX_DIR, + RES_PATH_GUI = MODID + ":" + TEX_DIR_GUI, + RES_PATH_ITEM = MODID + ":" + TEX_DIR_ITEM, + RES_PATH_BLOCK = MODID + ":" + TEX_DIR_BLOCK, + RES_PATH_ENTITY = MODID + ":" + TEX_DIR_ENTITY, + RES_PATH_ASPECTS = MODID + ":" + TEX_DIR_ASPECTS; + + //public static final Materials2[] MiscGeneratedMaterials = new Materials2[1000]; } diff --git a/src/Java/miscutil/gregtech/api/enums/GregtechTextures.java b/src/Java/miscutil/gregtech/api/enums/GregtechTextures.java index 40c3cb7f4e..9986add4fd 100644 --- a/src/Java/miscutil/gregtech/api/enums/GregtechTextures.java +++ b/src/Java/miscutil/gregtech/api/enums/GregtechTextures.java @@ -1,9 +1,9 @@ package miscutil.gregtech.api.enums; -import static gregtech.api.enums.GT_Values.RES_PATH_BLOCK; import gregtech.api.GregTech_API; import gregtech.api.interfaces.IIconContainer; import gregtech.api.interfaces.ITexture; +import miscutil.core.lib.CORE; import net.minecraft.client.renderer.texture.TextureMap; import net.minecraft.util.IIcon; import net.minecraft.util.ResourceLocation; @@ -12,61 +12,34 @@ public class GregtechTextures { public enum BlockIcons implements IIconContainer, Runnable { - LARGECENTRIFUGE_TI1, LARGECENTRIFUGE_TI2, LARGECENTRIFUGE_TI3, LARGECENTRIFUGE_TI4, LARGECENTRIFUGE_TI5, - LARGECENTRIFUGE_TI6, LARGECENTRIFUGE_TI7, LARGECENTRIFUGE_TI8, LARGECENTRIFUGE_TI9, - LARGECENTRIFUGE_TI_ACTIVE1, LARGECENTRIFUGE_TI_ACTIVE2, LARGECENTRIFUGE_TI_ACTIVE3, LARGECENTRIFUGE_TI_ACTIVE4, - LARGECENTRIFUGE_TI_ACTIVE5, LARGECENTRIFUGE_TI_ACTIVE6, LARGECENTRIFUGE_TI_ACTIVE7, LARGECENTRIFUGE_TI_ACTIVE8, LARGECENTRIFUGE_TI_ACTIVE9, - - LARGECENTRIFUGE_TU1, LARGECENTRIFUGE_TU2, LARGECENTRIFUGE_TU3, LARGECENTRIFUGE_TU4, LARGECENTRIFUGE_TU5, - LARGECENTRIFUGE_TU6, LARGECENTRIFUGE_TU7, LARGECENTRIFUGE_TU8, LARGECENTRIFUGE_TU9, - LARGECENTRIFUGE_TU_ACTIVE1, LARGECENTRIFUGE_TU_ACTIVE2, LARGECENTRIFUGE_TU_ACTIVE3, LARGECENTRIFUGE_TU_ACTIVE4, LARGECENTRIFUGE_TU_ACTIVE5, - LARGECENTRIFUGE_TU_ACTIVE6, LARGECENTRIFUGE_TU_ACTIVE7, LARGECENTRIFUGE_TU_ACTIVE8, LARGECENTRIFUGE_TU_ACTIVE9; + LARGECENTRIFUGE1, LARGECENTRIFUGE2, LARGECENTRIFUGE3, LARGECENTRIFUGE4, LARGECENTRIFUGE5, + LARGECENTRIFUGE6, LARGECENTRIFUGE7, LARGECENTRIFUGE8, LARGECENTRIFUGE9, + LARGECENTRIFUGE_ACTIVE1, LARGECENTRIFUGE_ACTIVE2, LARGECENTRIFUGE_ACTIVE3, LARGECENTRIFUGE_ACTIVE4, + LARGECENTRIFUGE_ACTIVE5, LARGECENTRIFUGE_ACTIVE6, LARGECENTRIFUGE_ACTIVE7, LARGECENTRIFUGE_ACTIVE8, LARGECENTRIFUGE_ACTIVE9; public static final IIconContainer[] - CENTRIFUGE1 = new IIconContainer[]{ - LARGECENTRIFUGE_TI1, - LARGECENTRIFUGE_TI2, - LARGECENTRIFUGE_TI3, - LARGECENTRIFUGE_TI4, - LARGECENTRIFUGE_TI5, - LARGECENTRIFUGE_TI6, - LARGECENTRIFUGE_TI7, - LARGECENTRIFUGE_TI8, - LARGECENTRIFUGE_TI9 - }, - CENTRIFUGE_ACTIVE1 = new IIconContainer[]{ - LARGECENTRIFUGE_TI_ACTIVE1, - LARGECENTRIFUGE_TI_ACTIVE2, - LARGECENTRIFUGE_TI_ACTIVE3, - LARGECENTRIFUGE_TI_ACTIVE4, - LARGECENTRIFUGE_TI_ACTIVE5, - LARGECENTRIFUGE_TI_ACTIVE6, - LARGECENTRIFUGE_TI_ACTIVE7, - LARGECENTRIFUGE_TI_ACTIVE8, - LARGECENTRIFUGE_TI_ACTIVE9 - }, - CENTRIFUGE2 = new IIconContainer[]{ - LARGECENTRIFUGE_TU1, - LARGECENTRIFUGE_TU2, - LARGECENTRIFUGE_TU3, - LARGECENTRIFUGE_TU4, - LARGECENTRIFUGE_TU5, - LARGECENTRIFUGE_TU6, - LARGECENTRIFUGE_TU7, - LARGECENTRIFUGE_TU8, - LARGECENTRIFUGE_TU9 + CENTRIFUGE = new IIconContainer[]{ + LARGECENTRIFUGE1, + LARGECENTRIFUGE2, + LARGECENTRIFUGE3, + LARGECENTRIFUGE4, + LARGECENTRIFUGE5, + LARGECENTRIFUGE6, + LARGECENTRIFUGE7, + LARGECENTRIFUGE8, + LARGECENTRIFUGE9 }, - CENTRIFUGE_ACTIVE2 = new IIconContainer[]{ - LARGECENTRIFUGE_TU_ACTIVE1, - LARGECENTRIFUGE_TU_ACTIVE2, - LARGECENTRIFUGE_TU_ACTIVE3, - LARGECENTRIFUGE_TU_ACTIVE4, - LARGECENTRIFUGE_TU_ACTIVE5, - LARGECENTRIFUGE_TU_ACTIVE6, - LARGECENTRIFUGE_TU_ACTIVE7, - LARGECENTRIFUGE_TU_ACTIVE8, - LARGECENTRIFUGE_TU_ACTIVE9 + CENTRIFUGE_ACTIVE = new IIconContainer[]{ + LARGECENTRIFUGE_ACTIVE1, + LARGECENTRIFUGE_ACTIVE2, + LARGECENTRIFUGE_ACTIVE3, + LARGECENTRIFUGE_ACTIVE4, + LARGECENTRIFUGE_ACTIVE5, + LARGECENTRIFUGE_ACTIVE6, + LARGECENTRIFUGE_ACTIVE7, + LARGECENTRIFUGE_ACTIVE8, + LARGECENTRIFUGE_ACTIVE9 }; public static ITexture[] @@ -86,7 +59,7 @@ public class GregtechTextures { @Override public void run() { - mIcon = GregTech_API.sBlockIcons.registerIcon(RES_PATH_BLOCK + "iconsets/" + this); + mIcon = GregTech_API.sBlockIcons.registerIcon(CORE.RES_PATH_BLOCK + "iconsets/" + this); } @Override @@ -115,7 +88,7 @@ public class GregtechTextures { @Override public void run() { - mIcon = GregTech_API.sBlockIcons.registerIcon(RES_PATH_BLOCK + mIconName); + mIcon = GregTech_API.sBlockIcons.registerIcon(CORE.RES_PATH_BLOCK + mIconName); } @Override diff --git a/src/Java/miscutil/gregtech/common/blocks/GregtechMetaCasingBlocks.java b/src/Java/miscutil/gregtech/common/blocks/GregtechMetaCasingBlocks.java index 2677157a8f..ec4541499f 100644 --- a/src/Java/miscutil/gregtech/common/blocks/GregtechMetaCasingBlocks.java +++ b/src/Java/miscutil/gregtech/common/blocks/GregtechMetaCasingBlocks.java @@ -101,102 +101,102 @@ extends GregtechMetaCasingBlocksAbstract { IMetaTileEntity tMetaTileEntity; if ((null != (tTileEntity = aWorld.getTileEntity(xCoord + (aSide == 3 ? 1 : -1), yCoord - 1, zCoord))) && ((tTileEntity instanceof IGregTechTileEntity)) && (((IGregTechTileEntity) tTileEntity).getFrontFacing() == aSide) && (null != (tMetaTileEntity = ((IGregTechTileEntity) tTileEntity).getMetaTileEntity())) && ((tMetaTileEntity instanceof GregtechMetaLargeIndustrialCentrifuge))) { if (((IGregTechTileEntity) tTileEntity).isActive()) { - return Textures.BlockIcons.TURBINE_ACTIVE[0].getIcon(); + return GregtechTextures.BlockIcons.CENTRIFUGE_ACTIVE[0].getIcon(); } - return Textures.BlockIcons.TURBINE[0].getIcon(); + GregtechTextures.BlockIcons.CENTRIFUGE[0].getIcon(); } if ((null != (tTileEntity = aWorld.getTileEntity(xCoord + (aSide == 3 ? 1 : -1), yCoord, zCoord))) && ((tTileEntity instanceof IGregTechTileEntity)) && (((IGregTechTileEntity) tTileEntity).getFrontFacing() == aSide) && (null != (tMetaTileEntity = ((IGregTechTileEntity) tTileEntity).getMetaTileEntity())) && ((tMetaTileEntity instanceof GregtechMetaLargeIndustrialCentrifuge))) { if (((IGregTechTileEntity) tTileEntity).isActive()) { - return Textures.BlockIcons.TURBINE_ACTIVE[3].getIcon(); + return GregtechTextures.BlockIcons.CENTRIFUGE_ACTIVE[3].getIcon(); } - return Textures.BlockIcons.TURBINE[3].getIcon(); + GregtechTextures.BlockIcons.CENTRIFUGE[3].getIcon(); } if ((null != (tTileEntity = aWorld.getTileEntity(xCoord + (aSide == 3 ? 1 : -1), yCoord + 1, zCoord))) && ((tTileEntity instanceof IGregTechTileEntity)) && (((IGregTechTileEntity) tTileEntity).getFrontFacing() == aSide) && (null != (tMetaTileEntity = ((IGregTechTileEntity) tTileEntity).getMetaTileEntity())) && ((tMetaTileEntity instanceof GregtechMetaLargeIndustrialCentrifuge))) { if (((IGregTechTileEntity) tTileEntity).isActive()) { - return Textures.BlockIcons.TURBINE_ACTIVE[6].getIcon(); + return GregtechTextures.BlockIcons.CENTRIFUGE_ACTIVE[6].getIcon(); } - return Textures.BlockIcons.TURBINE[6].getIcon(); + GregtechTextures.BlockIcons.CENTRIFUGE[6].getIcon(); } if ((null != (tTileEntity = aWorld.getTileEntity(xCoord, yCoord - 1, zCoord))) && ((tTileEntity instanceof IGregTechTileEntity)) && (((IGregTechTileEntity) tTileEntity).getFrontFacing() == aSide) && (null != (tMetaTileEntity = ((IGregTechTileEntity) tTileEntity).getMetaTileEntity())) && ((tMetaTileEntity instanceof GregtechMetaLargeIndustrialCentrifuge))) { if (((IGregTechTileEntity) tTileEntity).isActive()) { - return Textures.BlockIcons.TURBINE_ACTIVE[1].getIcon(); + return GregtechTextures.BlockIcons.CENTRIFUGE_ACTIVE[1].getIcon(); } - return Textures.BlockIcons.TURBINE[1].getIcon(); + GregtechTextures.BlockIcons.CENTRIFUGE[1].getIcon(); } if ((null != (tTileEntity = aWorld.getTileEntity(xCoord, yCoord + 1, zCoord))) && ((tTileEntity instanceof IGregTechTileEntity)) && (((IGregTechTileEntity) tTileEntity).getFrontFacing() == aSide) && (null != (tMetaTileEntity = ((IGregTechTileEntity) tTileEntity).getMetaTileEntity())) && ((tMetaTileEntity instanceof GregtechMetaLargeIndustrialCentrifuge))) { if (((IGregTechTileEntity) tTileEntity).isActive()) { - return Textures.BlockIcons.TURBINE_ACTIVE[7].getIcon(); + return GregtechTextures.BlockIcons.CENTRIFUGE_ACTIVE[7].getIcon(); } - return Textures.BlockIcons.TURBINE[7].getIcon(); + GregtechTextures.BlockIcons.CENTRIFUGE[7].getIcon(); } if ((null != (tTileEntity = aWorld.getTileEntity(xCoord + (aSide == 2 ? 1 : -1), yCoord + 1, zCoord))) && ((tTileEntity instanceof IGregTechTileEntity)) && (((IGregTechTileEntity) tTileEntity).getFrontFacing() == aSide) && (null != (tMetaTileEntity = ((IGregTechTileEntity) tTileEntity).getMetaTileEntity())) && ((tMetaTileEntity instanceof GregtechMetaLargeIndustrialCentrifuge))) { if (((IGregTechTileEntity) tTileEntity).isActive()) { - return Textures.BlockIcons.TURBINE_ACTIVE[8].getIcon(); + return GregtechTextures.BlockIcons.CENTRIFUGE_ACTIVE[8].getIcon(); } - return Textures.BlockIcons.TURBINE[8].getIcon(); + GregtechTextures.BlockIcons.CENTRIFUGE[8].getIcon(); } if ((null != (tTileEntity = aWorld.getTileEntity(xCoord + (aSide == 2 ? 1 : -1), yCoord, zCoord))) && ((tTileEntity instanceof IGregTechTileEntity)) && (((IGregTechTileEntity) tTileEntity).getFrontFacing() == aSide) && (null != (tMetaTileEntity = ((IGregTechTileEntity) tTileEntity).getMetaTileEntity())) && ((tMetaTileEntity instanceof GregtechMetaLargeIndustrialCentrifuge))) { if (((IGregTechTileEntity) tTileEntity).isActive()) { - return Textures.BlockIcons.TURBINE_ACTIVE[5].getIcon(); + return GregtechTextures.BlockIcons.CENTRIFUGE_ACTIVE[5].getIcon(); } - return Textures.BlockIcons.TURBINE[5].getIcon(); + GregtechTextures.BlockIcons.CENTRIFUGE[5].getIcon(); } if ((null != (tTileEntity = aWorld.getTileEntity(xCoord + (aSide == 2 ? 1 : -1), yCoord - 1, zCoord))) && ((tTileEntity instanceof IGregTechTileEntity)) && (((IGregTechTileEntity) tTileEntity).getFrontFacing() == aSide) && (null != (tMetaTileEntity = ((IGregTechTileEntity) tTileEntity).getMetaTileEntity())) && ((tMetaTileEntity instanceof GregtechMetaLargeIndustrialCentrifuge))) { if (((IGregTechTileEntity) tTileEntity).isActive()) { - return Textures.BlockIcons.TURBINE_ACTIVE[2].getIcon(); + return GregtechTextures.BlockIcons.CENTRIFUGE_ACTIVE[2].getIcon(); } - return Textures.BlockIcons.TURBINE[2].getIcon(); + GregtechTextures.BlockIcons.CENTRIFUGE[2].getIcon(); } } else if ((aSide == 4) || (aSide == 5)) { TileEntity tTileEntity; Object tMetaTileEntity; if ((null != (tTileEntity = aWorld.getTileEntity(xCoord, yCoord - 1, zCoord + (aSide == 4 ? 1 : -1)))) && ((tTileEntity instanceof IGregTechTileEntity)) && (((IGregTechTileEntity) tTileEntity).getFrontFacing() == aSide) && (null != (tMetaTileEntity = ((IGregTechTileEntity) tTileEntity).getMetaTileEntity())) && ((tMetaTileEntity instanceof GregtechMetaLargeIndustrialCentrifuge))) { if (((IGregTechTileEntity) tTileEntity).isActive()) { - return Textures.BlockIcons.TURBINE_ACTIVE[0].getIcon(); + return GregtechTextures.BlockIcons.CENTRIFUGE_ACTIVE[0].getIcon(); } - return Textures.BlockIcons.TURBINE[0].getIcon(); + GregtechTextures.BlockIcons.CENTRIFUGE[0].getIcon(); } if ((null != (tTileEntity = aWorld.getTileEntity(xCoord, yCoord, zCoord + (aSide == 4 ? 1 : -1)))) && ((tTileEntity instanceof IGregTechTileEntity)) && (((IGregTechTileEntity) tTileEntity).getFrontFacing() == aSide) && (null != (tMetaTileEntity = ((IGregTechTileEntity) tTileEntity).getMetaTileEntity())) && ((tMetaTileEntity instanceof GregtechMetaLargeIndustrialCentrifuge))) { if (((IGregTechTileEntity) tTileEntity).isActive()) { - return Textures.BlockIcons.TURBINE_ACTIVE[3].getIcon(); + return GregtechTextures.BlockIcons.CENTRIFUGE_ACTIVE[3].getIcon(); } - return Textures.BlockIcons.TURBINE[3].getIcon(); + GregtechTextures.BlockIcons.CENTRIFUGE[3].getIcon(); } if ((null != (tTileEntity = aWorld.getTileEntity(xCoord, yCoord + 1, zCoord + (aSide == 4 ? 1 : -1)))) && ((tTileEntity instanceof IGregTechTileEntity)) && (((IGregTechTileEntity) tTileEntity).getFrontFacing() == aSide) && (null != (tMetaTileEntity = ((IGregTechTileEntity) tTileEntity).getMetaTileEntity())) && ((tMetaTileEntity instanceof GregtechMetaLargeIndustrialCentrifuge))) { if (((IGregTechTileEntity) tTileEntity).isActive()) { - return Textures.BlockIcons.TURBINE_ACTIVE[6].getIcon(); + return GregtechTextures.BlockIcons.CENTRIFUGE_ACTIVE[6].getIcon(); } - return Textures.BlockIcons.TURBINE[6].getIcon(); + GregtechTextures.BlockIcons.CENTRIFUGE[6].getIcon(); } if ((null != (tTileEntity = aWorld.getTileEntity(xCoord, yCoord - 1, zCoord))) && ((tTileEntity instanceof IGregTechTileEntity)) && (((IGregTechTileEntity) tTileEntity).getFrontFacing() == aSide) && (null != (tMetaTileEntity = ((IGregTechTileEntity) tTileEntity).getMetaTileEntity())) && ((tMetaTileEntity instanceof GregtechMetaLargeIndustrialCentrifuge))) { if (((IGregTechTileEntity) tTileEntity).isActive()) { - return Textures.BlockIcons.TURBINE_ACTIVE[1].getIcon(); + return GregtechTextures.BlockIcons.CENTRIFUGE_ACTIVE[1].getIcon(); } - return Textures.BlockIcons.TURBINE[1].getIcon(); + GregtechTextures.BlockIcons.CENTRIFUGE[1].getIcon(); } if ((null != (tTileEntity = aWorld.getTileEntity(xCoord, yCoord + 1, zCoord))) && ((tTileEntity instanceof IGregTechTileEntity)) && (((IGregTechTileEntity) tTileEntity).getFrontFacing() == aSide) && (null != (tMetaTileEntity = ((IGregTechTileEntity) tTileEntity).getMetaTileEntity())) && ((tMetaTileEntity instanceof GregtechMetaLargeIndustrialCentrifuge))) { if (((IGregTechTileEntity) tTileEntity).isActive()) { - return Textures.BlockIcons.TURBINE_ACTIVE[7].getIcon(); + return GregtechTextures.BlockIcons.CENTRIFUGE_ACTIVE[7].getIcon(); } - return Textures.BlockIcons.TURBINE[7].getIcon(); + GregtechTextures.BlockIcons.CENTRIFUGE[7].getIcon(); } if ((null != (tTileEntity = aWorld.getTileEntity(xCoord, yCoord + 1, zCoord + (aSide == 5 ? 1 : -1)))) && ((tTileEntity instanceof IGregTechTileEntity)) && (((IGregTechTileEntity) tTileEntity).getFrontFacing() == aSide) && (null != (tMetaTileEntity = ((IGregTechTileEntity) tTileEntity).getMetaTileEntity())) && ((tMetaTileEntity instanceof GregtechMetaLargeIndustrialCentrifuge))) { if (((IGregTechTileEntity) tTileEntity).isActive()) { - return Textures.BlockIcons.TURBINE_ACTIVE[8].getIcon(); + return GregtechTextures.BlockIcons.CENTRIFUGE_ACTIVE[8].getIcon(); } - return Textures.BlockIcons.TURBINE[8].getIcon(); + GregtechTextures.BlockIcons.CENTRIFUGE[8].getIcon(); } if ((null != (tTileEntity = aWorld.getTileEntity(xCoord, yCoord, zCoord + (aSide == 5 ? 1 : -1)))) && ((tTileEntity instanceof IGregTechTileEntity)) && (((IGregTechTileEntity) tTileEntity).getFrontFacing() == aSide) && (null != (tMetaTileEntity = ((IGregTechTileEntity) tTileEntity).getMetaTileEntity())) && ((tMetaTileEntity instanceof GregtechMetaLargeIndustrialCentrifuge))) { if (((IGregTechTileEntity) tTileEntity).isActive()) { - return Textures.BlockIcons.TURBINE_ACTIVE[5].getIcon(); + return GregtechTextures.BlockIcons.CENTRIFUGE_ACTIVE[5].getIcon(); } - return Textures.BlockIcons.TURBINE[5].getIcon(); + GregtechTextures.BlockIcons.CENTRIFUGE[5].getIcon(); } if ((null != (tTileEntity = aWorld.getTileEntity(xCoord, yCoord - 1, zCoord + (aSide == 5 ? 1 : -1)))) && ((tTileEntity instanceof IGregTechTileEntity)) && (((IGregTechTileEntity) tTileEntity).getFrontFacing() == aSide) && (null != (tMetaTileEntity = ((IGregTechTileEntity) tTileEntity).getMetaTileEntity())) && ((tMetaTileEntity instanceof GregtechMetaLargeIndustrialCentrifuge))) { if (((IGregTechTileEntity) tTileEntity).isActive()) { - return Textures.BlockIcons.TURBINE_ACTIVE[2].getIcon(); + return GregtechTextures.BlockIcons.CENTRIFUGE_ACTIVE[2].getIcon(); } - return Textures.BlockIcons.TURBINE[2].getIcon(); + GregtechTextures.BlockIcons.CENTRIFUGE[2].getIcon(); } } return Textures.BlockIcons.MACHINE_CASING_SOLID_STEEL.getIcon(); diff --git a/src/Java/miscutil/gregtech/common/machines/multi/GregtechMetaLargeIndustrialCentrifuge.java b/src/Java/miscutil/gregtech/common/machines/multi/GregtechMetaLargeIndustrialCentrifuge.java index bbb1d4ad8b..c0ba9fc02d 100644 --- a/src/Java/miscutil/gregtech/common/machines/multi/GregtechMetaLargeIndustrialCentrifuge.java +++ b/src/Java/miscutil/gregtech/common/machines/multi/GregtechMetaLargeIndustrialCentrifuge.java @@ -6,6 +6,8 @@ import gregtech.api.gui.GT_GUIContainer_MultiMachine; import gregtech.api.interfaces.ITexture; 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.metatileentity.implementations.GT_MetaTileEntity_MultiBlockBase; import gregtech.api.objects.GT_RenderedTexture; import gregtech.api.util.GT_Recipe; @@ -17,6 +19,7 @@ import java.util.List; import miscutil.core.block.ModBlocks; import miscutil.core.util.Utils; +import miscutil.gregtech.api.enums.GregtechTextures; import net.minecraft.block.Block; import net.minecraft.entity.player.InventoryPlayer; import net.minecraft.item.ItemStack; @@ -69,7 +72,7 @@ extends GT_MetaTileEntity_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]}; + return new ITexture[]{Textures.BlockIcons.MACHINE_CASINGS[1][aColorIndex + 1], aFacing == aSide ? aActive ? new GT_RenderedTexture(GregtechTextures.BlockIcons.LARGECENTRIFUGE_ACTIVE5) : new GT_RenderedTexture(GregtechTextures.BlockIcons.LARGECENTRIFUGE5) : Textures.BlockIcons.CASING_BLOCKS[57]}; } @Override @@ -237,7 +240,7 @@ extends GT_MetaTileEntity_MultiBlockBase { int xDir = ForgeDirection.getOrientation(aBaseMetaTileEntity.getBackFacing()).offsetX; int yDir = ForgeDirection.getOrientation(aBaseMetaTileEntity.getBackFacing()).offsetY; int zDir = ForgeDirection.getOrientation(aBaseMetaTileEntity.getBackFacing()).offsetZ; - Utils.LOG_INFO("X:"+xDir+" Y:"+yDir+" Z:"+zDir); + //Utils.LOG_WARNING("X:"+xDir+" Y:"+yDir+" Z:"+zDir); if (!aBaseMetaTileEntity.getAirOffset(xDir, 0, zDir)) { return false; } @@ -245,10 +248,28 @@ extends GT_MetaTileEntity_MultiBlockBase { for (int i = -1; i < 2; i++) { //X-Dir for (int j = -1; j < 2; j++) { //Z-Dir for (int h = -1; h < 2; h++) { //Y-Dir - if ((h != 0) || (((xDir + i != 0) || (zDir + j != 0)) && ((i != 0) || (j != 0)))) { + if ((h != 0) || (((xDir + i != 0) || (zDir + j != 0)) && ((i != 0) || (j != 0)))) { + IGregTechTileEntity tTileEntity = aBaseMetaTileEntity.getIGregTechTileEntityOffset(xDir + i, h, zDir + j); //Utils.LOG_INFO("X:"+tTileEntity.getXCoord()+" Y:"+tTileEntity.getYCoord()+" Z:"+tTileEntity.getZCoord()); if ((!addMaintenanceToMachineList(tTileEntity, 57)) && (!addInputToMachineList(tTileEntity, 57)) && (!addOutputToMachineList(tTileEntity, 57)) && (!addEnergyInputToMachineList(tTileEntity, 57))) { + + //Maintenance Hatch + if ((tTileEntity != null) && (tTileEntity.getMetaTileEntity() != null)) { + if (tTileEntity.getXCoord() == aBaseMetaTileEntity.getXCoord() && tTileEntity.getYCoord() == aBaseMetaTileEntity.getYCoord() && tTileEntity.getZCoord() == (aBaseMetaTileEntity.getZCoord()+2)) { + if ((tTileEntity.getMetaTileEntity() instanceof GT_MetaTileEntity_Hatch_Maintenance)) { + Utils.LOG_INFO("MAINT HATCH IN CORRECT PLACE"); + this.mMaintenanceHatches.add((GT_MetaTileEntity_Hatch_Maintenance) tTileEntity.getMetaTileEntity()); + ((GT_MetaTileEntity_Hatch) tTileEntity.getMetaTileEntity()).mMachineBlock = getCasingTextureIndex(); + } else { + return false; + } + } + else { + Utils.LOG_INFO("MAINT HATCH IN WRONG PLACE"); + } + } + if (aBaseMetaTileEntity.getBlockOffset(xDir + i, h, zDir + j) != ModBlocks.blockCasingsMisc) { return false; } @@ -351,7 +372,7 @@ extends GT_MetaTileEntity_MultiBlockBase { return false; } }*/ - + /*//Energy Hatch IGregTechTileEntity tTileEntityEnergyHatch = getBaseMetaTileEntity().getIGregTechTileEntity(i, h+1, j+2); if ((tTileEntityEnergyHatch != null) && (tTileEntityEnergyHatch.getMetaTileEntity() != null)) { diff --git a/src/resources/assets/miscutils/textures/blocks/iconsets/LARGECENTRIFUGE1.png b/src/resources/assets/miscutils/textures/blocks/iconsets/LARGECENTRIFUGE1.png Binary files differnew file mode 100644 index 0000000000..db124a0e2f --- /dev/null +++ b/src/resources/assets/miscutils/textures/blocks/iconsets/LARGECENTRIFUGE1.png diff --git a/src/resources/assets/miscutils/textures/blocks/iconsets/LARGECENTRIFUGE2.png b/src/resources/assets/miscutils/textures/blocks/iconsets/LARGECENTRIFUGE2.png Binary files differnew file mode 100644 index 0000000000..39b04867c8 --- /dev/null +++ b/src/resources/assets/miscutils/textures/blocks/iconsets/LARGECENTRIFUGE2.png diff --git a/src/resources/assets/miscutils/textures/blocks/iconsets/LARGECENTRIFUGE3.png b/src/resources/assets/miscutils/textures/blocks/iconsets/LARGECENTRIFUGE3.png Binary files differnew file mode 100644 index 0000000000..c0f51ea87f --- /dev/null +++ b/src/resources/assets/miscutils/textures/blocks/iconsets/LARGECENTRIFUGE3.png diff --git a/src/resources/assets/miscutils/textures/blocks/iconsets/LARGECENTRIFUGE4.png b/src/resources/assets/miscutils/textures/blocks/iconsets/LARGECENTRIFUGE4.png Binary files differnew file mode 100644 index 0000000000..30de239b2a --- /dev/null +++ b/src/resources/assets/miscutils/textures/blocks/iconsets/LARGECENTRIFUGE4.png diff --git a/src/resources/assets/miscutils/textures/blocks/iconsets/LARGECENTRIFUGE5.png b/src/resources/assets/miscutils/textures/blocks/iconsets/LARGECENTRIFUGE5.png Binary files differnew file mode 100644 index 0000000000..e89713cac5 --- /dev/null +++ b/src/resources/assets/miscutils/textures/blocks/iconsets/LARGECENTRIFUGE5.png diff --git a/src/resources/assets/miscutils/textures/blocks/iconsets/LARGECENTRIFUGE6.png b/src/resources/assets/miscutils/textures/blocks/iconsets/LARGECENTRIFUGE6.png Binary files differnew file mode 100644 index 0000000000..b9dcec399c --- /dev/null +++ b/src/resources/assets/miscutils/textures/blocks/iconsets/LARGECENTRIFUGE6.png diff --git a/src/resources/assets/miscutils/textures/blocks/iconsets/LARGECENTRIFUGE7.png b/src/resources/assets/miscutils/textures/blocks/iconsets/LARGECENTRIFUGE7.png Binary files differnew file mode 100644 index 0000000000..3d1f500536 --- /dev/null +++ b/src/resources/assets/miscutils/textures/blocks/iconsets/LARGECENTRIFUGE7.png diff --git a/src/resources/assets/miscutils/textures/blocks/iconsets/LARGECENTRIFUGE8.png b/src/resources/assets/miscutils/textures/blocks/iconsets/LARGECENTRIFUGE8.png Binary files differnew file mode 100644 index 0000000000..faea0b0d76 --- /dev/null +++ b/src/resources/assets/miscutils/textures/blocks/iconsets/LARGECENTRIFUGE8.png diff --git a/src/resources/assets/miscutils/textures/blocks/iconsets/LARGECENTRIFUGE9.png b/src/resources/assets/miscutils/textures/blocks/iconsets/LARGECENTRIFUGE9.png Binary files differnew file mode 100644 index 0000000000..6862aba80b --- /dev/null +++ b/src/resources/assets/miscutils/textures/blocks/iconsets/LARGECENTRIFUGE9.png diff --git a/src/resources/assets/miscutils/textures/blocks/iconsets/LARGECENTRIFUGE_ACTIVE1.png b/src/resources/assets/miscutils/textures/blocks/iconsets/LARGECENTRIFUGE_ACTIVE1.png Binary files differnew file mode 100644 index 0000000000..17c5313a97 --- /dev/null +++ b/src/resources/assets/miscutils/textures/blocks/iconsets/LARGECENTRIFUGE_ACTIVE1.png diff --git a/src/resources/assets/miscutils/textures/blocks/iconsets/LARGECENTRIFUGE_ACTIVE1.png.mcmeta b/src/resources/assets/miscutils/textures/blocks/iconsets/LARGECENTRIFUGE_ACTIVE1.png.mcmeta new file mode 100644 index 0000000000..d746756cbd --- /dev/null +++ b/src/resources/assets/miscutils/textures/blocks/iconsets/LARGECENTRIFUGE_ACTIVE1.png.mcmeta @@ -0,0 +1,3 @@ +{ + "animation":{} +}
\ No newline at end of file diff --git a/src/resources/assets/miscutils/textures/blocks/iconsets/LARGECENTRIFUGE_ACTIVE2.png b/src/resources/assets/miscutils/textures/blocks/iconsets/LARGECENTRIFUGE_ACTIVE2.png Binary files differnew file mode 100644 index 0000000000..8aadc7416f --- /dev/null +++ b/src/resources/assets/miscutils/textures/blocks/iconsets/LARGECENTRIFUGE_ACTIVE2.png diff --git a/src/resources/assets/miscutils/textures/blocks/iconsets/LARGECENTRIFUGE_ACTIVE2.png.mcmeta b/src/resources/assets/miscutils/textures/blocks/iconsets/LARGECENTRIFUGE_ACTIVE2.png.mcmeta new file mode 100644 index 0000000000..d746756cbd --- /dev/null +++ b/src/resources/assets/miscutils/textures/blocks/iconsets/LARGECENTRIFUGE_ACTIVE2.png.mcmeta @@ -0,0 +1,3 @@ +{ + "animation":{} +}
\ No newline at end of file diff --git a/src/resources/assets/miscutils/textures/blocks/iconsets/LARGECENTRIFUGE_ACTIVE3.png b/src/resources/assets/miscutils/textures/blocks/iconsets/LARGECENTRIFUGE_ACTIVE3.png Binary files differnew file mode 100644 index 0000000000..8ddd66ee12 --- /dev/null +++ b/src/resources/assets/miscutils/textures/blocks/iconsets/LARGECENTRIFUGE_ACTIVE3.png diff --git a/src/resources/assets/miscutils/textures/blocks/iconsets/LARGECENTRIFUGE_ACTIVE3.png.mcmeta b/src/resources/assets/miscutils/textures/blocks/iconsets/LARGECENTRIFUGE_ACTIVE3.png.mcmeta new file mode 100644 index 0000000000..d746756cbd --- /dev/null +++ b/src/resources/assets/miscutils/textures/blocks/iconsets/LARGECENTRIFUGE_ACTIVE3.png.mcmeta @@ -0,0 +1,3 @@ +{ + "animation":{} +}
\ No newline at end of file diff --git a/src/resources/assets/miscutils/textures/blocks/iconsets/LARGECENTRIFUGE_ACTIVE4.png b/src/resources/assets/miscutils/textures/blocks/iconsets/LARGECENTRIFUGE_ACTIVE4.png Binary files differnew file mode 100644 index 0000000000..66fdf93619 --- /dev/null +++ b/src/resources/assets/miscutils/textures/blocks/iconsets/LARGECENTRIFUGE_ACTIVE4.png diff --git a/src/resources/assets/miscutils/textures/blocks/iconsets/LARGECENTRIFUGE_ACTIVE4.png.mcmeta b/src/resources/assets/miscutils/textures/blocks/iconsets/LARGECENTRIFUGE_ACTIVE4.png.mcmeta new file mode 100644 index 0000000000..d746756cbd --- /dev/null +++ b/src/resources/assets/miscutils/textures/blocks/iconsets/LARGECENTRIFUGE_ACTIVE4.png.mcmeta @@ -0,0 +1,3 @@ +{ + "animation":{} +}
\ No newline at end of file diff --git a/src/resources/assets/miscutils/textures/blocks/iconsets/LARGECENTRIFUGE_ACTIVE5.png b/src/resources/assets/miscutils/textures/blocks/iconsets/LARGECENTRIFUGE_ACTIVE5.png Binary files differnew file mode 100644 index 0000000000..d26eac053c --- /dev/null +++ b/src/resources/assets/miscutils/textures/blocks/iconsets/LARGECENTRIFUGE_ACTIVE5.png diff --git a/src/resources/assets/miscutils/textures/blocks/iconsets/LARGECENTRIFUGE_ACTIVE5.png.mcmeta b/src/resources/assets/miscutils/textures/blocks/iconsets/LARGECENTRIFUGE_ACTIVE5.png.mcmeta new file mode 100644 index 0000000000..d746756cbd --- /dev/null +++ b/src/resources/assets/miscutils/textures/blocks/iconsets/LARGECENTRIFUGE_ACTIVE5.png.mcmeta @@ -0,0 +1,3 @@ +{ + "animation":{} +}
\ No newline at end of file diff --git a/src/resources/assets/miscutils/textures/blocks/iconsets/LARGECENTRIFUGE_ACTIVE6.png b/src/resources/assets/miscutils/textures/blocks/iconsets/LARGECENTRIFUGE_ACTIVE6.png Binary files differnew file mode 100644 index 0000000000..d7f82470bb --- /dev/null +++ b/src/resources/assets/miscutils/textures/blocks/iconsets/LARGECENTRIFUGE_ACTIVE6.png diff --git a/src/resources/assets/miscutils/textures/blocks/iconsets/LARGECENTRIFUGE_ACTIVE6.png.mcmeta b/src/resources/assets/miscutils/textures/blocks/iconsets/LARGECENTRIFUGE_ACTIVE6.png.mcmeta new file mode 100644 index 0000000000..d746756cbd --- /dev/null +++ b/src/resources/assets/miscutils/textures/blocks/iconsets/LARGECENTRIFUGE_ACTIVE6.png.mcmeta @@ -0,0 +1,3 @@ +{ + "animation":{} +}
\ No newline at end of file diff --git a/src/resources/assets/miscutils/textures/blocks/iconsets/LARGECENTRIFUGE_ACTIVE7.png b/src/resources/assets/miscutils/textures/blocks/iconsets/LARGECENTRIFUGE_ACTIVE7.png Binary files differnew file mode 100644 index 0000000000..17af546793 --- /dev/null +++ b/src/resources/assets/miscutils/textures/blocks/iconsets/LARGECENTRIFUGE_ACTIVE7.png diff --git a/src/resources/assets/miscutils/textures/blocks/iconsets/LARGECENTRIFUGE_ACTIVE7.png.mcmeta b/src/resources/assets/miscutils/textures/blocks/iconsets/LARGECENTRIFUGE_ACTIVE7.png.mcmeta new file mode 100644 index 0000000000..d746756cbd --- /dev/null +++ b/src/resources/assets/miscutils/textures/blocks/iconsets/LARGECENTRIFUGE_ACTIVE7.png.mcmeta @@ -0,0 +1,3 @@ +{ + "animation":{} +}
\ No newline at end of file diff --git a/src/resources/assets/miscutils/textures/blocks/iconsets/LARGECENTRIFUGE_ACTIVE8.png b/src/resources/assets/miscutils/textures/blocks/iconsets/LARGECENTRIFUGE_ACTIVE8.png Binary files differnew file mode 100644 index 0000000000..93e9ab94da --- /dev/null +++ b/src/resources/assets/miscutils/textures/blocks/iconsets/LARGECENTRIFUGE_ACTIVE8.png diff --git a/src/resources/assets/miscutils/textures/blocks/iconsets/LARGECENTRIFUGE_ACTIVE8.png.mcmeta b/src/resources/assets/miscutils/textures/blocks/iconsets/LARGECENTRIFUGE_ACTIVE8.png.mcmeta new file mode 100644 index 0000000000..d746756cbd --- /dev/null +++ b/src/resources/assets/miscutils/textures/blocks/iconsets/LARGECENTRIFUGE_ACTIVE8.png.mcmeta @@ -0,0 +1,3 @@ +{ + "animation":{} +}
\ No newline at end of file diff --git a/src/resources/assets/miscutils/textures/blocks/iconsets/LARGECENTRIFUGE_ACTIVE9.png b/src/resources/assets/miscutils/textures/blocks/iconsets/LARGECENTRIFUGE_ACTIVE9.png Binary files differnew file mode 100644 index 0000000000..b10637e2a5 --- /dev/null +++ b/src/resources/assets/miscutils/textures/blocks/iconsets/LARGECENTRIFUGE_ACTIVE9.png diff --git a/src/resources/assets/miscutils/textures/blocks/iconsets/LARGECENTRIFUGE_ACTIVE9.png.mcmeta b/src/resources/assets/miscutils/textures/blocks/iconsets/LARGECENTRIFUGE_ACTIVE9.png.mcmeta new file mode 100644 index 0000000000..d746756cbd --- /dev/null +++ b/src/resources/assets/miscutils/textures/blocks/iconsets/LARGECENTRIFUGE_ACTIVE9.png.mcmeta @@ -0,0 +1,3 @@ +{ + "animation":{} +}
\ No newline at end of file |
