From 0d7724028987e53db52b2a30cefaaa91eac90880 Mon Sep 17 00:00:00 2001 From: Ben Spiers Date: Sat, 30 Aug 2014 02:34:50 +0100 Subject: [PATCH] Add lang utility methods to localise FluidStacks, use them throughout the codebase. --- .../java/mekanism/client/gui/GuiDynamicTank.java | 5 +++-- .../mekanism/client/gui/GuiElectricPump.java | 3 ++- .../java/mekanism/client/gui/GuiFluidGauge.java | 5 +++-- .../mekanism/client/gui/GuiFluidicPlenisher.java | 2 +- .../client/gui/GuiSalinationController.java | 5 +++-- .../client/nei/ChemicalWasherRecipeHandler.java | 2 +- .../nei/ElectrolyticSeparatorRecipeHandler.java | 4 ++-- .../mekanism/client/nei/PRCRecipeHandler.java | 4 ++-- .../nei/RotaryCondensentratorRecipeHandler.java | 5 +++-- .../nei/SalinationControllerRecipeHandler.java | 6 +++--- src/main/java/mekanism/common/FluidNetwork.java | 3 ++- .../mekanism/common/item/ItemBlockMachine.java | 2 +- .../java/mekanism/common/util/LangUtils.java | 16 +++++++++++++++- 13 files changed, 41 insertions(+), 21 deletions(-) diff --git a/src/main/java/mekanism/client/gui/GuiDynamicTank.java b/src/main/java/mekanism/client/gui/GuiDynamicTank.java index 5c36116ea..68e09d035 100644 --- a/src/main/java/mekanism/client/gui/GuiDynamicTank.java +++ b/src/main/java/mekanism/client/gui/GuiDynamicTank.java @@ -4,6 +4,7 @@ import mekanism.client.render.MekanismRenderer; import mekanism.common.content.tank.TankUpdateProtocol; import mekanism.common.inventory.container.ContainerDynamicTank; import mekanism.common.tile.TileEntityDynamicTank; +import mekanism.common.util.LangUtils; import mekanism.common.util.MekanismUtils; import mekanism.common.util.MekanismUtils.ResourceType; import net.minecraft.entity.player.InventoryPlayer; @@ -35,7 +36,7 @@ public class GuiDynamicTank extends GuiMekanism fontRendererObj.drawString(tileEntity.getInventoryName(), 45, 6, 0x404040); fontRendererObj.drawString(MekanismUtils.localize("container.inventory"), 8, (ySize - 94) + 2, 0x404040); fontRendererObj.drawString(MekanismUtils.localize("gui.volume") + ": " + tileEntity.clientCapacity/TankUpdateProtocol.FLUID_PER_TANK, 53, 26, 0x00CD00); - fontRendererObj.drawString(tileEntity.structure.fluidStored != null ? tileEntity.structure.fluidStored.getFluid().getName() + ":" : MekanismUtils.localize("gui.noFluid"), 53, 44, 0x00CD00); + fontRendererObj.drawString(tileEntity.structure.fluidStored != null ? LangUtils.localizeFluidStack(tileEntity.structure.fluidStored) + ":" : MekanismUtils.localize("gui.noFluid"), 53, 44, 0x00CD00); if(tileEntity.structure.fluidStored != null) { @@ -44,7 +45,7 @@ public class GuiDynamicTank extends GuiMekanism if(xAxis >= 7 && xAxis <= 39 && yAxis >= 14 && yAxis <= 72) { - drawCreativeTabHoveringText(tileEntity.structure.fluidStored != null ? tileEntity.structure.fluidStored.getFluid().getLocalizedName() + ": " + tileEntity.structure.fluidStored.amount + "mB" : MekanismUtils.localize("gui.empty"), xAxis, yAxis); + drawCreativeTabHoveringText(tileEntity.structure.fluidStored != null ? LangUtils.localizeFluidStack(tileEntity.structure.fluidStored) + ": " + tileEntity.structure.fluidStored.amount + "mB" : MekanismUtils.localize("gui.empty"), xAxis, yAxis); } super.drawGuiContainerForegroundLayer(mouseX, mouseY); diff --git a/src/main/java/mekanism/client/gui/GuiElectricPump.java b/src/main/java/mekanism/client/gui/GuiElectricPump.java index 021da7f27..4071f263d 100644 --- a/src/main/java/mekanism/client/gui/GuiElectricPump.java +++ b/src/main/java/mekanism/client/gui/GuiElectricPump.java @@ -5,6 +5,7 @@ import mekanism.client.gui.GuiSlot.SlotOverlay; import mekanism.client.gui.GuiSlot.SlotType; import mekanism.common.inventory.container.ContainerElectricPump; import mekanism.common.tile.TileEntityElectricPump; +import mekanism.common.util.LangUtils; import mekanism.common.util.MekanismUtils; import mekanism.common.util.MekanismUtils.ResourceType; import net.minecraft.entity.player.InventoryPlayer; @@ -48,7 +49,7 @@ public class GuiElectricPump extends GuiMekanism fontRendererObj.drawString(tileEntity.getInventoryName(), 45, 6, 0x404040); fontRendererObj.drawString(MekanismUtils.localize("container.inventory"), 8, (ySize - 94) + 2, 0x404040); fontRendererObj.drawString(MekanismUtils.getEnergyDisplay(tileEntity.getEnergy()), 51, 26, 0x00CD00); - fontRendererObj.drawString(tileEntity.fluidTank.getFluid() != null ? tileEntity.fluidTank.getFluid().getFluid().getName() + ": " + tileEntity.fluidTank.getFluid().amount : MekanismUtils.localize("gui.noFluid"), 51, 35, 0x00CD00); + fontRendererObj.drawString(tileEntity.fluidTank.getFluid() != null ? LangUtils.localizeFluidStack(tileEntity.fluidTank.getFluid()) + ": " + tileEntity.fluidTank.getFluid().amount : MekanismUtils.localize("gui.noFluid"), 51, 35, 0x00CD00); super.drawGuiContainerForegroundLayer(mouseX, mouseY); } diff --git a/src/main/java/mekanism/client/gui/GuiFluidGauge.java b/src/main/java/mekanism/client/gui/GuiFluidGauge.java index d1b8a6843..4fbe26165 100644 --- a/src/main/java/mekanism/client/gui/GuiFluidGauge.java +++ b/src/main/java/mekanism/client/gui/GuiFluidGauge.java @@ -1,5 +1,6 @@ package mekanism.client.gui; +import mekanism.common.util.LangUtils; import mekanism.common.util.MekanismUtils; import net.minecraft.util.IIcon; import net.minecraft.util.ResourceLocation; @@ -52,10 +53,10 @@ public class GuiFluidGauge extends GuiGauge { if(dummy) { - return dummyType.getLocalizedName(); + return dummyType.getLocalizedName(null); } - return infoHandler.getTank().getFluid() != null ? infoHandler.getTank().getFluid().getFluid().getLocalizedName(infoHandler.getTank().getFluid()) + ": " + infoHandler.getTank().getFluidAmount() + "mB" : MekanismUtils.localize("gui.empty"); + return infoHandler.getTank().getFluid() != null ? LangUtils.localizeFluidStack(infoHandler.getTank().getFluid()) + ": " + infoHandler.getTank().getFluidAmount() + "mB" : MekanismUtils.localize("gui.empty"); } public static interface IFluidInfoHandler diff --git a/src/main/java/mekanism/client/gui/GuiFluidicPlenisher.java b/src/main/java/mekanism/client/gui/GuiFluidicPlenisher.java index 17c13be02..aba8a6f07 100644 --- a/src/main/java/mekanism/client/gui/GuiFluidicPlenisher.java +++ b/src/main/java/mekanism/client/gui/GuiFluidicPlenisher.java @@ -50,7 +50,7 @@ public class GuiFluidicPlenisher extends GuiMekanism fontRendererObj.drawString(MekanismUtils.localize("container.inventory"), 8, (ySize - 94) + 2, 0x404040); fontRendererObj.drawString(MekanismUtils.getEnergyDisplay(tileEntity.getEnergy()), 51, 26, 0x00CD00); fontRendererObj.drawString(MekanismUtils.localize("gui.finished") + ": " + LangUtils.transYesNo(tileEntity.finishedCalc), 51, 35, 0x00CD00); - fontRendererObj.drawString(tileEntity.fluidTank.getFluid() != null ? tileEntity.fluidTank.getFluid().getFluid().getName() + ": " + tileEntity.fluidTank.getFluid().amount : MekanismUtils.localize("gui.noFluid"), 51, 44, 0x00CD00); + fontRendererObj.drawString(tileEntity.fluidTank.getFluid() != null ? LangUtils.localizeFluidStack(tileEntity.fluidTank.getFluid()) + ": " + tileEntity.fluidTank.getFluid().amount : MekanismUtils.localize("gui.noFluid"), 51, 44, 0x00CD00); super.drawGuiContainerForegroundLayer(mouseX, mouseY); } diff --git a/src/main/java/mekanism/client/gui/GuiSalinationController.java b/src/main/java/mekanism/client/gui/GuiSalinationController.java index 4ac27a4aa..584a931c5 100644 --- a/src/main/java/mekanism/client/gui/GuiSalinationController.java +++ b/src/main/java/mekanism/client/gui/GuiSalinationController.java @@ -10,6 +10,7 @@ import mekanism.common.Mekanism; import mekanism.common.inventory.container.ContainerSalinationController; import mekanism.common.network.PacketTileEntity.TileEntityMessage; import mekanism.common.tile.TileEntitySalinationController; +import mekanism.common.util.LangUtils; import mekanism.common.util.MekanismUtils; import mekanism.common.util.MekanismUtils.ResourceType; import net.minecraft.entity.player.InventoryPlayer; @@ -47,12 +48,12 @@ public class GuiSalinationController extends GuiMekanism if(xAxis >= 7 && xAxis <= 23 && yAxis >= 14 && yAxis <= 72) { - drawCreativeTabHoveringText(tileEntity.waterTank.getFluid() != null ? tileEntity.waterTank.getFluid().getFluid().getLocalizedName(tileEntity.waterTank.getFluid()) + ": " + tileEntity.waterTank.getFluidAmount() : MekanismUtils.localize("gui.empty"), xAxis, yAxis); + drawCreativeTabHoveringText(tileEntity.waterTank.getFluid() != null ? LangUtils.localizeFluidStack(tileEntity.waterTank.getFluid()) + ": " + tileEntity.waterTank.getFluidAmount() : MekanismUtils.localize("gui.empty"), xAxis, yAxis); } if(xAxis >= 153 && xAxis <= 169 && yAxis >= 14 && yAxis <= 72) { - drawCreativeTabHoveringText(tileEntity.brineTank.getFluid() != null ? tileEntity.brineTank.getFluid().getFluid().getLocalizedName(tileEntity.brineTank.getFluid()) + ": " + tileEntity.brineTank.getFluidAmount() : MekanismUtils.localize("gui.empty"), xAxis, yAxis); + drawCreativeTabHoveringText(tileEntity.brineTank.getFluid() != null ? LangUtils.localizeFluidStack(tileEntity.brineTank.getFluid()) + ": " + tileEntity.brineTank.getFluidAmount() : MekanismUtils.localize("gui.empty"), xAxis, yAxis); } if(xAxis >= 49 && xAxis <= 127 && yAxis >= 64 && yAxis <= 72) diff --git a/src/main/java/mekanism/client/nei/ChemicalWasherRecipeHandler.java b/src/main/java/mekanism/client/nei/ChemicalWasherRecipeHandler.java index 105d06522..80ea2b2a5 100644 --- a/src/main/java/mekanism/client/nei/ChemicalWasherRecipeHandler.java +++ b/src/main/java/mekanism/client/nei/ChemicalWasherRecipeHandler.java @@ -173,7 +173,7 @@ public class ChemicalWasherRecipeHandler extends BaseRecipeHandler if(xAxis >= 6 && xAxis <= 22 && yAxis >= 5+13 && yAxis <= 63+13) { - currenttip.add(FluidRegistry.WATER.getLocalizedName(new FluidStack(FluidRegistry.WATER, 1))); + currenttip.add(FluidRegistry.WATER.getLocalizedName(null)); } else if(xAxis >= 27 && xAxis <= 43 && yAxis >= 14+13 && yAxis <= 72+13) { diff --git a/src/main/java/mekanism/client/nei/ElectrolyticSeparatorRecipeHandler.java b/src/main/java/mekanism/client/nei/ElectrolyticSeparatorRecipeHandler.java index 81db2bc48..37fdfa665 100644 --- a/src/main/java/mekanism/client/nei/ElectrolyticSeparatorRecipeHandler.java +++ b/src/main/java/mekanism/client/nei/ElectrolyticSeparatorRecipeHandler.java @@ -28,6 +28,7 @@ import mekanism.client.gui.GuiSlot.SlotType; import mekanism.common.FluidSlot; import mekanism.common.ObfuscatedNames; import mekanism.common.recipe.RecipeHandler.Recipe; +import mekanism.common.util.LangUtils; import mekanism.common.util.MekanismUtils; import mekanism.common.util.MekanismUtils.ResourceType; import net.minecraft.client.gui.inventory.GuiContainer; @@ -221,8 +222,7 @@ public class ElectrolyticSeparatorRecipeHandler extends BaseRecipeHandler if(xAxis >= 6 && xAxis <= 22 && yAxis >= 11+7 && yAxis <= 69+7) { - FluidStack stack = ((CachedIORecipe)arecipes.get(recipe)).fluidInput; - currenttip.add(stack.getFluid().getLocalizedName(stack)); + currenttip.add(LangUtils.localizeFluidStack(((CachedIORecipe)arecipes.get(recipe)).fluidInput)); } else if(xAxis >= 59 && xAxis <= 75 && yAxis >= 19+7 && yAxis <= 47+7) { diff --git a/src/main/java/mekanism/client/nei/PRCRecipeHandler.java b/src/main/java/mekanism/client/nei/PRCRecipeHandler.java index 448bc82aa..487e73299 100644 --- a/src/main/java/mekanism/client/nei/PRCRecipeHandler.java +++ b/src/main/java/mekanism/client/nei/PRCRecipeHandler.java @@ -28,6 +28,7 @@ import mekanism.client.gui.GuiSlot.SlotOverlay; import mekanism.client.gui.GuiSlot.SlotType; import mekanism.common.ObfuscatedNames; import mekanism.common.recipe.RecipeHandler.Recipe; +import mekanism.common.util.LangUtils; import mekanism.common.util.MekanismUtils; import mekanism.common.util.MekanismUtils.ResourceType; import net.minecraft.client.gui.inventory.GuiContainer; @@ -265,8 +266,7 @@ public class PRCRecipeHandler extends BaseRecipeHandler if(xAxis >= 6-5 && xAxis <= 22-5 && yAxis >= 11-10 && yAxis <= 69-10) { - FluidStack stack = ((CachedIORecipe)arecipes.get(recipe)).pressurizedRecipe.reactants.getFluid(); - currenttip.add(stack.getFluid().getLocalizedName(stack)); + currenttip.add(LangUtils.localizeFluidStack(((CachedIORecipe)arecipes.get(recipe)).pressurizedRecipe.reactants.getFluid())); } else if(xAxis >= 29-5 && xAxis <= 45-5 && yAxis >= 11-10 && yAxis <= 69-10) { diff --git a/src/main/java/mekanism/client/nei/RotaryCondensentratorRecipeHandler.java b/src/main/java/mekanism/client/nei/RotaryCondensentratorRecipeHandler.java index ed9e96e95..0dd4f1322 100644 --- a/src/main/java/mekanism/client/nei/RotaryCondensentratorRecipeHandler.java +++ b/src/main/java/mekanism/client/nei/RotaryCondensentratorRecipeHandler.java @@ -13,6 +13,7 @@ import mekanism.api.gas.GasRegistry; import mekanism.api.gas.GasStack; import mekanism.client.gui.GuiRotaryCondensentrator; import mekanism.common.ObfuscatedNames; +import mekanism.common.util.LangUtils; import mekanism.common.util.MekanismUtils; import net.minecraft.client.gui.inventory.GuiContainer; import net.minecraftforge.fluids.FluidStack; @@ -184,11 +185,11 @@ public class RotaryCondensentratorRecipeHandler extends BaseRecipeHandler if(xAxis >= 26 && xAxis <= 42 && yAxis >= 14+4 && yAxis <= 72+4) { - currenttip.add(((CachedIORecipe)arecipes.get(recipe)).gasStack.getGas().getLocalizedName()); + currenttip.add(LangUtils.localiseGasStack(((CachedIORecipe) arecipes.get(recipe)).gasStack)); } else if(xAxis >= 134 && xAxis <= 150 && yAxis >= 14+4 && yAxis <= 72+4) { - currenttip.add(((CachedIORecipe)arecipes.get(recipe)).fluidStack.getFluid().getLocalizedName()); + currenttip.add(LangUtils.localizeFluidStack(((CachedIORecipe) arecipes.get(recipe)).fluidStack)); } return super.handleTooltip(gui, currenttip, recipe); diff --git a/src/main/java/mekanism/client/nei/SalinationControllerRecipeHandler.java b/src/main/java/mekanism/client/nei/SalinationControllerRecipeHandler.java index 105476ab1..7cc24c6ab 100644 --- a/src/main/java/mekanism/client/nei/SalinationControllerRecipeHandler.java +++ b/src/main/java/mekanism/client/nei/SalinationControllerRecipeHandler.java @@ -12,7 +12,7 @@ import java.util.Set; import mekanism.client.gui.GuiSalinationController; import mekanism.common.ObfuscatedNames; -import mekanism.common.recipe.RecipeHandler.Recipe; +import mekanism.common.util.LangUtils; import mekanism.common.util.MekanismUtils; import net.minecraft.client.gui.inventory.GuiContainer; import net.minecraftforge.fluids.FluidRegistry; @@ -164,11 +164,11 @@ public class SalinationControllerRecipeHandler extends BaseRecipeHandler if(xAxis >= 7 && xAxis <= 23 && yAxis >= 14+4 && yAxis <= 72+4) { - currenttip.add(((CachedIORecipe)arecipes.get(recipe)).fluidInput.getFluid().getLocalizedName()); + currenttip.add(LangUtils.localizeFluidStack(((CachedIORecipe) arecipes.get(recipe)).fluidInput)); } else if(xAxis >= 153 && xAxis <= 169 && yAxis >= 14+4 && yAxis <= 72+4) { - currenttip.add(((CachedIORecipe)arecipes.get(recipe)).fluidOutput.getFluid().getLocalizedName()); + currenttip.add(LangUtils.localizeFluidStack(((CachedIORecipe) arecipes.get(recipe)).fluidOutput)); } return super.handleTooltip(gui, currenttip, recipe); diff --git a/src/main/java/mekanism/common/FluidNetwork.java b/src/main/java/mekanism/common/FluidNetwork.java index 20677a0c6..68643f493 100644 --- a/src/main/java/mekanism/common/FluidNetwork.java +++ b/src/main/java/mekanism/common/FluidNetwork.java @@ -16,6 +16,7 @@ import mekanism.api.transmitters.IGridTransmitter; import mekanism.api.transmitters.ITransmitterNetwork; import mekanism.api.transmitters.TransmissionType; import mekanism.api.util.ListUtils; +import mekanism.common.util.LangUtils; import mekanism.common.util.PipeUtils; import net.minecraft.tileentity.TileEntity; import net.minecraftforge.common.MinecraftForge; @@ -469,7 +470,7 @@ public class FluidNetwork extends DynamicNetwork @Override public String getStoredInfo() { - return fluidStored != null ? fluidStored.getFluid().getLocalizedName(fluidStored) + " (" + fluidStored.amount + " mB)" : "None"; + return fluidStored != null ? LangUtils.localizeFluidStack(fluidStored) + " (" + fluidStored.amount + " mB)" : "None"; } @Override diff --git a/src/main/java/mekanism/common/item/ItemBlockMachine.java b/src/main/java/mekanism/common/item/ItemBlockMachine.java index 67e1b8f7b..e64837c66 100644 --- a/src/main/java/mekanism/common/item/ItemBlockMachine.java +++ b/src/main/java/mekanism/common/item/ItemBlockMachine.java @@ -176,7 +176,7 @@ public class ItemBlockMachine extends ItemBlock implements IEnergizedItem, ISpec FluidStack fluidStack = getFluidStack(itemstack); if(fluidStack != null) { - list.add(EnumColor.PINK + fluidStack.getFluid().getLocalizedName(fluidStack) + ": " + EnumColor.GREY + getFluidStack(itemstack).amount + "mB"); + list.add(EnumColor.PINK + LangUtils.localizeFluidStack(fluidStack) + ": " + EnumColor.GREY + getFluidStack(itemstack).amount + "mB"); } } diff --git a/src/main/java/mekanism/common/util/LangUtils.java b/src/main/java/mekanism/common/util/LangUtils.java index d1d30bd77..3962ce65f 100644 --- a/src/main/java/mekanism/common/util/LangUtils.java +++ b/src/main/java/mekanism/common/util/LangUtils.java @@ -1,6 +1,10 @@ package mekanism.common.util; -public final class LangUtils +import mekanism.api.gas.GasStack; + +import net.minecraftforge.fluids.FluidStack; + +public final class LangUtils { public static String transOnOff(boolean b) { @@ -11,4 +15,14 @@ public final class LangUtils { return MekanismUtils.localize("tooltip." + (b ? "yes" : "no")); } + + public static String localizeFluidStack(FluidStack fluidStack) + { + return (fluidStack == null || fluidStack.getFluid() == null ) ? null : fluidStack.getFluid().getLocalizedName(fluidStack); + } + + public static String localiseGasStack(GasStack gasStack) + { + return (gasStack == null || gasStack.getGas() == null ) ? null : gasStack.getGas().getLocalizedName(); + } }