xircon/Hbm-s-Nuclear-Tech-GIT
1
0
Fork 0
mirror of https://github.com/HbmMods/Hbm-s-Nuclear-Tech-GIT.git synced 2026-08-10 17:55:44 +00:00
Code Issues Packages Projects Releases Wiki Activity

tiny bit of cleanup

Browse Source
This commit is contained in:
HbmMods 2026-07-23 12:03:14 +02:00
parent 2df2f36f03
commit 6ac520467b
6 changed files with 30 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/java/com/hbm/blocks/machine/MachineDiesel.java
View File

@ -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 + "%");
}
}
}

2
src/main/java/com/hbm/blocks/machine/MachineTurbofan.java
View File

@ -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%");
}
}

16
src/main/java/com/hbm/inventory/fluid/trait/FT_Combustible.java
View File

@ -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);
}
}

12
src/main/java/com/hbm/inventory/fluid/trait/FT_Coolable.java
View File

@ -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

18
src/main/java/com/hbm/inventory/fluid/trait/FT_Heatable.java
View File

@ -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

2
src/main/java/com/hbm/items/machine/ItemPistons.java
View File

@ -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) + "%");
}
}