diff options
| author | draknyte1 <draknyte1@hotmail.com> | 2016-11-02 17:57:19 +1000 |
|---|---|---|
| committer | draknyte1 <draknyte1@hotmail.com> | 2016-11-02 17:57:19 +1000 |
| commit | 8f5e03f5b792738955b1578f6fd98434b566afb8 (patch) | |
| tree | cabb3549989b61d26bf10a017007c1d832f48a98 /src/Java/gtPlusPlus/xmod/gregtech/common | |
| parent | 3bd9cddd494682db29f8897f5f573ccd1dca1c2c (diff) | |
| download | GT5-Unofficial-8f5e03f5b792738955b1578f6fd98434b566afb8.tar.gz GT5-Unofficial-8f5e03f5b792738955b1578f6fd98434b566afb8.tar.bz2 GT5-Unofficial-8f5e03f5b792738955b1578f6fd98434b566afb8.zip | |
$ Fixed textures for new casings being invalid upon placing.
- Stopped tracking pointless changes to .classpath
Diffstat (limited to 'src/Java/gtPlusPlus/xmod/gregtech/common')
| -rw-r--r-- | src/Java/gtPlusPlus/xmod/gregtech/common/blocks/GregtechMetaCasingBlocks2.java | 12 | ||||
| -rw-r--r-- | src/Java/gtPlusPlus/xmod/gregtech/common/blocks/textures/CasingTextureHandler2.java | 13 |
2 files changed, 3 insertions, 22 deletions
diff --git a/src/Java/gtPlusPlus/xmod/gregtech/common/blocks/GregtechMetaCasingBlocks2.java b/src/Java/gtPlusPlus/xmod/gregtech/common/blocks/GregtechMetaCasingBlocks2.java index 9f8d324fb6..9c6fea31e6 100644 --- a/src/Java/gtPlusPlus/xmod/gregtech/common/blocks/GregtechMetaCasingBlocks2.java +++ b/src/Java/gtPlusPlus/xmod/gregtech/common/blocks/GregtechMetaCasingBlocks2.java @@ -40,6 +40,7 @@ extends GregtechMetaCasingBlocksAbstract { GT_LanguageManager.addStringLocalization(getUnlocalizedName() + ".12.name", "Placeholder Casing"); GT_LanguageManager.addStringLocalization(getUnlocalizedName() + ".13.name", "Placeholder Casing"); GT_LanguageManager.addStringLocalization(getUnlocalizedName() + ".14.name", "Placeholder Casing "); + GT_LanguageManager.addStringLocalization(getUnlocalizedName() + ".15.name", "Placeholder Casing "); GregtechItemList.Casing_StructuralGlass.set(new ItemStack(this, 1, 0)); GregtechItemList.Casing_PlaceHolder1.set(new ItemStack(this, 1, 1)); GregtechItemList.Casing_PlaceHolder2.set(new ItemStack(this, 1, 2)); @@ -62,15 +63,4 @@ extends GregtechMetaCasingBlocksAbstract { public IIcon getIcon(int aSide, int aMeta) { //Texture ID's. case 0 == ID[57] return TextureHandler.getIcon(aSide, aMeta); } - - - - @Override - @SideOnly(Side.CLIENT) - public IIcon getIcon(IBlockAccess aWorld, int xCoord, int yCoord, int zCoord, int aSide) { - GregtechMetaCasingBlocks2 i = this; - return TextureHandler.handleCasingsGT(aWorld, xCoord, yCoord, zCoord, aSide, i); - } - - } diff --git a/src/Java/gtPlusPlus/xmod/gregtech/common/blocks/textures/CasingTextureHandler2.java b/src/Java/gtPlusPlus/xmod/gregtech/common/blocks/textures/CasingTextureHandler2.java index 4d5ca40c3f..2c86cde5bd 100644 --- a/src/Java/gtPlusPlus/xmod/gregtech/common/blocks/textures/CasingTextureHandler2.java +++ b/src/Java/gtPlusPlus/xmod/gregtech/common/blocks/textures/CasingTextureHandler2.java @@ -13,7 +13,7 @@ public class CasingTextureHandler2 { switch (aMeta) { //Centrifuge case 0: - return TexturesGtBlock.Casing_Material_MaragingSteel.getIcon(); + return TexturesGtBlock.Casing_Machine_Dimensional_Adv.getIcon(); //Coke Oven Frame case 1: return TexturesGtBlock.Casing_Material_Tantalloy61.getIcon(); @@ -65,14 +65,5 @@ public class CasingTextureHandler2 { } return Textures.BlockIcons.MACHINE_CASING_GEARBOX_TUNGSTENSTEEL.getIcon(); } - - - public static IIcon handleCasingsGT(IBlockAccess aWorld, int xCoord, int yCoord, int zCoord, int aSide, GregtechMetaCasingBlocks2 thisBlock) { - /*if (CORE.MAIN_GREGTECH_5U_EXPERIMENTAL_FORK){ - return gregtech59.handleCasingsGT59(aWorld, xCoord, yCoord, zCoord, aSide, thisBlock); - } - return gregtech58.handleCasingsGT58(aWorld, xCoord, yCoord, zCoord, aSide, thisBlock);*/ - //return gregtechX.handleCasingsGT(aWorld, xCoord, yCoord, zCoord, aSide, thisBlock); - return null; //TODO - } + }
\ No newline at end of file |