From 96b66bdf2f05ae4d9fb059ec29a03b86949efce3 Mon Sep 17 00:00:00 2001 From: Jordan Byrne Date: Fri, 6 Apr 2018 16:49:16 +1000 Subject: + Added a casing for the Amazon Warehouse. + Added registration and loader for Amazon Warehouse. --- .../xmod/gregtech/common/blocks/textures/CasingTextureHandler3.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/Java/gtPlusPlus/xmod/gregtech/common/blocks/textures/CasingTextureHandler3.java') diff --git a/src/Java/gtPlusPlus/xmod/gregtech/common/blocks/textures/CasingTextureHandler3.java b/src/Java/gtPlusPlus/xmod/gregtech/common/blocks/textures/CasingTextureHandler3.java index 51fb289b61..2087cea2df 100644 --- a/src/Java/gtPlusPlus/xmod/gregtech/common/blocks/textures/CasingTextureHandler3.java +++ b/src/Java/gtPlusPlus/xmod/gregtech/common/blocks/textures/CasingTextureHandler3.java @@ -21,7 +21,7 @@ public class CasingTextureHandler3 { return TexturesGtBlock.Casing_Staballoy_Firebox.getIcon(); //Material Press Casings case 4: - return TexturesGtBlock._PlaceHolder.getIcon(); + return TexturesGtBlock.TEXTURE_CASING_AMAZON.getIcon(); //Sifter Structural case 5: return TexturesGtBlock._PlaceHolder.getIcon(); -- cgit From 31996894fd1dd04ef4850dbc470664c5766bffb8 Mon Sep 17 00:00:00 2001 From: Jordan Byrne Date: Sun, 8 Apr 2018 16:10:03 +1000 Subject: % Tweaked some classes related to Textures and Casings. --- .../xmod/gregtech/common/blocks/GregtechMetaCasingBlocks3.java | 8 ++++---- .../gregtech/common/blocks/textures/CasingTextureHandler3.java | 4 ++-- .../tileentities/machines/multi/misc/GMTE_AmazonPackager.java | 4 ++-- 3 files changed, 8 insertions(+), 8 deletions(-) (limited to 'src/Java/gtPlusPlus/xmod/gregtech/common/blocks/textures/CasingTextureHandler3.java') diff --git a/src/Java/gtPlusPlus/xmod/gregtech/common/blocks/GregtechMetaCasingBlocks3.java b/src/Java/gtPlusPlus/xmod/gregtech/common/blocks/GregtechMetaCasingBlocks3.java index 0c43482d5b..f05686bcfa 100644 --- a/src/Java/gtPlusPlus/xmod/gregtech/common/blocks/GregtechMetaCasingBlocks3.java +++ b/src/Java/gtPlusPlus/xmod/gregtech/common/blocks/GregtechMetaCasingBlocks3.java @@ -25,12 +25,12 @@ extends GregtechMetaCasingBlocksAbstract { GT_LanguageManager.addStringLocalization(this.getUnlocalizedName() + ".1.name", "Inconel Reinforced Casing"); GT_LanguageManager.addStringLocalization(this.getUnlocalizedName() + ".2.name", "Multi-Use Casing"); GT_LanguageManager.addStringLocalization(this.getUnlocalizedName() + ".3.name", "Trinium Plated Mining Platform Casing"); - GT_LanguageManager.addStringLocalization(this.getUnlocalizedName() + ".4.name", "Supply Depot Casing"); + GT_LanguageManager.addStringLocalization(this.getUnlocalizedName() + ".4.name", "Placeholder"); GT_LanguageManager.addStringLocalization(this.getUnlocalizedName() + ".5.name", "Placeholder"); GT_LanguageManager.addStringLocalization(this.getUnlocalizedName() + ".6.name", "Placeholder"); GT_LanguageManager.addStringLocalization(this.getUnlocalizedName() + ".7.name", "Placeholder");; GT_LanguageManager.addStringLocalization(this.getUnlocalizedName() + ".8.name", "Placeholder"); - GT_LanguageManager.addStringLocalization(this.getUnlocalizedName() + ".9.name", "Placeholder"); + GT_LanguageManager.addStringLocalization(this.getUnlocalizedName() + ".9.name", "Supply Depot Casing"); GT_LanguageManager.addStringLocalization(this.getUnlocalizedName() + ".10.name", "Placeholder"); GT_LanguageManager.addStringLocalization(this.getUnlocalizedName() + ".11.name", "Placeholder"); GT_LanguageManager.addStringLocalization(this.getUnlocalizedName() + ".12.name", "Placeholder"); @@ -41,12 +41,12 @@ extends GregtechMetaCasingBlocksAbstract { GregtechItemList.Casing_Extruder.set(new ItemStack(this, 1, 1)); GregtechItemList.Casing_Multi_Use.set(new ItemStack(this, 1, 2)); GregtechItemList.Casing_BedrockMiner.set(new ItemStack(this, 1, 3)); - GregtechItemList.Casing_AmazonWarehouse.set(new ItemStack(this, 1, 4)); + //GregtechItemList.Casing_WashPlant.set(new ItemStack(this, 1, 4)); //GregtechItemList.Casing_Sifter.set(new ItemStack(this, 1, 5)); //GregtechItemList.Casing_SifterGrate.set(new ItemStack(this, 1, 6)); //GregtechItemList.Casing_Vanadium_Redox.set(new ItemStack(this, 1, 7)); //GregtechItemList.Casing_Power_SubStation.set(new ItemStack(this, 1, 8)); - //GregtechItemList.Casing_Cyclotron_Coil.set(new ItemStack(this, 1, 9)); + GregtechItemList.Casing_AmazonWarehouse.set(new ItemStack(this, 1, 9)); //GregtechItemList.Casing_Cyclotron_External.set(new ItemStack(this, 1, 10)); //GregtechItemList.Casing_ThermalContainment.set(new ItemStack(this, 1, 11)); //GregtechItemList.Casing_Autocrafter.set(new ItemStack(this, 1, 12)); diff --git a/src/Java/gtPlusPlus/xmod/gregtech/common/blocks/textures/CasingTextureHandler3.java b/src/Java/gtPlusPlus/xmod/gregtech/common/blocks/textures/CasingTextureHandler3.java index 2087cea2df..900ee80483 100644 --- a/src/Java/gtPlusPlus/xmod/gregtech/common/blocks/textures/CasingTextureHandler3.java +++ b/src/Java/gtPlusPlus/xmod/gregtech/common/blocks/textures/CasingTextureHandler3.java @@ -21,7 +21,7 @@ public class CasingTextureHandler3 { return TexturesGtBlock.Casing_Staballoy_Firebox.getIcon(); //Material Press Casings case 4: - return TexturesGtBlock.TEXTURE_CASING_AMAZON.getIcon(); + return TexturesGtBlock._PlaceHolder.getIcon(); //Sifter Structural case 5: return TexturesGtBlock._PlaceHolder.getIcon(); @@ -36,7 +36,7 @@ public class CasingTextureHandler3 { return TexturesGtBlock._PlaceHolder.getIcon(); //Cyclotron Coil case 9: - return TexturesGtBlock._PlaceHolder.getIcon(); + return TexturesGtBlock.TEXTURE_CASING_AMAZON.getIcon(); //Cyclotron External Casing case 10: return TexturesGtBlock._PlaceHolder.getIcon(); diff --git a/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/misc/GMTE_AmazonPackager.java b/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/misc/GMTE_AmazonPackager.java index 865b8b7bf4..146d1b9fcc 100644 --- a/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/misc/GMTE_AmazonPackager.java +++ b/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/misc/GMTE_AmazonPackager.java @@ -237,11 +237,11 @@ public class GMTE_AmazonPackager extends GregtechMeta_MultiBlockBase { for (int h = -1; h < 2; h++) { if ((h != 0) || ((((xDir + i) != 0) || ((zDir + j) != 0)) && ((i != 0) || (j != 0)))) { final IGregTechTileEntity tTileEntity = aBaseMetaTileEntity.getIGregTechTileEntityOffset(xDir + i, h, zDir + j); - if (!this.addToMachineList(tTileEntity, TAE.getIndexFromPage(2, 4))) { + if (!this.addToMachineList(tTileEntity, TAE.getIndexFromPage(2, 9))) { final Block tBlock = aBaseMetaTileEntity.getBlockOffset(xDir + i, h, zDir + j); final byte tMeta = aBaseMetaTileEntity.getMetaIDOffset(xDir + i, h, zDir + j); - if (((tBlock != ModBlocks.blockCasings3Misc) || (tMeta != 4))) { + if (((tBlock != ModBlocks.blockCasings3Misc) || (tMeta != 9))) { return false; } tAmount++; -- cgit