Things cleanup

12 files changed, 38 insertions, 63 deletions

diff --git a/src/main/java/gregtech/api/enums/Tier.java b/src/main/java/gregtech/api/enums/Tier.java
index 20591505d9..007ee10d34 100644
--- a/src/main/java/gregtech/api/enums/Tier.java
+++ b/src/main/java/gregtech/api/enums/Tier.java
@@ -23,7 +23,6 @@ public class Tier {
             new Tier(SubTag.ENERGY_ELECTRICITY,14, 1073741824, 1, 1, 1, Materials.Neutronium, ItemList.Hull_MAX, OrePrefixes.wireGt01.get(Materials.Superconductor), OrePrefixes.wireGt04.get(Materials.Superconductor), OrePrefixes.circuit.get(Materials.Ultimate), OrePrefixes.circuit.get(Materials.Ultimate)),
             new Tier(SubTag.ENERGY_ELECTRICITY,15, Integer.MAX_VALUE-7, 1, 1, 1, Materials.Neutronium, ItemList.Hull_MAX, OrePrefixes.wireGt01.get(Materials.Superconductor), OrePrefixes.wireGt04.get(Materials.Superconductor), OrePrefixes.circuit.get(Materials.Ultimate), OrePrefixes.circuit.get(Materials.Ultimate)),
             //READ GT_VALUES CLASS BEFORE YOU START ADDING STUFF TO TIERS 8+ - and probably dont do it in GT but in GTNH core mod - that way we shouldnt need to set the tier class
-            //TODO:test if that above actually works as intended (tier class should be ignored) when adding stuff with coremod
     }, ROTATIONAL = new Tier[]{
             new Tier(SubTag.ENERGY_ROTATIONAL, 1, 32, 1, 1, 1, Materials.Wood, OrePrefixes.frameGt.get(Materials.Wood), OrePrefixes.stick.get(Materials.Wood), OrePrefixes.ingot.get(Materials.Wood), OrePrefixes.gearGt.get(Materials.Wood), OrePrefixes.gearGt.get(Materials.Stone)),
             new Tier(SubTag.ENERGY_ROTATIONAL, 1, 32, 1, 2, 2, Materials.WoodSealed, OrePrefixes.frameGt.get(Materials.WoodSealed), OrePrefixes.stick.get(Materials.WoodSealed), OrePrefixes.ingot.get(Materials.WoodSealed), OrePrefixes.gearGt.get(Materials.WoodSealed), OrePrefixes.gearGt.get(Materials.Stone)),
diff --git a/src/main/java/gregtech/api/metatileentity/MetaTileEntity.java b/src/main/java/gregtech/api/metatileentity/MetaTileEntity.java
index 4a3941a2f9..511967d932 100644
--- a/src/main/java/gregtech/api/metatileentity/MetaTileEntity.java
+++ b/src/main/java/gregtech/api/metatileentity/MetaTileEntity.java
@@ -86,10 +86,10 @@ public abstract class MetaTileEntity implements IMetaTileEntity {
         GT_LanguageManager.addStringLocalization("gt.blockmachines." + mName + ".name", aRegionalName);
         mInventory = new ItemStack[aInvSlotCount];
 
-        if (GT.isClientSide()) {//todo this was commented? do we need it?
-            ItemStack tStack = new ItemStack(GregTech_API.sBlockMachines, 1, aID);
-            tStack.getItem().addInformation(tStack, null, new ArrayList<String>(), true);
-        }
+        //if (GT.isClientSide()) {//todo this was commented? do we need it?
+        //    ItemStack tStack = new ItemStack(GregTech_API.sBlockMachines, 1, aID);
+        //    tStack.getItem().addInformation(tStack, null, new ArrayList<String>(), true);
+        //}
     }
 
     /**
diff --git a/src/main/java/gregtech/api/util/GT_Utility.java b/src/main/java/gregtech/api/util/GT_Utility.java
index 622db42d40..a29f520ac2 100644
--- a/src/main/java/gregtech/api/util/GT_Utility.java
+++ b/src/main/java/gregtech/api/util/GT_Utility.java
@@ -1579,8 +1579,7 @@ public class GT_Utility {
         entity.fallDistance = 0;
         return true;
     }
-	
-	//TODO check if unused?
+
     public static int getScaleCoordinates(double aValue, int aScale) {
     	return (int)Math.floor(aValue / aScale);
     }
@@ -1631,7 +1630,7 @@ public class GT_Utility {
                 if (tTileEntity instanceof ic2.api.reactor.IReactor) {
                     rEUAmount += 500;
                     tList.add(trans("168","Heat: ") +EnumChatFormatting.GREEN+ ((ic2.api.reactor.IReactor) tTileEntity).getHeat() +EnumChatFormatting.RESET+ " / " +EnumChatFormatting.YELLOW+ ((ic2.api.reactor.IReactor) tTileEntity).getMaxHeat()+EnumChatFormatting.RESET);
-                    tList.add(trans("169","  HEM: ") +EnumChatFormatting.YELLOW+((ic2.api.reactor.IReactor) tTileEntity).getHeatEffectModifier() +EnumChatFormatting.RESET/*+ trans("170"," Base EU Output: ")/* + ((ic2.api.reactor.IReactor)tTileEntity).getOutput()*/);//TODO WHAT?
+                    tList.add(trans("169","  HEM: ") +EnumChatFormatting.YELLOW+((ic2.api.reactor.IReactor) tTileEntity).getHeatEffectModifier() +EnumChatFormatting.RESET/*+ trans("170"," Base EU Output: ")/* + ((ic2.api.reactor.IReactor)tTileEntity).getOutput()*/);
                 }
             } catch (Throwable e) {
                 if (D1) e.printStackTrace(GT_Log.err);
@@ -1774,7 +1773,7 @@ public class GT_Utility {
             }
         }
         
-        if (aPlayer.capabilities.isCreativeMode && GT_Values.D1) {
+        if (aPlayer.capabilities.isCreativeMode) {
             FluidStack tFluid = undergroundOil(aWorld.getChunkFromBlockCoords(aX,aZ),-1);//-# to only read
             if (tFluid!=null)
             	tList.add(EnumChatFormatting.GOLD+tFluid.getLocalizedName()+EnumChatFormatting.RESET+": " +EnumChatFormatting.YELLOW+ tFluid.amount +EnumChatFormatting.RESET+" L");
@@ -2036,7 +2035,7 @@ public class GT_Utility {
             NBTTagCompound tNBT = getNBT(aStack);
             String tData = aX + "," + aY + "," + aZ + "," + aDim + ",";
             if (aFluid!=null)
-            	tData += (aFluid.amount /*/ 5000*/) + "," + aFluid.getLocalizedName() + ",";//TODO CHECK IF THAT /5000 is needed
+            	tData += (aFluid.amount) + "," + aFluid.getLocalizedName() + ",";//TODO CHECK IF THAT /5000 is needed
             for (String tString : aOres) {
                 tData += tString + ",";
             }
diff --git a/src/main/java/gregtech/common/blocks/GT_Block_Machines.java b/src/main/java/gregtech/common/blocks/GT_Block_Machines.java
index 510970453c..3ada783b1e 100644
--- a/src/main/java/gregtech/common/blocks/GT_Block_Machines.java
+++ b/src/main/java/gregtech/common/blocks/GT_Block_Machines.java
@@ -212,8 +212,7 @@ public class GT_Block_Machines
         TileEntity tTileEntity = blockAccess.getTileEntity(aX, aY, aZ);

         if (((tTileEntity instanceof IGregTechTileEntity)) && (((IGregTechTileEntity) tTileEntity).getMetaTileEntity() != null)) {

             AxisAlignedBB bbb=((IGregTechTileEntity)tTileEntity).getCollisionBoundingBoxFromPool(((IGregTechTileEntity)tTileEntity).getWorld(), 0, 0, 0);

-            //setBlockBounds((float) bbb.minX, (float) bbb.minY, (float) bbb.minZ, (float) bbb.maxX, (float) bbb.maxY, (float) bbb.maxZ);//TODO what is this???

-			minX=bbb.minX;

+			minX=bbb.minX;//This essentially sets block bounds

             minY=bbb.minY;

             minZ=bbb.minZ;

             maxX=bbb.maxX;

@@ -224,7 +223,7 @@ public class GT_Block_Machines
         super.setBlockBoundsBasedOnState(blockAccess,aX,aY,aZ);

     }

 

-    @Override//TODO check?

+    @Override

     public void setBlockBoundsForItemRender() {

         super.setBlockBounds(0,0,0,1,1,1);

     }

diff --git a/src/main/java/gregtech/common/tileentities/machines/basic/GT_MetaTileEntity_AdvSeismicProspector.java b/src/main/java/gregtech/common/tileentities/machines/basic/GT_MetaTileEntity_AdvSeismicProspector.java
index 3a549ee46c..b0f36ae7e5 100644
--- a/src/main/java/gregtech/common/tileentities/machines/basic/GT_MetaTileEntity_AdvSeismicProspector.java
+++ b/src/main/java/gregtech/common/tileentities/machines/basic/GT_MetaTileEntity_AdvSeismicProspector.java
@@ -188,16 +188,12 @@ public class GT_MetaTileEntity_AdvSeismicProspector extends GT_MetaTileEntity_Ba
             } 
     }
 
-    private void prospectHole(
-            int i, int k, Map<String, Integer> aOres) {
-
-        String tFoundOre = null;
+    private void prospectHole(int i, int k, Map<String, Integer> aOres) {
+        String tFoundOre;
         for (int j = this.getBaseMetaTileEntity().getYCoord(); j > 0; j--) {
             tFoundOre = checkForOre(i, j, k);                            
-            if (tFoundOre == null)
-                continue;
-
-            countOre(aOres, tFoundOre);
+            if (tFoundOre != null)
+                countOre(aOres, tFoundOre);
         }
     }
 
diff --git a/src/main/java/gregtech/common/tileentities/machines/basic/GT_MetaTileEntity_MicrowaveEnergyTransmitter.java b/src/main/java/gregtech/common/tileentities/machines/basic/GT_MetaTileEntity_MicrowaveEnergyTransmitter.java
index ec3228f209..60d4a1f3bd 100644
--- a/src/main/java/gregtech/common/tileentities/machines/basic/GT_MetaTileEntity_MicrowaveEnergyTransmitter.java
+++ b/src/main/java/gregtech/common/tileentities/machines/basic/GT_MetaTileEntity_MicrowaveEnergyTransmitter.java
@@ -8,6 +8,9 @@ import gregtech.api.interfaces.ITexture;
 import gregtech.api.interfaces.metatileentity.IMetaTileEntity;
 import gregtech.api.interfaces.tileentity.IEnergyConnected;
 import gregtech.api.interfaces.tileentity.IGregTechTileEntity;
+import gregtech.api.metatileentity.BaseMetaTileEntity;
+import gregtech.api.metatileentity.BaseTileEntity;
+import gregtech.api.metatileentity.MetaTileEntity;
 import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_BasicTank;
 import gregtech.api.objects.GT_RenderedTexture;
 import gregtech.api.util.GT_Config;
@@ -191,18 +194,25 @@ public class GT_MetaTileEntity_MicrowaveEnergyTransmitter extends GT_MetaTileEnt
                         }
                     }
                     int tDistance = distanceCalculation();
-                    if (tTile != null && tTile instanceof IEnergyConnected) {
-                        int tLoss = 1;
-                        if (mMaxLossDistance != 0) {
-                            tLoss = GT_Utility.safeInt(10L + (tDistance * Math.max(mMaxLoss - 10L,0) / mMaxLossDistance));
-                        }
-                        if(getBaseMetaTileEntity().isUniversalEnergyStored(V[mTier] + ((V[mTier] * tLoss) / 100))){
-                            //TODO:check tier before sending to disable remote detonation
-                            //if(((IEnergyConnected) tTile).)
-                                if (((IEnergyConnected) tTile).injectEnergyUnits((byte) 6, V[mTier], 1) > 0) {
-                                    getBaseMetaTileEntity().decreaseStoredEnergyUnits(V[mTier] + ((V[mTier] * tLoss) / 100), false);
+                    if(tTile!=null) {
+                        if (tTile instanceof IEnergyConnected) {
+                            long packetSize=V[mTier];
+                            if(tTile instanceof IGregTechTileEntity){
+                                IMetaTileEntity mte=((IGregTechTileEntity) tTile).getMetaTileEntity();
+                                if(mte instanceof BaseMetaTileEntity) {
+                                    packetSize=((BaseMetaTileEntity) mte).getMaxSafeInput();
                                 }
-                            //}
+                            }
+                            long energyUse = 1;
+                            if (mMaxLossDistance != 0) {
+                                energyUse = GT_Utility.safeInt(10L + (tDistance * Math.max(mMaxLoss - 10L, 0) / mMaxLossDistance));
+                            }
+                            energyUse=packetSize + ((V[mTier] * energyUse) / 100);
+                            if (getBaseMetaTileEntity().isUniversalEnergyStored(energyUse)) {
+                                if (((IEnergyConnected) tTile).injectEnergyUnits((byte) 6, packetSize, 1) > 0) {
+                                    getBaseMetaTileEntity().decreaseStoredEnergyUnits(energyUse, false);
+                                }
+                            }
                         }
                     }
                 }
diff --git a/src/main/java/gregtech/common/tileentities/machines/steam/GT_MetaTileEntity_Compressor_Bronze.java b/src/main/java/gregtech/common/tileentities/machines/steam/GT_MetaTileEntity_Compressor_Bronze.java
index ee2937bd26..67bde86f16 100644
--- a/src/main/java/gregtech/common/tileentities/machines/steam/GT_MetaTileEntity_Compressor_Bronze.java
+++ b/src/main/java/gregtech/common/tileentities/machines/steam/GT_MetaTileEntity_Compressor_Bronze.java
@@ -45,13 +45,6 @@ public class GT_MetaTileEntity_Compressor_Bronze
         return 0;

     }

 

-    //public boolean allowPutStack(IGregTechTileEntity aBaseMetaTileEntity, int aIndex, byte aSide, ItemStack aStack) {//GOT DISABLED?

-    //    if (!super.allowPutStack(aBaseMetaTileEntity, aIndex, aSide, aStack)) {

-    //        return false;

-    //    }

-    //    return GT_ModHandler.getCompressorOutput(GT_Utility.copyAmount(64L, new Object[]{aStack}), false, null) != null;

-    //}

-

     public void startSoundLoop(byte aIndex, double aX, double aY, double aZ) {

         super.startSoundLoop(aIndex, aX, aY, aZ);

         if (aIndex == 1) {

diff --git a/src/main/java/gregtech/common/tileentities/machines/steam/GT_MetaTileEntity_Compressor_Steel.java b/src/main/java/gregtech/common/tileentities/machines/steam/GT_MetaTileEntity_Compressor_Steel.java
index 6773499b3c..10d1f71d0d 100644
--- a/src/main/java/gregtech/common/tileentities/machines/steam/GT_MetaTileEntity_Compressor_Steel.java
+++ b/src/main/java/gregtech/common/tileentities/machines/steam/GT_MetaTileEntity_Compressor_Steel.java
@@ -44,13 +44,6 @@ public class GT_MetaTileEntity_Compressor_Steel
         }

         return 0;

     }

-	//TODO CHECK IF CAN BE RE ENABLED

-    //public boolean allowPutStack(IGregTechTileEntity aBaseMetaTileEntity, int aIndex, byte aSide, ItemStack aStack) {

-    //    if (!super.allowPutStack(aBaseMetaTileEntity, aIndex, aSide, aStack)) {

-    //        return false;

-    //    }

-    //    return GT_ModHandler.getCompressorOutput(GT_Utility.copyAmount(64L, new Object[]{aStack}), false, null) != null;

-    //}

 

     public void startSoundLoop(byte aIndex, double aX, double aY, double aZ) {

         super.startSoundLoop(aIndex, aX, aY, aZ);

diff --git a/src/main/java/gregtech/common/tileentities/machines/steam/GT_MetaTileEntity_Extractor_Bronze.java b/src/main/java/gregtech/common/tileentities/machines/steam/GT_MetaTileEntity_Extractor_Bronze.java
index 396dc7857b..f1d4ae1b86 100644
--- a/src/main/java/gregtech/common/tileentities/machines/steam/GT_MetaTileEntity_Extractor_Bronze.java
+++ b/src/main/java/gregtech/common/tileentities/machines/steam/GT_MetaTileEntity_Extractor_Bronze.java
@@ -44,13 +44,6 @@ public class GT_MetaTileEntity_Extractor_Bronze
         }

         return 0;

     }

-	//TODO RE ENABLE?

-    //public boolean allowPutStack(IGregTechTileEntity aBaseMetaTileEntity, int aIndex, byte aSide, ItemStack aStack) {

-    //    if (!super.allowPutStack(aBaseMetaTileEntity, aIndex, aSide, aStack)) {

-    //        return false;

-    //    }

-    //    return GT_ModHandler.getExtractorOutput(GT_Utility.copyAmount(64L, new Object[]{aStack}), false, null) != null;

-    //}

 

     public void startSoundLoop(byte aIndex, double aX, double aY, double aZ) {

         super.startSoundLoop(aIndex, aX, aY, aZ);

diff --git a/src/main/java/gregtech/common/tileentities/machines/steam/GT_MetaTileEntity_Extractor_Steel.java b/src/main/java/gregtech/common/tileentities/machines/steam/GT_MetaTileEntity_Extractor_Steel.java
index 0d737be386..9aa892a4fc 100644
--- a/src/main/java/gregtech/common/tileentities/machines/steam/GT_MetaTileEntity_Extractor_Steel.java
+++ b/src/main/java/gregtech/common/tileentities/machines/steam/GT_MetaTileEntity_Extractor_Steel.java
@@ -44,13 +44,6 @@ public class GT_MetaTileEntity_Extractor_Steel
         }

         return 0;

     }

-	//TODO CHECK???

-    //public boolean allowPutStack(IGregTechTileEntity aBaseMetaTileEntity, int aIndex, byte aSide, ItemStack aStack) {

-    //    if (!super.allowPutStack(aBaseMetaTileEntity, aIndex, aSide, aStack)) {

-    //        return false;

-    //    }

-    //    return GT_ModHandler.getExtractorOutput(GT_Utility.copyAmount(64L, new Object[]{aStack}), false, null) != null;

-    //}

 

     public void startSoundLoop(byte aIndex, double aX, double aY, double aZ) {

         super.startSoundLoop(aIndex, aX, aY, aZ);

diff --git a/src/main/java/gregtech/common/tileentities/machines/steam/GT_MetaTileEntity_Macerator_Steel.java b/src/main/java/gregtech/common/tileentities/machines/steam/GT_MetaTileEntity_Macerator_Steel.java
index 3ac197ee4d..65e05c898d 100644
--- a/src/main/java/gregtech/common/tileentities/machines/steam/GT_MetaTileEntity_Macerator_Steel.java
+++ b/src/main/java/gregtech/common/tileentities/machines/steam/GT_MetaTileEntity_Macerator_Steel.java
@@ -19,7 +19,7 @@ import java.util.Random;
 import static gregtech.api.enums.GT_Values.V;

 

 public class GT_MetaTileEntity_Macerator_Steel

-        extends GT_MetaTileEntity_BasicMachine_Steel {//TODO CHECK ALL STEAM POWERED MACHINES

+        extends GT_MetaTileEntity_BasicMachine_Steel {

     public GT_MetaTileEntity_Macerator_Steel(int aID, String aName, String aNameRegional) {

         super(aID, aName, aNameRegional, "Macerating your Ores", 1, 1, false);

     }

@@ -64,7 +64,7 @@ public class GT_MetaTileEntity_Macerator_Steel
         getInputAt(0).stackSize -= tRecipe.mInputs[0].stackSize;

         return FOUND_AND_SUCCESSFULLY_USED_RECIPE;

     }

-	//TODO THIS MIGHT WORK???

+

     public boolean allowPutStack(IGregTechTileEntity aBaseMetaTileEntity, int aIndex, byte aSide, ItemStack aStack) {

         if (!super.allowPutStack(aBaseMetaTileEntity, aIndex, aSide, aStack)) {

             return false;

diff --git a/src/main/java/gregtech/loaders/preload/GT_Loader_MetaTileEntities.java b/src/main/java/gregtech/loaders/preload/GT_Loader_MetaTileEntities.java
index 2613f7e558..e5e595fb60 100644
--- a/src/main/java/gregtech/loaders/preload/GT_Loader_MetaTileEntities.java
+++ b/src/main/java/gregtech/loaders/preload/GT_Loader_MetaTileEntities.java
@@ -1291,7 +1291,7 @@ public class GT_Loader_MetaTileEntities implements Runnable {//TODO CHECK CIRCUI
     		'P', OrePrefixes.pipeLarge.get(Materials.Polytetrafluoroethylene), 
     		'M', ItemList.Electric_Motor_HV,
     		'B', ItemList.Hull_HV});
-}
+    }
 
     private static void run4() {
         for (int i = 0; i < GregTech_API.sGeneratedMaterials.length; i++) {