diff --git a/src/main/java/moddedmite/xylose/extragui/config/ExtraGuiConfig.java b/src/main/java/moddedmite/xylose/extragui/config/ExtraGuiConfig.java index 21c01b6..66f3e11 100644 --- a/src/main/java/moddedmite/xylose/extragui/config/ExtraGuiConfig.java +++ b/src/main/java/moddedmite/xylose/extragui/config/ExtraGuiConfig.java @@ -11,6 +11,7 @@ import moddedmite.xylose.extragui.gui.GuiMiniInfoHandle; import moddedmite.xylose.extragui.gui.GuiEntityStats; import moddedmite.xylose.extragui.util.BiomeNameI18n; +import net.minecraft.BiomeGenBase; import net.minecraft.Minecraft; import org.lwjgl.input.Keyboard; @@ -52,7 +53,7 @@ public class ExtraGuiConfig extends SimpleConfigs { public static final ConfigInfo YawPitchSpeed = new ConfigInfo("extraGui.yawPitchSpeed", false, false, mc -> GuiMiniInfoHandle.getInstance().getYawPitchSpeedInfo(mc)); public static final ConfigInfo Weather = new ConfigInfo("extraGui.weather", true, mc -> GuiMiniInfoHandle.getInstance().weatherInfo(mc.theWorld)); public static final ConfigInfo Light = new ConfigInfo("extraGui.light", false, mc -> GuiMiniInfoHandle.getInstance().getLightInfo(mc)); - public static final ConfigInfo Biome = new ConfigInfo("extraGui.biome", false, mc -> BiomeNameI18n.getBiomeNameI18n(mc.thePlayer.getBiome())); + public static final ConfigInfo Biome = new ConfigInfo("extraGui.biome", false, mc ->GuiMiniInfoHandle.getInstance().getBiomeFullInfo(mc.thePlayer.getBiome())); public static final ConfigInfo Dimension = new ConfigInfo("extraGui.dimension", false, mc -> GuiMiniInfoHandle.getInstance().getDimension(mc.theWorld)); public static final ConfigInfo MoonPhases = new ConfigInfo("extraGui.moonPhases", true, mc -> GuiMiniInfoHandle.getInstance().getMoonPhases(mc.theWorld)); public static final ConfigBoolean OnePercentLowFps = new ConfigBoolean("extraGui.onePercentLowFps", true); diff --git a/src/main/java/moddedmite/xylose/extragui/gui/GuiMiniInfoHandle.java b/src/main/java/moddedmite/xylose/extragui/gui/GuiMiniInfoHandle.java index 5508d48..eefa69a 100644 --- a/src/main/java/moddedmite/xylose/extragui/gui/GuiMiniInfoHandle.java +++ b/src/main/java/moddedmite/xylose/extragui/gui/GuiMiniInfoHandle.java @@ -1,11 +1,13 @@ package moddedmite.xylose.extragui.gui; import com.google.common.base.Strings; +import moddedmite.rustedironcore.api.world.BiomeAPI; import moddedmite.xylose.extragui.config.ExtraGuiConfig; import moddedmite.xylose.extragui.util.DisplayUtil; import moddedmite.xylose.extragui.util.FrameTimeTracker; import net.minecraft.*; import org.lwjgl.opengl.GL11; +import moddedmite.xylose.extragui.util.BiomeNameI18n; import java.awt.*; import java.text.SimpleDateFormat; @@ -313,4 +315,9 @@ public String getCustomString() { return ExtraGuiConfig.CustomString.getStringValue(); return ""; } + + public String getBiomeFullInfo(BiomeGenBase biome) { + return BiomeNameI18n.getBiomeNameI18n(biome)+ BiomeNameI18n.getBiomeTempRainInfo(biome); + } + } diff --git a/src/main/java/moddedmite/xylose/extragui/util/BiomeNameI18n.java b/src/main/java/moddedmite/xylose/extragui/util/BiomeNameI18n.java index 14b85eb..f0eda53 100644 --- a/src/main/java/moddedmite/xylose/extragui/util/BiomeNameI18n.java +++ b/src/main/java/moddedmite/xylose/extragui/util/BiomeNameI18n.java @@ -10,4 +10,12 @@ public static String getBiomeNameI18n(BiomeGenBase biome) { if (((BiomeAPI) biome).getBiomeUnlocalizedName() == null) return biome.biomeName; return I18n.getString(((BiomeAPI) biome).getBiomeUnlocalizedName()); } + + public static String getBiomeTempRainInfo(BiomeGenBase biome) { + return I18n.getStringParams( + "extragui.biome.temp_rain", + biome.temperature, + biome.rainfall + ); + } } diff --git a/src/main/resources/assets/extragui/lang/en_US.lang b/src/main/resources/assets/extragui/lang/en_US.lang index 6fb08a0..54ea8ea 100644 --- a/src/main/resources/assets/extragui/lang/en_US.lang +++ b/src/main/resources/assets/extragui/lang/en_US.lang @@ -157,4 +157,6 @@ extragui.stats.equipment.held=Held: %s extragui.stats.equipment.worn=Worn[%s]: %s extragui.stats.invertory=Invertory -extragui.gui.anvil.durability=Durability: %d/%d \ No newline at end of file +extragui.gui.anvil.durability=Durability: %d/%d + +extragui.biome.temp_rain=(Temperature: %.1f, Rainfall: %.1f) \ No newline at end of file diff --git a/src/main/resources/assets/extragui/lang/zh_CN.lang b/src/main/resources/assets/extragui/lang/zh_CN.lang index e97516f..c438e13 100644 --- a/src/main/resources/assets/extragui/lang/zh_CN.lang +++ b/src/main/resources/assets/extragui/lang/zh_CN.lang @@ -158,3 +158,5 @@ extragui.stats.equipment.worn=穿着[%s]:%s extragui.stats.invertory=物品栏 extragui.gui.anvil.durability=耐久: %d/%d + +extragui.biome.temp_rain=(温度: %.1f, 湿度: %.1f)