diff options
Diffstat (limited to 'src/main/java/gregtech/common/tileentities/storage')
-rw-r--r-- | src/main/java/gregtech/common/tileentities/storage/MTEDigitalChestBase.java (renamed from src/main/java/gregtech/common/tileentities/storage/GT_MetaTileEntity_DigitalChestBase.java) | 75 | ||||
-rw-r--r-- | src/main/java/gregtech/common/tileentities/storage/MTEDigitalTankBase.java (renamed from src/main/java/gregtech/common/tileentities/storage/GT_MetaTileEntity_DigitalTankBase.java) | 115 | ||||
-rw-r--r-- | src/main/java/gregtech/common/tileentities/storage/MTELocker.java (renamed from src/main/java/gregtech/common/tileentities/storage/GT_MetaTileEntity_Locker.java) | 33 | ||||
-rw-r--r-- | src/main/java/gregtech/common/tileentities/storage/MTEQuantumChest.java (renamed from src/main/java/gregtech/common/tileentities/storage/GT_MetaTileEntity_QuantumChest.java) | 10 | ||||
-rw-r--r-- | src/main/java/gregtech/common/tileentities/storage/MTEQuantumTank.java (renamed from src/main/java/gregtech/common/tileentities/storage/GT_MetaTileEntity_QuantumTank.java) | 18 | ||||
-rw-r--r-- | src/main/java/gregtech/common/tileentities/storage/MTESuperChest.java (renamed from src/main/java/gregtech/common/tileentities/storage/GT_MetaTileEntity_SuperChest.java) | 10 | ||||
-rw-r--r-- | src/main/java/gregtech/common/tileentities/storage/MTESuperTank.java (renamed from src/main/java/gregtech/common/tileentities/storage/GT_MetaTileEntity_SuperTank.java) | 18 |
7 files changed, 138 insertions, 141 deletions
diff --git a/src/main/java/gregtech/common/tileentities/storage/GT_MetaTileEntity_DigitalChestBase.java b/src/main/java/gregtech/common/tileentities/storage/MTEDigitalChestBase.java index 1576f61ff8..96ec6c06ae 100644 --- a/src/main/java/gregtech/common/tileentities/storage/GT_MetaTileEntity_DigitalChestBase.java +++ b/src/main/java/gregtech/common/tileentities/storage/MTEDigitalChestBase.java @@ -34,35 +34,35 @@ import appeng.api.storage.data.IAEItemStack; import appeng.api.storage.data.IItemList; import appeng.util.item.AEItemStack; import appeng.util.item.ItemList; -import gregtech.api.enums.GT_Values; -import gregtech.api.gui.modularui.GT_UIInfos; -import gregtech.api.gui.modularui.GT_UITextures; +import gregtech.api.enums.GTValues; +import gregtech.api.gui.modularui.GTUIInfos; +import gregtech.api.gui.modularui.GTUITextures; import gregtech.api.interfaces.ITexture; import gregtech.api.interfaces.modularui.IAddUIWidgets; import gregtech.api.interfaces.tileentity.IGregTechTileEntity; -import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_TieredMachineBlock; +import gregtech.api.metatileentity.implementations.MTETieredMachineBlock; import gregtech.api.objects.AE2DigitalChestHandler; import gregtech.api.render.TextureFactory; -import gregtech.api.util.GT_LanguageManager; -import gregtech.api.util.GT_Utility; +import gregtech.api.util.GTLanguageManager; +import gregtech.api.util.GTUtility; import mcp.mobius.waila.api.IWailaConfigHandler; import mcp.mobius.waila.api.IWailaDataAccessor; -public abstract class GT_MetaTileEntity_DigitalChestBase extends GT_MetaTileEntity_TieredMachineBlock +public abstract class MTEDigitalChestBase extends MTETieredMachineBlock implements IMEMonitor<IAEItemStack>, IAddUIWidgets { protected boolean mVoidOverflow = false; protected boolean mDisableFilter; private Map<IMEMonitorHandlerReceiver<IAEItemStack>, Object> listeners = null; - public GT_MetaTileEntity_DigitalChestBase(int aID, String aName, String aNameRegional, int aTier) { + public MTEDigitalChestBase(int aID, String aName, String aNameRegional, int aTier) { super( aID, aName, aNameRegional, aTier, 3, - new String[] { "This Chest stores " + GT_Utility.formatNumbers(commonSizeCompute(aTier)) + " Blocks", + new String[] { "This Chest stores " + GTUtility.formatNumbers(commonSizeCompute(aTier)) + " Blocks", "Use a screwdriver to enable", "voiding items on overflow", "Will keep its contents when harvested", }); } @@ -82,12 +82,11 @@ public abstract class GT_MetaTileEntity_DigitalChestBase extends GT_MetaTileEnti }; } - public GT_MetaTileEntity_DigitalChestBase(String aName, int aTier, String aDescription, ITexture[][][] aTextures) { + public MTEDigitalChestBase(String aName, int aTier, String aDescription, ITexture[][][] aTextures) { super(aName, aTier, 3, aDescription, aTextures); } - public GT_MetaTileEntity_DigitalChestBase(String aName, int aTier, String[] aDescription, - ITexture[][][] aTextures) { + public MTEDigitalChestBase(String aName, int aTier, String[] aDescription, ITexture[][][] aTextures) { super(aName, aTier, 3, aDescription, aTextures); } @@ -99,14 +98,14 @@ public abstract class GT_MetaTileEntity_DigitalChestBase extends GT_MetaTileEnti final int tSize = stack.stackTagCompound.getInteger("mItemCount"); if (tContents != null && tSize > 0) { tooltip.add( - GT_LanguageManager.addStringLocalization("TileEntity_CHEST_INFO", "Contains Item: ") + GTLanguageManager.addStringLocalization("TileEntity_CHEST_INFO", "Contains Item: ") + EnumChatFormatting.YELLOW + tContents.getDisplayName() + EnumChatFormatting.GRAY); tooltip.add( - GT_LanguageManager.addStringLocalization("TileEntity_CHEST_AMOUNT", "Item Amount: ") + GTLanguageManager.addStringLocalization("TileEntity_CHEST_AMOUNT", "Item Amount: ") + EnumChatFormatting.GREEN - + GT_Utility.formatNumbers(tSize) + + GTUtility.formatNumbers(tSize) + EnumChatFormatting.GRAY); } } @@ -219,7 +218,7 @@ public abstract class GT_MetaTileEntity_DigitalChestBase extends GT_MetaTileEnti final long toAdd = input.getStackSize(); final ItemStack storedStack = getItemStack(); - if (storedStack != null && !GT_Utility.areStacksEqual(storedStack, inputStack)) { + if (storedStack != null && !GTUtility.areStacksEqual(storedStack, inputStack)) { // Can't stack with existing item, just return the input. return input; } @@ -272,7 +271,7 @@ public abstract class GT_MetaTileEntity_DigitalChestBase extends GT_MetaTileEnti @Override public final void onScrewdriverRightClick(ForgeDirection side, EntityPlayer aPlayer, float aX, float aY, float aZ) { mVoidOverflow = !mVoidOverflow; - GT_Utility.sendChatToPlayer( + GTUtility.sendChatToPlayer( aPlayer, StatCollector.translateToLocal( mVoidOverflow ? "GT5U.machines.digitalchest.voidoverflow.enabled" @@ -284,7 +283,7 @@ public abstract class GT_MetaTileEntity_DigitalChestBase extends GT_MetaTileEnti float aX, float aY, float aZ) { if (super.onSolderingToolRightClick(side, wrenchingSide, aPlayer, aX, aY, aZ)) return true; mDisableFilter = !mDisableFilter; - GT_Utility.sendChatToPlayer( + GTUtility.sendChatToPlayer( aPlayer, StatCollector.translateToLocal( mDisableFilter ? "GT5U.machines.digitalchest.inputfilter.disabled" @@ -308,7 +307,7 @@ public abstract class GT_MetaTileEntity_DigitalChestBase extends GT_MetaTileEnti int savedCount = count; if ((mInventory[0] != null) && ((count < getMaxItemCount()) || mVoidOverflow) - && GT_Utility.areStacksEqual(mInventory[0], stack)) { + && GTUtility.areStacksEqual(mInventory[0], stack)) { count += mInventory[0].stackSize; if (count <= getMaxItemCount()) { mInventory[0] = null; @@ -325,7 +324,7 @@ public abstract class GT_MetaTileEntity_DigitalChestBase extends GT_MetaTileEnti mInventory[1] = stack.copy(); mInventory[1].stackSize = Math.min(stack.getMaxStackSize(), count); count -= mInventory[1].stackSize; - } else if ((count > 0) && GT_Utility.areStacksEqual(mInventory[1], stack) + } else if ((count > 0) && GTUtility.areStacksEqual(mInventory[1], stack) && mInventory[1].getMaxStackSize() > mInventory[1].stackSize) { int tmp = Math.min(count, mInventory[1].getMaxStackSize() - mInventory[1].stackSize); mInventory[1].stackSize += tmp; @@ -346,7 +345,7 @@ public abstract class GT_MetaTileEntity_DigitalChestBase extends GT_MetaTileEnti @Override public boolean onRightclick(IGregTechTileEntity aBaseMetaTileEntity, EntityPlayer aPlayer) { - GT_UIInfos.openGTTileEntityUI(aBaseMetaTileEntity, aPlayer); + GTUIInfos.openGTTileEntityUI(aBaseMetaTileEntity, aPlayer); return true; } @@ -396,16 +395,16 @@ public abstract class GT_MetaTileEntity_DigitalChestBase extends GT_MetaTileEnti + EnumChatFormatting.RESET + " " + EnumChatFormatting.YELLOW - + GT_Utility.formatNumbers(getMaxItemCount()) + + GTUtility.formatNumbers(getMaxItemCount()) + EnumChatFormatting.RESET }; } return new String[] { EnumChatFormatting.BLUE + chestName() + EnumChatFormatting.RESET, "Stored Items:", EnumChatFormatting.GOLD + getItemStack().getDisplayName() + EnumChatFormatting.RESET, - EnumChatFormatting.GREEN + GT_Utility.formatNumbers(getItemCount()) + EnumChatFormatting.GREEN + GTUtility.formatNumbers(getItemCount()) + EnumChatFormatting.RESET + " " + EnumChatFormatting.YELLOW - + GT_Utility.formatNumbers(getMaxItemCount()) + + GTUtility.formatNumbers(getMaxItemCount()) + EnumChatFormatting.RESET }; } @@ -465,19 +464,19 @@ public abstract class GT_MetaTileEntity_DigitalChestBase extends GT_MetaTileEnti @Override public boolean allowPullStack(IGregTechTileEntity aBaseMetaTileEntity, int aIndex, ForgeDirection side, ItemStack aStack) { - if (GT_Values.disableDigitalChestsExternalAccess && hasActiveMEConnection()) return false; + if (GTValues.disableDigitalChestsExternalAccess && hasActiveMEConnection()) return false; return aIndex == 1; } @Override public boolean allowPutStack(IGregTechTileEntity aBaseMetaTileEntity, int aIndex, ForgeDirection side, ItemStack aStack) { - if (GT_Values.disableDigitalChestsExternalAccess && hasActiveMEConnection()) return false; + if (GTValues.disableDigitalChestsExternalAccess && hasActiveMEConnection()) return false; if (aIndex != 0) return false; - if ((mInventory[0] != null && !GT_Utility.areStacksEqual(mInventory[0], aStack))) return false; + if ((mInventory[0] != null && !GTUtility.areStacksEqual(mInventory[0], aStack))) return false; if (mDisableFilter) return true; - if (getItemStack() == null) return mInventory[1] == null || GT_Utility.areStacksEqual(mInventory[1], aStack); - return GT_Utility.areStacksEqual(getItemStack(), aStack); + if (getItemStack() == null) return mInventory[1] == null || GTUtility.areStacksEqual(mInventory[1], aStack); + return GTUtility.areStacksEqual(getItemStack(), aStack); } @Override @@ -497,7 +496,7 @@ public abstract class GT_MetaTileEntity_DigitalChestBase extends GT_MetaTileEnti super.getWailaBody(itemStack, currenttip, accessor, config); final NBTTagCompound tag = accessor.getNBTData(); if (tag.hasKey("itemType", Constants.NBT.TAG_COMPOUND)) { - currenttip.add("Item Count: " + GT_Utility.parseNumberToString(tag.getInteger("itemCount"))); + currenttip.add("Item Count: " + GTUtility.parseNumberToString(tag.getInteger("itemCount"))); currenttip.add( "Item Type: " + ItemStack.loadItemStackFromNBT(tag.getCompoundTag("itemType")) .getDisplayName()); @@ -511,9 +510,9 @@ public abstract class GT_MetaTileEntity_DigitalChestBase extends GT_MetaTileEnti int z) { super.getWailaNBTData(player, tile, tag, world, x, y, z); ItemStack is = getItemStack(); - if (GT_Utility.isStackInvalid(is)) return; + if (GTUtility.isStackInvalid(is)) return; int realItemCount = getItemCount(); - if (GT_Utility.isStackValid(mInventory[1]) && GT_Utility.areStacksEqual(mInventory[1], is)) + if (GTUtility.isStackValid(mInventory[1]) && GTUtility.areStacksEqual(mInventory[1], is)) realItemCount += mInventory[1].stackSize; tag.setInteger("itemCount", realItemCount); tag.setTag("itemType", is.writeToNBT(new NBTTagCompound())); @@ -525,21 +524,21 @@ public abstract class GT_MetaTileEntity_DigitalChestBase extends GT_MetaTileEnti @Override public void addUIWidgets(ModularWindow.Builder builder, UIBuildContext buildContext) { builder.widget( - new DrawableWidget().setDrawable(GT_UITextures.PICTURE_SCREEN_BLACK) + new DrawableWidget().setDrawable(GTUITextures.PICTURE_SCREEN_BLACK) .setPos(7, 16) .setSize(71, 45)) .widget( new SlotWidget(inventoryHandler, 0) - .setBackground(getGUITextureSet().getItemSlot(), GT_UITextures.OVERLAY_SLOT_IN) + .setBackground(getGUITextureSet().getItemSlot(), GTUITextures.OVERLAY_SLOT_IN) .setPos(79, 16)) .widget( new SlotWidget(inventoryHandler, 1).setAccess(true, false) - .setBackground(getGUITextureSet().getItemSlot(), GT_UITextures.OVERLAY_SLOT_OUT) + .setBackground(getGUITextureSet().getItemSlot(), GTUITextures.OVERLAY_SLOT_OUT) .setPos(79, 52)) .widget( SlotWidget.phantom(inventoryHandler, 2) .disableInteraction() - .setBackground(GT_UITextures.TRANSPARENT) + .setBackground(GTUITextures.TRANSPARENT) .setPos(59, 42)) .widget( new TextWidget("Item Amount").setDefaultColor(COLOR_TEXT_WHITE.get()) @@ -550,9 +549,7 @@ public abstract class GT_MetaTileEntity_DigitalChestBase extends GT_MetaTileEnti .setPos(10, 30)) .widget( new FakeSyncWidget.IntegerSyncer( - () -> this instanceof GT_MetaTileEntity_QuantumChest - ? ((GT_MetaTileEntity_QuantumChest) this).mItemCount - : 0, + () -> this instanceof MTEQuantumChest ? ((MTEQuantumChest) this).mItemCount : 0, value -> clientItemCount = value)); } diff --git a/src/main/java/gregtech/common/tileentities/storage/GT_MetaTileEntity_DigitalTankBase.java b/src/main/java/gregtech/common/tileentities/storage/MTEDigitalTankBase.java index cd609af343..d4b8da15da 100644 --- a/src/main/java/gregtech/common/tileentities/storage/GT_MetaTileEntity_DigitalTankBase.java +++ b/src/main/java/gregtech/common/tileentities/storage/MTEDigitalTankBase.java @@ -5,7 +5,7 @@ import static gregtech.api.enums.Textures.BlockIcons.OVERLAY_PIPE; import static gregtech.api.enums.Textures.BlockIcons.OVERLAY_QTANK; import static gregtech.api.enums.Textures.BlockIcons.OVERLAY_QTANK_GLOW; import static gregtech.api.metatileentity.BaseTileEntity.TOOLTIP_DELAY; -import static gregtech.api.util.GT_Utility.formatNumbers; +import static gregtech.api.util.GTUtility.formatNumbers; import java.util.List; @@ -36,29 +36,29 @@ import com.gtnewhorizons.modularui.common.widget.FluidSlotWidget; import com.gtnewhorizons.modularui.common.widget.SlotWidget; import com.gtnewhorizons.modularui.common.widget.TextWidget; -import gregtech.api.gui.modularui.GT_UIInfos; -import gregtech.api.gui.modularui.GT_UITextures; +import gregtech.api.gui.modularui.GTUIInfos; +import gregtech.api.gui.modularui.GTUITextures; import gregtech.api.interfaces.ITexture; import gregtech.api.interfaces.metatileentity.IFluidLockable; import gregtech.api.interfaces.modularui.IAddGregtechLogo; import gregtech.api.interfaces.modularui.IAddUIWidgets; import gregtech.api.interfaces.tileentity.IGregTechTileEntity; -import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_BasicTank; +import gregtech.api.metatileentity.implementations.MTEBasicTank; import gregtech.api.render.TextureFactory; -import gregtech.api.util.GT_LanguageManager; -import gregtech.api.util.GT_Utility; +import gregtech.api.util.GTLanguageManager; +import gregtech.api.util.GTUtility; import gregtech.common.gui.modularui.widget.FluidLockWidget; import mcp.mobius.waila.api.IWailaConfigHandler; import mcp.mobius.waila.api.IWailaDataAccessor; -public abstract class GT_MetaTileEntity_DigitalTankBase extends GT_MetaTileEntity_BasicTank +public abstract class MTEDigitalTankBase extends MTEBasicTank implements IFluidLockable, IAddUIWidgets, IAddGregtechLogo { public boolean mOutputFluid = false, mVoidFluidPart = false, mVoidFluidFull = false, mLockFluid = false; protected String lockedFluidName = null; public boolean mAllowInputFromOutputSide = false; - public GT_MetaTileEntity_DigitalTankBase(int aID, String aName, String aNameRegional, int aTier) { + public MTEDigitalTankBase(int aID, String aName, String aNameRegional, int aTier) { super( aID, aName, @@ -104,11 +104,11 @@ public abstract class GT_MetaTileEntity_DigitalTankBase extends GT_MetaTileEntit }; } - public GT_MetaTileEntity_DigitalTankBase(String aName, int aTier, String aDescription, ITexture[][][] aTextures) { + public MTEDigitalTankBase(String aName, int aTier, String aDescription, ITexture[][][] aTextures) { super(aName, aTier, 3, aDescription, aTextures); } - public GT_MetaTileEntity_DigitalTankBase(String aName, int aTier, String[] aDescription, ITexture[][][] aTextures) { + public MTEDigitalTankBase(String aName, int aTier, String[] aDescription, ITexture[][][] aTextures) { super(aName, aTier, 3, aDescription, aTextures); } @@ -125,12 +125,12 @@ public abstract class GT_MetaTileEntity_DigitalTankBase extends GT_MetaTileEntit .loadFluidStackFromNBT(stack.stackTagCompound.getCompoundTag("mFluid")); if (tContents != null && tContents.amount > 0) { tooltip.add( - GT_LanguageManager.addStringLocalization("TileEntity_TANK_INFO", "Contains Fluid: ") + GTLanguageManager.addStringLocalization("TileEntity_TANK_INFO", "Contains Fluid: ") + EnumChatFormatting.YELLOW + tContents.getLocalizedName() + EnumChatFormatting.GRAY); tooltip.add( - GT_LanguageManager.addStringLocalization("TileEntity_TANK_AMOUNT", "Fluid Amount: ") + GTLanguageManager.addStringLocalization("TileEntity_TANK_AMOUNT", "Fluid Amount: ") + EnumChatFormatting.GREEN + formatNumbers(tContents.amount) + " L" @@ -157,7 +157,7 @@ public abstract class GT_MetaTileEntity_DigitalTankBase extends GT_MetaTileEntit if (mVoidFluidPart) aNBT.setBoolean("mVoidOverflow", true); if (mVoidFluidFull) aNBT.setBoolean("mVoidFluidFull", true); if (mLockFluid) aNBT.setBoolean("mLockFluid", true); - if (mLockFluid && GT_Utility.isStringValid(lockedFluidName)) aNBT.setString("lockedFluidName", lockedFluidName); + if (mLockFluid && GTUtility.isStringValid(lockedFluidName)) aNBT.setString("lockedFluidName", lockedFluidName); if (this.mAllowInputFromOutputSide) aNBT.setBoolean("mAllowInputFromOutputSide", true); super.setItemNBT(aNBT); @@ -170,7 +170,7 @@ public abstract class GT_MetaTileEntity_DigitalTankBase extends GT_MetaTileEntit aNBT.setBoolean("mVoidOverflow", this.mVoidFluidPart); aNBT.setBoolean("mVoidFluidFull", this.mVoidFluidFull); aNBT.setBoolean("mLockFluid", mLockFluid); - if (mLockFluid && GT_Utility.isStringValid(lockedFluidName)) aNBT.setString("lockedFluidName", lockedFluidName); + if (mLockFluid && GTUtility.isStringValid(lockedFluidName)) aNBT.setString("lockedFluidName", lockedFluidName); else aNBT.removeTag("lockedFluidName"); aNBT.setBoolean("mAllowInputFromOutputSide", this.mAllowInputFromOutputSide); } @@ -249,7 +249,7 @@ public abstract class GT_MetaTileEntity_DigitalTankBase extends GT_MetaTileEntit @Override public void setLockedFluidName(String lockedFluidName) { - lockedFluidName = GT_Utility.isStringInvalid(lockedFluidName) ? null : lockedFluidName; + lockedFluidName = GTUtility.isStringInvalid(lockedFluidName) ? null : lockedFluidName; this.lockedFluidName = lockedFluidName; if (lockedFluidName != null) { Fluid fluid = FluidRegistry.getFluid(lockedFluidName); @@ -307,7 +307,7 @@ public abstract class GT_MetaTileEntity_DigitalTankBase extends GT_MetaTileEntit @Override public boolean onRightclick(IGregTechTileEntity aBaseMetaTileEntity, EntityPlayer aPlayer) { - GT_UIInfos.openGTTileEntityUI(aBaseMetaTileEntity, aPlayer); + GTUIInfos.openGTTileEntityUI(aBaseMetaTileEntity, aPlayer); return true; } @@ -315,9 +315,9 @@ public abstract class GT_MetaTileEntity_DigitalTankBase extends GT_MetaTileEntit public final void onScrewdriverRightClick(ForgeDirection side, EntityPlayer aPlayer, float aX, float aY, float aZ) { if (side == getBaseMetaTileEntity().getFrontFacing()) { mAllowInputFromOutputSide = !mAllowInputFromOutputSide; - GT_Utility.sendChatToPlayer( + GTUtility.sendChatToPlayer( aPlayer, - mAllowInputFromOutputSide ? GT_Utility.getTrans("095") : GT_Utility.getTrans("096")); + mAllowInputFromOutputSide ? GTUtility.getTrans("095") : GTUtility.getTrans("096")); } } @@ -352,7 +352,7 @@ public abstract class GT_MetaTileEntity_DigitalTankBase extends GT_MetaTileEntit } if (doesEmptyContainers()) { - FluidStack tFluid = GT_Utility.getFluidForFilledItem(mInventory[getInputSlot()], true); + FluidStack tFluid = GTUtility.getFluidForFilledItem(mInventory[getInputSlot()], true); if (tFluid != null && isFluidInputAllowed(tFluid)) { if (getFillableStack() == null) { if (isFluidInputAllowed(tFluid)) { @@ -360,7 +360,7 @@ public abstract class GT_MetaTileEntity_DigitalTankBase extends GT_MetaTileEntit tFluid = tFluid.copy(); if (aBaseMetaTileEntity.addStackToSlot( getOutputSlot(), - GT_Utility.getContainerForFilledItem(mInventory[getInputSlot()], true), + GTUtility.getContainerForFilledItem(mInventory[getInputSlot()], true), 1)) { setFillableStack(tFluid); this.onEmptyingContainerWhenEmpty(); @@ -375,7 +375,7 @@ public abstract class GT_MetaTileEntity_DigitalTankBase extends GT_MetaTileEntit || mVoidFluidFull) { if (aBaseMetaTileEntity.addStackToSlot( getOutputSlot(), - GT_Utility.getContainerForFilledItem(mInventory[getInputSlot()], true), + GTUtility.getContainerForFilledItem(mInventory[getInputSlot()], true), 1)) { getFillableStack().amount += Math .min(tFluid.amount, getRealCapacity() - getFillableStack().amount); @@ -388,10 +388,10 @@ public abstract class GT_MetaTileEntity_DigitalTankBase extends GT_MetaTileEntit } if (doesFillContainers()) { - ItemStack tOutput = GT_Utility + ItemStack tOutput = GTUtility .fillFluidContainer(getDrainableStack(), mInventory[getInputSlot()], false, true); if (tOutput != null && aBaseMetaTileEntity.addStackToSlot(getOutputSlot(), tOutput, 1)) { - FluidStack tFluid = GT_Utility.getFluidForFilledItem(tOutput, true); + FluidStack tFluid = GTUtility.getFluidForFilledItem(tOutput, true); aBaseMetaTileEntity.decrStackSize(getInputSlot(), 1); if (tFluid != null) getDrainableStack().amount -= tFluid.amount; if (getDrainableStack().amount <= 0 && isFluidChangingAllowed()) setDrainableStack(null); @@ -548,20 +548,20 @@ public abstract class GT_MetaTileEntity_DigitalTankBase extends GT_MetaTileEntit FluidSlotWidget fluidSlotWidget = new FluidSlotWidget(fluidTank); builder.widget( - new DrawableWidget().setDrawable(GT_UITextures.PICTURE_SCREEN_BLACK) + new DrawableWidget().setDrawable(GTUITextures.PICTURE_SCREEN_BLACK) .setPos(7, 16) .setSize(71, 45)) .widget( new SlotWidget(inventoryHandler, getInputSlot()) - .setBackground(getGUITextureSet().getItemSlot(), GT_UITextures.OVERLAY_SLOT_IN) + .setBackground(getGUITextureSet().getItemSlot(), GTUITextures.OVERLAY_SLOT_IN) .setPos(79, 16)) .widget( new SlotWidget(inventoryHandler, getOutputSlot()).setAccess(true, false) - .setBackground(getGUITextureSet().getItemSlot(), GT_UITextures.OVERLAY_SLOT_OUT) + .setBackground(getGUITextureSet().getItemSlot(), GTUITextures.OVERLAY_SLOT_OUT) .setPos(79, 43)) .widget( fluidSlotWidget.setOnClickContainer(widget -> onEmptyingContainerWhenEmpty()) - .setBackground(GT_UITextures.TRANSPARENT) + .setBackground(GTUITextures.TRANSPARENT) .setPos(58, 41)) .widget( new TextWidget(StatCollector.translateToLocal("GT5U.machines.digitaltank.fluid.amount")) @@ -572,7 +572,7 @@ public abstract class GT_MetaTileEntity_DigitalTankBase extends GT_MetaTileEntit .setDefaultColor(COLOR_TEXT_WHITE.get()) .setPos(10, 30)) .widget( - new DrawableWidget().setDrawable(GT_UITextures.PICTURE_SCREEN_BLACK) + new DrawableWidget().setDrawable(GTUITextures.PICTURE_SCREEN_BLACK) .setPos(98, 16) .setSize(71, 45)) .widget(new FluidLockWidget(this).setPos(149, 41)) @@ -592,17 +592,17 @@ public abstract class GT_MetaTileEntity_DigitalTankBase extends GT_MetaTileEntit .widget(new CycleButtonWidget().setToggle(() -> mOutputFluid, val -> { mOutputFluid = val; if (!mOutputFluid) { - GT_Utility.sendChatToPlayer( + GTUtility.sendChatToPlayer( buildContext.getPlayer(), - GT_Utility.trans("262", "Fluid Auto Output Disabled")); + GTUtility.trans("262", "Fluid Auto Output Disabled")); } else { - GT_Utility.sendChatToPlayer( + GTUtility.sendChatToPlayer( buildContext.getPlayer(), - GT_Utility.trans("263", "Fluid Auto Output Enabled")); + GTUtility.trans("263", "Fluid Auto Output Enabled")); } }) - .setVariableBackground(GT_UITextures.BUTTON_STANDARD_TOGGLE) - .setStaticTexture(GT_UITextures.OVERLAY_BUTTON_AUTOOUTPUT_FLUID) + .setVariableBackground(GTUITextures.BUTTON_STANDARD_TOGGLE) + .setStaticTexture(GTUITextures.OVERLAY_BUTTON_AUTOOUTPUT_FLUID) .setGTTooltip(() -> mTooltipCache.getData("GT5U.machines.digitaltank.autooutput.tooltip")) .setTooltipShowUpDelay(TOOLTIP_DELAY) .setPos(7, 63) @@ -615,7 +615,7 @@ public abstract class GT_MetaTileEntity_DigitalTankBase extends GT_MetaTileEntit if (mLockFluid) { if (mFluid == null) { setLockedFluidName(null); - inBrackets = GT_Utility + inBrackets = GTUtility .trans("264", "currently none, will be locked to the next that is put in"); } else { setLockedFluidName( @@ -623,19 +623,18 @@ public abstract class GT_MetaTileEntity_DigitalTankBase extends GT_MetaTileEntit .getName()); inBrackets = getDrainableStack().getLocalizedName(); } - GT_Utility.sendChatToPlayer( + GTUtility.sendChatToPlayer( buildContext.getPlayer(), - String.format("%s (%s)", GT_Utility.trans("265", "1 specific Fluid"), inBrackets)); + String.format("%s (%s)", GTUtility.trans("265", "1 specific Fluid"), inBrackets)); } else { fluidTank.drain(0, true); - GT_Utility.sendChatToPlayer( - buildContext.getPlayer(), - GT_Utility.trans("266", "Lock Fluid Mode Disabled")); + GTUtility + .sendChatToPlayer(buildContext.getPlayer(), GTUtility.trans("266", "Lock Fluid Mode Disabled")); } fluidSlotWidget.notifyTooltipChange(); }) - .setVariableBackground(GT_UITextures.BUTTON_STANDARD_TOGGLE) - .setStaticTexture(GT_UITextures.OVERLAY_BUTTON_LOCK) + .setVariableBackground(GTUITextures.BUTTON_STANDARD_TOGGLE) + .setStaticTexture(GTUITextures.OVERLAY_BUTTON_LOCK) .setGTTooltip(() -> mTooltipCache.getData("GT5U.machines.digitaltank.lockfluid.tooltip")) .setTooltipShowUpDelay(TOOLTIP_DELAY) .setPos(25, 63) @@ -643,13 +642,13 @@ public abstract class GT_MetaTileEntity_DigitalTankBase extends GT_MetaTileEntit .widget(new CycleButtonWidget().setToggle(() -> mAllowInputFromOutputSide, val -> { mAllowInputFromOutputSide = val; if (!mAllowInputFromOutputSide) { - GT_Utility.sendChatToPlayer(buildContext.getPlayer(), GT_Utility.getTrans("096")); + GTUtility.sendChatToPlayer(buildContext.getPlayer(), GTUtility.getTrans("096")); } else { - GT_Utility.sendChatToPlayer(buildContext.getPlayer(), GT_Utility.getTrans("095")); + GTUtility.sendChatToPlayer(buildContext.getPlayer(), GTUtility.getTrans("095")); } }) - .setVariableBackground(GT_UITextures.BUTTON_STANDARD_TOGGLE) - .setStaticTexture(GT_UITextures.OVERLAY_BUTTON_INPUT_FROM_OUTPUT_SIDE) + .setVariableBackground(GTUITextures.BUTTON_STANDARD_TOGGLE) + .setStaticTexture(GTUITextures.OVERLAY_BUTTON_INPUT_FROM_OUTPUT_SIDE) .setGTTooltip(() -> mTooltipCache.getData("GT5U.machines.digitaltank.inputfromoutput.tooltip")) .setTooltipShowUpDelay(TOOLTIP_DELAY) .setPos(43, 63) @@ -658,17 +657,17 @@ public abstract class GT_MetaTileEntity_DigitalTankBase extends GT_MetaTileEntit mVoidFluidPart = val; fluidTank.setAllowOverflow(allowOverflow()); if (!mVoidFluidPart) { - GT_Utility.sendChatToPlayer( + GTUtility.sendChatToPlayer( buildContext.getPlayer(), - GT_Utility.trans("267", "Overflow Voiding Mode Disabled")); + GTUtility.trans("267", "Overflow Voiding Mode Disabled")); } else { - GT_Utility.sendChatToPlayer( + GTUtility.sendChatToPlayer( buildContext.getPlayer(), - GT_Utility.trans("268", "Overflow Voiding Mode Enabled")); + GTUtility.trans("268", "Overflow Voiding Mode Enabled")); } }) - .setVariableBackground(GT_UITextures.BUTTON_STANDARD_TOGGLE) - .setStaticTexture(GT_UITextures.OVERLAY_BUTTON_TANK_VOID_EXCESS) + .setVariableBackground(GTUITextures.BUTTON_STANDARD_TOGGLE) + .setStaticTexture(GTUITextures.OVERLAY_BUTTON_TANK_VOID_EXCESS) .setGTTooltip(() -> mTooltipCache.getData("GT5U.machines.digitaltank.voidoverflow.tooltip")) .setTooltipShowUpDelay(TOOLTIP_DELAY) .setPos(98, 63) @@ -677,15 +676,15 @@ public abstract class GT_MetaTileEntity_DigitalTankBase extends GT_MetaTileEntit mVoidFluidFull = val; fluidTank.setAllowOverflow(allowOverflow()); if (!mVoidFluidFull) { - GT_Utility - .sendChatToPlayer(buildContext.getPlayer(), GT_Utility.trans("269", "Void Full Mode Disabled")); + GTUtility + .sendChatToPlayer(buildContext.getPlayer(), GTUtility.trans("269", "Void Full Mode Disabled")); } else { - GT_Utility - .sendChatToPlayer(buildContext.getPlayer(), GT_Utility.trans("270", "Void Full Mode Enabled")); + GTUtility + .sendChatToPlayer(buildContext.getPlayer(), GTUtility.trans("270", "Void Full Mode Enabled")); } }) - .setVariableBackground(GT_UITextures.BUTTON_STANDARD_TOGGLE) - .setStaticTexture(GT_UITextures.OVERLAY_BUTTON_TANK_VOID_ALL) + .setVariableBackground(GTUITextures.BUTTON_STANDARD_TOGGLE) + .setStaticTexture(GTUITextures.OVERLAY_BUTTON_TANK_VOID_ALL) .setGTTooltip(() -> mTooltipCache.getData("GT5U.machines.digitaltank.voidfull.tooltip")) .setTooltipShowUpDelay(TOOLTIP_DELAY) .setPos(116, 63) diff --git a/src/main/java/gregtech/common/tileentities/storage/GT_MetaTileEntity_Locker.java b/src/main/java/gregtech/common/tileentities/storage/MTELocker.java index abce9514de..6398f56bec 100644 --- a/src/main/java/gregtech/common/tileentities/storage/GT_MetaTileEntity_Locker.java +++ b/src/main/java/gregtech/common/tileentities/storage/MTELocker.java @@ -17,32 +17,33 @@ import net.minecraft.util.StatCollector; import net.minecraft.world.World; import net.minecraftforge.common.util.ForgeDirection; +import gregtech.api.enums.GTValues; import gregtech.api.enums.SoundResource; import gregtech.api.interfaces.ITexture; import gregtech.api.interfaces.metatileentity.IMetaTileEntity; import gregtech.api.interfaces.tileentity.IGregTechTileEntity; -import gregtech.api.metatileentity.implementations.GT_MetaTileEntity_TieredMachineBlock; -import gregtech.api.objects.GT_ItemStack; +import gregtech.api.metatileentity.implementations.MTETieredMachineBlock; +import gregtech.api.objects.GTItemStack; import gregtech.api.render.TextureFactory; -import gregtech.api.util.GT_ModHandler; -import gregtech.api.util.GT_Utility; +import gregtech.api.util.GTModHandler; +import gregtech.api.util.GTUtility; import mcp.mobius.waila.api.IWailaConfigHandler; import mcp.mobius.waila.api.IWailaDataAccessor; -public class GT_MetaTileEntity_Locker extends GT_MetaTileEntity_TieredMachineBlock { +public class MTELocker extends MTETieredMachineBlock { private static final String CHARGE_SLOT_WAILA_TAG = "charge_slot_"; public byte mType = 0; - public GT_MetaTileEntity_Locker(int aID, String aName, String aNameRegional, int aTier) { + public MTELocker(int aID, String aName, String aNameRegional, int aTier) { super(aID, aName, aNameRegional, aTier, 4, "Stores and recharges Armor"); } - public GT_MetaTileEntity_Locker(String aName, int aTier, String aDescription, ITexture[][][] aTextures) { + public MTELocker(String aName, int aTier, String aDescription, ITexture[][][] aTextures) { super(aName, aTier, 4, aDescription, aTextures); } - public GT_MetaTileEntity_Locker(String aName, int aTier, String[] aDescription, ITexture[][][] aTextures) { + public MTELocker(String aName, int aTier, String[] aDescription, ITexture[][][] aTextures) { super(aName, aTier, 4, aDescription, aTextures); } @@ -80,7 +81,7 @@ public class GT_MetaTileEntity_Locker extends GT_MetaTileEntity_TieredMachineBlo @Override public IMetaTileEntity newMetaEntity(IGregTechTileEntity aTileEntity) { - return new GT_MetaTileEntity_Locker(this.mName, this.mTier, this.mDescriptionArray, this.mTextures); + return new MTELocker(this.mName, this.mTier, this.mDescriptionArray, this.mTextures); } @Override @@ -120,12 +121,12 @@ public class GT_MetaTileEntity_Locker extends GT_MetaTileEntity_TieredMachineBlo @Override public long maxEUStore() { - return gregtech.api.enums.GT_Values.V[this.mTier] * maxAmperesIn(); + return GTValues.V[this.mTier] * maxAmperesIn(); } @Override public long maxEUInput() { - return gregtech.api.enums.GT_Values.V[this.mTier]; + return GTValues.V[this.mTier]; } @Override @@ -171,7 +172,7 @@ public class GT_MetaTileEntity_Locker extends GT_MetaTileEntity_TieredMachineBlo @Override public void doSound(byte aIndex, double aX, double aY, double aZ) { if (aIndex == 16) { - GT_Utility.doSoundAtClient(SoundResource.RANDOM_CLICK, 1, 1.0F); + GTUtility.doSoundAtClient(SoundResource.RANDOM_CLICK, 1, 1.0F); } } @@ -183,7 +184,7 @@ public class GT_MetaTileEntity_Locker extends GT_MetaTileEntity_TieredMachineBlo } @Override - public boolean allowCoverOnSide(ForgeDirection side, GT_ItemStack aStack) { + public boolean allowCoverOnSide(ForgeDirection side, GTItemStack aStack) { return side != getBaseMetaTileEntity().getFrontFacing(); } @@ -235,7 +236,7 @@ public class GT_MetaTileEntity_Locker extends GT_MetaTileEntity_TieredMachineBlo final NBTTagCompound tag = accessor.getNBTData(); for (int i = 0; i < 4; i++) { - final String index = GT_Utility.formatNumbers(i + 1); + final String index = GTUtility.formatNumbers(i + 1); if (tag.hasKey(CHARGE_SLOT_WAILA_TAG + i)) { final ItemStack slotItem = ItemStack @@ -243,7 +244,7 @@ public class GT_MetaTileEntity_Locker extends GT_MetaTileEntity_TieredMachineBlo assert slotItem != null; currentTip.add( - GT_ModHandler.getElectricItemCharge(slotItem) + GTModHandler.getElectricItemCharge(slotItem) .map(chargeInfo -> { final float ratio = (float) chargeInfo[0] / (float) chargeInfo[1]; final EnumChatFormatting chargeFormat; @@ -267,7 +268,7 @@ public class GT_MetaTileEntity_Locker extends GT_MetaTileEntity_TieredMachineBlo index, slotItem.getDisplayName(), chargeFormat, - GT_Utility.formatNumbers(ratio * 100)); + GTUtility.formatNumbers(ratio * 100)); }) .orElseGet( // Lazy initialization diff --git a/src/main/java/gregtech/common/tileentities/storage/GT_MetaTileEntity_QuantumChest.java b/src/main/java/gregtech/common/tileentities/storage/MTEQuantumChest.java index c830cd4e52..5402ded873 100644 --- a/src/main/java/gregtech/common/tileentities/storage/GT_MetaTileEntity_QuantumChest.java +++ b/src/main/java/gregtech/common/tileentities/storage/MTEQuantumChest.java @@ -14,27 +14,27 @@ import gregtech.api.interfaces.ITexture; import gregtech.api.interfaces.tileentity.IGregTechTileEntity; import gregtech.api.metatileentity.MetaTileEntity; -public class GT_MetaTileEntity_QuantumChest extends GT_MetaTileEntity_DigitalChestBase { +public class MTEQuantumChest extends MTEDigitalChestBase { public int mItemCount = 0; public ItemStack mItemStack = null; NBTTagList mInvData = null; - public GT_MetaTileEntity_QuantumChest(int aID, String aName, String aNameRegional, int aTier) { + public MTEQuantumChest(int aID, String aName, String aNameRegional, int aTier) { super(aID, aName, aNameRegional, aTier); } - public GT_MetaTileEntity_QuantumChest(String aName, int aTier, String aDescription, ITexture[][][] aTextures) { + public MTEQuantumChest(String aName, int aTier, String aDescription, ITexture[][][] aTextures) { super(aName, aTier, aDescription, aTextures); } - public GT_MetaTileEntity_QuantumChest(String aName, int aTier, String[] aDescription, ITexture[][][] aTextures) { + public MTEQuantumChest(String aName, int aTier, String[] aDescription, ITexture[][][] aTextures) { super(aName, aTier, aDescription, aTextures); } @Override public MetaTileEntity newMetaEntity(IGregTechTileEntity aTileEntity) { - return new GT_MetaTileEntity_QuantumChest(mName, mTier, mDescriptionArray, mTextures); + return new MTEQuantumChest(mName, mTier, mDescriptionArray, mTextures); } @Override diff --git a/src/main/java/gregtech/common/tileentities/storage/GT_MetaTileEntity_QuantumTank.java b/src/main/java/gregtech/common/tileentities/storage/MTEQuantumTank.java index 4d51d0b634..5ec574a59f 100644 --- a/src/main/java/gregtech/common/tileentities/storage/GT_MetaTileEntity_QuantumTank.java +++ b/src/main/java/gregtech/common/tileentities/storage/MTEQuantumTank.java @@ -5,25 +5,25 @@ import net.minecraft.util.EnumChatFormatting; import gregtech.api.interfaces.ITexture; import gregtech.api.interfaces.tileentity.IGregTechTileEntity; import gregtech.api.metatileentity.MetaTileEntity; -import gregtech.api.util.GT_Utility; +import gregtech.api.util.GTUtility; -public class GT_MetaTileEntity_QuantumTank extends GT_MetaTileEntity_DigitalTankBase { +public class MTEQuantumTank extends MTEDigitalTankBase { - public GT_MetaTileEntity_QuantumTank(int aID, String aName, String aNameRegional, int aTier) { + public MTEQuantumTank(int aID, String aName, String aNameRegional, int aTier) { super(aID, aName, aNameRegional, aTier); } - public GT_MetaTileEntity_QuantumTank(String aName, int aTier, String aDescription, ITexture[][][] aTextures) { + public MTEQuantumTank(String aName, int aTier, String aDescription, ITexture[][][] aTextures) { super(aName, aTier, aDescription, aTextures); } - public GT_MetaTileEntity_QuantumTank(String aName, int aTier, String[] aDescription, ITexture[][][] aTextures) { + public MTEQuantumTank(String aName, int aTier, String[] aDescription, ITexture[][][] aTextures) { super(aName, aTier, aDescription, aTextures); } @Override public MetaTileEntity newMetaEntity(IGregTechTileEntity aTileEntity) { - return new GT_MetaTileEntity_QuantumTank(mName, mTier, mDescriptionArray, mTextures); + return new MTEQuantumTank(mName, mTier, mDescriptionArray, mTextures); } @Override @@ -37,18 +37,18 @@ public class GT_MetaTileEntity_QuantumTank extends GT_MetaTileEntity_DigitalTank + EnumChatFormatting.RESET + " " + EnumChatFormatting.YELLOW - + GT_Utility.formatNumbers(getCapacity()) + + GTUtility.formatNumbers(getCapacity()) + " L" + EnumChatFormatting.RESET }; } return new String[] { EnumChatFormatting.BLUE + "Quantum Tank" + EnumChatFormatting.RESET, "Stored Fluid:", EnumChatFormatting.GOLD + mFluid.getLocalizedName() + EnumChatFormatting.RESET, - EnumChatFormatting.GREEN + GT_Utility.formatNumbers(mFluid.amount) + EnumChatFormatting.GREEN + GTUtility.formatNumbers(mFluid.amount) + " L" + EnumChatFormatting.RESET + " " + EnumChatFormatting.YELLOW - + GT_Utility.formatNumbers(getCapacity()) + + GTUtility.formatNumbers(getCapacity()) + " L" + EnumChatFormatting.RESET }; } diff --git a/src/main/java/gregtech/common/tileentities/storage/GT_MetaTileEntity_SuperChest.java b/src/main/java/gregtech/common/tileentities/storage/MTESuperChest.java index 271402f0de..8e3f35d2c1 100644 --- a/src/main/java/gregtech/common/tileentities/storage/GT_MetaTileEntity_SuperChest.java +++ b/src/main/java/gregtech/common/tileentities/storage/MTESuperChest.java @@ -4,17 +4,17 @@ import gregtech.api.interfaces.ITexture; import gregtech.api.interfaces.tileentity.IGregTechTileEntity; import gregtech.api.metatileentity.MetaTileEntity; -public class GT_MetaTileEntity_SuperChest extends GT_MetaTileEntity_QuantumChest { +public class MTESuperChest extends MTEQuantumChest { - public GT_MetaTileEntity_SuperChest(int aID, String aName, String aNameRegional, int aTier) { + public MTESuperChest(int aID, String aName, String aNameRegional, int aTier) { super(aID, aName, aNameRegional, aTier); } - public GT_MetaTileEntity_SuperChest(String aName, int aTier, String aDescription, ITexture[][][] aTextures) { + public MTESuperChest(String aName, int aTier, String aDescription, ITexture[][][] aTextures) { super(aName, aTier, aDescription, aTextures); } - public GT_MetaTileEntity_SuperChest(String aName, int aTier, String[] aDescription, ITexture[][][] aTextures) { + public MTESuperChest(String aName, int aTier, String[] aDescription, ITexture[][][] aTextures) { super(aName, aTier, aDescription, aTextures); } @@ -25,6 +25,6 @@ public class GT_MetaTileEntity_SuperChest extends GT_MetaTileEntity_QuantumChest @Override public MetaTileEntity newMetaEntity(IGregTechTileEntity aTileEntity) { - return new GT_MetaTileEntity_SuperChest(mName, mTier, mDescriptionArray, mTextures); + return new MTESuperChest(mName, mTier, mDescriptionArray, mTextures); } } diff --git a/src/main/java/gregtech/common/tileentities/storage/GT_MetaTileEntity_SuperTank.java b/src/main/java/gregtech/common/tileentities/storage/MTESuperTank.java index 4f0bdbc237..1e1e2fb109 100644 --- a/src/main/java/gregtech/common/tileentities/storage/GT_MetaTileEntity_SuperTank.java +++ b/src/main/java/gregtech/common/tileentities/storage/MTESuperTank.java @@ -5,25 +5,25 @@ import net.minecraft.util.EnumChatFormatting; import gregtech.api.interfaces.ITexture; import gregtech.api.interfaces.tileentity.IGregTechTileEntity; import gregtech.api.metatileentity.MetaTileEntity; -import gregtech.api.util.GT_Utility; +import gregtech.api.util.GTUtility; -public class GT_MetaTileEntity_SuperTank extends GT_MetaTileEntity_DigitalTankBase { +public class MTESuperTank extends MTEDigitalTankBase { - public GT_MetaTileEntity_SuperTank(int aID, String aName, String aNameRegional, int aTier) { + public MTESuperTank(int aID, String aName, String aNameRegional, int aTier) { super(aID, aName, aNameRegional, aTier); } - public GT_MetaTileEntity_SuperTank(String aName, int aTier, String aDescription, ITexture[][][] aTextures) { + public MTESuperTank(String aName, int aTier, String aDescription, ITexture[][][] aTextures) { super(aName, aTier, aDescription, aTextures); } - public GT_MetaTileEntity_SuperTank(String aName, int aTier, String[] aDescription, ITexture[][][] aTextures) { + public MTESuperTank(String aName, int aTier, String[] aDescription, ITexture[][][] aTextures) { super(aName, aTier, aDescription, aTextures); } @Override public MetaTileEntity newMetaEntity(IGregTechTileEntity aTileEntity) { - return new GT_MetaTileEntity_SuperTank(mName, mTier, mDescriptionArray, mTextures); + return new MTESuperTank(mName, mTier, mDescriptionArray, mTextures); } @Override @@ -36,18 +36,18 @@ public class GT_MetaTileEntity_SuperTank extends GT_MetaTileEntity_DigitalTankBa + EnumChatFormatting.RESET + " " + EnumChatFormatting.YELLOW - + GT_Utility.formatNumbers(getCapacity()) + + GTUtility.formatNumbers(getCapacity()) + " L" + EnumChatFormatting.RESET }; } return new String[] { EnumChatFormatting.BLUE + "Super Tank" + EnumChatFormatting.RESET, "Stored Fluid:", EnumChatFormatting.GOLD + mFluid.getLocalizedName() + EnumChatFormatting.RESET, - EnumChatFormatting.GREEN + GT_Utility.formatNumbers(mFluid.amount) + EnumChatFormatting.GREEN + GTUtility.formatNumbers(mFluid.amount) + " L" + EnumChatFormatting.RESET + " " + EnumChatFormatting.YELLOW - + GT_Utility.formatNumbers(getCapacity()) + + GTUtility.formatNumbers(getCapacity()) + " L" + EnumChatFormatting.RESET }; } |