Minor code clean up

3 files changed, 32 insertions, 57 deletions

diff --git a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/hatch/GT_MetaTileEntity_Hatch_Capacitor.java b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/hatch/GT_MetaTileEntity_Hatch_Capacitor.java
index 4c5ef0fd8a..f83a1b4269 100644
--- a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/hatch/GT_MetaTileEntity_Hatch_Capacitor.java
+++ b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/hatch/GT_MetaTileEntity_Hatch_Capacitor.java
@@ -18,7 +18,6 @@ import net.minecraft.client.renderer.texture.IIconRegister;
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.entity.player.InventoryPlayer;
 import net.minecraft.item.ItemStack;
-import net.minecraft.nbt.NBTTagCompound;
 import net.minecraft.util.EnumChatFormatting;
 
 import java.util.HashMap;
@@ -35,7 +34,6 @@ public class GT_MetaTileEntity_Hatch_Capacitor extends GT_MetaTileEntity_Hatch {
     private static Textures.BlockIcons.CustomIcon TM_H;
     private static Textures.BlockIcons.CustomIcon TM_H_ACTIVE;
     private static Map<String, GT_MetaTileEntity_Hatch_Capacitor.CapacitorComponent> componentBinds = new HashMap<>();
-    public float energyStoredFrac = 0;
 
     public GT_MetaTileEntity_Hatch_Capacitor(int aID, String aName, String aNameRegional, int aTier, String descr) {
         super(aID, aName, aNameRegional, aTier, 16, descr);
@@ -47,18 +45,6 @@ public class GT_MetaTileEntity_Hatch_Capacitor extends GT_MetaTileEntity_Hatch {
     }
 
     @Override
-    public void saveNBTData(NBTTagCompound aNBT) {
-        super.saveNBTData(aNBT);
-        aNBT.setFloat("energyStoredFrac", energyStoredFrac);
-    }
-
-    @Override
-    public void loadNBTData(NBTTagCompound aNBT) {
-        super.loadNBTData(aNBT);
-        energyStoredFrac = aNBT.getFloat("energyStoredFrac");
-    }
-
-    @Override
     public int getInventoryStackLimit() {
         return 1;
     }
@@ -137,7 +123,7 @@ public class GT_MetaTileEntity_Hatch_Capacitor extends GT_MetaTileEntity_Hatch {
 
     @Override
     public int getSizeInventory() {
-        return energyStoredFrac > 0.2 || getBaseMetaTileEntity().isActive() ? 0 : mInventory.length;
+        return getBaseMetaTileEntity().isActive() ? 0 : mInventory.length;
     }
 
     @Override
diff --git a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/hatch/gui/GT_Container_Capacitor.java b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/hatch/gui/GT_Container_Capacitor.java
index 0b27dc4f04..cd29379afc 100644
--- a/src/main/java/com/github/technus/tectech/thing/metaTileEntity/hatch/gui/GT_Container_Capacitor.java
+++ b/src/main/java/com/github/technus/tectech/thing/metaTileEntity/hatch/gui/GT_Container_Capacitor.java
@@ -1,19 +1,13 @@
 package com.github.technus.tectech.thing.metaTileEntity.hatch.gui;
 
-import com.github.technus.tectech.thing.metaTileEntity.hatch.GT_MetaTileEntity_Hatch_Capacitor;
-import cpw.mods.fml.relauncher.Side;
-import cpw.mods.fml.relauncher.SideOnly;
 import gregtech.api.gui.GT_ContainerMetaTile_Machine;
 import gregtech.api.interfaces.tileentity.IGregTechTileEntity;
 import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.entity.player.InventoryPlayer;
-import net.minecraft.inventory.ICrafting;
 import net.minecraft.inventory.Slot;
 import net.minecraft.item.ItemStack;
 
 public class GT_Container_Capacitor extends GT_ContainerMetaTile_Machine {
-    public boolean charged = false;
-
     public GT_Container_Capacitor(InventoryPlayer aInventoryPlayer, IGregTechTileEntity aTileEntity) {
         super(aInventoryPlayer, aTileEntity);
     }
@@ -50,12 +44,11 @@ public class GT_Container_Capacitor extends GT_ContainerMetaTile_Machine {
         if (mTileEntity.isClientSide() || mTileEntity.getMetaTileEntity() == null) {
             return;
         }
-        charged = ((GT_MetaTileEntity_Hatch_Capacitor) mTileEntity.getMetaTileEntity()).energyStoredFrac > 0;
     }
 
     @Override
     public ItemStack slotClick(int aSlotIndex, int aMouseclick, int aShifthold, EntityPlayer aPlayer) {
-        if (charged || mActive != 0) {
+        if (mActive != 0) {
             return null;
         }
         return super.slotClick(aSlotIndex, aMouseclick, aShifthold, aPlayer);
@@ -63,7 +56,7 @@ public class GT_Container_Capacitor extends GT_ContainerMetaTile_Machine {
 
     @Override
     public ItemStack transferStackInSlot(EntityPlayer aPlayer, int aSlotIndex) {
-        if (charged || mActive != 0) {
+        if (mActive != 0) {
             return null;
         }
         return super.transferStackInSlot(aPlayer, aSlotIndex);
@@ -71,7 +64,7 @@ public class GT_Container_Capacitor extends GT_ContainerMetaTile_Machine {
 
     @Override
     public boolean canDragIntoSlot(Slot par1Slot) {
-        if (charged || mActive != 0) {
+        if (mActive != 0) {
             return false;
         }
         return super.canDragIntoSlot(par1Slot);
@@ -79,7 +72,7 @@ public class GT_Container_Capacitor extends GT_ContainerMetaTile_Machine {
 
     @Override
     public void putStacksInSlots(ItemStack[] par1ArrayOfItemStack) {
-        if (charged || mActive != 0) {
+        if (mActive != 0) {
             return;
         }
         super.putStacksInSlots(par1ArrayOfItemStack);
@@ -87,7 +80,7 @@ public class GT_Container_Capacitor extends GT_ContainerMetaTile_Machine {
 
     @Override
     protected boolean mergeItemStack(ItemStack aStack, int aStartIndex, int aSlotCount, boolean par4) {
-        if (charged || mActive != 0) {
+        if (mActive != 0) {
             return false;
         }
         return super.mergeItemStack(aStack, aStartIndex, aSlotCount, par4);
@@ -95,7 +88,7 @@ public class GT_Container_Capacitor extends GT_ContainerMetaTile_Machine {
 
     @Override
     public void putStackInSlot(int par1, ItemStack par2ItemStack) {
-        if (charged || mActive != 0) {
+        if (mActive != 0) {
             return;
         }
         super.putStackInSlot(par1, par2ItemStack);
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 08f2d52b75..384d71fb1b 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
@@ -43,37 +43,36 @@ public class GT_MetaTileEntity_TM_teslaCoil extends GT_MetaTileEntity_Multiblock
     private static Textures.BlockIcons.CustomIcon ScreenOFF;
     private static Textures.BlockIcons.CustomIcon ScreenON;
 
-    private int mTier = 0;
-    private int orientation = 0;
-    private int maxTier = 6;
-    private int minTier = 1;
-
-    private int scanTime = 0; //Sets scan time to Z E R O :epic:
+    private int mTier = 0; //Determines max voltage and efficiency (MV to LuV)
+    private int orientation = 0; //Direction of multi for structure check
+    private int maxTier = 6; //Max tier for efficiency calcuation
+    private int minTier = 1; //Min tier for efficiency calcuation
 
     private Map<IGregTechTileEntity, Integer> eTeslaMap = new HashMap<>(); //Tesla Map to map them tesla bois!
     private final ArrayList<GT_MetaTileEntity_Hatch_Capacitor> eCaps = new ArrayList<>(); //Capacitor List
 
-    private int scanRadius = 32; //Tesla scan radius
 
+    private int scanTime = 0; //Scan timer used for tesla search intervals
+    private int scanRadius = 32; //Tesla scan radius
     private int transferRadiusTower; //Radius for tower to tower transfers
     private int transferRadiusTransceiver; //Radius for tower to transceiver transfers
     private int transferRadiusCoverUltimate; //Radius for tower to ultimate cover transfers
 
-    private long outputVoltageMax = 0; //Tesla Voltage Output
-    private long outputCurrentMax = 0; //Tesla Current Output
-    private long outputVoltage = 0; //Tesla Voltage Output
-    private long outputCurrent = 0; //Tesla Current Output
-    private long energyCapacity = 0; //Total energy the tower can store
-
-    public int vTier = -1;
+    private long energyCapacity = 0; //Total energy storage limited by capacitors
+    private long outputVoltageMax = 0; //Tesla voltage output limited by capacitors
+    public int vTier = -1; //Tesla voltage tier limited by capacitors
+    private long outputCurrentMax = 0; //Tesla current output limited by capacitors
+    private long outputVoltage = 0; //Tesla voltage output limited by settings
+    private long outputCurrent = 0; //Tesla current output limited by settings
 
-    private long lossPerBlock = 1; //EU lost per block traveled
-    private float energyEfficiencyMax = 0.95F; //Max efficiency
-    private float energyEfficiencyMin = 0.75F; //Min efficiency
+    private long lossPerBlock = 1; //Distance loss of each packet sent
+    private float energyEfficiencyMax = 0.95F; //Max efficiency of each packet sent at highest mTier
+    private float energyEfficiencyMin = 0.75F; //Min efficiency of each packet sent at lowest mTier
     private boolean overDriveToggle(){return (overDriveSetting.get() > 0);}
-    private float overdriveEfficiency = 0.95F; //Overdrive efficiency
-    private long outputVoltageInjectable = 0; //How much EU will be received post distance losses
-    private long outputVoltageConsumption = 0; //How much EU will be drained
+    private float overdriveEfficiency = 0.95F; //Overdrive efficiency added losses
+    private long outputVoltageConsumption = 0; //Packet size consumed including efficiency losses
+    private long outputVoltageInjectable = 0; //Packet size injected into target post losses
+
 
     private long getEnergyEfficiency(long voltage, int mTier){
         if (overDriveToggle()){
@@ -81,7 +80,7 @@ public class GT_MetaTileEntity_TM_teslaCoil extends GT_MetaTileEntity_Multiblock
         } else {
             return (long)(voltage * energyEfficiencyMin + (energyEfficiencyMax - energyEfficiencyMin) / (maxTier - minTier + 1) * mTier); //Efficiency Formula
         }
-    }
+    }//Efficiency function used on power transfers
 
     //region structure
     private static final String[][] shape0 = new String[][]{//3 16 0
@@ -138,7 +137,7 @@ public class GT_MetaTileEntity_TM_teslaCoil extends GT_MetaTileEntity_Multiblock
             EnumChatFormatting.AQUA + "Hint Details:",
             "1 - Classic Hatches or Steel Pipe Casing",
             "2 - Titanium Frames",
-    };
+    };//TODO Update casings + hatches
     //endregion
 
     //region parameters
@@ -375,6 +374,10 @@ public class GT_MetaTileEntity_TM_teslaCoil extends GT_MetaTileEntity_Multiblock
         for (GT_MetaTileEntity_Hatch_Capacitor cap : eCaps) {
             cap.getBaseMetaTileEntity().setActive(false);
         }
+
+        setEUVar(0);
+        energyStoredDisplay.set(0);
+        energyFractionDisplay.set(0);
     }
 
     @Override
@@ -570,13 +573,6 @@ public class GT_MetaTileEntity_TM_teslaCoil extends GT_MetaTileEntity_Multiblock
         energyStoredDisplay.set(energyStored);
         energyFractionDisplay.set(energyFrac);
 
-        for (GT_MetaTileEntity_Hatch_Capacitor cap : eCaps) {
-            if (!GT_MetaTileEntity_MultiBlockBase.isValidMetaTileEntity(cap)) {
-                continue;
-            }
-            cap.energyStoredFrac = energyFrac;
-        }
-
         //ePowerPass hist toggle
         if (!ePowerPass && energyFrac > histHighSetting.get()) {
             ePowerPass = true;