aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDraknyte1 <Draknyte1@hotmail.com>2016-11-23 14:43:33 +1000
committerDraknyte1 <Draknyte1@hotmail.com>2016-11-23 14:43:33 +1000
commitd2493ffb71f880483a93a2d896097185bee9e63e (patch)
treeaa5d906a93b11406b26b5e761764151ae3bf3efe
parentada3ae2bbcd293b3239e58b69aa33f860dd9aa3c (diff)
downloadGT5-Unofficial-d2493ffb71f880483a93a2d896097185bee9e63e.tar.gz
GT5-Unofficial-d2493ffb71f880483a93a2d896097185bee9e63e.tar.bz2
GT5-Unofficial-d2493ffb71f880483a93a2d896097185bee9e63e.zip
+ Added placeholder textures for the second set of casings.
-rw-r--r--.gradle/2.0/taskArtifacts/cache.properties1
-rw-r--r--src/Java/gtPlusPlus/xmod/gregtech/common/blocks/textures/CasingTextureHandler2.java67
-rw-r--r--src/Java/gtPlusPlus/xmod/gregtech/common/blocks/textures/TexturesGtBlock.java4
-rw-r--r--src/resources/assets/miscutils/textures/blocks/TileEntities/_PlaceHolder.pngbin0 -> 144 bytes
4 files changed, 37 insertions, 35 deletions
diff --git a/.gradle/2.0/taskArtifacts/cache.properties b/.gradle/2.0/taskArtifacts/cache.properties
deleted file mode 100644
index febe9db0c3..0000000000
--- a/.gradle/2.0/taskArtifacts/cache.properties
+++ /dev/null
@@ -1 +0,0 @@
-#Sun Aug 30 18:52:36 AEST 2015
diff --git a/src/Java/gtPlusPlus/xmod/gregtech/common/blocks/textures/CasingTextureHandler2.java b/src/Java/gtPlusPlus/xmod/gregtech/common/blocks/textures/CasingTextureHandler2.java
index 526f048b76..bd2edd22fa 100644
--- a/src/Java/gtPlusPlus/xmod/gregtech/common/blocks/textures/CasingTextureHandler2.java
+++ b/src/Java/gtPlusPlus/xmod/gregtech/common/blocks/textures/CasingTextureHandler2.java
@@ -1,6 +1,5 @@
package gtPlusPlus.xmod.gregtech.common.blocks.textures;
-import gregtech.api.enums.Textures;
import net.minecraft.util.IIcon;
public class CasingTextureHandler2 {
@@ -13,54 +12,54 @@ public class CasingTextureHandler2 {
return TexturesGtBlock.Casing_Machine_Dimensional_Adv.getIcon();
//Coke Oven Frame
case 1:
- return TexturesGtBlock.Casing_Material_Tantalloy61.getIcon();
+ return TexturesGtBlock._PlaceHolder.getIcon();
//Coke Oven Casing Tier 1
case 2:
- return Textures.BlockIcons.MACHINE_CASING_FIREBOX_BRONZE.getIcon();
+ return TexturesGtBlock._PlaceHolder.getIcon();
//Coke Oven Casing Tier 2
- case 3:
- return Textures.BlockIcons.MACHINE_CASING_FIREBOX_STEEL.getIcon();
+ case 3:
+ return TexturesGtBlock._PlaceHolder.getIcon();
//Material Press Casings
- case 4:
- return Textures.BlockIcons.MACHINE_CASING_STABLE_TITANIUM.getIcon();
+ case 4:
+ return TexturesGtBlock._PlaceHolder.getIcon();
//Electrolyzer Casings
- case 5:
- return TexturesGtBlock.Casing_Material_Potin.getIcon();
+ case 5:
+ return TexturesGtBlock._PlaceHolder.getIcon();
//Broken Blue Fusion Casings
- case 6:
- return TexturesGtBlock.Casing_Material_IncoloyMA956.getIcon();
+ case 6:
+ return TexturesGtBlock._PlaceHolder.getIcon();
//Maceration Stack Casings
- case 7:
- return TexturesGtBlock.Casing_Material_Tumbaga.getIcon();
+ case 7:
+ return TexturesGtBlock._PlaceHolder.getIcon();
//Broken Pink Fusion Casings
- case 8:
- return TexturesGtBlock.Casing_Material_IncoloyDS.getIcon();
+ case 8:
+ return TexturesGtBlock._PlaceHolder.getIcon();
//Matter Fabricator Casings
- case 9:
- return TexturesGtBlock.Casing_Machine_Dimensional_Adv.getIcon();
+ case 9:
+ return TexturesGtBlock._PlaceHolder.getIcon();
//Iron Blast Fuance Textures
- case 10:
- return TexturesGtBlock.Casing_Machine_Simple_Top.getIcon();
+ case 10:
+ return TexturesGtBlock._PlaceHolder.getIcon();
//Multitank Exterior Casing
- case 11:
- return Textures.BlockIcons.MACHINE_CASING_GRATE.getIcon();
+ case 11:
+ return TexturesGtBlock._PlaceHolder.getIcon();
//Reactor Casing I
- case 12:
- return TexturesGtBlock.Casing_Material_Stellite.getIcon();
+ case 12:
+ return TexturesGtBlock._PlaceHolder.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();
+ case 13:
+ return TexturesGtBlock._PlaceHolder.getIcon();
+ case 14:
+ return TexturesGtBlock._PlaceHolder.getIcon();
+ case 15:
+ return TexturesGtBlock._PlaceHolder.getIcon();
- default:
- return Textures.BlockIcons.MACHINE_CASING_RADIOACTIVEHAZARD.getIcon();
+ default:
+ return TexturesGtBlock.Overlay_UU_Matter.getIcon();
}
- }
- return Textures.BlockIcons.MACHINE_CASING_GEARBOX_TUNGSTENSTEEL.getIcon();
+ }
+ return TexturesGtBlock._PlaceHolder.getIcon();
}
-
+
} \ No newline at end of file
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 04a7fdceed..b0a327934a 100644
--- a/src/Java/gtPlusPlus/xmod/gregtech/common/blocks/textures/TexturesGtBlock.java
+++ b/src/Java/gtPlusPlus/xmod/gregtech/common/blocks/textures/TexturesGtBlock.java
@@ -54,7 +54,11 @@ public class TexturesGtBlock {
*/
+ //PlaceHolder Texture
+ private static final CustomIcon Internal_PlaceHolder = new CustomIcon("TileEntities/_PlaceHolder");
+ public static final CustomIcon _PlaceHolder = Internal_PlaceHolder;
+
//Machine Casings
//Simple
private static final CustomIcon Internal_Casing_Machine_Simple_Top = new CustomIcon("TileEntities/machine_top");
diff --git a/src/resources/assets/miscutils/textures/blocks/TileEntities/_PlaceHolder.png b/src/resources/assets/miscutils/textures/blocks/TileEntities/_PlaceHolder.png
new file mode 100644
index 0000000000..32b755202d
--- /dev/null
+++ b/src/resources/assets/miscutils/textures/blocks/TileEntities/_PlaceHolder.png
Binary files differ