diff --git a/CHANGELOG.md b/CHANGELOG.md index 3bc77da..b1d2fd8 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,15 +1,3 @@ ## Changes -- Support for 1.21.3 -- Checks chunkDebugKeys (whatever those are) when checking debug keys - -## New Features -- Added profiler chart toggle key -- Added FPS charts toggle key -- Added network charts toggle key -- Added chunk section path key -- added fog toggle key -- added smart culling toggle key -- added frustum octree toggle key -- added frustum capture key -- added section visibility toggle key -- added wireframe toggle key \ No newline at end of file +- Support for 1.21.4 +- Added kill text to frustum keybind on keybind screen diff --git a/common/src/main/java/dev/boxadactle/debugkeybind/DebugKeybindMain.java b/common/src/main/java/dev/boxadactle/debugkeybind/DebugKeybindMain.java index bdcd312..0ba36f2 100644 --- a/common/src/main/java/dev/boxadactle/debugkeybind/DebugKeybindMain.java +++ b/common/src/main/java/dev/boxadactle/debugkeybind/DebugKeybindMain.java @@ -13,7 +13,7 @@ public class DebugKeybindMain { public static final String MOD_ID = "debugkeybind"; - public static final String VERSION = "12.0.0"; + public static final String VERSION = "14.0.0"; public static final String VERSION_STRING = MOD_NAME + " v" + VERSION; diff --git a/common/src/main/java/dev/boxadactle/debugkeybind/gui/DebugKeybindsScreen.java b/common/src/main/java/dev/boxadactle/debugkeybind/gui/DebugKeybindsScreen.java index 6a6a78a..4a183bf 100644 --- a/common/src/main/java/dev/boxadactle/debugkeybind/gui/DebugKeybindsScreen.java +++ b/common/src/main/java/dev/boxadactle/debugkeybind/gui/DebugKeybindsScreen.java @@ -29,7 +29,7 @@ protected int getRowWidth() { } @Override - protected int getScrollbarPosition() { + protected int getScrollbarX() { return width - 15; } diff --git a/common/src/main/resources/assets/debugkeybind/lang/en_us.json b/common/src/main/resources/assets/debugkeybind/lang/en_us.json index af4a2a5..46ea6ad 100644 --- a/common/src/main/resources/assets/debugkeybind/lang/en_us.json +++ b/common/src/main/resources/assets/debugkeybind/lang/en_us.json @@ -32,7 +32,7 @@ "key.debug_actions.toggle_fog": "Toggle Fog", "key.debug_actions.toggle_smart_cull": "Toggle Smart Cull", "key.debug_actions.toggle_frustum_octree": "Toggle Frustum Octree", - "key.debug_actions.capture_frustum": "Capture Frustum", + "key.debug_actions.capture_frustum": "Capture Frustum (Shift to kill)", "key.debug_actions.toggle_section_visibility": "Toggle Section Visibility", "key.debug_actions.toggle_wireframe": "Toggle Wireframe", diff --git a/common/src/main/resources/assets/debugkeybind/lang/es_es.json b/common/src/main/resources/assets/debugkeybind/lang/es_es.json index 701f21f..38c1798 100644 --- a/common/src/main/resources/assets/debugkeybind/lang/es_es.json +++ b/common/src/main/resources/assets/debugkeybind/lang/es_es.json @@ -32,7 +32,7 @@ "key.debug_actions.toggle_fog": "Alternar Niebla", "key.debug_actions.toggle_smart_cull": "Alternar Culling Inteligente", "key.debug_actions.toggle_frustum_octree": "Alternar Octree de Frustum", - "key.debug_actions.capture_frustum": "Capturar Frustum", + "key.debug_actions.capture_frustum": "Capturar Frustum (pulse la tecla shift para matar)", "key.debug_actions.toggle_section_visibility": "Alternar Visibilidad de Sección", "key.debug_actions.toggle_wireframe": "Alternar Malla", diff --git a/fabric/src/main/resources/fabric.mod.json b/fabric/src/main/resources/fabric.mod.json index 969a60d..b64fe14 100644 --- a/fabric/src/main/resources/fabric.mod.json +++ b/fabric/src/main/resources/fabric.mod.json @@ -26,7 +26,7 @@ "depends": { "fabricloader": "*", "minecraft": "1.21.*", - "boxlib": "15.*" + "boxlib": "16.*" }, "recommends": { "modmenu": "*" diff --git a/forge/src/main/java/dev/boxadactle/debugkeybind/forge/DebugKeybindForge.java b/forge/src/main/java/dev/boxadactle/debugkeybind/forge/DebugKeybindForge.java index 3cfc0ff..516f078 100644 --- a/forge/src/main/java/dev/boxadactle/debugkeybind/forge/DebugKeybindForge.java +++ b/forge/src/main/java/dev/boxadactle/debugkeybind/forge/DebugKeybindForge.java @@ -3,7 +3,7 @@ import dev.boxadactle.debugkeybind.DebugKeybindMain; import dev.boxadactle.debugkeybind.gui.DebugKeybindsScreen; import net.minecraftforge.client.ConfigScreenHandler; -import net.minecraftforge.fml.ModLoadingContext; +import net.minecraftforge.fml.ModList; import net.minecraftforge.fml.common.Mod; @Mod(DebugKeybindMain.MOD_ID) @@ -12,9 +12,9 @@ public class DebugKeybindForge { public DebugKeybindForge() { DebugKeybindMain.init(); - ModLoadingContext.get().registerExtensionPoint(ConfigScreenHandler.ConfigScreenFactory.class, () -> - new ConfigScreenHandler.ConfigScreenFactory((minecraft, screen) -> new DebugKeybindsScreen(screen)) - ); + ModList.get().getModContainerById(DebugKeybindMain.MOD_ID).ifPresent(modContainer -> modContainer.registerExtensionPoint(ConfigScreenHandler.ConfigScreenFactory.class, () -> + new ConfigScreenHandler.ConfigScreenFactory(((minecraft, screen) -> new DebugKeybindsScreen(screen))) + )); } } diff --git a/forge/src/main/resources/META-INF/mods.toml b/forge/src/main/resources/META-INF/mods.toml index 648657a..0f92fde 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.debugkeybind]] modId="minecraft" mandatory=true -versionRange="[1.21.2,)" +versionRange="[1.21.4,1.22)" ordering="NONE" side="BOTH" [[dependencies.debugkeybind]] 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/gradle.properties b/gradle.properties index 4758d82..c183b6b 100644 --- a/gradle.properties +++ b/gradle.properties @@ -3,25 +3,25 @@ org.gradle.jvmargs=-Xmx2G org.gradle.parallel=true # Mod properties -mod_version = 13.0.0 +mod_version = 14.0.0 maven_group = dev.boxadactle archives_name = DebugKeybind enabled_platforms = fabric,forge,neoforge # 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 +game_versions = 1.21.4 project_id_curseforge = 901782 project_id_modrinth = DX9ioka8 release_type = release diff --git a/neoforge/src/main/resources/META-INF/neoforge.mods.toml b/neoforge/src/main/resources/META-INF/neoforge.mods.toml index ee23333..79fa0f7 100644 --- a/neoforge/src/main/resources/META-INF/neoforge.mods.toml +++ b/neoforge/src/main/resources/META-INF/neoforge.mods.toml @@ -21,14 +21,14 @@ A basic mod that adds keybinds for the F3 menu [[dependencies.debugkeybind]] modId="minecraft" mandatory=true - versionRange="[1.21.2,)" + versionRange="[1.21.4,1.22)" ordering="NONE" side="BOTH" [[dependencies.debugkeybind]] modId = "boxlib" type = "required" - versionRange = "[15.0.0, 16.0.0)" + versionRange = "[16.0.0, 17.0.0)" ordering = "NONE" side = "BOTH"