Refactor

+ Added 2 more coils
+ Improved Tooltips

3 files changed, 35 insertions, 28 deletions

diff --git a/src/main/java/gregtech/api/enums/HeatingCoilLevel.java b/src/main/java/gregtech/api/enums/HeatingCoilLevel.java
index 7b1b3f7334..56c09dccbe 100644
--- a/src/main/java/gregtech/api/enums/HeatingCoilLevel.java
+++ b/src/main/java/gregtech/api/enums/HeatingCoilLevel.java
@@ -1,64 +1,67 @@
 package gregtech.api.enums;
 
 public enum HeatingCoilLevel {
-        None             (     0L),
-        //        ULV              (   901L),  //Not implemented
-        LV               ( 1_801L), //Cupronickel
-        MV               ( 2_701L), //KANTHAL
-        HV               ( 3_601L), //NICHROME
-        EV               ( 4_501L), //TUNGSTENSTEEL
-        IV               ( 5_401L), //HSSG
-        //        LuV              ( 6_301L), //Not implemented
-        ZPM              ( 7_201L), //NAQUADAH
-        UV               ( 9_001L), //NAQUADAHALLOY
-        UHV              ( 9_901L), //ELECTRUMFLUX
-        UEV              (10_801L), //AWAKENEDDRACONIUM
-        UIV              (11_701L),
-
+        None, //                       0
+        ULV,  //Not implemented      901
+        LV,   //Cupronickel         1801
+        MV,   //KANTHAL             2701
+        HV,   //NICHROME            3601
+        EV,   //TUNGSTENSTEEL       4501
+        IV,   //HSSG                5401
+        LuV,  //HSSS                6301
+        ZPM,  //NAQUADAH            7201
+        UV,   //NAQUADAHALLOY       8101
+        UHV,  //TRINIUM             9001
+        UEV,  //ELECTRUMFLUX        9901
+        UIV,  //AWAKENEDDRACONIUM  10801
         //Not Implemented yet
-        UMV              (12_601L),
-        UXV              (13_501L),
-        OpV              (14_401L),
-        MAX              (15_301L),
+        UMV,
+        UXV,
+        OpV,
+        MAX,
         ;
 
-        private final long HEAT;
-
-        HeatingCoilLevel(long heat) {
-            this.HEAT = heat;
+        /**
+         * @return the coil heat, used for recipes in the Electronic Blast Furnace for example
+         */
+        public String getTierName() {
+            if (this.ordinal() < 1 || (this.ordinal()-1) >= GT_Values.VN.length)
+                return "ERROR!";
+            return GT_Values.VN[this.ordinal() - 1];
         }
+
         /**
          * @return the coil heat, used for recipes in the Electronic Blast Furnace for example
          */
         public long getHeat() {
-            return HEAT;
+            return this == None ? 0 : 1L + (900L * this.ordinal());
         }
 
         /**
          * @return the coil tier, used for discount in the Pyrolyse Ofen for example
          */
         public byte getTier() {
-            return (byte) (this.ordinal() - 1);
+            return (byte) (this.ordinal() - 2);
         }
 
         /**
          * @return the coil Level, used for Parallels in the Multi Furnace for example
          */
         public byte getLevel() {
-            return (byte) Math.max(16, 2 << (this.ordinal() -1));
+            return (byte) Math.max(16, 2 << (this.ordinal() - 2));
         }
 
         /**
          * @return the coil Discount, used for discount in the Multi Furnace for example
          */
         public byte getCostDiscount() {
-            return (byte) Math.min(1, 2 << (this.ordinal() -1 -4)); //-1 bcs. of none, -4 = offset
+            return (byte) Math.min(1, 2 << (this.ordinal() - 1 - 6)); //-1 bcs. of none, -4 = offset
         }
 
         public static HeatingCoilLevel getFromTier(byte tier){
             if (tier < 0 || tier > HeatingCoilLevel.values().length -1)
                 return HeatingCoilLevel.None;
 
-            return HeatingCoilLevel.values()[tier+1];
+            return HeatingCoilLevel.values()[tier+2];
         }
-}
+}
\ No newline at end of file
diff --git a/src/main/java/gregtech/api/enums/ItemList.java b/src/main/java/gregtech/api/enums/ItemList.java
index 420c371c40..8fb41a2923 100644
--- a/src/main/java/gregtech/api/enums/ItemList.java
+++ b/src/main/java/gregtech/api/enums/ItemList.java
@@ -1440,7 +1440,9 @@ public enum ItemList implements IItemContainer {
     Casing_Coil_Nichrome,
     Casing_Coil_TungstenSteel,
     Casing_Coil_HSSG,
+    Casing_Coil_HSSS,
     Casing_Coil_Naquadah,
+    Casing_Coil_Trinium,
     Casing_Coil_NaquadahAlloy,
     Casing_Coil_ElectrumFlux,
     Casing_Coil_AwakenedDraconium,
diff --git a/src/main/java/gregtech/api/enums/Textures.java b/src/main/java/gregtech/api/enums/Textures.java
index e0d0ce6abe..8f78784caf 100644
--- a/src/main/java/gregtech/api/enums/Textures.java
+++ b/src/main/java/gregtech/api/enums/Textures.java
@@ -283,6 +283,8 @@ public class Textures {
         MACHINE_COIL_NAQUADAHALLOY,
         MACHINE_COIL_ELECTRUMFLUX,
         MACHINE_COIL_AWAKENEDDRACONIUM,
+        MACHINE_COIL_HSSS,
+        MACHINE_COIL_TRINIUM,
         BOILER_SOLAR,
         BOILER_FRONT,