Tesla Casings

Today in Bass learns Java: Tec watches in horror as Bass decides to allocate himself casing ids 200-299 without asking permission while still procrastinating doing any sort of custom texture work!

4 files changed, 106 insertions, 5 deletions

diff --git a/src/main/java/com/github/technus/tectech/CommonValues.java b/src/main/java/com/github/technus/tectech/CommonValues.java
index 8ac6188b63..9564643fbe 100644
--- a/src/main/java/com/github/technus/tectech/CommonValues.java
+++ b/src/main/java/com/github/technus/tectech/CommonValues.java
@@ -18,6 +18,10 @@ public final class CommonValues {
             EnumChatFormatting.BLUE + "Tec" +
                     EnumChatFormatting.DARK_BLUE + "Tech" +
                     EnumChatFormatting.BLUE + ": Theta Movement";
+    public static final String COSMIC_MARK =
+            EnumChatFormatting.BLUE + "Tec" +
+                    EnumChatFormatting.DARK_BLUE + "Tech" +
+                    EnumChatFormatting.BLUE + ": Cosmic";//TODO get a better name than cosmic for *UNDEFINED* thing
 
     public static final byte DECAY_AT = 0;// hatches compute decays
     public static final byte MULTI_PURGE_1_AT = 2;// multiblocks clean their hatches 1
diff --git a/src/main/java/com/github/technus/tectech/thing/CustomItemList.java b/src/main/java/com/github/technus/tectech/thing/CustomItemList.java
index 5e45ead4f8..0010378b29 100644
--- a/src/main/java/com/github/technus/tectech/thing/CustomItemList.java
+++ b/src/main/java/com/github/technus/tectech/thing/CustomItemList.java
@@ -57,6 +57,9 @@ public enum CustomItemList implements IItemContainer {
     Parametrizer_Hatch, ParametrizerX_Hatch, Uncertainty_Hatch, UncertaintyX_Hatch, dataIn_Hatch, dataOut_Hatch, dataInAss_Hatch, dataOutAss_Hatch,

     eM_Containment, eM_Containment_Field, eM_Containment_Advanced, eM_Coil, eM_Teleportation, eM_Dimensional, eM_Ultimate_Containment, eM_Ultimate_Containment_Advanced, eM_Ultimate_Containment_Field, eM_Spacetime, eM_Computer_Casing, eM_Computer_Bus, eM_Computer_Vent, eM_Hollow, eM_Power,

     debugBlock,

+

+    tM_TeslaBase, tM_TeslaToroid, tM_TeslaFrame, tM_TeslaPrimary_0, tM_TeslaPrimary_1, tM_TeslaPrimary_2, tM_TeslaSecondary_0, tM_TeslaSecondary_1, tM_TeslaSecondary_2,

+

     Machine_Multi_Microwave, Machine_Multi_teslaCoil,

     Machine_Multi_Transformer,

     Machine_Multi_Computer, Machine_Multi_Switch, Machine_Multi_Research, Machine_Multi_DataBank,

diff --git a/src/main/java/com/github/technus/tectech/thing/casing/GT_Block_CasingsTT.java b/src/main/java/com/github/technus/tectech/thing/casing/GT_Block_CasingsTT.java
index 2ea22b625d..150e83b144 100644
--- a/src/main/java/com/github/technus/tectech/thing/casing/GT_Block_CasingsTT.java
+++ b/src/main/java/com/github/technus/tectech/thing/casing/GT_Block_CasingsTT.java
@@ -26,6 +26,7 @@ public class GT_Block_CasingsTT extends GT_Block_Casings_Abstract {
     public static final byte texturePage=tectechTexturePage1;
     public static final short textureOffset = texturePage << 7;//Start of PAGE 8 (which is the 9th page)  (8*128)
     private static IIcon eM0, eM1, eM1s, eM2, eM2s, eM3, eM3s, eM4, eM5, eM6, eM7, eM7s, eM8, eM9, eM10, eM11, eM12, eM13, eM14;
+    private static IIcon tM0, tM1, tM2, tM3, tM4, tM5, tM6, tM7, tM8;
     private static IIcon[] debug = new IIcon[6];
 
     public GT_Block_CasingsTT() {
@@ -57,6 +58,18 @@ public class GT_Block_CasingsTT extends GT_Block_Casings_Abstract {
 
         GT_LanguageManager.addStringLocalization(getUnlocalizedName() + ".15.name", "Debug Sides");//NOT REGISTER AS TEXTURE FOR HATCHES!
 
+        GT_LanguageManager.addStringLocalization(getUnlocalizedName() + ".200.name", "Tesla Base Casing");
+        GT_LanguageManager.addStringLocalization(getUnlocalizedName() + ".201.name", "Tesla Toroid Casing");
+        GT_LanguageManager.addStringLocalization(getUnlocalizedName() + ".202.name", "Tesla Structural Frame");
+
+        GT_LanguageManager.addStringLocalization(getUnlocalizedName() + ".203.name", "T0 Primary Tesla Windings");//TODO Decide tesla coil winding materials to rename
+        GT_LanguageManager.addStringLocalization(getUnlocalizedName() + ".204.name", "T1 Primary Tesla Windings");
+        GT_LanguageManager.addStringLocalization(getUnlocalizedName() + ".205.name", "T2 Primary Tesla Windings");
+
+        GT_LanguageManager.addStringLocalization(getUnlocalizedName() + ".206.name", "T3 Primary Tesla Windings");
+        GT_LanguageManager.addStringLocalization(getUnlocalizedName() + ".207.name", "T4 Primary Tesla Windings");
+        GT_LanguageManager.addStringLocalization(getUnlocalizedName() + ".208.name", "T5 Primary Tesla Windings");
+
 
         CustomItemList.eM_Power.set(new ItemStack(this, 1, 0));
 
@@ -80,6 +93,18 @@ public class GT_Block_CasingsTT extends GT_Block_Casings_Abstract {
         CustomItemList.eM_Ultimate_Containment_Field.set(new ItemStack(this, 1, 14));
 
         CustomItemList.debugBlock.set(new ItemStack(this, 1, 15));
+
+        CustomItemList.tM_TeslaBase.set(new ItemStack(this, 1, 200));
+        CustomItemList.tM_TeslaToroid.set(new ItemStack(this, 1, 201));
+        CustomItemList.tM_TeslaFrame.set(new ItemStack(this, 1, 202));
+
+        CustomItemList.tM_TeslaPrimary_0.set(new ItemStack(this, 1, 203));
+        CustomItemList.tM_TeslaPrimary_1.set(new ItemStack(this, 1, 204));
+        CustomItemList.tM_TeslaPrimary_2.set(new ItemStack(this, 1, 205));
+
+        CustomItemList.tM_TeslaSecondary_0.set(new ItemStack(this, 1, 206));
+        CustomItemList.tM_TeslaSecondary_1.set(new ItemStack(this, 1, 207));
+        CustomItemList.tM_TeslaSecondary_2.set(new ItemStack(this, 1, 208));
     }
 
     @Override
@@ -116,6 +141,18 @@ public class GT_Block_CasingsTT extends GT_Block_Casings_Abstract {
         debug[3] = aIconRegister.registerIcon("gregtech:iconsets/DEBUG_3");
         debug[4] = aIconRegister.registerIcon("gregtech:iconsets/DEBUG_4");
         debug[5] = aIconRegister.registerIcon("gregtech:iconsets/DEBUG_5");
+
+        tM0 = aIconRegister.registerIcon("gregtech:iconsets/EM_POWER");//TODO Configure custom tesla texture sets
+        tM1 = aIconRegister.registerIcon("gregtech:iconsets/EM_POWER");
+        tM2 = aIconRegister.registerIcon("gregtech:iconsets/EM_POWER");
+
+        tM3 = aIconRegister.registerIcon("gregtech:iconsets/EM_POWER");
+        tM4 = aIconRegister.registerIcon("gregtech:iconsets/EM_POWER");
+        tM5 = aIconRegister.registerIcon("gregtech:iconsets/EM_POWER");
+
+        tM6 = aIconRegister.registerIcon("gregtech:iconsets/EM_POWER");
+        tM7 = aIconRegister.registerIcon("gregtech:iconsets/EM_POWER");
+        tM8 = aIconRegister.registerIcon("gregtech:iconsets/EM_POWER");
     }
 
     @Override
@@ -165,6 +202,24 @@ public class GT_Block_CasingsTT extends GT_Block_Casings_Abstract {
                 return eM14;
             case 15:
                 return debug[aSide];
+            case 200:
+                return tM0;
+            case 201:
+                return tM1;
+            case 202:
+                return tM2;
+            case 203:
+                return tM3;
+            case 204:
+                return tM4;
+            case 205:
+                return tM5;
+            case 206:
+                return tM6;
+            case 207:
+                return tM7;
+            case 208:
+                return tM8;
             default:
                 return Textures.BlockIcons.MACHINE_CASING_SOLID_STEEL.getIcon();
         }
diff --git a/src/main/java/com/github/technus/tectech/thing/casing/GT_Item_CasingsTT.java b/src/main/java/com/github/technus/tectech/thing/casing/GT_Item_CasingsTT.java
index 6751e4b24b..8137a1d655 100644
--- a/src/main/java/com/github/technus/tectech/thing/casing/GT_Item_CasingsTT.java
+++ b/src/main/java/com/github/technus/tectech/thing/casing/GT_Item_CasingsTT.java
@@ -8,8 +8,7 @@ import net.minecraft.util.EnumChatFormatting;
 
 import java.util.List;
 
-import static com.github.technus.tectech.CommonValues.TEC_MARK_EM;
-import static com.github.technus.tectech.CommonValues.TEC_MARK_GENERAL;
+import static com.github.technus.tectech.CommonValues.*;
 
 /**
  * Created by danie_000 on 03.10.2016.
@@ -19,12 +18,16 @@ public class GT_Item_CasingsTT extends GT_Item_Casings_Abstract {
         super(par1);
     }
 
-    @Override
+    @Override //TODO Negotiate Casing space with Tec
     public void addInformation(ItemStack aStack, EntityPlayer aPlayer, List aList, boolean aF3_H) {
-        if(aStack.getItemDamage()>0 && aStack.getItemDamage()<15) {
+        if(aStack.getItemDamage() < 15) {
             aList.add(TEC_MARK_EM);
-        } else {
+        } else if ((aStack.getItemDamage() < 200)) {
             aList.add(TEC_MARK_GENERAL);
+        } else if (aStack.getItemDamage() < 300){
+            aList.add(BASS_MARK);
+        } else {
+            aList.add(COSMIC_MARK);
         }
         switch (aStack.getItemDamage()) {
             case 0://"High Power Casing"
@@ -91,6 +94,42 @@ public class GT_Item_CasingsTT extends GT_Item_Casings_Abstract {
                 aList.add("Lazy man way of determining sides.");
                 aList.add(EnumChatFormatting.BLUE.toString() + "0, 1, 2, 3, 4, 5, 6?!");
                 break;
+            case 200://"Tesla Base Casing"
+                aList.add("Lazy man way of determining sides.");
+                aList.add(EnumChatFormatting.BLUE.toString() + "0, 1, 2, 3, 4, 5, 6?!");
+                break;
+            case 201://"Tesla Toroid Casing"
+                aList.add("Lazy man way of determining sides.");
+                aList.add(EnumChatFormatting.BLUE.toString() + "0, 1, 2, 3, 4, 5, 6?!");
+                break;
+            case 202://"Tesla Structural Frame"
+                aList.add("Lazy man way of determining sides.");
+                aList.add(EnumChatFormatting.BLUE.toString() + "0, 1, 2, 3, 4, 5, 6?!");
+                break;
+            case 203://"T0 Primary Tesla Windings"
+                aList.add("Lazy man way of determining sides.");
+                aList.add(EnumChatFormatting.BLUE.toString() + "0, 1, 2, 3, 4, 5, 6?!");
+                break;
+            case 204://"T1 Primary Tesla Windings"
+                aList.add("Lazy man way of determining sides.");
+                aList.add(EnumChatFormatting.BLUE.toString() + "0, 1, 2, 3, 4, 5, 6?!");
+                break;
+            case 205://"T2 Primary Tesla Windings"
+                aList.add("Lazy man way of determining sides.");
+                aList.add(EnumChatFormatting.BLUE.toString() + "0, 1, 2, 3, 4, 5, 6?!");
+                break;
+            case 206://"T0 Secondary Tesla Windings"
+                aList.add("Lazy man way of determining sides.");
+                aList.add(EnumChatFormatting.BLUE.toString() + "0, 1, 2, 3, 4, 5, 6?!");
+                break;
+            case 207://"T1 Secondary Tesla Windings"
+                aList.add("Lazy man way of determining sides.");
+                aList.add(EnumChatFormatting.BLUE.toString() + "0, 1, 2, 3, 4, 5, 6?!");
+                break;
+            case 208://"T2 Secondary Tesla Windings"
+                aList.add("Lazy man way of determining sides.");
+                aList.add(EnumChatFormatting.BLUE.toString() + "0, 1, 2, 3, 4, 5, 6?!");
+                break;
             default://WTF?
                 aList.add("Damn son where did you get that!?");
                 aList.add(EnumChatFormatting.BLUE.toString() + "From outer space... I guess...");