From 6ac520467b1bc68308bc54c3ed7f6b1ed2fbbe13 Mon Sep 17 00:00:00 2001 From: HbmMods Date: Thu, 23 Jul 2026 12:03:14 +0200 Subject: [PATCH] tiny bit of cleanup --- .../com/hbm/blocks/machine/MachineDiesel.java | 2 +- .../hbm/blocks/machine/MachineTurbofan.java | 2 +- .../inventory/fluid/trait/FT_Combustible.java | 16 ++++++++-------- .../hbm/inventory/fluid/trait/FT_Coolable.java | 12 ++++++++---- .../hbm/inventory/fluid/trait/FT_Heatable.java | 18 +++++++++++------- .../com/hbm/items/machine/ItemPistons.java | 2 +- 6 files changed, 30 insertions(+), 22 deletions(-) diff --git a/src/main/java/com/hbm/blocks/machine/MachineDiesel.java b/src/main/java/com/hbm/blocks/machine/MachineDiesel.java index 1f7b923a2..d4204d79f 100644 --- a/src/main/java/com/hbm/blocks/machine/MachineDiesel.java +++ b/src/main/java/com/hbm/blocks/machine/MachineDiesel.java @@ -59,7 +59,7 @@ public class MachineDiesel extends BlockMachineBase implements ITooltipProvider if(efficiency != null) { int eff = (int)(efficiency * 100); - list.add(EnumChatFormatting.YELLOW + "-" + grade.getGrade() + ": " + EnumChatFormatting.RED + "" + eff + "%"); + list.add(EnumChatFormatting.YELLOW + "-" + grade.getLocalizedName() + ": " + EnumChatFormatting.RED + "" + eff + "%"); } } } diff --git a/src/main/java/com/hbm/blocks/machine/MachineTurbofan.java b/src/main/java/com/hbm/blocks/machine/MachineTurbofan.java index fb8a30c88..78f9ac60e 100644 --- a/src/main/java/com/hbm/blocks/machine/MachineTurbofan.java +++ b/src/main/java/com/hbm/blocks/machine/MachineTurbofan.java @@ -78,6 +78,6 @@ public class MachineTurbofan extends BlockDummyable implements ITooltipProvider @Override public void addInformation(ItemStack stack, EntityPlayer player, List list, boolean ext) { list.add(EnumChatFormatting.YELLOW + "Fuel efficiency:"); - list.add(EnumChatFormatting.YELLOW + "-" + FuelGrade.AERO.getGrade() + ": " + EnumChatFormatting.RED + "100%"); + list.add(EnumChatFormatting.YELLOW + "-" + FuelGrade.AERO.getLocalizedName() + ": " + EnumChatFormatting.RED + "100%"); } } \ No newline at end of file diff --git a/src/main/java/com/hbm/inventory/fluid/trait/FT_Combustible.java b/src/main/java/com/hbm/inventory/fluid/trait/FT_Combustible.java index c0c21ffaf..781b92004 100644 --- a/src/main/java/com/hbm/inventory/fluid/trait/FT_Combustible.java +++ b/src/main/java/com/hbm/inventory/fluid/trait/FT_Combustible.java @@ -30,7 +30,7 @@ public class FT_Combustible extends FluidTrait { if(combustionEnergy > 0) { info.add(EnumChatFormatting.GOLD + I18nUtil.resolveKey("hbmfluid.trait.provides") + " " + EnumChatFormatting.RED + "" + BobMathUtil.getShortNumber(combustionEnergy) + "HE " + EnumChatFormatting.GOLD + I18nUtil.resolveKey("hbmfluid.trait.perBucket")); - info.add(EnumChatFormatting.GOLD + I18nUtil.resolveKey("hbmfluid.trait.fuelGrade") + ": " + EnumChatFormatting.RED + this.fuelGrade.getGrade()); + info.add(EnumChatFormatting.GOLD + I18nUtil.resolveKey("hbmfluid.trait.fuelGrade") + ": " + EnumChatFormatting.RED + this.fuelGrade.getLocalizedName()); } } @@ -43,11 +43,11 @@ public class FT_Combustible extends FluidTrait { } public static enum FuelGrade { - LOW(I18nUtil.resolveKey("hbmfluid.trait.fuel.low")), //heating and industrial oil < star engine, iGen - MEDIUM(I18nUtil.resolveKey("hbmfluid.trait.fuel.medium")), //petroil < diesel generator - HIGH(I18nUtil.resolveKey("hbmfluid.trait.fuel.high")), //diesel, gasoline < HP engine - AERO(I18nUtil.resolveKey("hbmfluid.trait.fuel.aviation")), //kerosene and other light aviation fuels < turbofan - GAS(I18nUtil.resolveKey("hbmfluid.trait.fuel.gaseous")); //fuel gasses like NG, PG and syngas < gas turbine + LOW("low"), //heating and industrial oil < star engine, iGen + MEDIUM("medium"), //petroil < diesel generator + HIGH("high"), //diesel, gasoline < HP engine + AERO("aviation"), //kerosene and other light aviation fuels < turbofan + GAS("gaseous"); //fuel gasses like NG, PG and syngas < gas turbine private String grade; @@ -55,8 +55,8 @@ public class FT_Combustible extends FluidTrait { this.grade = grade; } - public String getGrade() { - return this.grade; + public String getLocalizedName() { + return I18nUtil.resolveKey("hbmfluid.trait.fuel." + this.grade); } } diff --git a/src/main/java/com/hbm/inventory/fluid/trait/FT_Coolable.java b/src/main/java/com/hbm/inventory/fluid/trait/FT_Coolable.java index d2664fb22..7de6e2e07 100644 --- a/src/main/java/com/hbm/inventory/fluid/trait/FT_Coolable.java +++ b/src/main/java/com/hbm/inventory/fluid/trait/FT_Coolable.java @@ -49,20 +49,24 @@ public class FT_Coolable extends FluidTrait { double eff = getEfficiency(type); if(eff > 0) { - info.add(EnumChatFormatting.YELLOW + "[" + type.name + "] " + EnumChatFormatting.AQUA + I18nUtil.resolveKey("hbmfluid.trait.efficiency") + ": " + ((int) (eff * 100D)) + "%"); + info.add(EnumChatFormatting.YELLOW + "[" + type.getLocalizedName() + "] " + EnumChatFormatting.AQUA + I18nUtil.resolveKey("hbmfluid.trait.efficiency") + ": " + ((int) (eff * 100D)) + "%"); } } } public static enum CoolingType { - TURBINE(I18nUtil.resolveKey("hbmfluid.trait.steam")), - HEATEXCHANGER(I18nUtil.resolveKey("hbmfluid.trait.coolable")); + TURBINE("steam"), + HEATEXCHANGER("coolable"); - public String name; + private String name; private CoolingType(String name) { this.name = name; } + + public String getLocalizedName() { + return I18nUtil.resolveKey("hbmfluid.trait." + this.name); + } } @Override diff --git a/src/main/java/com/hbm/inventory/fluid/trait/FT_Heatable.java b/src/main/java/com/hbm/inventory/fluid/trait/FT_Heatable.java index 1e599b6a0..3186da963 100644 --- a/src/main/java/com/hbm/inventory/fluid/trait/FT_Heatable.java +++ b/src/main/java/com/hbm/inventory/fluid/trait/FT_Heatable.java @@ -49,7 +49,7 @@ public class FT_Heatable extends FluidTrait { double eff = getEfficiency(type); if(eff > 0) { - info.add(EnumChatFormatting.YELLOW + "[" + type.name + "] " + EnumChatFormatting.AQUA + I18nUtil.resolveKey("hbmfluid.trait.efficiency") + ": " + ((int) (eff * 100D)) + "%"); + info.add(EnumChatFormatting.YELLOW + "[" + type.getLocalizedName() + "] " + EnumChatFormatting.AQUA + I18nUtil.resolveKey("hbmfluid.trait.efficiency") + ": " + ((int) (eff * 100D)) + "%"); } } } @@ -69,17 +69,21 @@ public class FT_Heatable extends FluidTrait { } public static enum HeatingType { - BOILER(I18nUtil.resolveKey("hbmfluid.trait.boilable")), - HEATEXCHANGER(I18nUtil.resolveKey("hbmfluid.trait.heatable")), - PWR(I18nUtil.resolveKey("hbmfluid.trait.coolantPWR")), - ICF(I18nUtil.resolveKey("hbmfluid.trait.coolantICF")), - PA(I18nUtil.resolveKey("hbmfluid.trait.coolantPA")); + BOILER("boilable"), + HEATEXCHANGER("heatable"), + PWR("coolantPWR"), + ICF("coolantICF"), + PA("coolantPA"); - public String name; + private String name; private HeatingType(String name) { this.name = name; } + + public String getLocalizedName() { + return I18nUtil.resolveKey("hbmfluid.trait." + this.name); + } } @Override diff --git a/src/main/java/com/hbm/items/machine/ItemPistons.java b/src/main/java/com/hbm/items/machine/ItemPistons.java index 4736b5cdd..822c0a5ba 100644 --- a/src/main/java/com/hbm/items/machine/ItemPistons.java +++ b/src/main/java/com/hbm/items/machine/ItemPistons.java @@ -46,7 +46,7 @@ public class ItemPistons extends ItemEnumMulti { list.add(EnumChatFormatting.YELLOW + "Fuel efficiency:"); for(int i = 0; i < type.eff.length; i++) { - list.add(EnumChatFormatting.YELLOW + "-" + FuelGrade.values()[i].getGrade() + ": " + EnumChatFormatting.RED + "" + (int)(type.eff[i] * 100) + "%"); + list.add(EnumChatFormatting.YELLOW + "-" + FuelGrade.values()[i].getLocalizedName() + ": " + EnumChatFormatting.RED + "" + (int)(type.eff[i] * 100) + "%"); } }