+ Added a new set of 16 casing blocks.

6 files changed, 168 insertions, 3 deletions

diff --git a/src/Java/gtPlusPlus/core/block/ModBlocks.java b/src/Java/gtPlusPlus/core/block/ModBlocks.java
index af7e5d833e..3b6f061ca7 100644
--- a/src/Java/gtPlusPlus/core/block/ModBlocks.java
+++ b/src/Java/gtPlusPlus/core/block/ModBlocks.java
@@ -6,6 +6,7 @@ import gtPlusPlus.core.block.machine.Machine_WorkbenchAdvanced;
 import gtPlusPlus.core.fluids.FluidRegistryHandler;
 import gtPlusPlus.core.lib.CORE;
 import gtPlusPlus.core.util.Utils;
+import gtPlusPlus.xmod.gregtech.common.blocks.GregtechMetaCasingBlocks2;
 import net.minecraft.block.Block;
 import net.minecraft.block.material.Material;
 import net.minecraftforge.fluids.Fluid;
@@ -30,6 +31,7 @@ public final class ModBlocks {
 
 	public static Fluid fluidJackDaniels = new Fluid("fluidJackDaniels");
 	public static Block blockFluidJackDaniels;
+	public static Block blockCasings2Misc;
 
 
 
diff --git a/src/Java/gtPlusPlus/xmod/gregtech/api/enums/GregtechItemList.java b/src/Java/gtPlusPlus/xmod/gregtech/api/enums/GregtechItemList.java
index dbf2e9f877..605317bb09 100644
--- a/src/Java/gtPlusPlus/xmod/gregtech/api/enums/GregtechItemList.java
+++ b/src/Java/gtPlusPlus/xmod/gregtech/api/enums/GregtechItemList.java
@@ -131,7 +131,16 @@ public enum GregtechItemList implements GregtechItemContainer {
 	Geothermal_Engine_EV, Geothermal_Engine_IV, Geothermal_Engine_LuV, 
 	
 	//Tesseracts
-	GT4_Tesseract_Generator, GT4_Tesseract_Terminal;
+	GT4_Tesseract_Generator, GT4_Tesseract_Terminal, 
+	
+	//Casings Tier 2 [17-32]
+	Casing_StructuralGlass, 
+	Casing_PlaceHolder1, Casing_PlaceHolder2, Casing_PlaceHolder3,
+	Casing_PlaceHolder4, Casing_PlaceHolder5, Casing_PlaceHolder6,
+	Casing_PlaceHolder7, Casing_PlaceHolder8, Casing_PlaceHolder9,
+	Casing_PlaceHolder10, Casing_PlaceHolder11, Casing_PlaceHolder12,
+	Casing_PlaceHolder13, Casing_PlaceHolder14, Casing_PlaceHolder15,
+	;
 
 	public static final GregtechItemList[]
 			DYE_ONLY_ITEMS = {
diff --git a/src/Java/gtPlusPlus/xmod/gregtech/common/blocks/GregtechMetaCasingBlocks2.java b/src/Java/gtPlusPlus/xmod/gregtech/common/blocks/GregtechMetaCasingBlocks2.java
new file mode 100644
index 0000000000..9f8d324fb6
--- /dev/null
+++ b/src/Java/gtPlusPlus/xmod/gregtech/common/blocks/GregtechMetaCasingBlocks2.java
@@ -0,0 +1,76 @@
+package gtPlusPlus.xmod.gregtech.common.blocks;
+
+import gregtech.api.enums.Textures;
+import gregtech.api.objects.GT_CopiedBlockTexture;
+import gregtech.api.util.GT_LanguageManager;
+import gregtech.common.blocks.GT_Material_Casings;
+import gtPlusPlus.xmod.gregtech.api.enums.GregtechItemList;
+import gtPlusPlus.xmod.gregtech.common.blocks.textures.CasingTextureHandler;
+import gtPlusPlus.xmod.gregtech.common.blocks.textures.CasingTextureHandler2;
+import net.minecraft.item.ItemStack;
+import net.minecraft.util.IIcon;
+import net.minecraft.world.IBlockAccess;
+import cpw.mods.fml.relauncher.Side;
+import cpw.mods.fml.relauncher.SideOnly;
+
+public class GregtechMetaCasingBlocks2
+extends GregtechMetaCasingBlocksAbstract {
+
+	public final static int GTID = 73;
+	
+	CasingTextureHandler2 TextureHandler = new CasingTextureHandler2();	
+
+	public GregtechMetaCasingBlocks2() {
+		super(GregtechMetaCasingItems.class, "gtplusplus.blockcasings.2", GT_Material_Casings.INSTANCE);
+		for (byte i = 0; i < 16; i = (byte) (i + 1)) {
+			Textures.BlockIcons.CASING_BLOCKS[GTID + i] = new GT_CopiedBlockTexture(this, 6, i);
+		}
+		GT_LanguageManager.addStringLocalization(getUnlocalizedName() + ".0.name", "Strctural Glass Casing");
+		GT_LanguageManager.addStringLocalization(getUnlocalizedName() + ".1.name", "Placeholder Casing");
+		GT_LanguageManager.addStringLocalization(getUnlocalizedName() + ".2.name", "Placeholder Casing");
+		GT_LanguageManager.addStringLocalization(getUnlocalizedName() + ".3.name", "Placeholder Casing"); //60
+		GT_LanguageManager.addStringLocalization(getUnlocalizedName() + ".4.name", "Placeholder Casing");
+		GT_LanguageManager.addStringLocalization(getUnlocalizedName() + ".5.name", "Placeholder Casing");
+		GT_LanguageManager.addStringLocalization(getUnlocalizedName() + ".6.name", "Placeholder Casing");
+		GT_LanguageManager.addStringLocalization(getUnlocalizedName() + ".7.name", "Placeholder Casing");
+		GT_LanguageManager.addStringLocalization(getUnlocalizedName() + ".8.name", "Placeholder Casing"); //65
+		GT_LanguageManager.addStringLocalization(getUnlocalizedName() + ".9.name", "Placeholder Casing");
+		GT_LanguageManager.addStringLocalization(getUnlocalizedName() + ".10.name", "Placeholder Casing");
+		GT_LanguageManager.addStringLocalization(getUnlocalizedName() + ".11.name", "Placeholder Casing");
+		GT_LanguageManager.addStringLocalization(getUnlocalizedName() + ".12.name", "Placeholder Casing");
+		GT_LanguageManager.addStringLocalization(getUnlocalizedName() + ".13.name", "Placeholder Casing");
+		GT_LanguageManager.addStringLocalization(getUnlocalizedName() + ".14.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));
+		GregtechItemList.Casing_PlaceHolder3.set(new ItemStack(this, 1, 3));
+		GregtechItemList.Casing_PlaceHolder4.set(new ItemStack(this, 1, 4));
+		GregtechItemList.Casing_PlaceHolder5.set(new ItemStack(this, 1, 5));
+		GregtechItemList.Casing_PlaceHolder6.set(new ItemStack(this, 1, 6));
+		GregtechItemList.Casing_PlaceHolder7.set(new ItemStack(this, 1, 7));
+		GregtechItemList.Casing_PlaceHolder8.set(new ItemStack(this, 1, 8));
+		GregtechItemList.Casing_PlaceHolder9.set(new ItemStack(this, 1, 9));
+		GregtechItemList.Casing_PlaceHolder10.set(new ItemStack(this, 1, 10));
+		GregtechItemList.Casing_PlaceHolder11.set(new ItemStack(this, 1, 11));
+		GregtechItemList.Casing_PlaceHolder12.set(new ItemStack(this, 1, 12));
+		GregtechItemList.Casing_PlaceHolder13.set(new ItemStack(this, 1, 13));
+		GregtechItemList.Casing_PlaceHolder14.set(new ItemStack(this, 1, 14));
+		GregtechItemList.Casing_PlaceHolder15.set(new ItemStack(this, 1, 15));		
+	}
+
+	@Override
+	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
new file mode 100644
index 0000000000..4d5ca40c3f
--- /dev/null
+++ b/src/Java/gtPlusPlus/xmod/gregtech/common/blocks/textures/CasingTextureHandler2.java
@@ -0,0 +1,78 @@
+package gtPlusPlus.xmod.gregtech.common.blocks.textures;
+
+import gregtech.api.enums.Textures;
+import gtPlusPlus.xmod.gregtech.common.blocks.GregtechMetaCasingBlocks;
+import gtPlusPlus.xmod.gregtech.common.blocks.GregtechMetaCasingBlocks2;
+import net.minecraft.util.IIcon;
+import net.minecraft.world.IBlockAccess;
+
+public class CasingTextureHandler2 {
+
+	public static  IIcon getIcon(int aSide, int aMeta) { //Texture ID's. case 0 == ID[57]
+		if ((aMeta >= 0) && (aMeta < 16)) {
+			switch (aMeta) {
+			//Centrifuge 
+			case 0: 
+				return TexturesGtBlock.Casing_Material_MaragingSteel.getIcon();
+				//Coke Oven Frame
+			case 1:
+				return TexturesGtBlock.Casing_Material_Tantalloy61.getIcon();
+				//Coke Oven Casing Tier 1
+			case 2: 
+				return Textures.BlockIcons.MACHINE_CASING_FIREBOX_BRONZE.getIcon();
+				//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();
+				//Electrolyzer Casings
+			case 5:
+				return TexturesGtBlock.Casing_Material_Potin.getIcon();
+				//Broken Blue Fusion Casings
+			case 6:
+				return Textures.BlockIcons.MACHINE_CASING_FUSION.getIcon();
+				//Maceration Stack Casings
+			case 7:
+				return TexturesGtBlock.Casing_Material_Tumbaga.getIcon();
+				//Broken Pink Fusion Casings
+			case 8:
+				return Textures.BlockIcons.MACHINE_CASING_FUSION_2.getIcon();
+				//Matter Fabricator Casings
+			case 9:
+				return TexturesGtBlock.Casing_Machine_Dimensional_Adv.getIcon();
+				//Iron Blast Fuance Textures
+			case 10:
+				return TexturesGtBlock.Casing_Machine_Simple_Top.getIcon();		
+				//Multitank Exterior Casing
+			case 11:
+				return Textures.BlockIcons.MACHINE_CASING_GRATE.getIcon();	
+				//Reactor Casing I
+			case 12:
+				return TexturesGtBlock.Casing_Material_Stellite.getIcon();	
+				//Reactor Casing II
+			case 13:
+				return TexturesGtBlock.Casing_Material_Zeron100.getIcon();	
+			case 14:
+				return TexturesGtBlock.Casing_Staballoy_Firebox.getIcon();
+			case 15:
+				return TexturesGtBlock.Casing_Material_ZirconiumCarbide.getIcon();		
+
+			default:
+				return Textures.BlockIcons.MACHINE_CASING_RADIOACTIVEHAZARD.getIcon();
+
+			}
+		}
+		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
diff --git a/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/GregtechMetaTileEntity_MassFabricator.java b/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/GregtechMetaTileEntity_MassFabricator.java
index 7f8db893c0..1f0655aaa7 100644
--- a/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/GregtechMetaTileEntity_MassFabricator.java
+++ b/src/Java/gtPlusPlus/xmod/gregtech/common/tileentities/machines/multi/GregtechMetaTileEntity_MassFabricator.java
@@ -50,8 +50,6 @@ public class GregtechMetaTileEntity_MassFabricator extends GregtechMeta_MultiBlo
 	public int getMatterProduced(){
 		return mMatterProduced;
 	}
-	
-	//public FluidStack mFluidOut = Materials.UUMatter.getFluid(1L);
 
 	public GregtechMetaTileEntity_MassFabricator(int aID, String aName, String aNameRegional) {
 		super(aID, aName, aNameRegional);
diff --git a/src/Java/gtPlusPlus/xmod/gregtech/loaders/Gregtech_Blocks.java b/src/Java/gtPlusPlus/xmod/gregtech/loaders/Gregtech_Blocks.java
index 8a92d34a8e..39b7fb41bd 100644
--- a/src/Java/gtPlusPlus/xmod/gregtech/loaders/Gregtech_Blocks.java
+++ b/src/Java/gtPlusPlus/xmod/gregtech/loaders/Gregtech_Blocks.java
@@ -5,6 +5,7 @@ import gtPlusPlus.core.block.ModBlocks;
 import gtPlusPlus.core.util.Utils;
 import gtPlusPlus.xmod.gregtech.common.Meta_GT_Proxy;
 import gtPlusPlus.xmod.gregtech.common.blocks.GregtechMetaCasingBlocks;
+import gtPlusPlus.xmod.gregtech.common.blocks.GregtechMetaCasingBlocks2;
 import cpw.mods.fml.common.event.FMLInterModComms;
 import cpw.mods.fml.common.registry.GameRegistry;
 
@@ -14,6 +15,7 @@ public class Gregtech_Blocks {
 
 		//Casing Blocks
 		ModBlocks.blockCasingsMisc = new GregtechMetaCasingBlocks();
+		ModBlocks.blockCasings2Misc = new GregtechMetaCasingBlocks2();
 		//ModBlocks.blockMetaTileEntity = new GregtechBlockMachines();
 		//registerDefailtGtTe();