diff --git a/gradle.properties b/gradle.properties index f3055d3..380aabf 100644 --- a/gradle.properties +++ b/gradle.properties @@ -7,17 +7,17 @@ org.gradle.configuration-cache=false # Fabric Properties # check these on https://modmuss50.me/fabric.html -minecraft_version=26.2 +minecraft_version=26.3 loader_version=0.19.0 loom_version=1.17-SNAPSHOT -fabric_api_version=0.152.2+26.2 +fabric_api_version=0.160.7+26.3 # Mod Properties -mod_version=1.7.7 +mod_version=1.7.8 maven_group=jerozgen archives_base_name=language-reload # Dependencies # https://maven.terraformersmc.com/releases/com/terraformersmc/modmenu # https://modrinth.com/mod/modmenu/versions -modmenu_version=20.0.0-beta.1 +modmenu_version=21.0.0 diff --git a/src/main/java/jerozgen/languagereload/LanguageReload.java b/src/main/java/jerozgen/languagereload/LanguageReload.java index 3aa682f..e2dae93 100644 --- a/src/main/java/jerozgen/languagereload/LanguageReload.java +++ b/src/main/java/jerozgen/languagereload/LanguageReload.java @@ -19,11 +19,11 @@ import net.minecraft.locale.Language; import net.minecraft.world.entity.Display; import net.minecraft.world.level.block.entity.SignBlockEntity; +import net.minecraft.world.level.block.entity.SignTextSlot; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.Nullable; -import org.lwjgl.glfw.GLFW; import java.util.LinkedList; @@ -40,8 +40,7 @@ public class LanguageReload implements ClientModInitializer { public void onInitializeClient() { reloadLanguagesKey = KeyMappingHelper.registerKeyMapping(new KeyMapping( "key.debug.reloadLanguages", - InputConstants.Type.KEYSYM, - GLFW.GLFW_KEY_J, + InputConstants.KEY_J, KeyMapping.Category.DEBUG )); } @@ -73,8 +72,8 @@ public static void reloadLanguages() { if (chunk == null) continue; for (var blockEntity : chunk.getBlockEntities().values()) { if (!(blockEntity instanceof SignBlockEntity sign)) continue; - ((SignTextAccessor) sign.getFrontText()).languagereload_setRenderMessages(null); - ((SignTextAccessor) sign.getBackText()).languagereload_setRenderMessages(null); + ((SignTextAccessor) sign.getText(SignTextSlot.FRONT)).languagereload_setRenderMessages(null); + ((SignTextAccessor) sign.getText(SignTextSlot.BACK)).languagereload_setRenderMessages(null); } } diff --git a/src/main/java/jerozgen/languagereload/mixin/AdvancementTabMixin.java b/src/main/java/jerozgen/languagereload/mixin/AdvancementTabMixin.java index 8240cce..063ed07 100644 --- a/src/main/java/jerozgen/languagereload/mixin/AdvancementTabMixin.java +++ b/src/main/java/jerozgen/languagereload/mixin/AdvancementTabMixin.java @@ -19,8 +19,7 @@ public abstract class AdvancementTabMixin implements IAdvancementsTab { @Override public void languagereload_recreateWidgets() { widgets.replaceAll((advancement, widget) -> { - var newWidget = new AdvancementWidget( - ((AdvancementWidgetAccessor) widget).languagereload_getTab(), + var newWidget = AdvancementWidgetAccessor.languagereload_create( minecraft, ((AdvancementWidgetAccessor) widget).languagereload_getAdvancementNode(), ((AdvancementWidgetAccessor) widget).languagereload_getDisplay() diff --git a/src/main/java/jerozgen/languagereload/mixin/AdvancementWidgetAccessor.java b/src/main/java/jerozgen/languagereload/mixin/AdvancementWidgetAccessor.java index fa483b3..9915835 100644 --- a/src/main/java/jerozgen/languagereload/mixin/AdvancementWidgetAccessor.java +++ b/src/main/java/jerozgen/languagereload/mixin/AdvancementWidgetAccessor.java @@ -3,18 +3,21 @@ import net.minecraft.advancements.AdvancementNode; import net.minecraft.advancements.AdvancementProgress; import net.minecraft.advancements.DisplayInfo; -import net.minecraft.client.gui.screens.advancements.AdvancementTab; +import net.minecraft.client.Minecraft; import net.minecraft.client.gui.screens.advancements.AdvancementWidget; import org.spongepowered.asm.mixin.Mixin; import org.spongepowered.asm.mixin.Mutable; import org.spongepowered.asm.mixin.gen.Accessor; +import org.spongepowered.asm.mixin.gen.Invoker; import java.util.List; @Mixin(AdvancementWidget.class) public interface AdvancementWidgetAccessor { - @Accessor("tab") - AdvancementTab languagereload_getTab(); + @Invoker("") + static AdvancementWidget languagereload_create(Minecraft minecraft, AdvancementNode advancementNode, DisplayInfo display) { + throw new AssertionError(); + } @Accessor("advancementNode") AdvancementNode languagereload_getAdvancementNode(); diff --git a/src/main/java/jerozgen/languagereload/mixin/KeyboardHandlerMixin.java b/src/main/java/jerozgen/languagereload/mixin/KeyboardHandlerMixin.java index 8ce0b31..1a8124f 100644 --- a/src/main/java/jerozgen/languagereload/mixin/KeyboardHandlerMixin.java +++ b/src/main/java/jerozgen/languagereload/mixin/KeyboardHandlerMixin.java @@ -89,8 +89,7 @@ private void onKeyPress(long handle, int action, KeyEvent event, CallbackInfo ci @Inject(method = "charTyped", at = @At("HEAD"), cancellable = true) private void onCharTyped(long handle, CharacterEvent event, CallbackInfo ci) { if (minecraft.options.keyDebugModifier.isDown()) { - var reloadLanguagesKeyCode = ((KeyMappingAccessor) LanguageReload.reloadLanguagesKey).languagereload_getKey().getValue(); - if (InputConstants.isKeyDown(minecraft.getWindow(), reloadLanguagesKeyCode)) { + if (LanguageReload.reloadLanguagesKey.isDown()) { ci.cancel(); } } diff --git a/src/main/resources/fabric.mod.json b/src/main/resources/fabric.mod.json index 709e79f..9a57c4a 100644 --- a/src/main/resources/fabric.mod.json +++ b/src/main/resources/fabric.mod.json @@ -59,7 +59,7 @@ "fabric-key-mapping-api-v1": "*", "fabric-lifecycle-events-v1": "*", "fabricloader": ">=0.19.0", - "minecraft": ">=26.2" + "minecraft": ">=26.3" }, "suggests": { "modmenu": "*"