Merge branch 'experimental' into eM

build.properties

@@ -1,7 +1,7 @@
 minecraft.version=1.7.10
 forge.version=10.13.4.1566-1.7.10
 
-gt.version=5.09.27.14
+gt.version=5.09.27.15
 
 ae2.version=rv2-beta-33
 applecore.version=1.7.10-1.2.1+107.59407

src/main/java/gregtech/api/GregTech_API.java

@@ -179,7 +179,7 @@ public class GregTech_API {
 
     public static Block sBlockOres1, sBlockOresUb1, sBlockOresUb2, sBlockOresUb3, /*sBlockGem,*/ sBlockMetal1, sBlockMetal2, sBlockMetal3, sBlockMetal4, sBlockMetal5, sBlockMetal6, sBlockMetal7, sBlockMetal8, sBlockGem1, sBlockGem2, sBlockGem3, sBlockReinforced;
     public static Block sBlockGranites, sBlockConcretes, sBlockStones;
-    public static Block sBlockCasings1, sBlockCasings2, sBlockCasings3, sBlockCasings4, sBlockCasings5;
+    public static Block sBlockCasings1, sBlockCasings2, sBlockCasings3, sBlockCasings4, sBlockCasings5, sBlockCasings6;
     /**
      * Getting assigned by the Config
      */

src/main/java/gregtech/api/enums/ItemList.java

@@ -640,6 +640,7 @@ public enum ItemList implements IItemContainer {
     Pump_LV, Pump_MV, Pump_HV, Pump_EV, Pump_IV,
     Teleporter, Cover_NeedsMaintainance, Casing_Turbine, Casing_Turbine1, Casing_Turbine2, Casing_Turbine3, Casing_EngineIntake,
     Casing_Coil_Cupronickel, Casing_Coil_Kanthal, Casing_Coil_Nichrome, Casing_Coil_TungstenSteel, Casing_Coil_HSSG, Casing_Coil_Naquadah, Casing_Coil_NaquadahAlloy,
+    Casing_Tank_1, Casing_Tank_2, Casing_Tank_3, Casing_Tank_4, Casing_Tank_5, Casing_Tank_6, Casing_Tank_7, Casing_Tank_8, Casing_Tank_9, Casing_Tank_10,
     MobRep_LV, MobRep_MV, MobRep_HV, MobRep_EV, MobRep_IV, MobRep_LuV, MobRep_ZPM, MobRep_UV, Cover_PlayerDetector, Machine_Multi_HeatExchanger,
     Block_BronzePlate, Block_IridiumTungstensteel, Block_Plascrete, Block_TungstenSteelReinforced,
     Honeycomb, Charcoal_Pile, Block_BrittleCharcoal, Seismic_Prospector, Seismic_Prospector_Adv, OilDrill, AdvancedMiner2, PyrolyseOven, OilCracker, Crop_Drop_UUMBerry, Crop_Drop_UUABerry, Empty_Board_Basic, Empty_Board_Elite,

src/main/java/gregtech/common/blocks/GT_Block_Casings6.java

@@ -0,0 +1,66 @@
+package gregtech.common.blocks;
+
+import cpw.mods.fml.relauncher.Side;
+import cpw.mods.fml.relauncher.SideOnly;
+import gregtech.api.enums.ItemList;
+import gregtech.api.enums.Textures;
+import gregtech.api.objects.GT_CopiedBlockTexture;
+import gregtech.api.util.GT_LanguageManager;
+import net.minecraft.item.ItemStack;
+import net.minecraft.util.IIcon;
+
+public class GT_Block_Casings6
+        extends GT_Block_Casings_Abstract {
+    public GT_Block_Casings6() {
+        super(GT_Item_Casings6.class, "gt.blockcasings6", GT_Material_Casings.INSTANCE);
+        
+        GT_LanguageManager.addStringLocalization(getUnlocalizedName() + ".0.name", "Hermetic Casing I");
+        GT_LanguageManager.addStringLocalization(getUnlocalizedName() + ".1.name", "Hermetic Casing II");
+        GT_LanguageManager.addStringLocalization(getUnlocalizedName() + ".2.name", "Hermetic Casing III");
+        GT_LanguageManager.addStringLocalization(getUnlocalizedName() + ".3.name", "Hermetic Casing IV");
+        GT_LanguageManager.addStringLocalization(getUnlocalizedName() + ".4.name", "Hermetic Casing V");
+        GT_LanguageManager.addStringLocalization(getUnlocalizedName() + ".5.name", "Hermetic Casing VI");
+        GT_LanguageManager.addStringLocalization(getUnlocalizedName() + ".6.name", "Hermetic Casing VII");
+        GT_LanguageManager.addStringLocalization(getUnlocalizedName() + ".7.name", "Hermetic Casing VIII");
+        GT_LanguageManager.addStringLocalization(getUnlocalizedName() + ".8.name", "Hermetic Casing IX");
+        GT_LanguageManager.addStringLocalization(getUnlocalizedName() + ".9.name", "Hermetic Casing X");
+
+        ItemList.Casing_Tank_1.set(new ItemStack(this, 1, 0));
+        ItemList.Casing_Tank_2.set(new ItemStack(this, 1, 1));
+        ItemList.Casing_Tank_3.set(new ItemStack(this, 1, 2));
+        ItemList.Casing_Tank_4.set(new ItemStack(this, 1, 3));
+        ItemList.Casing_Tank_5.set(new ItemStack(this, 1, 4));
+        ItemList.Casing_Tank_6.set(new ItemStack(this, 1, 5));
+        ItemList.Casing_Tank_7.set(new ItemStack(this, 1, 6));
+        ItemList.Casing_Tank_8.set(new ItemStack(this, 1, 7));
+        ItemList.Casing_Tank_9.set(new ItemStack(this, 1, 8));
+        ItemList.Casing_Tank_10.set(new ItemStack(this, 1, 9));
+    }
+    @Override
+    @SideOnly(Side.CLIENT)
+    public IIcon getIcon(int aSide, int aMeta) {
+        switch (aMeta) {
+            case 0:
+                return Textures.BlockIcons.MACHINE_CASING_TANK_1.getIcon();
+            case 1:
+                return Textures.BlockIcons.MACHINE_CASING_TANK_2.getIcon();
+            case 2:
+                return Textures.BlockIcons.MACHINE_CASING_TANK_3.getIcon();
+            case 3:
+                return Textures.BlockIcons.MACHINE_CASING_TANK_4.getIcon();
+            case 4:
+                return Textures.BlockIcons.MACHINE_CASING_TANK_5.getIcon();
+            case 5:
+                return Textures.BlockIcons.MACHINE_CASING_TANK_6.getIcon();
+            case 6:
+                return Textures.BlockIcons.MACHINE_CASING_TANK_7.getIcon();
+            case 7:
+                return Textures.BlockIcons.MACHINE_CASING_TANK_8.getIcon();
+            case 8:
+                return Textures.BlockIcons.MACHINE_CASING_TANK_9.getIcon();
+            case 9:
+                return Textures.BlockIcons.MACHINE_CASING_TANK_10.getIcon();
+        }
+        return Textures.BlockIcons.MACHINE_CASING_TANK_1.getIcon();
+    }
+}

src/main/java/gregtech/common/blocks/GT_Item_Casings6.java

@@ -0,0 +1,10 @@
+package gregtech.common.blocks;
+
+import net.minecraft.block.Block;
+
+public class GT_Item_Casings6
+        extends GT_Item_Casings_Abstract {
+    public GT_Item_Casings6(Block par1) {
+        super(par1);
+    }
+}

src/main/java/gregtech/loaders/preload/GT_Loader_Item_Block_And_Fluid.java

@@ -161,6 +161,7 @@ public class GT_Loader_Item_Block_And_Fluid
         GregTech_API.sBlockCasings3 = new GT_Block_Casings3();
         GregTech_API.sBlockCasings4 = new GT_Block_Casings4();
         GregTech_API.sBlockCasings5 = new GT_Block_Casings5();
+        GregTech_API.sBlockCasings6 = new GT_Block_Casings6();
         GregTech_API.sBlockGranites = new GT_Block_Granites();
         GregTech_API.sBlockConcretes = new GT_Block_Concretes();
         GregTech_API.sBlockStones = new GT_Block_Stones();