diff options
Diffstat (limited to 'src/main/java')
4 files changed, 5 insertions, 20 deletions
diff --git a/src/main/java/tectech/thing/metaTileEntity/multi/base/TTMultiblockBase.java b/src/main/java/tectech/thing/metaTileEntity/multi/base/TTMultiblockBase.java index 140fb80ae2..2a0c10f303 100644 --- a/src/main/java/tectech/thing/metaTileEntity/multi/base/TTMultiblockBase.java +++ b/src/main/java/tectech/thing/metaTileEntity/multi/base/TTMultiblockBase.java @@ -104,7 +104,6 @@ import tectech.thing.metaTileEntity.hatch.MTEHatchParam; import tectech.thing.metaTileEntity.hatch.MTEHatchUncertainty; import tectech.thing.metaTileEntity.multi.base.render.TTRenderedExtendedFacingTexture; import tectech.util.CommonValues; -import tectech.util.TTUtility; /** * Created by danie_000 on 27.10.2016. @@ -1717,12 +1716,12 @@ public abstract class TTMultiblockBase extends MTEExtendedPowerMultiBlockBase<TT // new Method public final int getMaxEnergyInputTier_EM() { - return TTUtility.getTier(maxEUinputMax); + return GTUtility.getTier(maxEUinputMax); } // new Method public final int getMinEnergyInputTier_EM() { - return TTUtility.getTier(maxEUinputMin); + return GTUtility.getTier(maxEUinputMin); } public final long getMaxAmpereFlowAtMinTierOfEnergyHatches() { diff --git a/src/main/java/tectech/thing/metaTileEntity/single/MTEBuckConverter.java b/src/main/java/tectech/thing/metaTileEntity/single/MTEBuckConverter.java index 3f2c66276d..0a2a8d756e 100644 --- a/src/main/java/tectech/thing/metaTileEntity/single/MTEBuckConverter.java +++ b/src/main/java/tectech/thing/metaTileEntity/single/MTEBuckConverter.java @@ -33,6 +33,7 @@ import gregtech.api.interfaces.tileentity.IGregTechTileEntity; import gregtech.api.metatileentity.MetaTileEntity; import gregtech.api.metatileentity.implementations.MTETieredMachineBlock; import gregtech.api.objects.GTRenderedTexture; +import gregtech.api.util.GTUtility; import tectech.util.CommonValues; import tectech.util.TTUtility; @@ -219,7 +220,7 @@ public class MTEBuckConverter extends MTETieredMachineBlock implements IAddUIWid .setDefaultColor(COLOR_TEXT_WHITE.get()) .setPos(46, 8)) .widget( - new TextWidget().setStringSupplier(() -> "TIER: " + VN[TTUtility.getTier(Math.abs(EUT))]) + new TextWidget().setStringSupplier(() -> "TIER: " + VN[GTUtility.getTier(Math.abs(EUT))]) .setDefaultColor(COLOR_TEXT_WHITE.get()) .setPos(46, 16)) .widget( diff --git a/src/main/java/tectech/thing/metaTileEntity/single/MTEDebugPowerGenerator.java b/src/main/java/tectech/thing/metaTileEntity/single/MTEDebugPowerGenerator.java index b82e0036c0..0251a919f0 100644 --- a/src/main/java/tectech/thing/metaTileEntity/single/MTEDebugPowerGenerator.java +++ b/src/main/java/tectech/thing/metaTileEntity/single/MTEDebugPowerGenerator.java @@ -323,7 +323,7 @@ public class MTEDebugPowerGenerator extends MTETieredMachineBlock .setPos(43, 4)) .widget( - new TextWidget().setStringSupplier(() -> "TIER: " + VN[TTUtility.getTier(Math.abs(EUT))]) + new TextWidget().setStringSupplier(() -> "TIER: " + VN[GTUtility.getTier(Math.abs(EUT))]) .setDefaultColor(COLOR_TEXT_WHITE.get()) .setPos(46, 22)) diff --git a/src/main/java/tectech/util/TTUtility.java b/src/main/java/tectech/util/TTUtility.java index c933b37b82..da58e3d22f 100644 --- a/src/main/java/tectech/util/TTUtility.java +++ b/src/main/java/tectech/util/TTUtility.java @@ -1,7 +1,5 @@ package tectech.util; -import static gregtech.api.enums.GTValues.V; - import java.lang.reflect.Field; import java.math.BigInteger; import java.util.Formatter; @@ -95,19 +93,6 @@ public final class TTUtility { return GameRegistry.findUniqueIdentifierFor(is.getItem()).modId + ':' + is.getUnlocalizedName(); } - public static byte getTier(long l) { - byte b = -1; - - do { - ++b; - if (b >= V.length) { - return b; - } - } while (l > V[b]); - - return b; - } - public static void setTier(int tier, Object me) { try { Field field = MTETieredMachineBlock.class.getField("mTier"); |