Skip to content

feat: add temperature/humidity display for biome info #1

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
huazhongyouji wants to merge 1 commit into
base: master
Choose a base branch
from
Open

feat: add temperature/humidity display for biome info #1

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion src/main/java/moddedmite/xylose/extragui/config/ExtraGuiConfig.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;

Expand Down Expand Up @@ -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);
Expand Down
7 changes: 7 additions & 0 deletions src/main/java/moddedmite/xylose/extragui/gui/GuiMiniInfoHandle.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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;
Expand Down Expand Up @@ -313,4 +315,9 @@ public String getCustomString() {
return ExtraGuiConfig.CustomString.getStringValue();
return "";
}

public String getBiomeFullInfo(BiomeGenBase biome) {
return BiomeNameI18n.getBiomeNameI18n(biome)+ BiomeNameI18n.getBiomeTempRainInfo(biome);
}

}
8 changes: 8 additions & 0 deletions src/main/java/moddedmite/xylose/extragui/util/BiomeNameI18n.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
);
}
}
4 changes: 3 additions & 1 deletion src/main/resources/assets/extragui/lang/en_US.lang
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
extragui.gui.anvil.durability=Durability: %d/%d

extragui.biome.temp_rain=(Temperature: %.1f, Rainfall: %.1f)
2 changes: 2 additions & 0 deletions src/main/resources/assets/extragui/lang/zh_CN.lang
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)