Tesla Cover Work

Lord forgive me for this is fucked

8 files changed, 107 insertions, 19 deletions

diff --git a/src/main/java/com/github/technus/tectech/loader/MainLoader.java b/src/main/java/com/github/technus/tectech/loader/MainLoader.java
index de53fb225f..3c9eeac800 100644
--- a/src/main/java/com/github/technus/tectech/loader/MainLoader.java
+++ b/src/main/java/com/github/technus/tectech/loader/MainLoader.java
@@ -12,6 +12,7 @@ import com.github.technus.tectech.loader.gui.ModGuiHandler;
 import com.github.technus.tectech.loader.mechanics.ElementalLoader;
 import com.github.technus.tectech.loader.recipe.RecipeLoader;
 import com.github.technus.tectech.loader.thing.ComponentLoader;
+import com.github.technus.tectech.loader.thing.CoverLoader;
 import com.github.technus.tectech.loader.thing.MachineLoader;
 import com.github.technus.tectech.loader.thing.ThingsLoader;
 import com.github.technus.tectech.thing.casing.TT_Container_Casings;
@@ -74,7 +75,7 @@ public final class MainLoader {
     }
 
     public static void load() {
-        ProgressManager.ProgressBar progressBarLoad = ProgressManager.push("TecTech Loader", 8);
+        ProgressManager.ProgressBar progressBarLoad = ProgressManager.push("TecTech Loader", 9);
 
         progressBarLoad.step("Elemental Things");
         new ElementalLoader().run();
@@ -96,6 +97,10 @@ public final class MainLoader {
         new MachineLoader().run();
         LOGGER.info("Machine Init Done");
 
+        progressBarLoad.step("Cover Things");
+        new CoverLoader().run();
+        LOGGER.info("Cover Init Done");
+
         progressBarLoad.step("Register entities");
         new EntityLoader().run();
         LOGGER.info("Entities registered");
diff --git a/src/main/java/com/github/technus/tectech/loader/thing/CoverLoader.java b/src/main/java/com/github/technus/tectech/loader/thing/CoverLoader.java
new file mode 100644
index 0000000000..198fd4ac01
--- /dev/null
+++ b/src/main/java/com/github/technus/tectech/loader/thing/CoverLoader.java
@@ -0,0 +1,19 @@
+package com.github.technus.tectech.loader.thing;
+
+import com.github.technus.tectech.TecTech;
+
+import com.github.technus.tectech.thing.cover.GT_Cover_TM_TeslaCoil;
+import gregtech.api.GregTech_API;
+import gregtech.api.enums.Textures;
+import gregtech.api.objects.GT_RenderedTexture;
+import gregtech.api.util.GT_ModHandler;
+
+public class CoverLoader implements Runnable {
+    @Override
+    public void run() {
+        //TODO Create a techTechModItem method, but for now I need it to actually USE the tesla cover item
+        //GregTech_API.registerCover(GT_ModHandler.getModItem("tectech", "tm.teslaCoilCover", 1L), new GT_RenderedTexture(Textures.BlockIcons.VENT_ADVANCED), new GT_Cover_TM_TeslaCoil());
+        GregTech_API.registerCover(GT_ModHandler.getIC2Item("reactorReflector", 1L, 1), new GT_RenderedTexture(Textures.BlockIcons.VENT_ADVANCED), new GT_Cover_TM_TeslaCoil());
+        TecTech.LOGGER.info("Cover functionality registered");
+    }
+}
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 b422688a70..e9967a3e62 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
@@ -53,6 +53,9 @@ public class ThingsLoader implements Runnable {
         ReactorSimBlock.run();
         TecTech.LOGGER.info("Reactor Simulator registered");
 
+        TeslaCoilCover.run();
+        TecTech.LOGGER.info("Covers Items registered");
+
         ConstructableTriggerItem.run();
         FrontRotationTriggerItem.run();
         ParametrizerMemoryCard.run();
diff --git a/src/main/java/com/github/technus/tectech/thing/cover/GT_Cover_TM_TeslaCoil.java b/src/main/java/com/github/technus/tectech/thing/cover/GT_Cover_TM_TeslaCoil.java
new file mode 100644
index 0000000000..a9349dd2ee
--- /dev/null
+++ b/src/main/java/com/github/technus/tectech/thing/cover/GT_Cover_TM_TeslaCoil.java
@@ -0,0 +1,17 @@
+package com.github.technus.tectech.thing.cover;
+
+import gregtech.api.interfaces.tileentity.ICoverable;
+import gregtech.api.util.GT_CoverBehavior;
+
+public class GT_Cover_TM_TeslaCoil extends GT_CoverBehavior {
+    public GT_Cover_TM_TeslaCoil() {
+    }
+
+    public boolean teslaCompatibiliy(byte aSide, int aCoverID, int aCoverVariable, ICoverable aTileEntity) {
+        if (aSide != 1) {
+            return false;
+        } else {
+            return true;
+        }
+    }
+}
\ No newline at end of file
diff --git a/src/main/java/com/github/technus/tectech/thing/item/TeslaCoilCover.java b/src/main/java/com/github/technus/tectech/thing/item/TeslaCoilCover.java
new file mode 100644
index 0000000000..abf1bd90a0
--- /dev/null
+++ b/src/main/java/com/github/technus/tectech/thing/item/TeslaCoilCover.java
@@ -0,0 +1,51 @@
+package com.github.technus.tectech.thing.item;
+
+import com.github.technus.tectech.CommonValues;
+import com.github.technus.tectech.Util;
+import com.github.technus.tectech.thing.metaTileEntity.hatch.GT_MetaTileEntity_Hatch_Param;
+import com.github.technus.tectech.thing.metaTileEntity.multi.base.GT_MetaTileEntity_MultiblockBase_EM;
+import cpw.mods.fml.common.registry.GameRegistry;
+import cpw.mods.fml.relauncher.Side;
+import cpw.mods.fml.relauncher.SideOnly;
+import gregtech.api.interfaces.metatileentity.IMetaTileEntity;
+import gregtech.api.interfaces.tileentity.IGregTechTileEntity;
+import net.minecraft.client.renderer.texture.IIconRegister;
+import net.minecraft.creativetab.CreativeTabs;
+import net.minecraft.entity.player.EntityPlayer;
+import net.minecraft.entity.player.EntityPlayerMP;
+import net.minecraft.item.Item;
+import net.minecraft.item.ItemStack;
+import net.minecraft.nbt.NBTTagCompound;
+import net.minecraft.tileentity.TileEntity;
+import net.minecraft.util.EnumChatFormatting;
+import net.minecraft.util.IIcon;
+import net.minecraft.world.World;
+
+import java.util.List;
+
+import static com.github.technus.tectech.Reference.MODID;
+import static com.github.technus.tectech.thing.CustomItemList.parametrizerMemory;
+
+
+public final class TeslaCoilCover extends Item {
+    public static TeslaCoilCover INSTANCE;
+
+    public TeslaCoilCover() {
+        setUnlocalizedName("tm.teslaCoilCover");
+        setTextureName(MODID + ":itemParametrizerMemoryCardUnlocked");
+    }
+
+    @Override
+    public void addInformation(ItemStack aStack, EntityPlayer ep, List aList, boolean boo) {
+        aList.add(CommonValues.BASS_MARK);
+        aList.add("Tesla-Enables Machines!");
+        aList.add(EnumChatFormatting.BLUE + "Use on a machine to apply Tesla capabilities");
+        aList.add(EnumChatFormatting.BLUE + "Who the hell need cables anyway?");
+    }
+
+    public static void run() {
+        INSTANCE = new TeslaCoilCover();
+        System.out.print(INSTANCE.getUnlocalizedName());
+        GameRegistry.registerItem(INSTANCE, INSTANCE.getUnlocalizedName());
+    }
+}
diff --git a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/single/GT_MetaTileEntity_TeslaCoil.java b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/single/GT_MetaTileEntity_TeslaCoil.java
index d8dd6efadb..2feca75c7c 100644
--- a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/single/GT_MetaTileEntity_TeslaCoil.java
+++ b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/single/GT_MetaTileEntity_TeslaCoil.java
@@ -116,7 +116,7 @@ public class GT_MetaTileEntity_TeslaCoil extends GT_MetaTileEntity_BasicBatteryB
             long energyStored = getStoredEnergy()[0];

 

             float energyFrac = (float)energyStored/energyMax;

-            System.err.println(energyFrac);

+            //System.err.println(energyFrac); Debug energy fraction display

 

             //ePowerPass hist toggle

             if (!powerPassToggle && energyFrac > histHigh) {

@@ -147,7 +147,7 @@ public class GT_MetaTileEntity_TeslaCoil extends GT_MetaTileEntity_BasicBatteryB
                             IMetaTileEntity nodeInside = node.getMetaTileEntity();

                             if (nodeInside instanceof GT_MetaTileEntity_TM_teslaCoil && node.isActive()){

                                 eTeslaTowerList.add((GT_MetaTileEntity_TM_teslaCoil) nodeInside);

-                                int distance = (int)round(Math.abs(Math.sqrt(xPosOffset^2 + yPosOffset^2 + zPosOffset^2)));

+                                int distance = (int)Math.ceil(Math.sqrt(xPosOffset*xPosOffset + yPosOffset*yPosOffset + zPosOffset*zPosOffset));

                                 eTeslaTowerMap.put(node,distance);

                             }

                         }

@@ -156,20 +156,9 @@ public class GT_MetaTileEntity_TeslaCoil extends GT_MetaTileEntity_BasicBatteryB
             }

 

             for (Map.Entry<IGregTechTileEntity, Integer> Rx : entriesSortedByValues(eTeslaTowerMap)) {

-                System.out.println("yote @ : " + Rx.getValue());

+                System.out.println("yote @: " + Rx.getValue());

             }

 

-            for (IGregTechTileEntity RxRee : eTeslaTowerMap.keySet()) {

-                GT_MetaTileEntity_TM_teslaCoil Rx = (GT_MetaTileEntity_TM_teslaCoil) RxRee.getMetaTileEntity();

-                if (!Rx.powerPassToggle) {

-                    long euTran = outputVoltage;

-                    if (Rx.getEUVar() + euTran <= (Rx.maxEUStore() / 2)) {

-                        setEUVar(getEUVar() - euTran);

-                        Rx.getBaseMetaTileEntity().increaseStoredEnergyUnits(euTran, true);

-                        System.err.println("Energy Sent!");

-                    }

-                }

-            }

             //Stuff to do if ePowerPass

             if (powerPassToggle) {

                 outputVoltage = 512;//TODO Set Depending On Tier

@@ -188,14 +177,14 @@ public class GT_MetaTileEntity_TeslaCoil extends GT_MetaTileEntity_BasicBatteryB
                     }

                 }

 

-                //Try to send EU to big teslas

-                for (GT_MetaTileEntity_TM_teslaCoil Rx : eTeslaTowerList) {

+                for (IGregTechTileEntity RxRee : eTeslaTowerMap.keySet()) {

+                    GT_MetaTileEntity_TM_teslaCoil Rx = (GT_MetaTileEntity_TM_teslaCoil) RxRee.getMetaTileEntity();

                     if (!Rx.powerPassToggle) {

                         long euTran = outputVoltage;

-                        if (Rx.getEUVar() + euTran <= (Rx.maxEUStore()/2)) {

+                        if (Rx.getEUVar() + euTran <= (Rx.maxEUStore() / 2)) {

                             setEUVar(getEUVar() - euTran);

                             Rx.getBaseMetaTileEntity().increaseStoredEnergyUnits(euTran, true);

-                            System.err.println("Energy Sent!");

+                            //System.err.println("Energy Sent!"); Debug energy sent message

                         }

                     }

                 }

diff --git a/src/main/resources/assets/tectech/lang/en_US.lang b/src/main/resources/assets/tectech/lang/en_US.lang
index ccb17a8a0c..2c748a18d7 100644
--- a/src/main/resources/assets/tectech/lang/en_US.lang
+++ b/src/main/resources/assets/tectech/lang/en_US.lang
@@ -9,6 +9,8 @@ item.em.frontRotate.name=Front Rotation Scrench
 item.em.parametrizerMemoryCard.name=Parametrizer Memory Card
 item.em.EuMeterGT.name=GT EU meter
 
+item.tm.teslaCoilCover.name=Tesla Coil Cover
+
 death.attack.microwaving=%1$s was dehydrated by radiation.
 death.attack.microwaving.player=%1$s was dehydrated by radiation while fighting %2$s.
 
diff --git a/src/main/resources/assets/tectech/lang/zh_CN.lang b/src/main/resources/assets/tectech/lang/zh_CN.lang
index 5359f04e9b..47912d245d 100644
--- a/src/main/resources/assets/tectech/lang/zh_CN.lang
+++ b/src/main/resources/assets/tectech/lang/zh_CN.lang
@@ -6,6 +6,8 @@ item.em.definitionContainer.name=EM配方指引
 item.em.debugBuilder.name=多方块机器蓝图
 item.em.parametrizerMemoryCard.name=参量机记忆卡
 
+item.tm.teslaCoilCover.name=Tesla Coil Cover
+
 death.attack.microwaving=%1$s 被辐射脱水
 death.attack.microwaving.player=%1$s 在与 %2$s 战斗中被辐射脱水