diff --git a/src/main/java/com/hbm/inventory/fluid/trait/FluidTraitSimple.java b/src/main/java/com/hbm/inventory/fluid/trait/FluidTraitSimple.java index 8afc8ee8f..908005f68 100644 --- a/src/main/java/com/hbm/inventory/fluid/trait/FluidTraitSimple.java +++ b/src/main/java/com/hbm/inventory/fluid/trait/FluidTraitSimple.java @@ -12,7 +12,11 @@ public class FluidTraitSimple { } } - public static class FT_Gaseous_ART extends FluidTrait { } //at room temperature, for cryogenic hydrogen for example + public static class FT_Gaseous_ART extends FluidTrait { //at room temperature, for cryogenic hydrogen for example + @Override public void addInfoHidden(List info) { + info.add(EnumChatFormatting.BLUE + "[Gaseous at Room Temperature]"); + } + } public static class FT_Liquid extends FluidTrait { @Override public void addInfoHidden(List info) { diff --git a/src/main/java/com/hbm/inventory/gui/GUICrucible.java b/src/main/java/com/hbm/inventory/gui/GUICrucible.java index aa1893b21..76c252df5 100644 --- a/src/main/java/com/hbm/inventory/gui/GUICrucible.java +++ b/src/main/java/com/hbm/inventory/gui/GUICrucible.java @@ -12,6 +12,7 @@ import com.hbm.inventory.material.Mats.MaterialStack; import com.hbm.inventory.material.NTMMaterial.SmeltingBehavior; import com.hbm.lib.RefStrings; import com.hbm.tileentity.machine.TileEntityCrucible; +import com.hbm.util.I18nUtil; import net.minecraft.client.Minecraft; import net.minecraft.client.renderer.OpenGlHelper; @@ -75,7 +76,7 @@ public class GUICrucible extends GuiInfoContainer { list.add(EnumChatFormatting.RED + "Empty"); for(MaterialStack sta : stack) { - list.add(EnumChatFormatting.YELLOW + sta.material.names[0] + ": " + Mats.formatAmount(sta.amount)); + list.add(EnumChatFormatting.YELLOW + I18nUtil.resolveKey(sta.material.getUnlocalizedName()) + ": " + Mats.formatAmount(sta.amount)); } this.drawCustomInfoStat(mouseX, mouseY, guiLeft + x, guiTop + y, 36, 81, mouseX, mouseY, list); diff --git a/src/main/java/com/hbm/items/machine/ItemScraps.java b/src/main/java/com/hbm/items/machine/ItemScraps.java index dad82669d..224afc88d 100644 --- a/src/main/java/com/hbm/items/machine/ItemScraps.java +++ b/src/main/java/com/hbm/items/machine/ItemScraps.java @@ -6,6 +6,7 @@ import com.hbm.inventory.material.MaterialShapes; import com.hbm.inventory.material.Mats; import com.hbm.inventory.material.Mats.MaterialStack; import com.hbm.items.ModItems; +import com.hbm.util.I18nUtil; import com.hbm.inventory.material.NTMMaterial; import cpw.mods.fml.relauncher.Side; @@ -35,7 +36,7 @@ public class ItemScraps extends Item { MaterialStack contents = getMats(stack); if(contents != null) { - list.add(contents.material.names[0] + ", " + Mats.formatAmount(contents.amount)); + list.add(I18nUtil.resolveKey(contents.material.getUnlocalizedName()) + ", " + Mats.formatAmount(contents.amount)); } } diff --git a/src/main/resources/assets/hbm/lang/de_DE.lang b/src/main/resources/assets/hbm/lang/de_DE.lang index a41e221d3..72da8e6f8 100644 --- a/src/main/resources/assets/hbm/lang/de_DE.lang +++ b/src/main/resources/assets/hbm/lang/de_DE.lang @@ -636,8 +636,8 @@ hbmfluid.xenon=Xenongas hbmfluid.xpjuice=Erfahrungssaft hbmmat.actinium227=Actinium-227 -hbmmat.alloy=Fortgeschrittene Legierung -hbmmat.aluminium=Aluminium +hbmmat.advancedalloy=Fortgeschrittene Legierung +hbmmat.aluminum=Aluminium hbmmat.americiumrg=Reaktorfähiges Armericium hbmmat.americium241=Americium-241 hbmmat.americium242=Americium-242 @@ -645,6 +645,7 @@ hbmmat.arsenic=Arsen hbmmat.asbestos=Asbest hbmmat.bakelite=Bakelit hbmmat.beryllium=Beryllium +hbmmat.bismuth=Bismut hbmmat.borax=Borax hbmmat.boron=Bor hbmmat.cinnabar=Zinnober @@ -677,6 +678,7 @@ hbmmat.magnetizedtungsten=Magnetisierter Wolfram hbmmat.mingrade=Minecraft-Kupfer hbmmat.neptunium237=Neptunium-237 hbmmat.niobium=Niob +hbmmat.obsidian=Obsidian hbmmat.osmiridium=Osmiridium hbmmat.petcoke=Petroleumkoks hbmmat.plutonium=Plutonium @@ -697,11 +699,11 @@ hbmmat.schrabidate=Eisenschrabidat hbmmat.schrabidium=Schrabidium hbmmat.schraranium=Schraranium hbmmat.solinium=Solinium -hbmmat.star=Sternenmetall +hbmmat.starmetal=Sternenmetall hbmmat.steel=Stahl hbmmat.stone=Stein hbmmat.sulfur=Schwefel -hbmmat.tantalium=Tantal +hbmmat.tantalum=Tantal hbmmat.tcalloy=Technetiumstahl hbmmat.technetium99=Technetium-99 hbmmat.titanium=Titan diff --git a/src/main/resources/assets/hbm/lang/en_US.lang b/src/main/resources/assets/hbm/lang/en_US.lang index 85b913571..c783c54a8 100644 --- a/src/main/resources/assets/hbm/lang/en_US.lang +++ b/src/main/resources/assets/hbm/lang/en_US.lang @@ -864,8 +864,8 @@ hbmpseudofluid.mud_heavy=Heavy Sludge Fraction hbmpseudofluid.mud=Poisonous Sludge Gas hbmmat.actinium227=Actinium-227 -hbmmat.alloy=Advanced Alloy -hbmmat.aluminium=Aluminium +hbmmat.advancedalloy=Advanced Alloy +hbmmat.aluminum=Aluminium hbmmat.americiumrg=Reactor-Grade Americium hbmmat.americium241=Americium-241 hbmmat.americium242=Americium-242 @@ -873,6 +873,7 @@ hbmmat.arsenic=Arsenic hbmmat.asbestos=Asbestos hbmmat.bakelite=Bakelite hbmmat.beryllium=Beryllium +hbmmat.bismuth=Bismuth hbmmat.borax=Borax hbmmat.boron=Boron hbmmat.cinnabar=Cinnabar @@ -905,6 +906,7 @@ hbmmat.magnetizedtungsten=Magnetized Tungsten hbmmat.mingrade=Minecraft Grade Copper hbmmat.neptunium237=Neptunium-237 hbmmat.niobium=Niobium +hbmmat.obsidian=Obsidian hbmmat.osmiridium=Osmiridium hbmmat.petcoke=Petroleum Coke hbmmat.plutonium=Plutonium @@ -925,11 +927,11 @@ hbmmat.schrabidate=Ferric Schrabidate hbmmat.schrabidium=Schrabidium hbmmat.schraranium=Schraranium hbmmat.solinium=Solinium -hbmmat.star=Starmetal +hbmmat.starmetal=Starmetal hbmmat.steel=Steel hbmmat.stone=Stone hbmmat.sulfur=Sulfur -hbmmat.tantalium=Tantalum +hbmmat.tantalum=Tantalum hbmmat.tcalloy=Technetium Steel hbmmat.technetium99=Technetium-99 hbmmat.titanium=Titanium