Merge pull request #5 from alkcorp/master

sync fork

2 files changed, 49 insertions, 7 deletions

diff --git a/src/Java/gtPlusPlus/xmod/gregtech/common/blocks/textures/TexturesGtBlock.java b/src/Java/gtPlusPlus/xmod/gregtech/common/blocks/textures/TexturesGtBlock.java
index aaacbcd3a0..6cac1fddea 100644
--- a/src/Java/gtPlusPlus/xmod/gregtech/common/blocks/textures/TexturesGtBlock.java
+++ b/src/Java/gtPlusPlus/xmod/gregtech/common/blocks/textures/TexturesGtBlock.java
@@ -30,9 +30,15 @@ public class TexturesGtBlock {
 	public static class CustomIcon implements IIconContainer, Runnable {
 		protected IIcon mIcon;
 		protected String mIconName;
+		protected String mModID;
 
 		public CustomIcon(final String aIconName) {
+			this(CORE.MODID, aIconName);
+		}
+		
+		public CustomIcon(final String aModID, final String aIconName) {
 			this.mIconName = aIconName;
+			this.mModID = aModID;
 			mCustomiconMap.put(this);
 			Logger.WARNING("Constructing a Custom Texture. " + this.mIconName);
 			GregTech_API.sGTBlockIconload.add(this);
@@ -50,7 +56,7 @@ public class TexturesGtBlock {
 
 		@Override
 		public void run() {
-			this.mIcon = GregTech_API.sBlockIcons.registerIcon(CORE.MODID + ":"  + this.mIconName);
+			this.mIcon = GregTech_API.sBlockIcons.registerIcon(this.mModID + ":"  + this.mIconName);
 			Logger.WARNING("FIND ME _ Processing texture: "+this.getTextureFile().getResourcePath());
 		}
 
@@ -273,6 +279,8 @@ public class TexturesGtBlock {
 	public static final CustomIcon TEXTURE_CASING_AMAZON = new CustomIcon("TileEntities/CASING_AMAZON");
 	public static final CustomIcon TEXTURE_CASING_ADVANCED_CRYOGENIC = new CustomIcon("TileEntities/MACHINE_CASING_ADVANCED_CRYOGENIC");
 	public static final CustomIcon TEXTURE_CASING_ADVANCED_VOLCNUS = new CustomIcon("TileEntities/MACHINE_CASING_ADVANCED_VOLCANUS");
+	public static final CustomIcon TEXTURE_CASING_ROCKETDYNE = new CustomIcon("TileEntities/MACHINE_CASING_ROCKETDYNE");
+		
 
 	public static final CustomIcon TEXTURE_CASING_FUSION_COIL_II = new CustomIcon("iconsets/MACHINE_CASING_FUSION_3");
 	public static final CustomIcon TEXTURE_CASING_FUSION_COIL_II_INNER = new CustomIcon("iconsets/MACHINE_CASING_FUSION_COIL_II");
@@ -342,8 +350,13 @@ public class TexturesGtBlock {
 	private static final CustomIcon Internal_Overlay_Machine_Controller_Advanced_Active = new CustomIcon("iconsets/OVERLAY_FRONT_ADVANCED_MULTIBLOCK_ANIMATED_ACTIVE");
 	public static final CustomIcon Overlay_Machine_Controller_Advanced_Active = Internal_Overlay_Machine_Controller_Advanced_Active;
 	
-	
-	
+	//Fluid Reactor Overlays
+	public static final CustomIcon Overlay_FluidReactor_Front = new CustomIcon("TileEntities/FluidReactor/OVERLAY_FRONT");
+	public static final CustomIcon Overlay_FluidReactor_Side = new CustomIcon("TileEntities/FluidReactor/OVERLAY_SIDE");
+	public static final CustomIcon Overlay_FluidReactor_Top = new CustomIcon("TileEntities/FluidReactor/OVERLAY_TOP");
+	public static final CustomIcon Overlay_FluidReactor_Front_Active = new CustomIcon("TileEntities/FluidReactor/OVERLAY_FRONT_ACTIVE");
+	public static final CustomIcon Overlay_FluidReactor_Side_Active = new CustomIcon("TileEntities/FluidReactor/OVERLAY_SIDE_ACTIVE");
+	public static final CustomIcon Overlay_FluidReactor_Top_Active = new CustomIcon("TileEntities/FluidReactor/OVERLAY_TOP_ACTIVE");	
 	
 	//Crafting Overlays
 	private static final CustomIcon Internal_Overlay_Crafting_Bronze = new CustomIcon("TileEntities/bronze_top_crafting");
@@ -555,10 +568,7 @@ public class TexturesGtBlock {
 
 
 
-	public static Object Casing_Material_Turbine;
-
-
-
+	public static Object Casing_Material_Turbine;	
 
 	
 }
diff --git a/src/Java/gtPlusPlus/xmod/gregtech/common/blocks/textures/TexturesGtCutomCovers.java b/src/Java/gtPlusPlus/xmod/gregtech/common/blocks/textures/TexturesGtCutomCovers.java
new file mode 100644
index 0000000000..cc5cf3d55e
--- /dev/null
+++ b/src/Java/gtPlusPlus/xmod/gregtech/common/blocks/textures/TexturesGtCutomCovers.java
@@ -0,0 +1,32 @@
+package gtPlusPlus.xmod.gregtech.common.blocks.textures;
+
+import gtPlusPlus.xmod.gregtech.common.blocks.textures.TexturesGtBlock.CustomIcon;
+
+public class TexturesGtCutomCovers {
+
+	public static final CustomIcon[] TEXTURE_ZTONES_AGON = new CustomIcon[16];
+	public static final CustomIcon[] TEXTURE_ZTONES_ISZM = new CustomIcon[16];
+	public static final CustomIcon[] TEXTURE_ZTONES_KORP = new CustomIcon[16];
+	public static final CustomIcon[] TEXTURE_ZTONES_JELT = new CustomIcon[16];
+	public static final CustomIcon[] TEXTURE_ZTONES_BITT = new CustomIcon[16];
+	
+	public static void init() {
+		generateZTones();
+	}
+
+	private static void generateZTones() {
+		// ZTONES
+		String[] aZtoneCoverTextureNames = new String[] { "agon", "iszm", "korp", "jelt", "bitt" };
+		int aArrayIndex = 0;
+		CustomIcon[][] aArrays = new CustomIcon[][] { TEXTURE_ZTONES_AGON, TEXTURE_ZTONES_ISZM, TEXTURE_ZTONES_KORP,
+				TEXTURE_ZTONES_JELT, TEXTURE_ZTONES_BITT };
+
+		for (CustomIcon[] t : aArrays) {
+			for (int s = 0; s < 16; s++) {
+				t[s] = new CustomIcon("Ztones", "sets/" + aZtoneCoverTextureNames[aArrayIndex] + "/"+aZtoneCoverTextureNames[aArrayIndex]+"_ (" + s + ")");
+			}
+			aArrayIndex++;
+		}
+	}
+
+}