aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorAlkalus <3060479+draknyte1@users.noreply.github.com>2018-09-01 16:35:41 +1000
committerAlkalus <3060479+draknyte1@users.noreply.github.com>2018-09-01 16:35:41 +1000
commit4826c5f0b3f05c3265ec3757db5bdc6c8cf0bbf3 (patch)
tree47ac05f94dfcb70422cc0dbe3dda5184223730ae /src
parent7221c2ed12dabfc6443fa6303915feae51a0d020 (diff)
downloadGT5-Unofficial-4826c5f0b3f05c3265ec3757db5bdc6c8cf0bbf3.tar.gz
GT5-Unofficial-4826c5f0b3f05c3265ec3757db5bdc6c8cf0bbf3.tar.bz2
GT5-Unofficial-4826c5f0b3f05c3265ec3757db5bdc6c8cf0bbf3.zip
+ Added some new Casing Textures.
Diffstat (limited to 'src')
-rw-r--r--src/Java/gtPlusPlus/xmod/gregtech/common/blocks/GregtechMetaCasingBlocks4.java2
-rw-r--r--src/Java/gtPlusPlus/xmod/gregtech/common/blocks/textures/CasingTextureHandler3.java2
-rw-r--r--src/Java/gtPlusPlus/xmod/gregtech/common/blocks/textures/TexturesGtBlock.java7
-rw-r--r--src/resources/assets/miscutils/textures/blocks/TileEntities/MACHINE_CASING_STABLE_TRINIUM_NAQUADAH.pngbin0 -> 459 bytes
-rw-r--r--src/resources/assets/miscutils/textures/blocks/TileEntities/MACHINE_CASING_STABLE_TRINIUM_NAQUADAH_CARBON.pngbin0 -> 436 bytes
-rw-r--r--src/resources/assets/miscutils/textures/blocks/TileEntities/MACHINE_CASING_STABLE_TRINIUM_NAQUADAH_VENT.pngbin0 -> 623 bytes
-rw-r--r--src/resources/assets/miscutils/textures/blocks/TileEntities/MACHINE_CASING_STABLE_TRINIUM_TITANIUM.pngbin0 -> 504 bytes
-rw-r--r--src/resources/assets/miscutils/textures/blocks/metro/TEXTURE_MAGIC_A.pngbin335 -> 1651 bytes
-rw-r--r--src/resources/assets/miscutils/textures/blocks/metro/TEXTURE_MAGIC_A.png.mcmeta6
9 files changed, 15 insertions, 2 deletions
diff --git a/src/Java/gtPlusPlus/xmod/gregtech/common/blocks/GregtechMetaCasingBlocks4.java b/src/Java/gtPlusPlus/xmod/gregtech/common/blocks/GregtechMetaCasingBlocks4.java
index e6a228b854..7373ef4bba 100644
--- a/src/Java/gtPlusPlus/xmod/gregtech/common/blocks/GregtechMetaCasingBlocks4.java
+++ b/src/Java/gtPlusPlus/xmod/gregtech/common/blocks/GregtechMetaCasingBlocks4.java
@@ -61,7 +61,7 @@ extends GregtechMetaCasingBlocksAbstract {
switch (aMeta) {
//Centrifuge
case 0:
- return TexturesGtBlock.TEXTURE_METAL_PANEL_E.getIcon();
+ return TexturesGtBlock.Casing_Trinium_Titanium.getIcon();
//Coke Oven Frame
case 1:
return TexturesGtBlock.TEXTURE_TECH_C.getIcon();
diff --git a/src/Java/gtPlusPlus/xmod/gregtech/common/blocks/textures/CasingTextureHandler3.java b/src/Java/gtPlusPlus/xmod/gregtech/common/blocks/textures/CasingTextureHandler3.java
index 2bd96bcec5..019a432013 100644
--- a/src/Java/gtPlusPlus/xmod/gregtech/common/blocks/textures/CasingTextureHandler3.java
+++ b/src/Java/gtPlusPlus/xmod/gregtech/common/blocks/textures/CasingTextureHandler3.java
@@ -19,7 +19,7 @@ public class CasingTextureHandler3 {
return TexturesGtBlock.TEXTURE_METAL_PANEL_C.getIcon();
case 3:
//Trinium Plated Mining Platform Casing
- return TexturesGtBlock.Casing_Staballoy_Firebox.getIcon();
+ return TexturesGtBlock.Casing_Trinium_Naquadah_Vent.getIcon();
case 4:
//Vanadium Redox IV
return TexturesGtBlock.Casing_Redox_2.getIcon();
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 e35f9e033a..5d76f26a82 100644
--- a/src/Java/gtPlusPlus/xmod/gregtech/common/blocks/textures/TexturesGtBlock.java
+++ b/src/Java/gtPlusPlus/xmod/gregtech/common/blocks/textures/TexturesGtBlock.java
@@ -208,6 +208,13 @@ public class TexturesGtBlock {
public static final CustomIcon Casing_Material_HastelloyN = Internal_Casing_HastelloyN;
private static final CustomIcon Internal_Casing_Fluid_IncoloyDS = new CustomIcon("TileEntities/MACHINE_CASING_FLUID_INCOLOY_DS");
public static final CustomIcon Casing_Material_Fluid_IncoloyDS = Internal_Casing_Fluid_IncoloyDS;
+
+
+ //Trinium Alloys
+ public static final CustomIcon Casing_Trinium_Titanium = new CustomIcon("TileEntities/MACHINE_CASING_STABLE_TRINIUM_TITANIUM");
+ public static final CustomIcon Casing_Trinium_Naquadah = new CustomIcon("TileEntities/MACHINE_CASING_STABLE_TRINIUM_NAQUADAH");
+ public static final CustomIcon Casing_Trinium_Naquadah_Vent = new CustomIcon("TileEntities/MACHINE_CASING_STABLE_TRINIUM_NAQUADAH_VENT");
+ public static final CustomIcon Casing_Trinium_Naquadah_Carbon = new CustomIcon("TileEntities/MACHINE_CASING_STABLE_TRINIUM_NAQUADAH_CARBON");
//Material Machine/Firebox Casings
private static final CustomIcon Internal_Casing_Staballoy_Firebox = new CustomIcon("TileEntities/MACHINE_CASING_FIREBOX_STABALLOY");
diff --git a/src/resources/assets/miscutils/textures/blocks/TileEntities/MACHINE_CASING_STABLE_TRINIUM_NAQUADAH.png b/src/resources/assets/miscutils/textures/blocks/TileEntities/MACHINE_CASING_STABLE_TRINIUM_NAQUADAH.png
new file mode 100644
index 0000000000..91d3660711
--- /dev/null
+++ b/src/resources/assets/miscutils/textures/blocks/TileEntities/MACHINE_CASING_STABLE_TRINIUM_NAQUADAH.png
Binary files differ
diff --git a/src/resources/assets/miscutils/textures/blocks/TileEntities/MACHINE_CASING_STABLE_TRINIUM_NAQUADAH_CARBON.png b/src/resources/assets/miscutils/textures/blocks/TileEntities/MACHINE_CASING_STABLE_TRINIUM_NAQUADAH_CARBON.png
new file mode 100644
index 0000000000..c82b335f0c
--- /dev/null
+++ b/src/resources/assets/miscutils/textures/blocks/TileEntities/MACHINE_CASING_STABLE_TRINIUM_NAQUADAH_CARBON.png
Binary files differ
diff --git a/src/resources/assets/miscutils/textures/blocks/TileEntities/MACHINE_CASING_STABLE_TRINIUM_NAQUADAH_VENT.png b/src/resources/assets/miscutils/textures/blocks/TileEntities/MACHINE_CASING_STABLE_TRINIUM_NAQUADAH_VENT.png
new file mode 100644
index 0000000000..6a5dba4448
--- /dev/null
+++ b/src/resources/assets/miscutils/textures/blocks/TileEntities/MACHINE_CASING_STABLE_TRINIUM_NAQUADAH_VENT.png
Binary files differ
diff --git a/src/resources/assets/miscutils/textures/blocks/TileEntities/MACHINE_CASING_STABLE_TRINIUM_TITANIUM.png b/src/resources/assets/miscutils/textures/blocks/TileEntities/MACHINE_CASING_STABLE_TRINIUM_TITANIUM.png
new file mode 100644
index 0000000000..651c539c5b
--- /dev/null
+++ b/src/resources/assets/miscutils/textures/blocks/TileEntities/MACHINE_CASING_STABLE_TRINIUM_TITANIUM.png
Binary files differ
diff --git a/src/resources/assets/miscutils/textures/blocks/metro/TEXTURE_MAGIC_A.png b/src/resources/assets/miscutils/textures/blocks/metro/TEXTURE_MAGIC_A.png
index 913537dcf3..7bd5602292 100644
--- a/src/resources/assets/miscutils/textures/blocks/metro/TEXTURE_MAGIC_A.png
+++ b/src/resources/assets/miscutils/textures/blocks/metro/TEXTURE_MAGIC_A.png
Binary files differ
diff --git a/src/resources/assets/miscutils/textures/blocks/metro/TEXTURE_MAGIC_A.png.mcmeta b/src/resources/assets/miscutils/textures/blocks/metro/TEXTURE_MAGIC_A.png.mcmeta
new file mode 100644
index 0000000000..3a720fb53a
--- /dev/null
+++ b/src/resources/assets/miscutils/textures/blocks/metro/TEXTURE_MAGIC_A.png.mcmeta
@@ -0,0 +1,6 @@
+{
+ "animation":{
+ "frametime":3,
+ "frames": [0, 2, 3, 3, 4, 5, 6, 7, 7, 6, 5, 4, 3, 2, 1, 0]
+ }
+} \ No newline at end of file