Trying to use some new textures for the centrifuge.

1 files changed, 27 insertions, 54 deletions

diff --git a/src/Java/miscutil/gregtech/api/enums/GregtechTextures.java b/src/Java/miscutil/gregtech/api/enums/GregtechTextures.java
index 40c3cb7f4e..9986add4fd 100644
--- a/src/Java/miscutil/gregtech/api/enums/GregtechTextures.java
+++ b/src/Java/miscutil/gregtech/api/enums/GregtechTextures.java
@@ -1,9 +1,9 @@
 package miscutil.gregtech.api.enums;
 
-import static gregtech.api.enums.GT_Values.RES_PATH_BLOCK;
 import gregtech.api.GregTech_API;
 import gregtech.api.interfaces.IIconContainer;
 import gregtech.api.interfaces.ITexture;
+import miscutil.core.lib.CORE;
 import net.minecraft.client.renderer.texture.TextureMap;
 import net.minecraft.util.IIcon;
 import net.minecraft.util.ResourceLocation;
@@ -12,61 +12,34 @@ public class GregtechTextures {
     public enum BlockIcons implements IIconContainer, Runnable {	
 
 
-	LARGECENTRIFUGE_TI1, LARGECENTRIFUGE_TI2, LARGECENTRIFUGE_TI3, LARGECENTRIFUGE_TI4, LARGECENTRIFUGE_TI5, 
-	LARGECENTRIFUGE_TI6, LARGECENTRIFUGE_TI7, LARGECENTRIFUGE_TI8, LARGECENTRIFUGE_TI9, 
-	LARGECENTRIFUGE_TI_ACTIVE1, LARGECENTRIFUGE_TI_ACTIVE2, LARGECENTRIFUGE_TI_ACTIVE3, LARGECENTRIFUGE_TI_ACTIVE4, 
-	LARGECENTRIFUGE_TI_ACTIVE5, LARGECENTRIFUGE_TI_ACTIVE6, LARGECENTRIFUGE_TI_ACTIVE7, LARGECENTRIFUGE_TI_ACTIVE8, LARGECENTRIFUGE_TI_ACTIVE9, 
-	
-	LARGECENTRIFUGE_TU1, LARGECENTRIFUGE_TU2, LARGECENTRIFUGE_TU3, LARGECENTRIFUGE_TU4, LARGECENTRIFUGE_TU5, 
-	LARGECENTRIFUGE_TU6, LARGECENTRIFUGE_TU7, LARGECENTRIFUGE_TU8, LARGECENTRIFUGE_TU9, 
-	LARGECENTRIFUGE_TU_ACTIVE1, LARGECENTRIFUGE_TU_ACTIVE2, LARGECENTRIFUGE_TU_ACTIVE3, LARGECENTRIFUGE_TU_ACTIVE4, LARGECENTRIFUGE_TU_ACTIVE5,
-	LARGECENTRIFUGE_TU_ACTIVE6, LARGECENTRIFUGE_TU_ACTIVE7, LARGECENTRIFUGE_TU_ACTIVE8, LARGECENTRIFUGE_TU_ACTIVE9;
+	LARGECENTRIFUGE1, LARGECENTRIFUGE2, LARGECENTRIFUGE3, LARGECENTRIFUGE4, LARGECENTRIFUGE5, 
+	LARGECENTRIFUGE6, LARGECENTRIFUGE7, LARGECENTRIFUGE8, LARGECENTRIFUGE9, 
+	LARGECENTRIFUGE_ACTIVE1, LARGECENTRIFUGE_ACTIVE2, LARGECENTRIFUGE_ACTIVE3, LARGECENTRIFUGE_ACTIVE4, 
+	LARGECENTRIFUGE_ACTIVE5, LARGECENTRIFUGE_ACTIVE6, LARGECENTRIFUGE_ACTIVE7, LARGECENTRIFUGE_ACTIVE8, LARGECENTRIFUGE_ACTIVE9;
 	
     public static final IIconContainer[]
     		
-    CENTRIFUGE1 = new IIconContainer[]{
-            LARGECENTRIFUGE_TI1,
-            LARGECENTRIFUGE_TI2,
-            LARGECENTRIFUGE_TI3,
-            LARGECENTRIFUGE_TI4,
-            LARGECENTRIFUGE_TI5,
-            LARGECENTRIFUGE_TI6,
-            LARGECENTRIFUGE_TI7,
-            LARGECENTRIFUGE_TI8,
-            LARGECENTRIFUGE_TI9
-    },
-    CENTRIFUGE_ACTIVE1 = new IIconContainer[]{
-            LARGECENTRIFUGE_TI_ACTIVE1,
-            LARGECENTRIFUGE_TI_ACTIVE2,
-            LARGECENTRIFUGE_TI_ACTIVE3,
-            LARGECENTRIFUGE_TI_ACTIVE4,
-            LARGECENTRIFUGE_TI_ACTIVE5,
-            LARGECENTRIFUGE_TI_ACTIVE6,
-            LARGECENTRIFUGE_TI_ACTIVE7,
-            LARGECENTRIFUGE_TI_ACTIVE8,
-            LARGECENTRIFUGE_TI_ACTIVE9
-    },
-    CENTRIFUGE2 = new IIconContainer[]{
-            LARGECENTRIFUGE_TU1,
-            LARGECENTRIFUGE_TU2,
-            LARGECENTRIFUGE_TU3,
-            LARGECENTRIFUGE_TU4,
-            LARGECENTRIFUGE_TU5,
-            LARGECENTRIFUGE_TU6,
-            LARGECENTRIFUGE_TU7,
-            LARGECENTRIFUGE_TU8,
-            LARGECENTRIFUGE_TU9
+    CENTRIFUGE = new IIconContainer[]{
+            LARGECENTRIFUGE1,
+            LARGECENTRIFUGE2,
+            LARGECENTRIFUGE3,
+            LARGECENTRIFUGE4,
+            LARGECENTRIFUGE5,
+            LARGECENTRIFUGE6,
+            LARGECENTRIFUGE7,
+            LARGECENTRIFUGE8,
+            LARGECENTRIFUGE9
     },
-    CENTRIFUGE_ACTIVE2 = new IIconContainer[]{
-            LARGECENTRIFUGE_TU_ACTIVE1,
-            LARGECENTRIFUGE_TU_ACTIVE2,
-            LARGECENTRIFUGE_TU_ACTIVE3,
-            LARGECENTRIFUGE_TU_ACTIVE4,
-            LARGECENTRIFUGE_TU_ACTIVE5,
-            LARGECENTRIFUGE_TU_ACTIVE6,
-            LARGECENTRIFUGE_TU_ACTIVE7,
-            LARGECENTRIFUGE_TU_ACTIVE8,
-            LARGECENTRIFUGE_TU_ACTIVE9
+    CENTRIFUGE_ACTIVE = new IIconContainer[]{
+            LARGECENTRIFUGE_ACTIVE1,
+            LARGECENTRIFUGE_ACTIVE2,
+            LARGECENTRIFUGE_ACTIVE3,
+            LARGECENTRIFUGE_ACTIVE4,
+            LARGECENTRIFUGE_ACTIVE5,
+            LARGECENTRIFUGE_ACTIVE6,
+            LARGECENTRIFUGE_ACTIVE7,
+            LARGECENTRIFUGE_ACTIVE8,
+            LARGECENTRIFUGE_ACTIVE9
     };
     
     public static ITexture[]   
@@ -86,7 +59,7 @@ public class GregtechTextures {
 
     @Override
     public void run() {
-        mIcon = GregTech_API.sBlockIcons.registerIcon(RES_PATH_BLOCK + "iconsets/" + this);
+        mIcon = GregTech_API.sBlockIcons.registerIcon(CORE.RES_PATH_BLOCK + "iconsets/" + this);
     }
 
     @Override
@@ -115,7 +88,7 @@ public class GregtechTextures {
 
         @Override
         public void run() {
-            mIcon = GregTech_API.sBlockIcons.registerIcon(RES_PATH_BLOCK + mIconName);
+            mIcon = GregTech_API.sBlockIcons.registerIcon(CORE.RES_PATH_BLOCK + mIconName);
         }
 
         @Override