aboutsummaryrefslogtreecommitdiff
path: root/src/main/java/gregtech/common/tileentities/machines/basic
diff options
context:
space:
mode:
authorbartimaeusnek <33183715+bartimaeusnek@users.noreply.github.com>2018-09-08 00:39:04 +0200
committerbartimaeusnek <33183715+bartimaeusnek@users.noreply.github.com>2018-09-08 00:39:04 +0200
commitb7c66bf2094dd2f03d92919c18fec9dfb04264e6 (patch)
treea767c60069d7a517b09833c896cc2de849e46498 /src/main/java/gregtech/common/tileentities/machines/basic
parent65d3cf01f28a275d186d34f5771e2ec72ccd975d (diff)
downloadGT5-Unofficial-b7c66bf2094dd2f03d92919c18fec9dfb04264e6.tar.gz
GT5-Unofficial-b7c66bf2094dd2f03d92919c18fec9dfb04264e6.tar.bz2
GT5-Unofficial-b7c66bf2094dd2f03d92919c18fec9dfb04264e6.zip
Various fixes
+Added GT-FML-Log +Added an Exception if a Nq reactor without recipe map is created +Added the ability to add ReinforcedGlass in the CleanroomWalls (https://github.com/GTNewHorizons/NewHorizons/issues/3584) +Added a config option for changing the ReinforcedGlass percentage +Renamed Materials2 -> GTNH_ExtraMaterials and fixed it
Diffstat (limited to 'src/main/java/gregtech/common/tileentities/machines/basic')
-rw-r--r--src/main/java/gregtech/common/tileentities/machines/basic/GT_MetaTileEntity_Scanner.java1
-rw-r--r--src/main/java/gregtech/common/tileentities/machines/basic/GT_MetaTileEntity_Teleporter.java2
2 files changed, 1 insertions, 2 deletions
diff --git a/src/main/java/gregtech/common/tileentities/machines/basic/GT_MetaTileEntity_Scanner.java b/src/main/java/gregtech/common/tileentities/machines/basic/GT_MetaTileEntity_Scanner.java
index 4dcbc95786..8e244ff502 100644
--- a/src/main/java/gregtech/common/tileentities/machines/basic/GT_MetaTileEntity_Scanner.java
+++ b/src/main/java/gregtech/common/tileentities/machines/basic/GT_MetaTileEntity_Scanner.java
@@ -1,7 +1,6 @@
package gregtech.common.tileentities.machines.basic;
import cpw.mods.fml.common.FMLCommonHandler;
-import cpw.mods.fml.common.FMLLog;
import forestry.api.genetics.AlleleManager;
import forestry.api.genetics.IIndividual;
import gregtech.GT_Mod;
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 7fdb9689a9..c9dbded8f9 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
@@ -309,7 +309,7 @@ public class GT_MetaTileEntity_Teleporter extends GT_MetaTileEntity_BasicTank {
for (Object tObject : entities_in_box) {
if (((tObject instanceof Entity)) && (!((Entity) tObject).isDead)) {
Entity tEntity = (Entity) tObject;
-// System.out.println("teleport"+(Math.pow(tDistance, 1.5)));
+// GT_FML_LOGGER.info("teleport"+(Math.pow(tDistance, 1.5)));
if (getBaseMetaTileEntity().decreaseStoredEnergyUnits((long) (Math.pow(tDistance, 1.5) * weightCalculation(tEntity) * sFPowerMultiplyer), false)) {
//if (hasDimensionalTeleportCapability() && this.mTargetD != getBaseMetaTileEntity().getWorld().provider.dimensionId && (hasEgg || mFluid.isFluidEqual(Materials.Nitrogen.getPlasma(1)))) {
// mFluid.amount = mFluid.amount - ((int) Math.min(10, (Math.pow(tDistance, 1.5) * weightCalculation(tEntity) / 8192)));