aboutsummaryrefslogtreecommitdiff
path: root/src/Java/gtPlusPlus/xmod
diff options
context:
space:
mode:
authorDraknyte1 <Draknyte1@hotmail.com>2016-10-20 20:04:45 +1000
committerDraknyte1 <Draknyte1@hotmail.com>2016-10-20 20:04:45 +1000
commitd6c2e9fd582594f9e19f732398d1c16d20d3b38e (patch)
treec17148e3f11fccd715b6196b0af8d8774ea77097 /src/Java/gtPlusPlus/xmod
parent5496d90210fdb56f1b7c4b07295a90b130aed7a3 (diff)
downloadGT5-Unofficial-d6c2e9fd582594f9e19f732398d1c16d20d3b38e.tar.gz
GT5-Unofficial-d6c2e9fd582594f9e19f732398d1c16d20d3b38e.tar.bz2
GT5-Unofficial-d6c2e9fd582594f9e19f732398d1c16d20d3b38e.zip
+ Added the Advanced workbench.
+ Added custom slots for the Adv. Workbench, that take either tools or IElectricItems. % Swapped the textures on most multiblocks/casings.
Diffstat (limited to 'src/Java/gtPlusPlus/xmod')
-rw-r--r--src/Java/gtPlusPlus/xmod/gregtech/common/blocks/textures/CasingTextureHandler.java12
-rw-r--r--src/Java/gtPlusPlus/xmod/gregtech/common/blocks/textures/TexturesGtBlocks.java18
2 files changed, 23 insertions, 7 deletions
diff --git a/src/Java/gtPlusPlus/xmod/gregtech/common/blocks/textures/CasingTextureHandler.java b/src/Java/gtPlusPlus/xmod/gregtech/common/blocks/textures/CasingTextureHandler.java
index 8327d30155..0f4a9f522c 100644
--- a/src/Java/gtPlusPlus/xmod/gregtech/common/blocks/textures/CasingTextureHandler.java
+++ b/src/Java/gtPlusPlus/xmod/gregtech/common/blocks/textures/CasingTextureHandler.java
@@ -16,10 +16,10 @@ public class CasingTextureHandler {
switch (aMeta) {
//Centrifuge
case 0:
- return Textures.BlockIcons.MACHINE_CASING_SOLID_STEEL.getIcon();
+ return TexturesGtBlocks.Casing_Material_MaragingSteel.getIcon();
//Coke Oven Frame
case 1:
- return Textures.BlockIcons.MACHINE_CASING_RADIATIONPROOF.getIcon();
+ return TexturesGtBlocks.Casing_Material_Staballoy61.getIcon();
//Coke Oven Casing Tier 1
case 2:
return Textures.BlockIcons.MACHINE_CASING_FIREBOX_BRONZE.getIcon();
@@ -31,13 +31,13 @@ public class CasingTextureHandler {
return Textures.BlockIcons.MACHINE_CASING_STABLE_TITANIUM.getIcon();
//Electrolyzer Casings
case 5:
- return Textures.BlockIcons.MACHINE_CASING_FUSION_2.getIcon();
+ return TexturesGtBlocks.Casing_Material_Potin.getIcon();
//Broken Blue Fusion Casings
case 6:
return Textures.BlockIcons.MACHINE_CASING_FUSION.getIcon();
//Maceration Stack Casings
case 7:
- return Textures.BlockIcons.MACHINE_LuV_BOTTOM.getIcon();
+ return TexturesGtBlocks.Casing_Material_Tumbaga.getIcon();
//Broken Pink Fusion Casings
case 8:
return Textures.BlockIcons.MACHINE_CASING_FUSION_2.getIcon();
@@ -52,10 +52,10 @@ public class CasingTextureHandler {
return Textures.BlockIcons.MACHINE_CASING_GRATE.getIcon();
//Reactor Casing I
case 12:
- return Textures.BlockIcons.MACHINE_CASING_CLEAN_STAINLESSSTEEL.getIcon();
+ return TexturesGtBlocks.Casing_Material_Stellite.getIcon();
//Reactor Casing II
case 13:
- return Textures.BlockIcons.MACHINE_CASING_ROBUST_TUNGSTENSTEEL.getIcon();
+ return TexturesGtBlocks.Casing_Material_Zeron100.getIcon();
default:
return Textures.BlockIcons.MACHINE_CASING_RADIOACTIVEHAZARD.getIcon();
diff --git a/src/Java/gtPlusPlus/xmod/gregtech/common/blocks/textures/TexturesGtBlocks.java b/src/Java/gtPlusPlus/xmod/gregtech/common/blocks/textures/TexturesGtBlocks.java
index 3f90e2a467..672fc58ff7 100644
--- a/src/Java/gtPlusPlus/xmod/gregtech/common/blocks/textures/TexturesGtBlocks.java
+++ b/src/Java/gtPlusPlus/xmod/gregtech/common/blocks/textures/TexturesGtBlocks.java
@@ -58,12 +58,28 @@ public class TexturesGtBlocks {
//Machine Casings
private static final CustomIcon Internal_Casing_Machine_Simple = new CustomIcon("TileEntities/machine_top");
public static final CustomIcon Casing_Machine_Simple = Internal_Casing_Machine_Simple;
-
private static final CustomIcon Internal_Casing_Machine_Dimensional = new CustomIcon("TileEntities/adv_machine_dimensional");
public static final CustomIcon Casing_Machine_Dimensional = Internal_Casing_Machine_Dimensional;
private static final CustomIcon Internal_Casing_Machine_Dimensional_Adv = new CustomIcon("TileEntities/high_adv_machine_dimensional");
public static final CustomIcon Casing_Machine_Dimensional_Adv = Internal_Casing_Machine_Dimensional_Adv;
+ //Material Casings
+ private static final CustomIcon Internal_Casing_Staballoy61 = new CustomIcon("TileEntities/MACHINE_CASING_STABLE_TANTALLOY61");
+ public static final CustomIcon Casing_Material_Staballoy61 = Internal_Casing_Staballoy61;
+ private static final CustomIcon Internal_Casing_MaragingSteel = new CustomIcon("TileEntities/MACHINE_CASING_STABLE_MARAGINGSTEEL");
+ public static final CustomIcon Casing_Material_MaragingSteel = Internal_Casing_MaragingSteel;
+ private static final CustomIcon Internal_Casing_Stellite = new CustomIcon("TileEntities/MACHINE_CASING_STABLE_STELLITE");
+ public static final CustomIcon Casing_Material_Stellite = Internal_Casing_Stellite;
+ private static final CustomIcon Internal_Casing_Talonite = new CustomIcon("TileEntities/MACHINE_CASING_STABLE_TALONITE");
+ public static final CustomIcon Casing_Material_Talonite = Internal_Casing_Talonite;
+ private static final CustomIcon Internal_Casing_Tumbaga = new CustomIcon("TileEntities/MACHINE_CASING_STABLE_TUMBAGA");
+ public static final CustomIcon Casing_Material_Tumbaga = Internal_Casing_Tumbaga;
+ private static final CustomIcon Internal_Casing_Zeron100 = new CustomIcon("TileEntities/MACHINE_CASING_STABLE_ZERON100");
+ public static final CustomIcon Casing_Material_Zeron100 = Internal_Casing_Zeron100;
+ private static final CustomIcon Internal_Casing_Potin = new CustomIcon("TileEntities/MACHINE_CASING_STABLE_POTIN");
+ public static final CustomIcon Casing_Material_Potin = Internal_Casing_Potin;
+
+ //Misc Casings
private static final CustomIcon Internal_Casing_Machine_Sound = new CustomIcon("TileEntities/audio_out");
public static final CustomIcon Casing_Machine_Sound = Internal_Casing_Machine_Sound;
private static final CustomIcon Internal_Casing_Machine_Sound_Active = new CustomIcon("TileEntities/audio_out_active");