From 7b84b2af8946101c366582552356cd4bbd0f2417 Mon Sep 17 00:00:00 2001 From: PassiHD Date: Tue, 16 Jan 2024 06:01:08 +0100 Subject: [PATCH 1/2] feat: Chunk coordinates Signed-off-by: PassiHD --- .../configuration/FoxClientConfigManager.java | 1 + .../configuration/FoxClientSetting.java | 1 + .../net/foxes4life/foxclient/gui/InfoHud.java | 6 ++++++ .../screen/settings/FoxClientSettingsScreen.java | 2 +- .../textures/ui/info-hud/icons/cxyz.png | Bin 0 -> 1002 bytes .../resources/assets/minecraft/lang/de_de.json | 1 + .../resources/assets/minecraft/lang/en_us.json | 1 + .../resources/assets/minecraft/lang/nl_nl.json | 1 + 8 files changed, 12 insertions(+), 1 deletion(-) create mode 100644 src/main/resources/assets/foxclient/textures/ui/info-hud/icons/cxyz.png diff --git a/src/main/java/net/foxes4life/foxclient/configuration/FoxClientConfigManager.java b/src/main/java/net/foxes4life/foxclient/configuration/FoxClientConfigManager.java index 814eb94..4aac4ff 100644 --- a/src/main/java/net/foxes4life/foxclient/configuration/FoxClientConfigManager.java +++ b/src/main/java/net/foxes4life/foxclient/configuration/FoxClientConfigManager.java @@ -26,6 +26,7 @@ public void initializeDefaults() { setDefault(FoxClientSetting.HudVersion, true); setDefault(FoxClientSetting.HudCoordinates, true); setDefault(FoxClientSetting.HudCoordinatesColor, false); + setDefault(FoxClientSetting.HudChunkCoordinates, false); setDefault(FoxClientSetting.HudFPS, true); setDefault(FoxClientSetting.HudPing, true); setDefault(FoxClientSetting.HudTps, true); diff --git a/src/main/java/net/foxes4life/foxclient/configuration/FoxClientSetting.java b/src/main/java/net/foxes4life/foxclient/configuration/FoxClientSetting.java index 673cf28..d5602b8 100644 --- a/src/main/java/net/foxes4life/foxclient/configuration/FoxClientSetting.java +++ b/src/main/java/net/foxes4life/foxclient/configuration/FoxClientSetting.java @@ -18,6 +18,7 @@ public enum FoxClientSetting { HudVersion, HudCoordinates, HudCoordinatesColor, + HudChunkCoordinates, HudFPS, HudPing, HudTps, diff --git a/src/main/java/net/foxes4life/foxclient/gui/InfoHud.java b/src/main/java/net/foxes4life/foxclient/gui/InfoHud.java index 5f9fb01..ce34f2d 100644 --- a/src/main/java/net/foxes4life/foxclient/gui/InfoHud.java +++ b/src/main/java/net/foxes4life/foxclient/gui/InfoHud.java @@ -65,6 +65,7 @@ void loadList(boolean drawLogo) { boolean version = Main.config.get(FoxClientSetting.HudVersion, Boolean.class); boolean coords = Main.config.get(FoxClientSetting.HudCoordinates, Boolean.class); boolean colorcoords = Main.config.get(FoxClientSetting.HudCoordinatesColor, Boolean.class); + boolean chunkcoords = Main.config.get(FoxClientSetting.HudChunkCoordinates, Boolean.class); boolean fps = Main.config.get(FoxClientSetting.HudFPS, Boolean.class); boolean ping = Main.config.get(FoxClientSetting.HudPing, Boolean.class); boolean tps = Main.config.get(FoxClientSetting.HudTps, Boolean.class); @@ -80,6 +81,11 @@ void loadList(boolean drawLogo) { textList.put("xyz", TextUtils.string(String.format((colorcoords ? "§c%s §a%s §9%s" : "%s %s %s"), this.client.player.getBlockPos().getX(), this.client.player.getBlockPos().getY(), this.client.player.getBlockPos().getZ()))); } + if (chunkcoords) { + assert this.client.player != null; + textList.put("cxyz", TextUtils.string(String.format((colorcoords ? "§c%s §9%s" : "%s %s"), this.client.player.getChunkPos().getRegionRelativeX(), this.client.player.getChunkPos().getRegionRelativeZ()))); + } + if (fps) textList.put("fps", TextUtils.string(ClientUtils.getFPS() + "fps")); diff --git a/src/main/java/net/foxes4life/foxclient/screen/settings/FoxClientSettingsScreen.java b/src/main/java/net/foxes4life/foxclient/screen/settings/FoxClientSettingsScreen.java index 21d80e1..f2096eb 100644 --- a/src/main/java/net/foxes4life/foxclient/screen/settings/FoxClientSettingsScreen.java +++ b/src/main/java/net/foxes4life/foxclient/screen/settings/FoxClientSettingsScreen.java @@ -90,7 +90,7 @@ public FoxClientSettingsScreen(boolean showBackground) { categories.put("menus", List.of(FoxClientSetting.CustomMainMenu, FoxClientSetting.CustomPauseMenu)); categories.put("misc", List.of(FoxClientSetting.DiscordEnabled, FoxClientSetting.DiscordShowIP, FoxClientSetting.DiscordShowPlayer, FoxClientSetting.SmoothZoom)); categories.put("eastereggs", List.of(FoxClientSetting.UwUfy)); - categories.put("ingame-hud", List.of(FoxClientSetting.HudBackground, FoxClientSetting.HudLogo, FoxClientSetting.HudVersion, FoxClientSetting.HudCoordinates, FoxClientSetting.HudCoordinatesColor, FoxClientSetting.HudFPS, FoxClientSetting.HudPing, FoxClientSetting.HudTps, FoxClientSetting.HudServerIP, FoxClientSetting.HudBiome)); + categories.put("ingame-hud", List.of(FoxClientSetting.HudBackground, FoxClientSetting.HudLogo, FoxClientSetting.HudVersion, FoxClientSetting.HudCoordinates, FoxClientSetting.HudCoordinatesColor, FoxClientSetting.HudChunkCoordinates, FoxClientSetting.HudFPS, FoxClientSetting.HudPing, FoxClientSetting.HudTps, FoxClientSetting.HudServerIP, FoxClientSetting.HudBiome)); categories.put("armor-hud", List.of(FoxClientSetting.ArmorHudDisplayPercentage)); categories.put("block-hud", List.of(FoxClientSetting.BlockHudAnimations)); } diff --git a/src/main/resources/assets/foxclient/textures/ui/info-hud/icons/cxyz.png b/src/main/resources/assets/foxclient/textures/ui/info-hud/icons/cxyz.png new file mode 100644 index 0000000000000000000000000000000000000000..eabe0fc607ef86b7f9cc7814f57eed5014230ebe GIT binary patch literal 1002 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!60wlNoGJgf6n3BBRT^JZv^(q?yd7K3vk;M!Q zddeWoSh3W;3@FH6;_2(k{+xqZTwT;#vF#iK1LJ|Jkcg6?#Bzm#qWrYXoK%I9%7Rpd z%;aPS28-UM!LQHCDDwRA7u7uYW9O8^2iHycC*5(dVErBOmm=QUTaqRE&rYb@KCP}d z;4q8wh9)!Bw{8b)6yH`!Npo#7R63#Ps>O68bDrHF<%XP%PQJ6I_VDcB-srWVMsj+% zY}Y3?tHk}WN5zjnlS5UOTy!)95$O@+t$c%uh%We zIeFajxJ2haiw{ln-}c=W-p6Wb*Ks3XZAntxVYd&=^FPXeTdsIDp!&~czYXUP@otDJ zDAl*fzf+byMI|5QlDS0>^8S8cBE(+bR=ykcjUKi8M8b1!x@O*rMg^u$vx*XxG) zkC*k@3nguwxjlK^&lh|dWw-C#mT{^6v_fvO`0AqqOU^Wlm^Eu{7r*a%L9NNFR!)Sk zxiGspS##++F2@?r-zUqfZ{%O+`+fFr>Yo1!Ri;V5m|02`46hg#X91&EAUV+w6wL-u z3`!ylQuF3s22y^WE{-7@=l4!<)0<#Bi z!CLK2PY*C2cqe8tjgN6hvpc)ZtXTGyzv4x>ml?mEwe^o;_3|Iy>UoEG&Lth&?FBSh zxWqN0#5q4VH#M(>A*oU!EvK}&B(tJI^L*whptLGTIwi3r)hf9t6-Y4{85kMs8d&HW z7>5`cTNztg85wFD7+4t?oapIZf}$ZeKP5A*61Rq(7mX!=8Z_WGlw{_n7MCRE7BCoE znj7dE7y?lU*leKj5KGo=@wy7sBMs66OyyR|`303lnduoN3<0G{Ihn}{F8R5MnR(kL z8b$+^DZ!Mbq!uR^WfqiV=I1fEd-?__B$a07l;~#WDHI2}JNcwL3IkP(!c^xb=9Q); rCYO{Jr51se`^=jF3JX5Cg8Y=!90riq=mbw^pbUejtDnm{r-UW|^=y51 literal 0 HcmV?d00001 diff --git a/src/main/resources/assets/minecraft/lang/de_de.json b/src/main/resources/assets/minecraft/lang/de_de.json index 3cd9f0c..3c0535a 100644 --- a/src/main/resources/assets/minecraft/lang/de_de.json +++ b/src/main/resources/assets/minecraft/lang/de_de.json @@ -38,6 +38,7 @@ "foxclient.config.hudversion": "Version", "foxclient.config.hudcoordinates": "XYZ", "foxclient.config.hudcoordinatescolor": "Farbige Koordinaten", + "foxclient.config.hudchunkcoordinates": "Chunk Koordinaten", "foxclient.config.hudbiome": "Biom", "foxclient.config.hudserverip": "Server IP", "foxclient.config.hudlogo": "Logo", diff --git a/src/main/resources/assets/minecraft/lang/en_us.json b/src/main/resources/assets/minecraft/lang/en_us.json index 3861900..c78ca3e 100644 --- a/src/main/resources/assets/minecraft/lang/en_us.json +++ b/src/main/resources/assets/minecraft/lang/en_us.json @@ -40,6 +40,7 @@ "foxclient.config.hudcoordinates": "XYZ", "foxclient.config.hudbiome": "Biome", "foxclient.config.hudcoordinatescolor": "Colored XYZ", + "foxclient.config.hudchunkcoordinates": "Chunk Coordinates", "foxclient.config.hudserverip": "Server IP", "foxclient.config.hudlogo": "Logo", "foxclient.config.hudbackground": "Background", diff --git a/src/main/resources/assets/minecraft/lang/nl_nl.json b/src/main/resources/assets/minecraft/lang/nl_nl.json index 9ee2ae0..14cc33c 100644 --- a/src/main/resources/assets/minecraft/lang/nl_nl.json +++ b/src/main/resources/assets/minecraft/lang/nl_nl.json @@ -39,6 +39,7 @@ "foxclient.config.hudcoordinates": "XYZ", "foxclient.config.hudbiome": "Bioom", "foxclient.config.hudcoordinatescolor": "Gekleurde XYZ", + "foxclient.config.hudchunkcoordinates": "Chunk coords", "foxclient.config.hudserverip": "Server IP", "foxclient.config.hudlogo": "Logo", "foxclient.config.hudbackground": "Achtergrond", From a06a13e5290bc4f045e7ea2a58c2c3696d419946 Mon Sep 17 00:00:00 2001 From: PassiHD Date: Tue, 16 Jan 2024 07:12:08 +0100 Subject: [PATCH 2/2] chore: make biome display look nicer Signed-off-by: PassiHD --- src/main/java/net/foxes4life/foxclient/gui/InfoHud.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/net/foxes4life/foxclient/gui/InfoHud.java b/src/main/java/net/foxes4life/foxclient/gui/InfoHud.java index ce34f2d..c826ccb 100644 --- a/src/main/java/net/foxes4life/foxclient/gui/InfoHud.java +++ b/src/main/java/net/foxes4life/foxclient/gui/InfoHud.java @@ -99,7 +99,7 @@ void loadList(boolean drawLogo) { if (client.world != null) { assert client.getCameraEntity() != null; final BlockPos blockPos = client.getCameraEntity().getBlockPos(); - textList.put("biome", TextUtils.string(String.format(client.world.getBiome(blockPos).getKey().get().getValue().toString()))); + textList.put("biome", TextUtils.string(client.world.getBiome(blockPos).getKey().get().getValue().toString().replaceAll("([Aa-zZ].*:)", ""))); } if (server) {