Cleaned up to ore processing

2 files changed, 31 insertions, 14 deletions

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 60d4a1f3bd..3d8cbb34ca 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
@@ -31,16 +31,16 @@ import static gregtech.api.enums.GT_Values.V;
 
 public class GT_MetaTileEntity_MicrowaveEnergyTransmitter extends GT_MetaTileEntity_BasicTank {
 
-    public static boolean sInterDimensionalTeleportAllowed = true;
+    private static boolean sInterDimensionalTeleportAllowed = true;
+    private static int mMaxLoss = 50;
+    private static int mMaxLossDistance = 10000;
+    private static boolean mPassiveEnergyUse = true;
     public int mTargetX = 0;
     public int mTargetY = 0;
     public int mTargetZ = 0;
     public int mTargetD = 0;
     public boolean mDebug = false;
     public boolean hasBlock = false;
-    public int mMaxLoss = 50;
-    public int mMaxLossDistance = 10000;
-    public boolean mPassiveEnergyUse = true;
     public int tTargetX = 0;
     public int tTargetY = 0;
     public int tTargetZ = 0;
@@ -151,11 +151,19 @@ public class GT_MetaTileEntity_MicrowaveEnergyTransmitter extends GT_MetaTileEnt
     }
 
     public boolean hasDimensionalTeleportCapability() {
-        return (this.mDebug) || (this.hasBlock) || (mFluid.isFluidEqual(Materials.Nitrogen.getPlasma(1)) && mFluid.amount >= 1000);
+        return this.mDebug ||
+                (
+                        sInterDimensionalTeleportAllowed &&
+                                (
+                                        this.hasBlock ||
+                                        mFluid.isFluidEqual(Materials.Nitrogen.getPlasma(1)) && mFluid.amount >= 1000
+                                )
+                )
+        ;
     }
 
     public boolean isDimensionalTeleportAvailable() {
-        return (this.mDebug) || ((hasDimensionalTeleportCapability()) && (GT_Utility.isRealDimension(this.mTargetD)) && (GT_Utility.isRealDimension(getBaseMetaTileEntity().getWorld().provider.dimensionId)));
+        return this.mDebug || (hasDimensionalTeleportCapability() && GT_Utility.isRealDimension(this.mTargetD) && GT_Utility.isRealDimension(getBaseMetaTileEntity().getWorld().provider.dimensionId));
     }
 
     @Override
@@ -203,7 +211,7 @@ public class GT_MetaTileEntity_MicrowaveEnergyTransmitter extends GT_MetaTileEnt
                                     packetSize=((BaseMetaTileEntity) mte).getMaxSafeInput();
                                 }
                             }
-                            long energyUse = 1;
+                            long energyUse = 10;
                             if (mMaxLossDistance != 0) {
                                 energyUse = GT_Utility.safeInt(10L + (tDistance * Math.max(mMaxLoss - 10L, 0) / mMaxLossDistance));
                             }
diff --git a/src/main/java/gregtech/common/tileentities/machines/basic/GT_MetaTileEntity_Teleporter.java b/src/main/java/gregtech/common/tileentities/machines/basic/GT_MetaTileEntity_Teleporter.java
index f24cfb64eb..83a83575b6 100644
--- a/src/main/java/gregtech/common/tileentities/machines/basic/GT_MetaTileEntity_Teleporter.java
+++ b/src/main/java/gregtech/common/tileentities/machines/basic/GT_MetaTileEntity_Teleporter.java
@@ -41,10 +41,10 @@ import static gregtech.api.enums.GT_Values.V;
 
 public class GT_MetaTileEntity_Teleporter extends GT_MetaTileEntity_BasicTank {
 
-    public static boolean sInterDimensionalTeleportAllowed = true;
-    public static int sPassiveEnergyDrain = 2048;
-    public static int sPowerMultiplyer = 100;
-    public static double sFPowerMultiplyer = 1.0;
+    private static boolean sInterDimensionalTeleportAllowed = true;
+    private static int sPassiveEnergyDrain = 2048;
+    private static int sPowerMultiplyer = 100;
+    private static double sFPowerMultiplyer = 1.0;
     public int mTargetX = 0;
     public int mTargetY = 0;
     public int mTargetZ = 0;
@@ -240,13 +240,22 @@ public class GT_MetaTileEntity_Teleporter extends GT_MetaTileEntity_BasicTank {
     //    return false;
 	//}
 
+
+
     public boolean hasDimensionalTeleportCapability() {
-		//return (this.mDebug) || (this.hasEgg) || (mFluid.isFluidEqual(Materials.Nitrogen.getPlasma(1)) && mFluid.amount >= 10);
-        return true;
+        return this.mDebug ||
+                //(
+                        sInterDimensionalTeleportAllowed //&&
+                //                (
+                //                        this.hasEgg ||
+                //                                mFluid.isFluidEqual(Materials.Nitrogen.getPlasma(1)) && mFluid.amount >= 1000
+                //                )
+                //)
+        ;
     }
 
     public boolean isDimensionalTeleportAvailable() {
-        return (this.mDebug) || ((GT_Utility.isRealDimension(this.mTargetD)) && (GT_Utility.isRealDimension(getBaseMetaTileEntity().getWorld().provider.dimensionId)));
+        return this.mDebug || (hasDimensionalTeleportCapability() && GT_Utility.isRealDimension(this.mTargetD) && GT_Utility.isRealDimension(getBaseMetaTileEntity().getWorld().provider.dimensionId));
     }
 
     @Override