Merge branch 'master' of https://github.com/draknyte1/GTplusplus

3 files changed, 30 insertions, 19 deletions

diff --git a/src/Java/gtPlusPlus/xmod/gregtech/api/enums/GregtechItemList.java b/src/Java/gtPlusPlus/xmod/gregtech/api/enums/GregtechItemList.java
index 6f492ef2b9..dbf2e9f877 100644
--- a/src/Java/gtPlusPlus/xmod/gregtech/api/enums/GregtechItemList.java
+++ b/src/Java/gtPlusPlus/xmod/gregtech/api/enums/GregtechItemList.java
@@ -70,7 +70,7 @@ public enum GregtechItemList implements GregtechItemContainer {
 	//Unused Machine Casings
 	Casing_MacerationStack, Casing_MatterGen, Casing_MatterFab, Casing_U7, 
 	//Unused Machine Coils
-	Casing_Coil_U1, Casing_Coil_U2, Casing_Coil_U3, Casing_Coil_U4,
+	Casing_Coil_U1, Casing_Coil_U2, Casing_Coil_BlastSmelter, Casing_BlastSmelter,
 	
 	//Windmill Shaft Shape for Extruder
 	Shape_Extruder_WindmillShaft, 
@@ -100,7 +100,7 @@ public enum GregtechItemList implements GregtechItemContainer {
 	Food_Baked_Raisin_Bread, 
 	
 	//For sintering TODO
-	Industrial_SinterFurnace, 
+	Industrial_AlloyBlastSmelter, 
 	
 	//Block that enables uplink to a superconductor network
 	SuperConductorInputNode, 
@@ -122,7 +122,16 @@ public enum GregtechItemList implements GregtechItemContainer {
 	Fluid_Cell_1L, Fluid_Cell_16L, Fluid_Cell_36L, Fluid_Cell_144L, 
 	
 	//Multitank
-	Industrial_MultiTank, Industrial_MultiTankDense, Casing_MultitankExterior;
+	Industrial_MultiTank, Industrial_MultiTankDense, Casing_MultitankExterior, 
+	
+	//Gt4 Workbenches
+	GT4_Workbench_Bronze, GT4_Workbench_Advanced, 
+	
+	//Geothermal Engines
+	Geothermal_Engine_EV, Geothermal_Engine_IV, Geothermal_Engine_LuV, 
+	
+	//Tesseracts
+	GT4_Tesseract_Generator, GT4_Tesseract_Terminal;
 
 	public static final GregtechItemList[]
 			DYE_ONLY_ITEMS = {
diff --git a/src/Java/gtPlusPlus/xmod/gregtech/api/enums/GregtechOrePrefixes.java b/src/Java/gtPlusPlus/xmod/gregtech/api/enums/GregtechOrePrefixes.java
index 238f535505..9a1ef1376d 100644
--- a/src/Java/gtPlusPlus/xmod/gregtech/api/enums/GregtechOrePrefixes.java
+++ b/src/Java/gtPlusPlus/xmod/gregtech/api/enums/GregtechOrePrefixes.java
@@ -328,7 +328,7 @@ public enum GregtechOrePrefixes {
 		Staballoy(30, TextureSet.SET_ROUGH, 10.0F, 5120, 4, 1 | 2  | 16 | 32 | 64 | 128, 68, 75, 66, 0, "Staballoy", 0, 0, 1500, 2800, true, false, 1, 3, 1, Dyes.dyeGreen, 2, Arrays.asList(new MaterialStack(Materials.Titanium, 1), new MaterialStack(Materials.Uranium, 9)), Arrays.asList(getTcAspectStack(TC_Aspects.METALLUM, 8), getTcAspectStack(TC_Aspects.STRONTIO, 3))),
 		Bedrockium(31, TextureSet.SET_FINE, 8.0F, 8196, 3, 1 | 2 | 16 | 32 | 64 | 128, 39, 39, 39, 0, "Bedrockium", 0, 0, -1, 0, false, false, 1, 5, 1, Dyes.dyeLightGray, 2, Arrays.asList(new MaterialStack(Materials.Carbon, 63), new MaterialStack(Materials.Carbon, 56)),   Arrays.asList(getTcAspectStack(TC_Aspects.VACUOS, 8), getTcAspectStack(TC_Aspects.TUTAMEN, 3))),
 		BloodSteel(32, TextureSet.SET_METALLIC, 11.0F, 768, 4, 1 | 2 | 16 | 32 | 64 | 128, 142, 28, 0, 0, "Blood Steel", 0, 0, -1, 0, false, false, 1, 1, 1, Dyes.dyeRed, 2, Arrays.asList(new MaterialStack(Materials.Steel, 3)), Arrays.asList(getTcAspectStack(TC_Aspects.VICTUS, 8), getTcAspectStack(TC_Aspects.IGNIS, 3))),
-		VoidMetal(33, TextureSet.SET_METALLIC, 6.0F, 1280, 3, 1 | 2 | 16 | 32 | 64 | 128, 82, 17, 82, 0, "Void Metal", 0, 0, -1, 0, false, false, 3, 1, 1, Dyes.dyeBlack, Arrays.asList(getTcAspectStack("PRAECANTATIO", 5), getTcAspectStack(TC_Aspects.VACUOS, 7))),
+		Void(33, TextureSet.SET_METALLIC, 6.0F, 1280, 3, 1 | 2 | 16 | 32 | 64 | 128, 82, 17, 82, 0, "Void Metal", 0, 0, -1, 0, false, false, 3, 1, 1, Dyes.dyeBlack, Arrays.asList(getTcAspectStack("PRAECANTATIO", 5), getTcAspectStack(TC_Aspects.VACUOS, 7))),
 		ConductiveIron(34, TextureSet.SET_METALLIC, 5.0F, 256, 2, 1 | 2, 164, 109, 100, 0, "Conductive Iron", 0, 0, -1, 0, false, false, 3, 1, 1, Dyes.dyeRed, 2, Arrays.asList(new MaterialStack(Materials.Iron, 6), new MaterialStack(Materials.Redstone, 2)), Arrays.asList(getTcAspectStack(TC_Aspects.POTENTIA, 2), getTcAspectStack(TC_Aspects.METALLUM, 2))),
 		ElectricalSteel(35, TextureSet.SET_METALLIC, 7.0F, 768, 3, 1 | 2 | 64 | 128, 194, 194, 194, 0, "Electrical Steel", 0, 0, 1811, 1000, true, false, 3, 1, 1, Dyes.dyeLightGray, 2, Arrays.asList(new MaterialStack(Materials.Iron, 3), new MaterialStack(Materials.Coal, 2), new MaterialStack(Materials.Silicon, 2)),   Arrays.asList(getTcAspectStack(TC_Aspects.MAGNETO, 2), getTcAspectStack(TC_Aspects.ELECTRUM, 5))),
 		EnergeticAlloy(36, TextureSet.SET_SHINY, 5.0F, 512, 3, 1 | 2 | 64 | 128, 252, 152, 45, 0, "Energetic Alloy", 0, 0, -1, 0, false, false, 3, 1, 1, Dyes.dyeOrange, 2, Arrays.asList(new MaterialStack(Materials.Gold, 3), new MaterialStack(Materials.Glowstone, 2), new MaterialStack(Materials.Redstone, 2)),  Arrays.asList(getTcAspectStack(TC_Aspects.POTENTIA, 4), getTcAspectStack(TC_Aspects.LUX, 3))),
diff --git a/src/Java/gtPlusPlus/xmod/gregtech/api/enums/GregtechTextures.java b/src/Java/gtPlusPlus/xmod/gregtech/api/enums/GregtechTextures.java
index 705f5b338e..dca5d7301c 100644
--- a/src/Java/gtPlusPlus/xmod/gregtech/api/enums/GregtechTextures.java
+++ b/src/Java/gtPlusPlus/xmod/gregtech/api/enums/GregtechTextures.java
@@ -1,9 +1,9 @@
 package gtPlusPlus.xmod.gregtech.api.enums;
 
-import gregtech.api.GregTech_API;
 import gtPlusPlus.core.lib.CORE;
 import gtPlusPlus.xmod.gregtech.api.interfaces.internal.Interface_IconContainer;
 import gtPlusPlus.xmod.gregtech.api.interfaces.internal.Interface_Texture;
+import gtPlusPlus.xmod.gregtech.common.Meta_GT_Proxy;
 import net.minecraft.client.renderer.texture.TextureMap;
 import net.minecraft.util.IIcon;
 import net.minecraft.util.ResourceLocation;
@@ -51,7 +51,7 @@ public class GregtechTextures {
 		protected IIcon mIcon;
 
         private BlockIcons() {
-            CORE.GT_BlockIconload.add(this);
+        	Meta_GT_Proxy.GT_BlockIconload.add(this);
         }
 
         @Override
@@ -66,7 +66,7 @@ public class GregtechTextures {
 
         @Override
         public void run() {
-            mIcon = GregTech_API.sBlockIcons.registerIcon(CORE.MODID + ":" + "iconsets/" + this);
+            mIcon = Meta_GT_Proxy.sBlockIcons.registerIcon(CORE.MODID + ":" + "iconsets/" + this);
         }
         
         @Override
@@ -80,7 +80,7 @@ public class GregtechTextures {
 
             public CustomIcon(String aIconName) {
                 mIconName = aIconName;
-                CORE.GT_BlockIconload.add(this);
+                Meta_GT_Proxy.GT_BlockIconload.add(this);
             }
 
             @Override
@@ -95,7 +95,7 @@ public class GregtechTextures {
 
             @Override
             public void run() {
-                mIcon = CORE.GT_BlockIcons.registerIcon(CORE.MODID + ":" + mIconName);
+                mIcon = Meta_GT_Proxy.sBlockIcons.registerIcon(CORE.MODID + ":" + mIconName);
             }
 
             @Override
@@ -107,10 +107,12 @@ public class GregtechTextures {
 	
 	
 	public enum ItemIcons implements Interface_IconContainer, Runnable {
-        VOID // The Empty Texture
-        , RENDERING_ERROR, SKOOKUMCHOOCHER, DURABILITY_BAR_0, DURABILITY_BAR_1, DURABILITY_BAR_2, DURABILITY_BAR_3, DURABILITY_BAR_4, DURABILITY_BAR_5, DURABILITY_BAR_6, DURABILITY_BAR_7, DURABILITY_BAR_8, ENERGY_BAR_0, ENERGY_BAR_1, ENERGY_BAR_2, ENERGY_BAR_3, ENERGY_BAR_4, ENERGY_BAR_5, ENERGY_BAR_6, ENERGY_BAR_7, ENERGY_BAR_8, TURBINE, TURBINE_SMALL, TURBINE_LARGE, TURBINE_HUGE;
+        VOID, // The Empty Texture
+        RENDERING_ERROR, //The Purple/Black Texture
+        SKOOKUMCHOOCHER, //The Skookum Tool Texture
+        TURBINE_SMALL, TURBINE_LARGE, TURBINE_HUGE;
 
-        public static final Interface_IconContainer[]
+       /* public static final Interface_IconContainer[]
                 DURABILITY_BAR = new Interface_IconContainer[]{
                 DURABILITY_BAR_0,
                 DURABILITY_BAR_1,
@@ -132,14 +134,14 @@ public class GregtechTextures {
                         ENERGY_BAR_6,
                         ENERGY_BAR_7,
                         ENERGY_BAR_8,
-                };
+                };*/
 
         //public static final Interface_Texture[] ERROR_RENDERING = new Interface_Texture[]{new GregtechRenderedTexture(RENDERING_ERROR)};
 
         protected IIcon mIcon, mOverlay;
 
         private ItemIcons() {
-            GregTech_API.sGTItemIconload.add(this);
+        	Meta_GT_Proxy.GT_ItemIconload.add(this);
         }
 
         @Override
@@ -159,8 +161,8 @@ public class GregtechTextures {
 
         @Override
         public void run() {
-            mIcon = GregTech_API.sItemIcons.registerIcon(CORE.MODID+ ":" + "iconsets/" + this);
-            mOverlay = GregTech_API.sItemIcons.registerIcon(CORE.MODID+ ":" + "iconsets/" + this + "_OVERLAY");
+            mIcon = Meta_GT_Proxy.sItemIcons.registerIcon(CORE.MODID+ ":" + "iconsets/" + this);
+            mOverlay = Meta_GT_Proxy.sItemIcons.registerIcon(CORE.MODID+ ":" + "iconsets/" + this + "_OVERLAY");
         }
 
         public static class CustomIcon implements Interface_IconContainer, Runnable {
@@ -169,7 +171,7 @@ public class GregtechTextures {
 
             public CustomIcon(String aIconName) {
                 mIconName = aIconName;
-                GregTech_API.sGTItemIconload.add(this);
+                Meta_GT_Proxy.GT_ItemIconload.add(this);
             }
 
             @Override
@@ -184,8 +186,8 @@ public class GregtechTextures {
 
             @Override
             public void run() {
-                mIcon = GregTech_API.sItemIcons.registerIcon(CORE.MODID+ ":" + mIconName);
-                mOverlay = GregTech_API.sItemIcons.registerIcon(CORE.MODID+ ":" + mIconName + "_OVERLAY");
+                mIcon = Meta_GT_Proxy.sItemIcons.registerIcon(CORE.MODID+ ":" + mIconName);
+                mOverlay = Meta_GT_Proxy.sItemIcons.registerIcon(CORE.MODID+ ":" + mIconName + "_OVERLAY");
             }
 
             @Override