Tesla Winding Components

6 files changed, 107 insertions, 49 deletions

diff --git a/src/main/java/com/github/technus/tectech/loader/thing/ThingsLoader.java b/src/main/java/com/github/technus/tectech/loader/thing/ThingsLoader.java
index 6a12c640f3..6aa238df49 100644
--- a/src/main/java/com/github/technus/tectech/loader/thing/ThingsLoader.java
+++ b/src/main/java/com/github/technus/tectech/loader/thing/ThingsLoader.java
@@ -61,6 +61,9 @@ public class ThingsLoader implements Runnable {
         TeslaCoilCapacitor.run();
         TecTech.LOGGER.info("Useful Items registered");
 
+        TeslaCoilComponent.run();
+        TecTech.LOGGER.info("Crafting Components registered");
+
         ElementalDefinitionContainer_EM.run();
         DebugElementalInstanceContainer_EM.run();
         TecTech.LOGGER.info("Debug Items registered");
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 8bbb8fd4ce..9ea92f507a 100644
--- a/src/main/java/com/github/technus/tectech/thing/CustomItemList.java
+++ b/src/main/java/com/github/technus/tectech/thing/CustomItemList.java
@@ -92,7 +92,7 @@ public enum CustomItemList implements IItemContainer {
     Machine_Multi_BHG,
     hint_0,hint_1,hint_2,hint_3,hint_4,hint_5,hint_6,hint_7,hint_8,hint_9,hint_10,hint_11, hint_general,hint_air,hint_noAir,hint_error,
 
-    scanContainer,parametrizerMemory,teslaCapacitor,teslaCoilCover,
+    scanContainer,parametrizerMemory,teslaCapacitor,teslaCoilCover,teslaComponent,
 
     Machine_TeslaCoil_LV_1A, Machine_TeslaCoil_MV_1A, Machine_TeslaCoil_HV_1A, Machine_TeslaCoil_EV_1A, Machine_TeslaCoil_IV_1A,
     Machine_TeslaCoil_LV_4A, Machine_TeslaCoil_MV_4A, Machine_TeslaCoil_HV_4A, Machine_TeslaCoil_EV_4A, Machine_TeslaCoil_IV_4A,
diff --git a/src/main/java/com/github/technus/tectech/thing/item/TeslaCoilComponent.java b/src/main/java/com/github/technus/tectech/thing/item/TeslaCoilComponent.java
new file mode 100644
index 0000000000..32b75ebce7
--- /dev/null
+++ b/src/main/java/com/github/technus/tectech/thing/item/TeslaCoilComponent.java
@@ -0,0 +1,72 @@
+package com.github.technus.tectech.thing.item;
+
+import com.github.technus.tectech.CommonValues;
+import cpw.mods.fml.common.registry.GameRegistry;
+import cpw.mods.fml.relauncher.Side;
+import cpw.mods.fml.relauncher.SideOnly;
+import gregtech.api.util.GT_LanguageManager;
+import net.minecraft.client.renderer.texture.IIconRegister;
+import net.minecraft.creativetab.CreativeTabs;
+import net.minecraft.entity.player.EntityPlayer;
+import net.minecraft.item.Item;
+import net.minecraft.item.ItemStack;
+import net.minecraft.util.EnumChatFormatting;
+import net.minecraft.util.IIcon;
+
+import java.util.List;
+
+import static com.github.technus.tectech.Reference.MODID;
+import static com.github.technus.tectech.thing.CustomItemList.teslaComponent;
+
+
+public final class TeslaCoilComponent extends Item {
+    public static TeslaCoilComponent INSTANCE;
+    private static IIcon ultItemIcon;
+
+    private TeslaCoilComponent() {
+        setHasSubtypes(true);
+        setUnlocalizedName("tm.itemTeslaComponent");
+        setTextureName(MODID + ":itemTeslaComponent");
+
+        GT_LanguageManager.addStringLocalization(getUnlocalizedName() + ".0.name", "Electrum Tesla Windings");
+        GT_LanguageManager.addStringLocalization(getUnlocalizedName() + ".1.name", "Superconductive Tesla Windings");
+    }
+
+    @Override
+    public void addInformation(ItemStack aStack, EntityPlayer ep, List aList, boolean boo) {
+        aList.add(CommonValues.BASS_MARK);
+        aList.add(EnumChatFormatting.BLUE + "Tesla bois need these!");
+    }
+
+    @Override
+    public String getUnlocalizedName(ItemStack aStack) {
+        return getUnlocalizedName() + "." + getDamage(aStack);
+    }
+
+    public static void run() {
+        INSTANCE = new TeslaCoilComponent();
+        GameRegistry.registerItem(INSTANCE, INSTANCE.getUnlocalizedName());
+        teslaComponent.set(INSTANCE);
+    }
+
+    @Override
+    @SideOnly(Side.CLIENT)
+    public void registerIcons(IIconRegister iconRegister) {
+        itemIcon = iconRegister.registerIcon(getIconString());
+        ultItemIcon = iconRegister.registerIcon(MODID + ":itemTeslaComponentUltimate");
+    }
+
+    @Override
+    public IIcon getIconFromDamage(int damage) {
+        if (damage == 1) {
+            return ultItemIcon;
+        }
+        return itemIcon;
+    }
+
+    @Override
+    public void getSubItems(Item aItem, CreativeTabs par2CreativeTabs, List aList) {
+        aList.add(new ItemStack(aItem, 1, 0));
+        aList.add(new ItemStack(aItem, 1, 1));
+    }
+}
diff --git a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_TM_teslaCoil.java b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_TM_teslaCoil.java
index 5a003f4eec..df8f44b133 100644
--- a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_TM_teslaCoil.java
+++ b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/multi/GT_MetaTileEntity_TM_teslaCoil.java
@@ -420,7 +420,7 @@ public class GT_MetaTileEntity_TM_teslaCoil extends GT_MetaTileEntity_Multiblock
 
     @Override
     public void construct(int stackSize, boolean hintsOnly) {
-        StructureBuilderExtreme(shape, blockType, blockMetas[(stackSize-1)%6], 3, 16, 0, getBaseMetaTileEntity(), this, hintsOnly);
+        StructureBuilderExtreme(shape, blockType, blockMetas[(stackSize - 1) % 6], 3, 16, 0, getBaseMetaTileEntity(), this, hintsOnly);
     }
 
     @Override
@@ -440,14 +440,14 @@ public class GT_MetaTileEntity_TM_teslaCoil extends GT_MetaTileEntity_Multiblock
 
     @Override
     public boolean checkRecipe_EM(ItemStack itemStack) {
-        if (!histHighSetting.getStatus(false).isOk||
-                !histLowSetting.getStatus(false).isOk||
-                !transferRadiusTowerSetting.getStatus(false).isOk||
-                !transferRadiusTransceiverSetting.getStatus(false).isOk||
-                !transferRadiusCoverUltimateSetting.getStatus(false).isOk||
-                !outputVoltageSetting.getStatus(false).isOk||
-                !outputCurrentSetting.getStatus(false).isOk||
-                !scanTimeMinSetting.getStatus(false).isOk||
+        if (!histHighSetting.getStatus(false).isOk ||
+                !histLowSetting.getStatus(false).isOk ||
+                !transferRadiusTowerSetting.getStatus(false).isOk ||
+                !transferRadiusTransceiverSetting.getStatus(false).isOk ||
+                !transferRadiusCoverUltimateSetting.getStatus(false).isOk ||
+                !outputVoltageSetting.getStatus(false).isOk ||
+                !outputCurrentSetting.getStatus(false).isOk ||
+                !scanTimeMinSetting.getStatus(false).isOk ||
                 !overDriveSetting.getStatus(false).isOk
         ) return false;
 
@@ -471,15 +471,15 @@ public class GT_MetaTileEntity_TM_teslaCoil extends GT_MetaTileEntity_Multiblock
         energyCapacity = 0;
         outputCurrentMax = 0;
 
-        if(vTier < 0){
+        if (vTier < 0) {
             //Returning true to allow for 'passive running'
             outputVoltageMax = 0;
             return true;
-        } else if (vTier > mTier && getEUVar() > 0){
+        } else if (vTier > mTier && getEUVar() > 0) {
             explodeMultiblock();
         }
 
-        outputVoltageMax = V[vTier+1];
+        outputVoltageMax = V[vTier + 1];
         for (GT_MetaTileEntity_Hatch_Capacitor cap : eCapacitorHatches) {
             if (!GT_MetaTileEntity_MultiBlockBase.isValidMetaTileEntity(cap)) {
                 continue;
@@ -487,7 +487,7 @@ public class GT_MetaTileEntity_TM_teslaCoil extends GT_MetaTileEntity_Multiblock
             cap.getBaseMetaTileEntity().setActive(true);
             capacitorData = cap.getCapacitors();
             if (capacitorData[0] < vTier) {
-                if(getEUVar() > 0 && capacitorData[0] != 0){
+                if (getEUVar() > 0 && capacitorData[0] != 0) {
                     cap.getBaseMetaTileEntity().setToFire();
                 }
                 eCapacitorHatches.remove(cap);
@@ -500,31 +500,14 @@ public class GT_MetaTileEntity_TM_teslaCoil extends GT_MetaTileEntity_Multiblock
     }
 
     private void scanForTransmissionTargets(int[] coordsMin, int[] coordsMax) {
-        int xMin = coordsMin[0];
-        int yMin = coordsMin[1];
-        int zMin = coordsMin[2];
-
-        int xMax = coordsMax[0];
-        int yMax = coordsMax[1];
-        int zMax = coordsMax[2];
-
-        if (xMin > xMax) {
-            int xMax2 = xMin;
-            xMin = xMax;
-            xMax = xMax2;
-        }
-
-        if (yMin > yMax) {
-            int yMax2 = yMin;
-            yMin = yMax;
-            yMax = yMax2;
-        }
-
-        if (zMin > zMax) {
-            int zMax2 = zMin;
-            zMin = zMax;
-            zMax = zMax2;
-        }
+        //This makes sure the minimums are actually smaller than the maximums
+        int xMin = coordsMin[0] < coordsMax[0] ? coordsMin[0] : coordsMax[0];
+        int yMin = coordsMin[1] < coordsMax[1] ? coordsMin[1] : coordsMax[1];
+        int zMin = coordsMin[2] < coordsMax[2] ? coordsMin[2] : coordsMax[2];
+        //And vice versa
+        int xMax = coordsMin[0] > coordsMax[0] ? coordsMin[0] : coordsMax[0];
+        int yMax = coordsMin[1] > coordsMax[1] ? coordsMin[1] : coordsMax[1];
+        int zMax = coordsMin[2] > coordsMax[2] ? coordsMin[2] : coordsMax[2];
 
         for (int xPos = xMin; xPos <= xMax; xPos++) {
             for (int yPos = yMin; yPos <= yMax; yPos++) {
@@ -547,13 +530,13 @@ public class GT_MetaTileEntity_TM_teslaCoil extends GT_MetaTileEntity_Multiblock
     }
 
     private void thaumLightning(IGregTechTileEntity mte, IGregTechTileEntity node) {
-        byte xR = (byte)(node.getXCoord() - posTop[0]);
-        byte yR = (byte)(node.getYCoord() - posTop[1]);
-        byte zR = (byte)(node.getZCoord() - posTop[2]);
+        byte xR = (byte) (node.getXCoord() - posTop[0]);
+        byte yR = (byte) (node.getYCoord() - posTop[1]);
+        byte zR = (byte) (node.getZCoord() - posTop[2]);
 
         int wID = mte.getWorld().provider.dimensionId;
 
-        sparkList.add(new Util.thaumSpark(posTop[0],posTop[1],posTop[2],xR,yR,zR,wID));
+        sparkList.add(new Util.thaumSpark(posTop[0], posTop[1], posTop[2], xR, yR, zR, wID));
     }
 
     @Override
@@ -605,23 +588,23 @@ public class GT_MetaTileEntity_TM_teslaCoil extends GT_MetaTileEntity_Multiblock
         switch (scanTime) {
             case 0:
                 scanTimeDisplay.updateStatus();
-                scanForTransmissionTargets(scanPosOffsets[0],scanPosOffsets[1]);
+                scanForTransmissionTargets(scanPosOffsets[0], scanPosOffsets[1]);
                 break;
             case 20:
                 scanTimeDisplay.updateStatus();
-                scanForTransmissionTargets(scanPosOffsets[2],scanPosOffsets[3]);
+                scanForTransmissionTargets(scanPosOffsets[2], scanPosOffsets[3]);
                 break;
             case 40:
                 scanTimeDisplay.updateStatus();
-                scanForTransmissionTargets(scanPosOffsets[4],scanPosOffsets[5]);
+                scanForTransmissionTargets(scanPosOffsets[4], scanPosOffsets[5]);
                 break;
             case 60:
                 scanTimeDisplay.updateStatus();
-                scanForTransmissionTargets(scanPosOffsets[6],scanPosOffsets[7]);
+                scanForTransmissionTargets(scanPosOffsets[6], scanPosOffsets[7]);
                 break;
             case 80:
                 scanTimeDisplay.updateStatus();
-                scanForTransmissionTargets(scanPosOffsets[8],scanPosOffsets[9]);
+                scanForTransmissionTargets(scanPosOffsets[8], scanPosOffsets[9]);
                 break;
             default:
                 if (scanTime == (int) scanTimeMinSetting.get() - 1) {
@@ -845,4 +828,4 @@ public class GT_MetaTileEntity_TM_teslaCoil extends GT_MetaTileEntity_Multiblock
         }
         return false;
     }
-}
+}
\ No newline at end of file
diff --git a/src/main/resources/assets/tectech/textures/items/itemTeslaComponent.png b/src/main/resources/assets/tectech/textures/items/itemTeslaComponent.png
new file mode 100644
index 0000000000..77441e2b21
--- /dev/null
+++ b/src/main/resources/assets/tectech/textures/items/itemTeslaComponent.png
diff --git a/src/main/resources/assets/tectech/textures/items/itemTeslaComponentUltimate.png b/src/main/resources/assets/tectech/textures/items/itemTeslaComponentUltimate.png
new file mode 100644
index 0000000000..8a19f7a142
--- /dev/null
+++ b/src/main/resources/assets/tectech/textures/items/itemTeslaComponentUltimate.png