aboutsummaryrefslogtreecommitdiff
path: root/src/main/java/gregtech/common/tileentities/storage
diff options
context:
space:
mode:
authorRaven Szewczyk <git@eigenraven.me>2023-04-10 17:49:16 +0100
committerRaven Szewczyk <git@eigenraven.me>2023-04-10 17:49:16 +0100
commit8ac58626bd4caa9e49f58acc6b97ac031f6c2107 (patch)
tree0a8c7b737f1f2607fa6875309f4c6a5c2b8b3331 /src/main/java/gregtech/common/tileentities/storage
parentd795cf740c3b48b602d3bfb708ed9e6c492ad37d (diff)
downloadGT5-Unofficial-8ac58626bd4caa9e49f58acc6b97ac031f6c2107.tar.gz
GT5-Unofficial-8ac58626bd4caa9e49f58acc6b97ac031f6c2107.tar.bz2
GT5-Unofficial-8ac58626bd4caa9e49f58acc6b97ac031f6c2107.zip
Update spotless config to 0.2.2
Diffstat (limited to 'src/main/java/gregtech/common/tileentities/storage')
-rw-r--r--src/main/java/gregtech/common/tileentities/storage/GT_MetaTileEntity_DigitalChestBase.java205
-rw-r--r--src/main/java/gregtech/common/tileentities/storage/GT_MetaTileEntity_DigitalTankBase.java418
-rw-r--r--src/main/java/gregtech/common/tileentities/storage/GT_MetaTileEntity_Locker.java6
-rw-r--r--src/main/java/gregtech/common/tileentities/storage/GT_MetaTileEntity_QuantumTank.java36
-rw-r--r--src/main/java/gregtech/common/tileentities/storage/GT_MetaTileEntity_SuperTank.java34
5 files changed, 334 insertions, 365 deletions
diff --git a/src/main/java/gregtech/common/tileentities/storage/GT_MetaTileEntity_DigitalChestBase.java b/src/main/java/gregtech/common/tileentities/storage/GT_MetaTileEntity_DigitalChestBase.java
index 23bf3d7c46..c9a3ad7650 100644
--- a/src/main/java/gregtech/common/tileentities/storage/GT_MetaTileEntity_DigitalChestBase.java
+++ b/src/main/java/gregtech/common/tileentities/storage/GT_MetaTileEntity_DigitalChestBase.java
@@ -41,7 +41,7 @@ import gregtech.api.util.GT_LanguageManager;
import gregtech.api.util.GT_Utility;
public abstract class GT_MetaTileEntity_DigitalChestBase extends GT_MetaTileEntity_TieredMachineBlock
- implements appeng.api.storage.IMEMonitor<appeng.api.storage.data.IAEItemStack>, IAddUIWidgets {
+ implements appeng.api.storage.IMEMonitor<appeng.api.storage.data.IAEItemStack>, IAddUIWidgets {
protected boolean mVoidOverflow = false;
protected boolean mDisableFilter;
@@ -49,14 +49,13 @@ public abstract class GT_MetaTileEntity_DigitalChestBase extends GT_MetaTileEnti
public GT_MetaTileEntity_DigitalChestBase(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",
- "Use a screwdriver to enable", "voiding items on overflow",
- "Will keep its contents when harvested", });
+ aID,
+ aName,
+ aNameRegional,
+ aTier,
+ 3,
+ new String[] { "This Chest stores " + GT_Utility.formatNumbers(commonSizeCompute(aTier)) + " Blocks",
+ "Use a screwdriver to enable", "voiding items on overflow", "Will keep its contents when harvested", });
}
protected static int commonSizeCompute(int tier) {
@@ -80,53 +79,53 @@ public abstract class GT_MetaTileEntity_DigitalChestBase extends GT_MetaTileEnti
}
public GT_MetaTileEntity_DigitalChestBase(String aName, int aTier, String[] aDescription,
- ITexture[][][] aTextures) {
+ ITexture[][][] aTextures) {
super(aName, aTier, 3, aDescription, aTextures);
}
@Override
public void addAdditionalTooltipInformation(ItemStack stack, List<String> tooltip) {
if (stack.hasTagCompound() && stack.stackTagCompound.hasKey("mItemStack")) {
- final ItemStack tContents = ItemStack.loadItemStackFromNBT(
- stack.stackTagCompound.getCompoundTag("mItemStack"));
+ final ItemStack tContents = ItemStack
+ .loadItemStackFromNBT(stack.stackTagCompound.getCompoundTag("mItemStack"));
final int tSize = stack.stackTagCompound.getInteger("mItemCount");
if (tContents != null && tSize > 0) {
tooltip.add(
- GT_LanguageManager.addStringLocalization(
- "TileEntity_CHEST_INFO",
- "Contains Item: ",
- !GregTech_API.sPostloadFinished) + EnumChatFormatting.YELLOW
- + tContents.getDisplayName()
- + EnumChatFormatting.GRAY);
+ GT_LanguageManager.addStringLocalization(
+ "TileEntity_CHEST_INFO",
+ "Contains Item: ",
+ !GregTech_API.sPostloadFinished) + EnumChatFormatting.YELLOW
+ + tContents.getDisplayName()
+ + EnumChatFormatting.GRAY);
tooltip.add(
- GT_LanguageManager.addStringLocalization(
- "TileEntity_CHEST_AMOUNT",
- "Item Amount: ",
- !GregTech_API.sPostloadFinished) + EnumChatFormatting.GREEN
- + GT_Utility.formatNumbers(tSize)
- + EnumChatFormatting.GRAY);
+ GT_LanguageManager.addStringLocalization(
+ "TileEntity_CHEST_AMOUNT",
+ "Item Amount: ",
+ !GregTech_API.sPostloadFinished) + EnumChatFormatting.GREEN
+ + GT_Utility.formatNumbers(tSize)
+ + EnumChatFormatting.GRAY);
}
}
}
public static void registerAEIntegration() {
appeng.api.AEApi.instance()
- .registries()
- .externalStorage()
- .addExternalStorageInterface(new AE2DigitalChestHandler());
+ .registries()
+ .externalStorage()
+ .addExternalStorageInterface(new AE2DigitalChestHandler());
}
@Override
public void addListener(
- appeng.api.storage.IMEMonitorHandlerReceiver<appeng.api.storage.data.IAEItemStack> imeMonitorHandlerReceiver,
- Object o) {
+ appeng.api.storage.IMEMonitorHandlerReceiver<appeng.api.storage.data.IAEItemStack> imeMonitorHandlerReceiver,
+ Object o) {
if (listeners == null) listeners = new HashMap<>();
listeners.put(imeMonitorHandlerReceiver, o);
}
@Override
public void removeListener(
- appeng.api.storage.IMEMonitorHandlerReceiver<appeng.api.storage.data.IAEItemStack> imeMonitorHandlerReceiver) {
+ appeng.api.storage.IMEMonitorHandlerReceiver<appeng.api.storage.data.IAEItemStack> imeMonitorHandlerReceiver) {
if (listeners == null) listeners = new HashMap<>();
listeners.remove(imeMonitorHandlerReceiver);
}
@@ -171,7 +170,7 @@ public abstract class GT_MetaTileEntity_DigitalChestBase extends GT_MetaTileEnti
@Override
public appeng.api.storage.data.IItemList<appeng.api.storage.data.IAEItemStack> getAvailableItems(
- final appeng.api.storage.data.IItemList out) {
+ final appeng.api.storage.data.IItemList out) {
ItemStack storedStack = getItemStack();
if (storedStack != null) {
appeng.util.item.AEItemStack s = appeng.util.item.AEItemStack.create(storedStack);
@@ -210,7 +209,7 @@ public abstract class GT_MetaTileEntity_DigitalChestBase extends GT_MetaTileEnti
@Override
public appeng.api.storage.data.IAEItemStack injectItems(final appeng.api.storage.data.IAEItemStack input,
- final appeng.api.config.Actionable mode, final appeng.api.networking.security.BaseActionSource src) {
+ final appeng.api.config.Actionable mode, final appeng.api.networking.security.BaseActionSource src) {
final ItemStack inputStack = input.getItemStack();
if (inputStack == null) return null;
if (getBaseMetaTileEntity() == null) return input;
@@ -246,7 +245,7 @@ public abstract class GT_MetaTileEntity_DigitalChestBase extends GT_MetaTileEnti
@Override
public appeng.api.storage.data.IAEItemStack extractItems(final appeng.api.storage.data.IAEItemStack request,
- final appeng.api.config.Actionable mode, final appeng.api.networking.security.BaseActionSource src) {
+ final appeng.api.config.Actionable mode, final appeng.api.networking.security.BaseActionSource src) {
if (request.isSameType(getItemStack())) {
if (getBaseMetaTileEntity() == null) return null;
if (mode != appeng.api.config.Actionable.SIMULATE) getBaseMetaTileEntity().markDirty();
@@ -273,22 +272,22 @@ public abstract class GT_MetaTileEntity_DigitalChestBase extends GT_MetaTileEnti
public final void onScrewdriverRightClick(byte aSide, EntityPlayer aPlayer, float aX, float aY, float aZ) {
mVoidOverflow = !mVoidOverflow;
GT_Utility.sendChatToPlayer(
- aPlayer,
- StatCollector.translateToLocal(
- mVoidOverflow ? "GT5U.machines.digitalchest.voidoverflow.enabled"
- : "GT5U.machines.digitalchest.voidoverflow.disabled"));
+ aPlayer,
+ StatCollector.translateToLocal(
+ mVoidOverflow ? "GT5U.machines.digitalchest.voidoverflow.enabled"
+ : "GT5U.machines.digitalchest.voidoverflow.disabled"));
}
@Override
public boolean onSolderingToolRightClick(byte aSide, byte aWrenchingSide, EntityPlayer aPlayer, float aX, float aY,
- float aZ) {
+ float aZ) {
if (super.onSolderingToolRightClick(aSide, aWrenchingSide, aPlayer, aX, aY, aZ)) return true;
mDisableFilter = !mDisableFilter;
GT_Utility.sendChatToPlayer(
- aPlayer,
- StatCollector.translateToLocal(
- mDisableFilter ? "GT5U.machines.digitalchest.inputfilter.disabled"
- : "GT5U.machines.digitalchest.inputfilter.enabled"));
+ aPlayer,
+ StatCollector.translateToLocal(
+ mDisableFilter ? "GT5U.machines.digitalchest.inputfilter.disabled"
+ : "GT5U.machines.digitalchest.inputfilter.enabled"));
return true;
}
@@ -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)) {
+ && GT_Utility.areStacksEqual(mInventory[0], stack)) {
count += mInventory[0].stackSize;
if (count <= getMaxItemCount()) {
mInventory[0] = null;
@@ -326,11 +325,11 @@ public abstract class GT_MetaTileEntity_DigitalChestBase extends GT_MetaTileEnti
mInventory[1].stackSize = Math.min(stack.getMaxStackSize(), count);
count -= mInventory[1].stackSize;
} else if ((count > 0) && GT_Utility.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;
- count -= tmp;
- }
+ && mInventory[1].getMaxStackSize() > mInventory[1].stackSize) {
+ int tmp = Math.min(count, mInventory[1].getMaxStackSize() - mInventory[1].stackSize);
+ mInventory[1].stackSize += tmp;
+ count -= tmp;
+ }
setItemCount(count);
if (stack != null) {
mInventory[2] = stack.copy();
@@ -373,7 +372,7 @@ public abstract class GT_MetaTileEntity_DigitalChestBase extends GT_MetaTileEnti
@Override
public int getProgresstime() {
return getItemCount() + (mInventory[0] == null ? 0 : mInventory[0].stackSize)
- + (mInventory[1] == null ? 0 : mInventory[1].stackSize);
+ + (mInventory[1] == null ? 0 : mInventory[1].stackSize);
}
@Override
@@ -391,22 +390,22 @@ public abstract class GT_MetaTileEntity_DigitalChestBase extends GT_MetaTileEnti
if (getItemStack() == null) {
return new String[] { EnumChatFormatting.BLUE + chestName() + EnumChatFormatting.RESET, "Stored Items:",
- EnumChatFormatting.GOLD + "No Items" + EnumChatFormatting.RESET,
- EnumChatFormatting.GREEN + "0"
- + EnumChatFormatting.RESET
- + " "
- + EnumChatFormatting.YELLOW
- + GT_Utility.formatNumbers(getMaxItemCount())
- + EnumChatFormatting.RESET };
+ EnumChatFormatting.GOLD + "No Items" + EnumChatFormatting.RESET,
+ EnumChatFormatting.GREEN + "0"
+ + EnumChatFormatting.RESET
+ + " "
+ + EnumChatFormatting.YELLOW
+ + GT_Utility.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.RESET
- + " "
- + EnumChatFormatting.YELLOW
- + GT_Utility.formatNumbers(getMaxItemCount())
- + EnumChatFormatting.RESET };
+ EnumChatFormatting.GOLD + getItemStack().getDisplayName() + EnumChatFormatting.RESET,
+ EnumChatFormatting.GREEN + GT_Utility.formatNumbers(getItemCount())
+ + EnumChatFormatting.RESET
+ + " "
+ + EnumChatFormatting.YELLOW
+ + GT_Utility.formatNumbers(getMaxItemCount())
+ + EnumChatFormatting.RESET };
}
@Override
@@ -434,7 +433,8 @@ public abstract class GT_MetaTileEntity_DigitalChestBase extends GT_MetaTileEnti
private boolean hasActiveMEConnection() {
if (listeners == null || listeners.isEmpty()) return false;
- for (Map.Entry<appeng.api.storage.IMEMonitorHandlerReceiver<appeng.api.storage.data.IAEItemStack>, Object> e : listeners.entrySet()) {
+ for (Map.Entry<appeng.api.storage.IMEMonitorHandlerReceiver<appeng.api.storage.data.IAEItemStack>, Object> e : listeners
+ .entrySet()) {
if ((e.getKey() instanceof appeng.api.parts.IPart)) {
appeng.api.networking.IGridNode n = ((appeng.api.parts.IPart) e.getKey()).getGridNode();
if (n != null && n.isActive()) return true;
@@ -480,25 +480,25 @@ public abstract class GT_MetaTileEntity_DigitalChestBase extends GT_MetaTileEnti
@Override
public ITexture[] getTexture(IGregTechTileEntity aBaseMetaTileEntity, byte aSide, byte aFacing, byte aColorIndex,
- boolean aActive, boolean aRedstone) {
+ boolean aActive, boolean aRedstone) {
if (aSide != aFacing) return new ITexture[] { MACHINE_CASINGS[mTier][aColorIndex + 1] };
return new ITexture[] { MACHINE_CASINGS[mTier][aColorIndex + 1], TextureFactory.of(OVERLAY_SCHEST),
- TextureFactory.builder()
- .addIcon(OVERLAY_SCHEST_GLOW)
- .glow()
- .build() };
+ TextureFactory.builder()
+ .addIcon(OVERLAY_SCHEST_GLOW)
+ .glow()
+ .build() };
}
@Override
public void getWailaBody(ItemStack itemStack, List<String> currenttip, IWailaDataAccessor accessor,
- IWailaConfigHandler config) {
+ IWailaConfigHandler config) {
super.getWailaBody(itemStack, currenttip, accessor, config);
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 Type: " + ItemStack.loadItemStackFromNBT(tag.getCompoundTag("itemType"))
- .getDisplayName());
+ "Item Type: " + ItemStack.loadItemStackFromNBT(tag.getCompoundTag("itemType"))
+ .getDisplayName());
} else {
currenttip.add("Chest Empty");
}
@@ -506,7 +506,7 @@ public abstract class GT_MetaTileEntity_DigitalChestBase extends GT_MetaTileEnti
@Override
public void getWailaNBTData(EntityPlayerMP player, TileEntity tile, NBTTagCompound tag, World world, int x, int y,
- int z) {
+ int z) {
super.getWailaNBTData(player, tile, tag, world, x, y, z);
ItemStack is = getItemStack();
if (GT_Utility.isStackInvalid(is)) return;
@@ -525,36 +525,33 @@ 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)
- .setPos(7, 16)
- .setSize(71, 45))
- .widget(
- new SlotWidget(inventoryHandler, 0)
- .setBackground(
- getGUITextureSet().getItemSlot(),
- GT_UITextures.OVERLAY_SLOT_IN)
- .setPos(79, 16))
- .widget(
- new SlotWidget(inventoryHandler, 1).setAccess(true, false)
- .setBackground(
- getGUITextureSet().getItemSlot(),
- GT_UITextures.OVERLAY_SLOT_OUT)
- .setPos(79, 52))
- .widget(
- SlotWidget.phantom(inventoryHandler, 2)
- .disableInteraction()
- .setBackground(GT_UITextures.TRANSPARENT)
- .setPos(59, 42))
- .widget(
- new TextWidget("Item Amount").setDefaultColor(COLOR_TEXT_WHITE.get())
- .setPos(10, 20))
- .widget(
- TextWidget.dynamicString(
- () -> GT_Utility.parseNumberToString(
- this instanceof GT_MetaTileEntity_QuantumChest
- ? ((GT_MetaTileEntity_QuantumChest) this).mItemCount
- : 0))
- .setDefaultColor(COLOR_TEXT_WHITE.get())
- .setPos(10, 30));
+ new DrawableWidget().setDrawable(GT_UITextures.PICTURE_SCREEN_BLACK)
+ .setPos(7, 16)
+ .setSize(71, 45))
+ .widget(
+ new SlotWidget(inventoryHandler, 0)
+ .setBackground(getGUITextureSet().getItemSlot(), GT_UITextures.OVERLAY_SLOT_IN)
+ .setPos(79, 16))
+ .widget(
+ new SlotWidget(inventoryHandler, 1).setAccess(true, false)
+ .setBackground(getGUITextureSet().getItemSlot(), GT_UITextures.OVERLAY_SLOT_OUT)
+ .setPos(79, 52))
+ .widget(
+ SlotWidget.phantom(inventoryHandler, 2)
+ .disableInteraction()
+ .setBackground(GT_UITextures.TRANSPARENT)
+ .setPos(59, 42))
+ .widget(
+ new TextWidget("Item Amount").setDefaultColor(COLOR_TEXT_WHITE.get())
+ .setPos(10, 20))
+ .widget(
+ TextWidget
+ .dynamicString(
+ () -> GT_Utility.parseNumberToString(
+ this instanceof GT_MetaTileEntity_QuantumChest
+ ? ((GT_MetaTileEntity_QuantumChest) this).mItemCount
+ : 0))
+ .setDefaultColor(COLOR_TEXT_WHITE.get())
+ .setPos(10, 30));
}
}
diff --git a/src/main/java/gregtech/common/tileentities/storage/GT_MetaTileEntity_DigitalTankBase.java b/src/main/java/gregtech/common/tileentities/storage/GT_MetaTileEntity_DigitalTankBase.java
index 1bf8705279..14f1501527 100644
--- a/src/main/java/gregtech/common/tileentities/storage/GT_MetaTileEntity_DigitalTankBase.java
+++ b/src/main/java/gregtech/common/tileentities/storage/GT_MetaTileEntity_DigitalTankBase.java
@@ -46,7 +46,7 @@ import gregtech.api.util.GT_Utility;
import gregtech.common.gui.modularui.widget.FluidDisplaySlotWidget;
public abstract class GT_MetaTileEntity_DigitalTankBase extends GT_MetaTileEntity_BasicTank
- implements IFluidLockable, IAddUIWidgets {
+ implements IFluidLockable, IAddUIWidgets {
public boolean mOutputFluid = false, mVoidFluidPart = false, mVoidFluidFull = false, mLockFluid = false;
protected String lockedFluidName = null;
@@ -54,16 +54,16 @@ public abstract class GT_MetaTileEntity_DigitalTankBase extends GT_MetaTileEntit
public GT_MetaTileEntity_DigitalTankBase(int aID, String aName, String aNameRegional, int aTier) {
super(
- aID,
- aName,
- aNameRegional,
- aTier,
- 3,
- new String[] {
- StatCollector.translateToLocalFormatted(
- "GT5U.machines.digitaltank.tooltip",
- GT_Utility.formatNumbers(commonSizeCompute(aTier))),
- StatCollector.translateToLocal("GT5U.machines.digitaltank.tooltip1"), });
+ aID,
+ aName,
+ aNameRegional,
+ aTier,
+ 3,
+ new String[] {
+ StatCollector.translateToLocalFormatted(
+ "GT5U.machines.digitaltank.tooltip",
+ GT_Utility.formatNumbers(commonSizeCompute(aTier))),
+ StatCollector.translateToLocal("GT5U.machines.digitaltank.tooltip1"), });
}
protected static int commonSizeCompute(int tier) {
@@ -114,24 +114,24 @@ public abstract class GT_MetaTileEntity_DigitalTankBase extends GT_MetaTileEntit
@Override
public void addAdditionalTooltipInformation(ItemStack stack, List<String> tooltip) {
if (stack.hasTagCompound() && stack.stackTagCompound.hasKey("mFluid")) {
- final FluidStack tContents = FluidStack.loadFluidStackFromNBT(
- stack.stackTagCompound.getCompoundTag("mFluid"));
+ final FluidStack tContents = FluidStack
+ .loadFluidStackFromNBT(stack.stackTagCompound.getCompoundTag("mFluid"));
if (tContents != null && tContents.amount > 0) {
tooltip.add(
- GT_LanguageManager.addStringLocalization(
- "TileEntity_TANK_INFO",
- "Contains Fluid: ",
- !GregTech_API.sPostloadFinished) + EnumChatFormatting.YELLOW
- + tContents.getLocalizedName()
- + EnumChatFormatting.GRAY);
+ GT_LanguageManager.addStringLocalization(
+ "TileEntity_TANK_INFO",
+ "Contains Fluid: ",
+ !GregTech_API.sPostloadFinished) + EnumChatFormatting.YELLOW
+ + tContents.getLocalizedName()
+ + EnumChatFormatting.GRAY);
tooltip.add(
- GT_LanguageManager.addStringLocalization(
- "TileEntity_TANK_AMOUNT",
- "Fluid Amount: ",
- !GregTech_API.sPostloadFinished) + EnumChatFormatting.GREEN
- + GT_Utility.formatNumbers(tContents.amount)
- + " L"
- + EnumChatFormatting.GRAY);
+ GT_LanguageManager.addStringLocalization(
+ "TileEntity_TANK_AMOUNT",
+ "Fluid Amount: ",
+ !GregTech_API.sPostloadFinished) + EnumChatFormatting.GREEN
+ + GT_Utility.formatNumbers(tContents.amount)
+ + " L"
+ + EnumChatFormatting.GRAY);
}
}
}
@@ -178,9 +178,9 @@ public abstract class GT_MetaTileEntity_DigitalTankBase extends GT_MetaTileEntit
@Override
public boolean isFluidInputAllowed(FluidStack aFluid) {
return !mLockFluid || lockedFluidName == null
- || lockedFluidName.equals(
- aFluid.getFluid()
- .getName());
+ || lockedFluidName.equals(
+ aFluid.getFluid()
+ .getName());
}
@Override
@@ -192,7 +192,7 @@ public abstract class GT_MetaTileEntity_DigitalTankBase extends GT_MetaTileEntit
public void onEmptyingContainerWhenEmpty() {
if (this.lockedFluidName == null && this.mFluid != null) {
this.lockedFluidName = this.mFluid.getFluid()
- .getName();
+ .getName();
}
}
@@ -269,17 +269,17 @@ public abstract class GT_MetaTileEntity_DigitalTankBase extends GT_MetaTileEntit
@Override
public ITexture[] getTexture(IGregTechTileEntity aBaseMetaTileEntity, byte aSide, byte aFacing, byte aColorIndex,
- boolean aActive, boolean aRedstone) {
+ boolean aActive, boolean aRedstone) {
if (aSide != ForgeDirection.UP.ordinal()) {
if (aSide == aBaseMetaTileEntity.getFrontFacing()) {
return new ITexture[] { MACHINE_CASINGS[mTier][aColorIndex + 1], TextureFactory.of(OVERLAY_PIPE) };
} else return new ITexture[] { MACHINE_CASINGS[mTier][aColorIndex + 1] };
}
return new ITexture[] { MACHINE_CASINGS[mTier][aColorIndex + 1], TextureFactory.of(OVERLAY_QTANK),
- TextureFactory.builder()
- .addIcon(OVERLAY_QTANK_GLOW)
- .glow()
- .build() };
+ TextureFactory.builder()
+ .addIcon(OVERLAY_QTANK_GLOW)
+ .glow()
+ .build() };
}
@Override
@@ -293,8 +293,8 @@ public abstract class GT_MetaTileEntity_DigitalTankBase extends GT_MetaTileEntit
if (aSide == getBaseMetaTileEntity().getFrontFacing()) {
mAllowInputFromOutputSide = !mAllowInputFromOutputSide;
GT_Utility.sendChatToPlayer(
- aPlayer,
- mAllowInputFromOutputSide ? GT_Utility.getTrans("095") : GT_Utility.getTrans("096"));
+ aPlayer,
+ mAllowInputFromOutputSide ? GT_Utility.getTrans("095") : GT_Utility.getTrans("096"));
}
}
@@ -338,9 +338,9 @@ public abstract class GT_MetaTileEntity_DigitalTankBase extends GT_MetaTileEntit
if ((tFluid.amount <= getRealCapacity()) || mVoidFluidPart) {
tFluid = tFluid.copy();
if (aBaseMetaTileEntity.addStackToSlot(
- getOutputSlot(),
- GT_Utility.getContainerForFilledItem(mInventory[getInputSlot()], true),
- 1)) {
+ getOutputSlot(),
+ GT_Utility.getContainerForFilledItem(mInventory[getInputSlot()], true),
+ 1)) {
setFillableStack(tFluid);
this.onEmptyingContainerWhenEmpty();
aBaseMetaTileEntity.decrStackSize(getInputSlot(), 1);
@@ -350,15 +350,14 @@ public abstract class GT_MetaTileEntity_DigitalTankBase extends GT_MetaTileEntit
} else {
if (tFluid.isFluidEqual(getFillableStack())) {
if ((((long) tFluid.amount + getFillableStack().amount) <= (long) getRealCapacity())
- || mVoidFluidPart
- || mVoidFluidFull) {
+ || mVoidFluidPart
+ || mVoidFluidFull) {
if (aBaseMetaTileEntity.addStackToSlot(
- getOutputSlot(),
- GT_Utility.getContainerForFilledItem(mInventory[getInputSlot()], true),
- 1)) {
- getFillableStack().amount += Math.min(
- tFluid.amount,
- getRealCapacity() - getFillableStack().amount);
+ getOutputSlot(),
+ GT_Utility.getContainerForFilledItem(mInventory[getInputSlot()], true),
+ 1)) {
+ getFillableStack().amount += Math
+ .min(tFluid.amount, getRealCapacity() - getFillableStack().amount);
aBaseMetaTileEntity.decrStackSize(getInputSlot(), 1);
}
}
@@ -368,11 +367,8 @@ public abstract class GT_MetaTileEntity_DigitalTankBase extends GT_MetaTileEntit
}
if (doesFillContainers()) {
- ItemStack tOutput = GT_Utility.fillFluidContainer(
- getDrainableStack(),
- mInventory[getInputSlot()],
- false,
- true);
+ ItemStack tOutput = GT_Utility
+ .fillFluidContainer(getDrainableStack(), mInventory[getInputSlot()], false, true);
if (tOutput != null && aBaseMetaTileEntity.addStackToSlot(getOutputSlot(), tOutput, 1)) {
FluidStack tFluid = GT_Utility.getFluidForFilledItem(tOutput, true);
aBaseMetaTileEntity.decrStackSize(getInputSlot(), 1);
@@ -386,9 +382,7 @@ public abstract class GT_MetaTileEntity_DigitalTankBase extends GT_MetaTileEntit
@Override
public int fill(FluidStack aFluid, boolean doFill) {
if (aFluid == null || aFluid.getFluid()
- .getID()
- <= 0 || aFluid.amount <= 0 || !canTankBeFilled() || !isFluidInputAllowed(aFluid))
- return 0;
+ .getID() <= 0 || aFluid.amount <= 0 || !canTankBeFilled() || !isFluidInputAllowed(aFluid)) return 0;
if (getFillableStack() != null && !getFillableStack().isFluidEqual(aFluid)) {
return 0;
}
@@ -417,14 +411,12 @@ public abstract class GT_MetaTileEntity_DigitalTankBase extends GT_MetaTileEntit
if (tTank != null) {
FluidStack tDrained = drain(20 * (1 << (3 + 2 * tierPump(mTier))), false);
if (tDrained != null) {
- int tFilledAmount = tTank.fill(
- ForgeDirection.getOrientation(aBaseMetaTileEntity.getBackFacing()),
- tDrained,
- false);
+ int tFilledAmount = tTank
+ .fill(ForgeDirection.getOrientation(aBaseMetaTileEntity.getBackFacing()), tDrained, false);
if (tFilledAmount > 0) tTank.fill(
- ForgeDirection.getOrientation(aBaseMetaTileEntity.getBackFacing()),
- drain(tFilledAmount, true),
- true);
+ ForgeDirection.getOrientation(aBaseMetaTileEntity.getBackFacing()),
+ drain(tFilledAmount, true),
+ true);
}
}
}
@@ -492,16 +484,15 @@ public abstract class GT_MetaTileEntity_DigitalTankBase extends GT_MetaTileEntit
@Override
public void getWailaBody(ItemStack itemStack, List<String> currenttip, IWailaDataAccessor accessor,
- IWailaConfigHandler config) {
+ IWailaConfigHandler config) {
super.getWailaBody(itemStack, currenttip, accessor, config);
NBTTagCompound tag = accessor.getNBTData();
FluidStack fluid = tag.hasKey("mFluid") ? FluidStack.loadFluidStackFromNBT(tag.getCompoundTag("mFluid")) : null;
if (fluid != null && fluid.amount > 0) {
currenttip.remove(0);
- currenttip.add(
- 0,
- String.format("%d / %d mB %s", fluid.amount, getRealCapacity(), fluid.getLocalizedName()));
+ currenttip
+ .add(0, String.format("%d / %d mB %s", fluid.amount, getRealCapacity(), fluid.getLocalizedName()));
} else {
currenttip.add(0, "Tank Empty");
}
@@ -509,7 +500,7 @@ public abstract class GT_MetaTileEntity_DigitalTankBase extends GT_MetaTileEntit
@Override
public void getWailaNBTData(EntityPlayerMP player, TileEntity tile, NBTTagCompound tag, World world, int x, int y,
- int z) {
+ int z) {
super.getWailaNBTData(player, tile, tag, world, x, y, z);
FluidStack fluid = getFluid();
if (fluid != null) tag.setTag("mFluid", fluid.writeToNBT(new NBTTagCompound()));
@@ -524,161 +515,142 @@ public abstract class GT_MetaTileEntity_DigitalTankBase extends GT_MetaTileEntit
@Override
public void addUIWidgets(ModularWindow.Builder builder, UIBuildContext buildContext) {
builder.widget(
- new DrawableWidget().setDrawable(GT_UITextures.PICTURE_SCREEN_BLACK)
- .setPos(7, 16)
- .setSize(71, 45))
- .widget(
- new SlotWidget(inventoryHandler, getInputSlot())
- .setBackground(
- getGUITextureSet().getItemSlot(),
- GT_UITextures.OVERLAY_SLOT_IN)
- .setPos(79, 16))
- .widget(
- new SlotWidget(inventoryHandler, getOutputSlot()).setAccess(true, false)
- .setBackground(
- getGUITextureSet().getItemSlot(),
- GT_UITextures.OVERLAY_SLOT_OUT)
- .setPos(79, 43))
- .widget(
- new FluidDisplaySlotWidget(
- inventoryHandler,
- getStackDisplaySlot()).setFluidAccessConstructor(() -> constructFluidAccess(false))
- .setIHasFluidDisplay(this)
- .setCanDrain(true)
- .setCanFill(!isDrainableStackSeparate())
- .setActionRealClick(FluidDisplaySlotWidget.Action.TRANSFER)
- .setActionDragAndDrop(FluidDisplaySlotWidget.Action.LOCK)
- .setBeforeRealClick((clickData, widget) -> {
- if (NetworkUtils.isClient()) {
- // propagate display item content to actual fluid stored in
- // this tank
- setDrainableStack(
- GT_Utility.getFluidFromDisplayStack(
- widget.getMcSlot()
- .getStack()));
- }
- return true;
- })
- .setBackground(GT_UITextures.TRANSPARENT)
- .setPos(58, 41))
- .widget(
- new TextWidget("Liquid Amount").setDefaultColor(COLOR_TEXT_WHITE.get())
- .setPos(10, 20))
- .widget(
- TextWidget.dynamicString(
- () -> GT_Utility.parseNumberToString(mFluid != null ? mFluid.amount : 0))
- .setDefaultColor(COLOR_TEXT_WHITE.get())
- .setPos(10, 30))
- .widget(new CycleButtonWidget().setToggle(() -> mOutputFluid, val -> {
- mOutputFluid = val;
- if (!mOutputFluid) {
- GT_Utility.sendChatToPlayer(
- buildContext.getPlayer(),
- GT_Utility.trans("262", "Fluid Auto Output Disabled"));
- } else {
- GT_Utility.sendChatToPlayer(
- buildContext.getPlayer(),
- GT_Utility.trans("263", "Fluid Auto Output Enabled"));
- }
- })
- .setVariableBackground(GT_UITextures.BUTTON_STANDARD_TOGGLE)
- .setStaticTexture(GT_UITextures.OVERLAY_BUTTON_AUTOOUTPUT_FLUID)
- .setGTTooltip(
- () -> mTooltipCache.getData(
- "GT5U.machines.digitaltank.autooutput.tooltip"))
- .setTooltipShowUpDelay(TOOLTIP_DELAY)
- .setPos(7, 63)
- .setSize(18, 18))
- .widget(new CycleButtonWidget().setToggle(() -> mLockFluid, val -> {
- mLockFluid = val;
-
- String inBrackets;
- if (mLockFluid) {
- if (mFluid == null) {
- setLockedFluidName(null);
- inBrackets = GT_Utility.trans(
- "264",
- "currently none, will be locked to the next that is put in");
- } else {
- setLockedFluidName(
- getDrainableStack().getFluid()
- .getName());
- inBrackets = getDrainableStack().getLocalizedName();
- }
- GT_Utility.sendChatToPlayer(
- buildContext.getPlayer(),
- String.format("%s (%s)", GT_Utility.trans("265", "1 specific Fluid"), inBrackets));
- } else {
- setLockedFluidName(null);
- GT_Utility.sendChatToPlayer(
- buildContext.getPlayer(),
- GT_Utility.trans("266", "Lock Fluid Mode Disabled"));
- }
- })
- .setVariableBackground(GT_UITextures.BUTTON_STANDARD_TOGGLE)
- .setStaticTexture(GT_UITextures.OVERLAY_BUTTON_LOCK)
- .setGTTooltip(
- () -> mTooltipCache.getData(
- "GT5U.machines.digitaltank.lockfluid.tooltip"))
- .setTooltipShowUpDelay(TOOLTIP_DELAY)
- .setPos(25, 63)
- .setSize(18, 18))
- .widget(new CycleButtonWidget().setToggle(() -> mAllowInputFromOutputSide, val -> {
- mAllowInputFromOutputSide = val;
- if (!mAllowInputFromOutputSide) {
- GT_Utility.sendChatToPlayer(buildContext.getPlayer(), GT_Utility.getTrans("096"));
- } else {
- GT_Utility.sendChatToPlayer(buildContext.getPlayer(), GT_Utility.getTrans("095"));
- }
- })
- .setVariableBackground(GT_UITextures.BUTTON_STANDARD_TOGGLE)
- .setStaticTexture(GT_UITextures.OVERLAY_BUTTON_INPUT_FROM_OUTPUT_SIDE)
- .setGTTooltip(
- () -> mTooltipCache.getData(
- "GT5U.machines.digitaltank.inputfromoutput.tooltip"))
- .setTooltipShowUpDelay(TOOLTIP_DELAY)
- .setPos(43, 63)
- .setSize(18, 18))
- .widget(new CycleButtonWidget().setToggle(() -> mVoidFluidPart, val -> {
- mVoidFluidPart = val;
- if (!mVoidFluidPart) {
- GT_Utility.sendChatToPlayer(
- buildContext.getPlayer(),
- GT_Utility.trans("267", "Overflow Voiding Mode Disabled"));
- } else {
- GT_Utility.sendChatToPlayer(
- buildContext.getPlayer(),
- GT_Utility.trans("268", "Overflow Voiding Mode Enabled"));
- }
- })
- .setVariableBackground(GT_UITextures.BUTTON_STANDARD_TOGGLE)
- .setStaticTexture(GT_UITextures.OVERLAY_BUTTON_VOID_EXCESS)
- .setGTTooltip(
- () -> mTooltipCache.getData(
- "GT5U.machines.digitaltank.voidoverflow.tooltip"))
- .setTooltipShowUpDelay(TOOLTIP_DELAY)
- .setPos(151, 7)
- .setSize(18, 18))
- .widget(new CycleButtonWidget().setToggle(() -> mVoidFluidFull, val -> {
- mVoidFluidFull = val;
- if (!mVoidFluidFull) {
- GT_Utility.sendChatToPlayer(
- buildContext.getPlayer(),
- GT_Utility.trans("269", "Void Full Mode Disabled"));
- } else {
- GT_Utility.sendChatToPlayer(
- buildContext.getPlayer(),
- GT_Utility.trans("270", "Void Full Mode Enabled"));
- }
- })
- .setVariableBackground(GT_UITextures.BUTTON_STANDARD_TOGGLE)
- .setStaticTexture(GT_UITextures.OVERLAY_BUTTON_VOID_ALL)
- .setGTTooltip(
- () -> mTooltipCache.getData(
- "GT5U.machines.digitaltank.voidfull.tooltip"))
- .setTooltipShowUpDelay(TOOLTIP_DELAY)
- .setPos(151, 25)
- .setSize(18, 18));
+ new DrawableWidget().setDrawable(GT_UITextures.PICTURE_SCREEN_BLACK)
+ .setPos(7, 16)
+ .setSize(71, 45))
+ .widget(
+ new SlotWidget(inventoryHandler, getInputSlot())
+ .setBackground(getGUITextureSet().getItemSlot(), GT_UITextures.OVERLAY_SLOT_IN)
+ .setPos(79, 16))
+ .widget(
+ new SlotWidget(inventoryHandler, getOutputSlot()).setAccess(true, false)
+ .setBackground(getGUITextureSet().getItemSlot(), GT_UITextures.OVERLAY_SLOT_OUT)
+ .setPos(79, 43))
+ .widget(
+ new FluidDisplaySlotWidget(inventoryHandler, getStackDisplaySlot())
+ .setFluidAccessConstructor(() -> constructFluidAccess(false))
+ .setIHasFluidDisplay(this)
+ .setCanDrain(true)
+ .setCanFill(!isDrainableStackSeparate())
+ .setActionRealClick(FluidDisplaySlotWidget.Action.TRANSFER)
+ .setActionDragAndDrop(FluidDisplaySlotWidget.Action.LOCK)
+ .setBeforeRealClick((clickData, widget) -> {
+ if (NetworkUtils.isClient()) {
+ // propagate display item content to actual fluid stored in
+ // this tank
+ setDrainableStack(
+ GT_Utility.getFluidFromDisplayStack(
+ widget.getMcSlot()
+ .getStack()));
+ }
+ return true;
+ })
+ .setBackground(GT_UITextures.TRANSPARENT)
+ .setPos(58, 41))
+ .widget(
+ new TextWidget("Liquid Amount").setDefaultColor(COLOR_TEXT_WHITE.get())
+ .setPos(10, 20))
+ .widget(
+ TextWidget.dynamicString(() -> GT_Utility.parseNumberToString(mFluid != null ? mFluid.amount : 0))
+ .setDefaultColor(COLOR_TEXT_WHITE.get())
+ .setPos(10, 30))
+ .widget(new CycleButtonWidget().setToggle(() -> mOutputFluid, val -> {
+ mOutputFluid = val;
+ if (!mOutputFluid) {
+ GT_Utility.sendChatToPlayer(
+ buildContext.getPlayer(),
+ GT_Utility.trans("262", "Fluid Auto Output Disabled"));
+ } else {
+ GT_Utility.sendChatToPlayer(
+ buildContext.getPlayer(),
+ GT_Utility.trans("263", "Fluid Auto Output Enabled"));
+ }
+ })
+ .setVariableBackground(GT_UITextures.BUTTON_STANDARD_TOGGLE)
+ .setStaticTexture(GT_UITextures.OVERLAY_BUTTON_AUTOOUTPUT_FLUID)
+ .setGTTooltip(() -> mTooltipCache.getData("GT5U.machines.digitaltank.autooutput.tooltip"))
+ .setTooltipShowUpDelay(TOOLTIP_DELAY)
+ .setPos(7, 63)
+ .setSize(18, 18))
+ .widget(new CycleButtonWidget().setToggle(() -> mLockFluid, val -> {
+ mLockFluid = val;
+
+ String inBrackets;
+ if (mLockFluid) {
+ if (mFluid == null) {
+ setLockedFluidName(null);
+ inBrackets = GT_Utility
+ .trans("264", "currently none, will be locked to the next that is put in");
+ } else {
+ setLockedFluidName(
+ getDrainableStack().getFluid()
+ .getName());
+ inBrackets = getDrainableStack().getLocalizedName();
+ }
+ GT_Utility.sendChatToPlayer(
+ buildContext.getPlayer(),
+ String.format("%s (%s)", GT_Utility.trans("265", "1 specific Fluid"), inBrackets));
+ } else {
+ setLockedFluidName(null);
+ GT_Utility.sendChatToPlayer(
+ buildContext.getPlayer(),
+ GT_Utility.trans("266", "Lock Fluid Mode Disabled"));
+ }
+ })
+ .setVariableBackground(GT_UITextures.BUTTON_STANDARD_TOGGLE)
+ .setStaticTexture(GT_UITextures.OVERLAY_BUTTON_LOCK)
+ .setGTTooltip(() -> mTooltipCache.getData("GT5U.machines.digitaltank.lockfluid.tooltip"))
+ .setTooltipShowUpDelay(TOOLTIP_DELAY)
+ .setPos(25, 63)
+ .setSize(18, 18))
+ .widget(new CycleButtonWidget().setToggle(() -> mAllowInputFromOutputSide, val -> {
+ mAllowInputFromOutputSide = val;
+ if (!mAllowInputFromOutputSide) {
+ GT_Utility.sendChatToPlayer(buildContext.getPlayer(), GT_Utility.getTrans("096"));
+ } else {
+ GT_Utility.sendChatToPlayer(buildContext.getPlayer(), GT_Utility.getTrans("095"));
+ }
+ })
+ .setVariableBackground(GT_UITextures.BUTTON_STANDARD_TOGGLE)
+ .setStaticTexture(GT_UITextures.OVERLAY_BUTTON_INPUT_FROM_OUTPUT_SIDE)
+ .setGTTooltip(() -> mTooltipCache.getData("GT5U.machines.digitaltank.inputfromoutput.tooltip"))
+ .setTooltipShowUpDelay(TOOLTIP_DELAY)
+ .setPos(43, 63)
+ .setSize(18, 18))
+ .widget(new CycleButtonWidget().setToggle(() -> mVoidFluidPart, val -> {
+ mVoidFluidPart = val;
+ if (!mVoidFluidPart) {
+ GT_Utility.sendChatToPlayer(
+ buildContext.getPlayer(),
+ GT_Utility.trans("267", "Overflow Voiding Mode Disabled"));
+ } else {
+ GT_Utility.sendChatToPlayer(
+ buildContext.getPlayer(),
+ GT_Utility.trans("268", "Overflow Voiding Mode Enabled"));
+ }
+ })
+ .setVariableBackground(GT_UITextures.BUTTON_STANDARD_TOGGLE)
+ .setStaticTexture(GT_UITextures.OVERLAY_BUTTON_VOID_EXCESS)
+ .setGTTooltip(() -> mTooltipCache.getData("GT5U.machines.digitaltank.voidoverflow.tooltip"))
+ .setTooltipShowUpDelay(TOOLTIP_DELAY)
+ .setPos(151, 7)
+ .setSize(18, 18))
+ .widget(new CycleButtonWidget().setToggle(() -> mVoidFluidFull, val -> {
+ mVoidFluidFull = val;
+ if (!mVoidFluidFull) {
+ GT_Utility
+ .sendChatToPlayer(buildContext.getPlayer(), GT_Utility.trans("269", "Void Full Mode Disabled"));
+ } else {
+ GT_Utility
+ .sendChatToPlayer(buildContext.getPlayer(), GT_Utility.trans("270", "Void Full Mode Enabled"));
+ }
+ })
+ .setVariableBackground(GT_UITextures.BUTTON_STANDARD_TOGGLE)
+ .setStaticTexture(GT_UITextures.OVERLAY_BUTTON_VOID_ALL)
+ .setGTTooltip(() -> mTooltipCache.getData("GT5U.machines.digitaltank.voidfull.tooltip"))
+ .setTooltipShowUpDelay(TOOLTIP_DELAY)
+ .setPos(151, 25)
+ .setSize(18, 18));
}
@Override
diff --git a/src/main/java/gregtech/common/tileentities/storage/GT_MetaTileEntity_Locker.java b/src/main/java/gregtech/common/tileentities/storage/GT_MetaTileEntity_Locker.java
index 3d81076bc9..32d1694cc8 100644
--- a/src/main/java/gregtech/common/tileentities/storage/GT_MetaTileEntity_Locker.java
+++ b/src/main/java/gregtech/common/tileentities/storage/GT_MetaTileEntity_Locker.java
@@ -58,10 +58,10 @@ public class GT_MetaTileEntity_Locker extends GT_MetaTileEntity_TieredMachineBlo
@Override
public ITexture[] getTexture(IGregTechTileEntity aBaseMetaTileEntity, byte aSide, byte aFacing, byte aColorIndex,
- boolean aActive, boolean aRedstone) {
+ boolean aActive, boolean aRedstone) {
if (aSide == aFacing) {
return new ITexture[] { this.mTextures[2][(aColorIndex + 1)][0], this.mTextures[2][(aColorIndex + 1)][1],
- LOCKERS[Math.abs(this.mType % LOCKERS.length)] };
+ LOCKERS[Math.abs(this.mType % LOCKERS.length)] };
}
return this.mTextures[0][(aColorIndex + 1)];
}
@@ -177,7 +177,7 @@ public class GT_MetaTileEntity_Locker extends GT_MetaTileEntity_TieredMachineBlo
@Override
public boolean onRightclick(IGregTechTileEntity aBaseMetaTileEntity, EntityPlayer aPlayer, byte aSide, float aX,
- float aY, float aZ) {
+ float aY, float aZ) {
if ((aBaseMetaTileEntity.isServerSide()) && (aSide == aBaseMetaTileEntity.getFrontFacing())) {
for (int i = 0; i < 4; i++) {
ItemStack tSwapStack = this.mInventory[i];
diff --git a/src/main/java/gregtech/common/tileentities/storage/GT_MetaTileEntity_QuantumTank.java b/src/main/java/gregtech/common/tileentities/storage/GT_MetaTileEntity_QuantumTank.java
index d6a936c745..4d51d0b634 100644
--- a/src/main/java/gregtech/common/tileentities/storage/GT_MetaTileEntity_QuantumTank.java
+++ b/src/main/java/gregtech/common/tileentities/storage/GT_MetaTileEntity_QuantumTank.java
@@ -31,25 +31,25 @@ public class GT_MetaTileEntity_QuantumTank extends GT_MetaTileEntity_DigitalTank
if (mFluid == null) {
return new String[] { EnumChatFormatting.BLUE + "Quantum Tank" + EnumChatFormatting.RESET, "Stored Fluid:",
- EnumChatFormatting.GOLD + "No Fluid" + EnumChatFormatting.RESET,
- EnumChatFormatting.GREEN + Integer.toString(0)
- + " L"
- + EnumChatFormatting.RESET
- + " "
- + EnumChatFormatting.YELLOW
- + GT_Utility.formatNumbers(getCapacity())
- + " L"
- + EnumChatFormatting.RESET };
+ EnumChatFormatting.GOLD + "No Fluid" + EnumChatFormatting.RESET,
+ EnumChatFormatting.GREEN + Integer.toString(0)
+ + " L"
+ + EnumChatFormatting.RESET
+ + " "
+ + EnumChatFormatting.YELLOW
+ + GT_Utility.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)
- + " L"
- + EnumChatFormatting.RESET
- + " "
- + EnumChatFormatting.YELLOW
- + GT_Utility.formatNumbers(getCapacity())
- + " L"
- + EnumChatFormatting.RESET };
+ EnumChatFormatting.GOLD + mFluid.getLocalizedName() + EnumChatFormatting.RESET,
+ EnumChatFormatting.GREEN + GT_Utility.formatNumbers(mFluid.amount)
+ + " L"
+ + EnumChatFormatting.RESET
+ + " "
+ + EnumChatFormatting.YELLOW
+ + GT_Utility.formatNumbers(getCapacity())
+ + " L"
+ + EnumChatFormatting.RESET };
}
}
diff --git a/src/main/java/gregtech/common/tileentities/storage/GT_MetaTileEntity_SuperTank.java b/src/main/java/gregtech/common/tileentities/storage/GT_MetaTileEntity_SuperTank.java
index 5dac66e49a..4493d57bd3 100644
--- a/src/main/java/gregtech/common/tileentities/storage/GT_MetaTileEntity_SuperTank.java
+++ b/src/main/java/gregtech/common/tileentities/storage/GT_MetaTileEntity_SuperTank.java
@@ -31,24 +31,24 @@ public class GT_MetaTileEntity_SuperTank extends GT_MetaTileEntity_DigitalTankBa
if (mFluid == null) {
return new String[] { EnumChatFormatting.BLUE + "Super Tank" + EnumChatFormatting.RESET, "Stored Fluid:",
- EnumChatFormatting.GOLD + "No Fluid" + EnumChatFormatting.RESET,
- EnumChatFormatting.GREEN + "0 L"
- + EnumChatFormatting.RESET
- + " "
- + EnumChatFormatting.YELLOW
- + GT_Utility.formatNumbers(getCapacity())
- + " L"
- + EnumChatFormatting.RESET };
+ EnumChatFormatting.GOLD + "No Fluid" + EnumChatFormatting.RESET,
+ EnumChatFormatting.GREEN + "0 L"
+ + EnumChatFormatting.RESET
+ + " "
+ + EnumChatFormatting.YELLOW
+ + GT_Utility.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)
- + " L"
- + EnumChatFormatting.RESET
- + " "
- + EnumChatFormatting.YELLOW
- + GT_Utility.formatNumbers(getCapacity())
- + " L"
- + EnumChatFormatting.RESET };
+ EnumChatFormatting.GOLD + mFluid.getLocalizedName() + EnumChatFormatting.RESET,
+ EnumChatFormatting.GREEN + GT_Utility.formatNumbers(mFluid.amount)
+ + " L"
+ + EnumChatFormatting.RESET
+ + " "
+ + EnumChatFormatting.YELLOW
+ + GT_Utility.formatNumbers(getCapacity())
+ + " L"
+ + EnumChatFormatting.RESET };
}
}