From ddbb13dde2fb9ca9e6408b01514f700f99ca7830 Mon Sep 17 00:00:00 2001 From: Boxadactle Date: Sat, 21 Dec 2024 14:15:58 -0800 Subject: [PATCH] 1.21.4 + add hotbar customizabilty --- CHANGELOG.md | 4 +- .../CoordinatesDisplay.java | 41 ++++++++++++- .../hud/renderer/HotbarRenderer.java | 34 +++++++---- .../assets/coordinatesdisplay/lang/en_us.json | 1 - .../assets/coordinatesdisplay/lang/es_es.json | 1 - .../assets/coordinatesdisplay/lang/ja_jp.json | 1 - .../assets/coordinatesdisplay/lang/ko_kr.json | 1 - .../assets/coordinatesdisplay/lang/ru_ru.json | 1 - .../assets/coordinatesdisplay/lang/uk_ua.json | 1 - .../assets/coordinatesdisplay/lang/zh_tw.json | 1 - .../fabric/CoordinatesDisplayFabric.java | 33 +---------- fabric/src/main/resources/fabric.mod.json | 6 +- forge/build.gradle | 2 +- .../forge/CoordinatesDisplayForge.java | 13 +++- .../forge/mixin/GuiMixin.java | 59 ------------------- forge/src/main/resources/META-INF/mods.toml | 4 +- .../coordinatesdisplay-forge.mixins.json | 12 ---- gradle.properties | 16 ++--- .../neoforge/CoordinatesDisplayNeoforge.java | 31 +--------- .../resources/META-INF/neoforge.mods.toml | 4 +- 20 files changed, 93 insertions(+), 173 deletions(-) delete mode 100644 forge/src/main/java/dev/boxadactle/coordinatesdisplay/forge/mixin/GuiMixin.java delete mode 100644 forge/src/main/resources/coordinatesdisplay-forge.mixins.json diff --git a/CHANGELOG.md b/CHANGELOG.md index 48eec6c..55a7241 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,3 @@ ## Changes -- Updated to 1.21.3 -- Fixed flipped Y text in direction mode \ No newline at end of file +- Updated to 1.21.4 +- Hotbar mode is now configurable \ No newline at end of file diff --git a/common/src/main/java/dev/boxadactle/coordinatesdisplay/CoordinatesDisplay.java b/common/src/main/java/dev/boxadactle/coordinatesdisplay/CoordinatesDisplay.java index 0daae99..7a06d6b 100644 --- a/common/src/main/java/dev/boxadactle/coordinatesdisplay/CoordinatesDisplay.java +++ b/common/src/main/java/dev/boxadactle/coordinatesdisplay/CoordinatesDisplay.java @@ -1,12 +1,17 @@ package dev.boxadactle.coordinatesdisplay; +import com.mojang.blaze3d.systems.RenderSystem; import dev.boxadactle.boxlib.command.BCommandManager; import dev.boxadactle.boxlib.config.BConfigClass; import dev.boxadactle.boxlib.config.BConfigHandler; import dev.boxadactle.boxlib.rendering.RenderQueue; +import dev.boxadactle.boxlib.util.GuiUtils; import dev.boxadactle.boxlib.util.ModLogger; +import dev.boxadactle.boxlib.util.WorldUtils; import dev.boxadactle.coordinatesdisplay.command.CoordinatesCommand; import dev.boxadactle.coordinatesdisplay.hud.Hud; +import dev.boxadactle.coordinatesdisplay.position.Position; +import net.minecraft.client.gui.GuiGraphics; public class CoordinatesDisplay { @@ -14,7 +19,7 @@ public class CoordinatesDisplay { public static final String MOD_ID = "coordinatesdisplay"; - public static final String VERSION = "14.0.0"; + public static final String VERSION = "15.0.0"; public static final String VERSION_STRING = MOD_NAME + " v" + VERSION; @@ -27,6 +32,7 @@ public class CoordinatesDisplay { public static String WIKI_DEATHPOS = WIKI + "#deathpos"; public static String WIKI_TEXTS = WIKI + "#text"; + static boolean deltaError = false; public static final ModLogger LOGGER = new ModLogger(MOD_NAME); @@ -58,4 +64,37 @@ public static ModConfig getConfig() { return CONFIG.get(); } + public static void renderHud(GuiGraphics graphics) { + try { + if (CoordinatesDisplay.HUD.shouldRender(CoordinatesDisplay.getConfig().visibilityFilter)) { + RenderSystem.enableBlend(); + + ModConfig config = CoordinatesDisplay.getConfig(); + + CoordinatesDisplay.HUD.render( + graphics, + Hud.RenderType.HUD, + Position.of(WorldUtils.getPlayer()), + config.hudX, + config.hudY, + config.renderMode, + config.startCorner, + config.hudScale + ); + } + } catch (NullPointerException e) { + if (deltaError) { + throw new RuntimeException(e); + } + + CoordinatesDisplay.LOGGER.error("Unknown error from config file"); + CoordinatesDisplay.LOGGER.printStackTrace(e); + + CoordinatesDisplay.LOGGER.player.warn(GuiUtils.getTranslatable("message.coordinatesdisplay.configError")); + CoordinatesDisplay.CONFIG.resetConfig(); + + deltaError = true; + } + } + } diff --git a/common/src/main/java/dev/boxadactle/coordinatesdisplay/hud/renderer/HotbarRenderer.java b/common/src/main/java/dev/boxadactle/coordinatesdisplay/hud/renderer/HotbarRenderer.java index fec9107..fb28d6c 100644 --- a/common/src/main/java/dev/boxadactle/coordinatesdisplay/hud/renderer/HotbarRenderer.java +++ b/common/src/main/java/dev/boxadactle/coordinatesdisplay/hud/renderer/HotbarRenderer.java @@ -15,21 +15,23 @@ import dev.boxadactle.coordinatesdisplay.mixin.OverlayMessageTimeAccessor; import dev.boxadactle.coordinatesdisplay.position.Position; import net.minecraft.network.chat.Component; +import net.minecraft.network.chat.MutableComponent; import net.minecraft.resources.ResourceLocation; import net.minecraft.world.level.biome.Biome; import oshi.util.tuples.Triplet; +import java.util.ArrayList; +import java.util.Iterator; +import java.util.List; + @HudDisplayMode( value = "hotbar", ignoreTranslations = true, positionModifier = HotbarRenderer.HotbarPosition.class, allowMove = false, hasBackground = false, - hasXYZ = false, hasChunkData = false, - hasDirection = false, hasDirectionInt = false, - hasBiome = false, hasMCVersion = false, hasDimension = false ) @@ -41,24 +43,34 @@ public RenderingLayout renderOverlay(int x, int y, Position pos) { return new ColumnLayout(0, 0, 0); } + List components = new ArrayList<>(); + Triplet player = this.roundPosition(pos.position.getPlayerPos(), pos.position.getBlockPos(), CoordinatesDisplay.getConfig().decimalPlaces); - Component xyz = definition(GlobalTexts.XYZ, + if (config().renderXYZ) components.add(definition(GlobalTexts.XYZ, value(player.getA()), value(player.getB()), value(player.getC()) - ); + )); - Component direction = definition(GlobalTexts.FACING, value(resolveDirection(ModUtil.getDirectionFromYaw(pos.headRot.wrapYaw())))); + if (config().renderDirection) components.add(definition(GlobalTexts.FACING, value(resolveDirection(ModUtil.getDirectionFromYaw(pos.headRot.wrapYaw()))))); - ResourceLocation bKey = pos.world.getBiomeKey(); - Biome b = pos.world.getBiome(); - Component biome = ModUtil.getBiomeComponent(bKey, b, config().biomeColors, config().dataColor); + if (config().renderBiome) { + ResourceLocation bKey = pos.world.getBiomeKey(); + Biome b = pos.world.getBiome(); + components.add(ModUtil.getBiomeComponent(bKey, b, config().biomeColors, config().dataColor)); + } - Component all = translation("all", xyz, direction, biome); + MutableComponent all = Component.empty(); + + Iterator it = components.iterator(); + while (it.hasNext()) { + all.append(it.next()); + if (it.hasNext()) all.append(Component.literal(" / ")); + } ColumnLayout hud = new ColumnLayout(x, y, 0); - hud.addComponent(new CenteredParagraphComponent(0, all)); + hud.addComponent(new CenteredParagraphComponent(0, definition(all))); return hud; } diff --git a/common/src/main/resources/assets/coordinatesdisplay/lang/en_us.json b/common/src/main/resources/assets/coordinatesdisplay/lang/en_us.json index daa24be..e68b8dc 100644 --- a/common/src/main/resources/assets/coordinatesdisplay/lang/en_us.json +++ b/common/src/main/resources/assets/coordinatesdisplay/lang/en_us.json @@ -63,7 +63,6 @@ "hud.coordinatesdisplay.nether_overworld.error": "Not in overworld or nether", "hud.coordinatesdisplay.hotbar": "Hotbar", - "hud.coordinatesdisplay.hotbar.all": "%s / %s / %s", "hud.coordinatesdisplay.spawnpoint": "World Spawn (Compass)", "hud.coordinatesdisplay.spawnpoint.player": "Player", diff --git a/common/src/main/resources/assets/coordinatesdisplay/lang/es_es.json b/common/src/main/resources/assets/coordinatesdisplay/lang/es_es.json index c2b30ae..f6f9f35 100644 --- a/common/src/main/resources/assets/coordinatesdisplay/lang/es_es.json +++ b/common/src/main/resources/assets/coordinatesdisplay/lang/es_es.json @@ -63,7 +63,6 @@ "hud.coordinatesdisplay.nether_overworld.error": "No estás en el Overworld o Nether", "hud.coordinatesdisplay.hotbar": "Barra de acceso rápido", - "hud.coordinatesdisplay.hotbar.all": "%s / %s / %s", "hud.coordinatesdisplay.spawnpoint": "Punto de generación del mundo (brújula)", "hud.coordinatesdisplay.spawnpoint.player": "Jugador", diff --git a/common/src/main/resources/assets/coordinatesdisplay/lang/ja_jp.json b/common/src/main/resources/assets/coordinatesdisplay/lang/ja_jp.json index 47a129e..4ab186f 100644 --- a/common/src/main/resources/assets/coordinatesdisplay/lang/ja_jp.json +++ b/common/src/main/resources/assets/coordinatesdisplay/lang/ja_jp.json @@ -63,7 +63,6 @@ "hud.coordinatesdisplay.nether_overworld.error": "オーバーワールドまたはネザーにいません", "hud.coordinatesdisplay.hotbar": "ホットバー", - "hud.coordinatesdisplay.hotbar.all": "%s / %s / %s", "hud.coordinatesdisplay.spawnpoint": "World Spawn (Compass)", "hud.coordinatesdisplay.spawnpoint.player": "Player", diff --git a/common/src/main/resources/assets/coordinatesdisplay/lang/ko_kr.json b/common/src/main/resources/assets/coordinatesdisplay/lang/ko_kr.json index 37ef769..2402e85 100644 --- a/common/src/main/resources/assets/coordinatesdisplay/lang/ko_kr.json +++ b/common/src/main/resources/assets/coordinatesdisplay/lang/ko_kr.json @@ -63,7 +63,6 @@ "hud.coordinatesdisplay.nether_overworld.error": "Not in overworld or nether", "hud.coordinatesdisplay.hotbar": "핫바", - "hud.coordinatesdisplay.hotbar.all": "%s / %s / %s", "hud.coordinatesdisplay.spawnpoint": "World Spawn (Compass)", "hud.coordinatesdisplay.spawnpoint.player": "Player", diff --git a/common/src/main/resources/assets/coordinatesdisplay/lang/ru_ru.json b/common/src/main/resources/assets/coordinatesdisplay/lang/ru_ru.json index ea5bd18..0c74f14 100644 --- a/common/src/main/resources/assets/coordinatesdisplay/lang/ru_ru.json +++ b/common/src/main/resources/assets/coordinatesdisplay/lang/ru_ru.json @@ -63,7 +63,6 @@ "hud.coordinatesdisplay.nether_overworld.error": "Not in overworld or nether", "hud.coordinatesdisplay.hotbar": "Hotbar", - "hud.coordinatesdisplay.hotbar.all": "%s / %s / %s", "hud.coordinatesdisplay.spawnpoint": "World Spawn (Compass)", "hud.coordinatesdisplay.spawnpoint.player": "Player", diff --git a/common/src/main/resources/assets/coordinatesdisplay/lang/uk_ua.json b/common/src/main/resources/assets/coordinatesdisplay/lang/uk_ua.json index 8edfb68..26779d0 100644 --- a/common/src/main/resources/assets/coordinatesdisplay/lang/uk_ua.json +++ b/common/src/main/resources/assets/coordinatesdisplay/lang/uk_ua.json @@ -63,7 +63,6 @@ "hud.coordinatesdisplay.nether_overworld.error": "Зараз не у Незері/Верхньому світі", "hud.coordinatesdisplay.hotbar": "Панель швидкого доступу", - "hud.coordinatesdisplay.hotbar.all": "%s / %s / %s", "hud.coordinatesdisplay.spawnpoint": "Точка появи у світі (компас)", "hud.coordinatesdisplay.spawnpoint.player": "Гравець", diff --git a/common/src/main/resources/assets/coordinatesdisplay/lang/zh_tw.json b/common/src/main/resources/assets/coordinatesdisplay/lang/zh_tw.json index 9e59069..9400544 100644 --- a/common/src/main/resources/assets/coordinatesdisplay/lang/zh_tw.json +++ b/common/src/main/resources/assets/coordinatesdisplay/lang/zh_tw.json @@ -63,7 +63,6 @@ "hud.coordinatesdisplay.nether_overworld.error": "不在主世界或地獄中", "hud.coordinatesdisplay.hotbar": "快捷欄", - "hud.coordinatesdisplay.hotbar.all": "%s / %s / %s", "hud.coordinatesdisplay.spawnpoint": "世界重生點（羅盤）", "hud.coordinatesdisplay.spawnpoint.player": "玩家", diff --git a/fabric/src/main/java/dev/boxadactle/coordinatesdisplay/fabric/CoordinatesDisplayFabric.java b/fabric/src/main/java/dev/boxadactle/coordinatesdisplay/fabric/CoordinatesDisplayFabric.java index e305a8e..062c768 100644 --- a/fabric/src/main/java/dev/boxadactle/coordinatesdisplay/fabric/CoordinatesDisplayFabric.java +++ b/fabric/src/main/java/dev/boxadactle/coordinatesdisplay/fabric/CoordinatesDisplayFabric.java @@ -26,7 +26,7 @@ public void onInitializeClient() { ClientTickEvents.END_CLIENT_TICK.register(this::checkBindings); - HudRenderCallback.EVENT.register(this::renderHud); + HudRenderCallback.EVENT.register((g, d) -> CoordinatesDisplay.renderHud(g)); KeyBindingHelper.registerKeyBinding(Bindings.hudEnabled); KeyBindingHelper.registerKeyBinding(Bindings.coordinatesGUIKeybind); @@ -45,35 +45,4 @@ private void checkBindings(Minecraft client) { } } - private void renderHud(GuiGraphics guiGraphics, DeltaTracker deltaTracker) { - try { - if (CoordinatesDisplay.HUD.shouldRender(CoordinatesDisplay.getConfig().visibilityFilter)) { - ModConfig config = CoordinatesDisplay.getConfig(); - - CoordinatesDisplay.HUD.render( - guiGraphics, - Hud.RenderType.HUD, - Position.of(WorldUtils.getPlayer()), - config.hudX, - config.hudY, - config.renderMode, - config.startCorner, - config.hudScale - ); - } - } catch (NullPointerException e) { - if (CoordinatesDisplayFabric.deltaError) { - throw new RuntimeException(e); - } - - CoordinatesDisplay.LOGGER.error("Unknown error from config file"); - CoordinatesDisplay.LOGGER.printStackTrace(e); - - CoordinatesDisplay.LOGGER.player.warn(GuiUtils.getTranslatable("message.coordinatesdisplay.configError")); - CoordinatesDisplay.CONFIG.resetConfig(); - - CoordinatesDisplayFabric.deltaError = true; - } - } - } \ No newline at end of file diff --git a/fabric/src/main/resources/fabric.mod.json b/fabric/src/main/resources/fabric.mod.json index 59b4f8f..f6ca231 100644 --- a/fabric/src/main/resources/fabric.mod.json +++ b/fabric/src/main/resources/fabric.mod.json @@ -24,9 +24,9 @@ "coordinatesdisplay.mixins.json" ], "depends": { - "fabricloader": ">=0.16", - "minecraft": ">=1.21.2", - "boxlib": "15.*", + "fabricloader": "*", + "minecraft": ">=1.21.4", + "boxlib": "16.*", "fabric": "*" }, "recommends": { diff --git a/forge/build.gradle b/forge/build.gradle index 0e54764..e2c9696 100644 --- a/forge/build.gradle +++ b/forge/build.gradle @@ -10,7 +10,7 @@ architectury { loom { forge { - mixinConfig "coordinatesdisplay.mixins.json", "coordinatesdisplay-forge.mixins.json" + mixinConfig "coordinatesdisplay.mixins.json" } } diff --git a/forge/src/main/java/dev/boxadactle/coordinatesdisplay/forge/CoordinatesDisplayForge.java b/forge/src/main/java/dev/boxadactle/coordinatesdisplay/forge/CoordinatesDisplayForge.java index 4262f15..9ca3362 100644 --- a/forge/src/main/java/dev/boxadactle/coordinatesdisplay/forge/CoordinatesDisplayForge.java +++ b/forge/src/main/java/dev/boxadactle/coordinatesdisplay/forge/CoordinatesDisplayForge.java @@ -8,9 +8,11 @@ import net.minecraft.world.entity.player.Player; import net.minecraftforge.api.distmarker.Dist; import net.minecraftforge.client.ConfigScreenHandler; +import net.minecraftforge.client.event.CustomizeGuiOverlayEvent; import net.minecraftforge.client.event.InputEvent; import net.minecraftforge.client.event.RegisterKeyMappingsEvent; import net.minecraftforge.eventbus.api.SubscribeEvent; +import net.minecraftforge.fml.ModList; import net.minecraftforge.fml.ModLoadingContext; import net.minecraftforge.fml.common.Mod; @@ -23,9 +25,9 @@ public class CoordinatesDisplayForge { public CoordinatesDisplayForge() { CoordinatesDisplay.init(); - ModLoadingContext.get().registerExtensionPoint(ConfigScreenHandler.ConfigScreenFactory.class, () -> - new ConfigScreenHandler.ConfigScreenFactory((minecraft, screen) -> new ConfigScreen(screen)) - ); + ModList.get().getModContainerById(CoordinatesDisplay.MOD_ID).ifPresent(modContainer -> modContainer.registerExtensionPoint(ConfigScreenHandler.ConfigScreenFactory.class, () -> + new ConfigScreenHandler.ConfigScreenFactory(((minecraft, screen) -> new ConfigScreen(screen))) + )); } @Mod.EventBusSubscriber(modid = CoordinatesDisplay.MOD_ID, value = Dist.CLIENT) @@ -39,6 +41,11 @@ public static void keyInput(InputEvent.Key e) { } } + @SubscribeEvent + public static void renderHud(CustomizeGuiOverlayEvent.Chat e) { + CoordinatesDisplay.renderHud(e.getGuiGraphics()); + } + } @Mod.EventBusSubscriber(modid = CoordinatesDisplay.MOD_ID, value = Dist.CLIENT, bus = Mod.EventBusSubscriber.Bus.MOD) diff --git a/forge/src/main/java/dev/boxadactle/coordinatesdisplay/forge/mixin/GuiMixin.java b/forge/src/main/java/dev/boxadactle/coordinatesdisplay/forge/mixin/GuiMixin.java deleted file mode 100644 index 214cab9..0000000 --- a/forge/src/main/java/dev/boxadactle/coordinatesdisplay/forge/mixin/GuiMixin.java +++ /dev/null @@ -1,59 +0,0 @@ -package dev.boxadactle.coordinatesdisplay.forge.mixin; - -import com.mojang.blaze3d.systems.RenderSystem; -import dev.boxadactle.boxlib.util.GuiUtils; -import dev.boxadactle.boxlib.util.WorldUtils; -import dev.boxadactle.coordinatesdisplay.CoordinatesDisplay; -import dev.boxadactle.coordinatesdisplay.ModConfig; -import dev.boxadactle.coordinatesdisplay.forge.CoordinatesDisplayForge; -import dev.boxadactle.coordinatesdisplay.hud.Hud; -import dev.boxadactle.coordinatesdisplay.position.Position; -import net.minecraft.client.Minecraft; -import net.minecraft.client.gui.Gui; -import net.minecraft.client.gui.LayeredDraw; -import org.spongepowered.asm.mixin.Mixin; -import org.spongepowered.asm.mixin.injection.At; -import org.spongepowered.asm.mixin.injection.Inject; -import org.spongepowered.asm.mixin.injection.callback.CallbackInfo; -import org.spongepowered.asm.mixin.injection.callback.LocalCapture; - -@Mixin(Gui.class) -public class GuiMixin { - - @Inject(method = "", at = @At("TAIL"), locals = LocalCapture.CAPTURE_FAILHARD) - private void init(Minecraft arg, CallbackInfo ci, LayeredDraw drawer) { - drawer.add((graphics, f) -> { - try { - if (CoordinatesDisplay.HUD.shouldRender(CoordinatesDisplay.getConfig().visibilityFilter)) { - RenderSystem.enableBlend(); - - ModConfig config = CoordinatesDisplay.getConfig(); - - CoordinatesDisplay.HUD.render( - graphics, - Hud.RenderType.HUD, - Position.of(WorldUtils.getPlayer()), - config.hudX, - config.hudY, - config.renderMode, - config.startCorner, - config.hudScale - ); - } - } catch (NullPointerException e) { - if (CoordinatesDisplayForge.deltaError) { - throw new RuntimeException(e); - } - - CoordinatesDisplay.LOGGER.error("Unknown error from config file"); - CoordinatesDisplay.LOGGER.printStackTrace(e); - - CoordinatesDisplay.LOGGER.player.warn(GuiUtils.getTranslatable("message.coordinatesdisplay.configError")); - CoordinatesDisplay.CONFIG.resetConfig(); - - CoordinatesDisplayForge.deltaError = true; - } - }); - } - -} \ No newline at end of file diff --git a/forge/src/main/resources/META-INF/mods.toml b/forge/src/main/resources/META-INF/mods.toml index 7471493..abb5bc3 100644 --- a/forge/src/main/resources/META-INF/mods.toml +++ b/forge/src/main/resources/META-INF/mods.toml @@ -20,13 +20,13 @@ side="BOTH" [[dependencies.coordinatesdisplay]] modId="minecraft" mandatory=true -versionRange="[1.21.2,)" +versionRange="[1.21.4,1.22)" ordering="NONE" side="BOTH" [[dependencies.coordinatesdisplay]] modId="boxlib" mandatory=true -versionRange="[15.0.0,16.0.0)" +versionRange="[16.0.0,17.0.0)" ordering="NONE" side="CLIENT" \ No newline at end of file diff --git a/forge/src/main/resources/coordinatesdisplay-forge.mixins.json b/forge/src/main/resources/coordinatesdisplay-forge.mixins.json deleted file mode 100644 index c22e0b7..0000000 --- a/forge/src/main/resources/coordinatesdisplay-forge.mixins.json +++ /dev/null @@ -1,12 +0,0 @@ -{ - "required": true, - "minVersion": "0.8", - "package": "dev.boxadactle.coordinatesdisplay.forge.mixin", - "compatibilityLevel": "JAVA_16", - "client": [ - "GuiMixin" - ], - "injectors": { - "defaultRequire": 1 - } -} \ No newline at end of file diff --git a/gradle.properties b/gradle.properties index 125ea39..74df9c9 100644 --- a/gradle.properties +++ b/gradle.properties @@ -3,22 +3,22 @@ org.gradle.jvmargs=-Xmx2G org.gradle.parallel=true # Mod properties -mod_version = 14.0.0 +mod_version = 15.0.0 maven_group = dev.boxadactle archives_name = CoordinatesDisplay enabled_platforms = fabric,neoforge,forge # Minecraft properties -minecraft_version = 1.21.3 +minecraft_version = 1.21.4 # Dependencies -fabric_loader_version = 0.16.7 -fabric_api_version = 0.107.0+1.21.3 -neoforge_version = 21.3.3-beta -forge_version = 53.0.4 +fabric_loader_version = 0.16.9 +fabric_api_version = 0.112.2+1.21.4 +neoforge_version = 21.4.33-beta +forge_version = 54.0.7 -modmenu_version = 12.0.0-beta.1 -boxlib_version = 15.0.0 +modmenu_version=13.0.0-beta.1 +boxlib_version = 16.0.1 # publishing game_versions = 1.21.2,1.21.3 diff --git a/neoforge/src/main/java/dev/boxadactle/coordinatesdisplay/neoforge/CoordinatesDisplayNeoforge.java b/neoforge/src/main/java/dev/boxadactle/coordinatesdisplay/neoforge/CoordinatesDisplayNeoforge.java index d6b5084..62521fb 100644 --- a/neoforge/src/main/java/dev/boxadactle/coordinatesdisplay/neoforge/CoordinatesDisplayNeoforge.java +++ b/neoforge/src/main/java/dev/boxadactle/coordinatesdisplay/neoforge/CoordinatesDisplayNeoforge.java @@ -48,36 +48,7 @@ public static void keyInput(InputEvent.Key e) { @SubscribeEvent(priority = EventPriority.LOW) public static void renderHud(RenderGuiEvent.Post event) { - try { - if (CoordinatesDisplay.HUD.shouldRender(CoordinatesDisplay.getConfig().visibilityFilter)) { - RenderSystem.enableBlend(); - - ModConfig config = CoordinatesDisplay.getConfig(); - - CoordinatesDisplay.HUD.render( - event.getGuiGraphics(), - Hud.RenderType.HUD, - Position.of(WorldUtils.getPlayer()), - config.hudX, - config.hudY, - config.renderMode, - config.startCorner, - config.hudScale - ); - } - } catch (NullPointerException e) { - if (deltaError) { - throw new RuntimeException(e); - } - - CoordinatesDisplay.LOGGER.error("Unknown error from config file"); - CoordinatesDisplay.LOGGER.printStackTrace(e); - - CoordinatesDisplay.LOGGER.player.warn(GuiUtils.getTranslatable("message.coordinatesdisplay.configError")); - CoordinatesDisplay.CONFIG.resetConfig(); - - deltaError = true; - } + CoordinatesDisplay.renderHud(event.getGuiGraphics()); } } diff --git a/neoforge/src/main/resources/META-INF/neoforge.mods.toml b/neoforge/src/main/resources/META-INF/neoforge.mods.toml index bf606ef..d494cc3 100644 --- a/neoforge/src/main/resources/META-INF/neoforge.mods.toml +++ b/neoforge/src/main/resources/META-INF/neoforge.mods.toml @@ -22,14 +22,14 @@ side = "BOTH" [[dependencies.coordinatesdisplay]] modId = "minecraft" type = "required" -versionRange = "[1.21.2,1.22)" +versionRange = "[1.21.4,1.22)" ordering = "NONE" side = "BOTH" [[dependencies.coordinatesdisplay]] modId = "boxlib" type = "required" -versionRange = "[15.0.0,16.0.0)" +versionRange = "[16.0.0,17.0.0)" ordering = "NONE" side = "BOTH"