diff options
author | Draknyte1 <Draknyte1@hotmail.com> | 2016-07-13 15:28:09 +1000 |
---|---|---|
committer | Draknyte1 <Draknyte1@hotmail.com> | 2016-07-13 15:28:09 +1000 |
commit | f63de1a19798e9e84a1c7b44353ea5fbeb59ac4b (patch) | |
tree | 4d52a37e0260b0e5645b6b1d3871695c8ce33ffe /src | |
parent | 0d960a9664c89f4b0bd4e2834b4b34d86716ee4f (diff) | |
download | GT5-Unofficial-f63de1a19798e9e84a1c7b44353ea5fbeb59ac4b.tar.gz GT5-Unofficial-f63de1a19798e9e84a1c7b44353ea5fbeb59ac4b.tar.bz2 GT5-Unofficial-f63de1a19798e9e84a1c7b44353ea5fbeb59ac4b.zip |
+ Re-added the Industrial Material Press (A Bending Machine)
+ Added Casing Blocks for it as well.
> Yet to add recipes though.
Diffstat (limited to 'src')
3 files changed, 23 insertions, 12 deletions
diff --git a/src/Java/miscutil/core/xmod/gregtech/api/enums/GregtechItemList.java b/src/Java/miscutil/core/xmod/gregtech/api/enums/GregtechItemList.java index b9e80ce91b..93e547c01a 100644 --- a/src/Java/miscutil/core/xmod/gregtech/api/enums/GregtechItemList.java +++ b/src/Java/miscutil/core/xmod/gregtech/api/enums/GregtechItemList.java @@ -81,7 +81,7 @@ public enum GregtechItemList implements GregtechItemContainer { Circuit_Parts_Wiring_IV, Circuit_Parts_Wiring_LuV, Circuit_Parts_Wiring_ZPM, //Unused Machine Casings - Casing_U1, Casing_U2, Casing_U3, Casing_U4, Casing_U5, Casing_U6, Casing_U7, + Casing_MaterialPress, Casing_U2, Casing_U3, Casing_U4, Casing_U5, Casing_U6, Casing_U7, //Unused Machine Coils Casing_Coil_U1, Casing_Coil_U2, Casing_Coil_U3, Casing_Coil_U4, diff --git a/src/Java/miscutil/core/xmod/gregtech/common/blocks/GregtechMetaCasingBlocks.java b/src/Java/miscutil/core/xmod/gregtech/common/blocks/GregtechMetaCasingBlocks.java index d776d62f6c..88d609ec11 100644 --- a/src/Java/miscutil/core/xmod/gregtech/common/blocks/GregtechMetaCasingBlocks.java +++ b/src/Java/miscutil/core/xmod/gregtech/common/blocks/GregtechMetaCasingBlocks.java @@ -29,7 +29,7 @@ extends GregtechMetaCasingBlocksAbstract { GT_LanguageManager.addStringLocalization(getUnlocalizedName() + ".1.name", "Structural Coke Oven Casing"); GT_LanguageManager.addStringLocalization(getUnlocalizedName() + ".2.name", "Heat Resistant Coke Oven Casing"); GT_LanguageManager.addStringLocalization(getUnlocalizedName() + ".3.name", "Heat Proof Coke Oven Casing"); - GT_LanguageManager.addStringLocalization(getUnlocalizedName() + ".4.name", "Unused Casing"); + GT_LanguageManager.addStringLocalization(getUnlocalizedName() + ".4.name", "Material Press Machine Casing"); GT_LanguageManager.addStringLocalization(getUnlocalizedName() + ".5.name", "Unused Casing"); GT_LanguageManager.addStringLocalization(getUnlocalizedName() + ".6.name", "Unused Casing"); GT_LanguageManager.addStringLocalization(getUnlocalizedName() + ".7.name", "Unused Casing"); @@ -45,7 +45,7 @@ extends GregtechMetaCasingBlocksAbstract { GregtechItemList.Casing_CokeOven.set(new ItemStack(this, 1, 1)); GregtechItemList.Casing_CokeOven_Coil1.set(new ItemStack(this, 1, 2)); GregtechItemList.Casing_CokeOven_Coil2.set(new ItemStack(this, 1, 3)); - GregtechItemList.Casing_U1.set(new ItemStack(this, 1, 4)); + GregtechItemList.Casing_MaterialPress.set(new ItemStack(this, 1, 4)); GregtechItemList.Casing_U2.set(new ItemStack(this, 1, 5)); GregtechItemList.Casing_U3.set(new ItemStack(this, 1, 6)); GregtechItemList.Casing_U4.set(new ItemStack(this, 1, 7)); @@ -75,6 +75,9 @@ extends GregtechMetaCasingBlocksAbstract { //Coke Oven Casing Tier 2 case 3: return Textures.BlockIcons.MACHINE_CASING_FIREBOX_STEEL.getIcon(); + //Material Press Casings + case 4: + return Textures.BlockIcons.MACHINE_CASING_STABLE_TITANIUM.getIcon(); //Iron Blast Fuance Textures case 10: return Textures.BlockIcons.MACHINE_CASING_SOLID_STEEL.getIcon(); diff --git a/src/Java/miscutil/core/xmod/gregtech/common/tileentities/machines/multi/GregtechMetaTileEntityIndustrialPlatePress.java b/src/Java/miscutil/core/xmod/gregtech/common/tileentities/machines/multi/GregtechMetaTileEntityIndustrialPlatePress.java index 5bea91cf8c..92d6203b9b 100644 --- a/src/Java/miscutil/core/xmod/gregtech/common/tileentities/machines/multi/GregtechMetaTileEntityIndustrialPlatePress.java +++ b/src/Java/miscutil/core/xmod/gregtech/common/tileentities/machines/multi/GregtechMetaTileEntityIndustrialPlatePress.java @@ -1,8 +1,7 @@ package miscutil.core.xmod.gregtech.common.tileentities.machines.multi; -import gregtech.api.GregTech_API; +import static miscutil.core.xmod.gregtech.common.blocks.GregtechMetaCasingBlocks.GTID; import gregtech.api.enums.Textures; -import gregtech.api.gui.GT_GUIContainer_MultiMachine; import gregtech.api.interfaces.ITexture; import gregtech.api.interfaces.metatileentity.IMetaTileEntity; import gregtech.api.interfaces.tileentity.IGregTechTileEntity; @@ -13,6 +12,8 @@ import gregtech.api.util.GT_Utility; import java.util.ArrayList; +import miscutil.core.block.ModBlocks; +import miscutil.core.xmod.gregtech.api.gui.GUI_MultiMachine; import net.minecraft.entity.player.InventoryPlayer; import net.minecraft.item.ItemStack; import net.minecraftforge.common.util.ForgeDirection; @@ -34,20 +35,27 @@ extends GT_MetaTileEntity_MultiBlockBase { @Override public String[] getDescription() { - return new String[]{"Controller Block for the Vacuum Freezer", "Size: 3x3x3 (Hollow)", "Controller (front centered)", "1x Input (anywhere)", "1x Output (anywhere)", "1x Energy Hatch (anywhere)", "1x Maintenance Hatch (anywhere)", "Frost Proof Casings for the rest (16 at least!)"}; + return new String[]{"Controller Block for the Material Press", + "Size: 3x3x3 (Hollow)", + "Controller (front centered)", + "1x Input (anywhere)", + "1x Output (anywhere)", + "1x Energy Hatch (anywhere)", + "1x Maintenance Hatch (anywhere)", + "Material Press Machine Casings for the rest (16 at least!)"}; } @Override public ITexture[] getTexture(IGregTechTileEntity aBaseMetaTileEntity, byte aSide, byte aFacing, byte aColorIndex, boolean aActive, boolean aRedstone) { if (aSide == aFacing) { - return new ITexture[]{Textures.BlockIcons.CASING_BLOCKS[17], new GT_RenderedTexture(aActive ? Textures.BlockIcons.OVERLAY_FRONT_VACUUM_FREEZER_ACTIVE : Textures.BlockIcons.OVERLAY_FRONT_VACUUM_FREEZER)}; + return new ITexture[]{Textures.BlockIcons.CASING_BLOCKS[GTID+4], new GT_RenderedTexture(aActive ? Textures.BlockIcons.OVERLAY_FRONT_VACUUM_FREEZER_ACTIVE : Textures.BlockIcons.OVERLAY_FRONT_VACUUM_FREEZER)}; } - return new ITexture[]{Textures.BlockIcons.CASING_BLOCKS[17]}; + return new ITexture[]{Textures.BlockIcons.CASING_BLOCKS[GTID+4]}; } @Override public Object getClientGUI(int aID, InventoryPlayer aPlayerInventory, IGregTechTileEntity aBaseMetaTileEntity) { - return new GT_GUIContainer_MultiMachine(aPlayerInventory, aBaseMetaTileEntity, getLocalName(), "VacuumFreezer.png"); + return new GUI_MultiMachine(aPlayerInventory, aBaseMetaTileEntity, getLocalName(), "CokeOven.png"); } @Override @@ -112,11 +120,11 @@ extends GT_MetaTileEntity_MultiBlockBase { int tAmount = 0; for (int i = -1; i < 2; i++) { for (int j = -1; j < 2; j++) { - for (int h = -1; h < 2; h++) { + for (int h = -1; h < 3; h++) { if ((h != 0) || (((xDir + i != 0) || (zDir + j != 0)) && ((i != 0) || (j != 0)))) { IGregTechTileEntity tTileEntity = aBaseMetaTileEntity.getIGregTechTileEntityOffset(xDir + i, h, zDir + j); - if ((!addMaintenanceToMachineList(tTileEntity, 17)) && (!addInputToMachineList(tTileEntity, 17)) && (!addOutputToMachineList(tTileEntity, 17)) && (!addEnergyInputToMachineList(tTileEntity, 17))) { - if (aBaseMetaTileEntity.getBlockOffset(xDir + i, h, zDir + j) != GregTech_API.sBlockCasings2) { + if ((!addMaintenanceToMachineList(tTileEntity, GTID+4)) && (!addInputToMachineList(tTileEntity, GTID+4)) && (!addOutputToMachineList(tTileEntity, GTID+4)) && (!addEnergyInputToMachineList(tTileEntity, GTID+4))) { + if (aBaseMetaTileEntity.getBlockOffset(xDir + i, h, zDir + j) != ModBlocks.blockCasingsMisc) { return false; } if (aBaseMetaTileEntity.getMetaIDOffset(xDir + i, h, zDir + j) != 1) { |