fix: bump forge version which should fix crash at startup

Author: skyecodes

common/src/main/java/com/github/franckyi/ibeeditor/ClientPlatformUtil.java

@@ -4,11 +4,6 @@
 import net.minecraft.client.KeyMapping;
 
 public final class ClientPlatformUtil {
-    @ExpectPlatform
-    public static KeyMapping registerKeyBinding(String name, int code, String category) {
-        throw new AssertionError();
-    }
-
     @ExpectPlatform
     public static int getKeyCode(KeyMapping keyMapping) {
         throw new AssertionError();

common/src/main/java/com/github/franckyi/ibeeditor/client/ClientInit.java

@@ -21,7 +21,6 @@ public static void init() {
 
     public static void setup() {
         LOGGER.info("Setting up IBE Editor - client");
-        KeyBindings.init();
         ClientConfiguration.load();
         syncGuapiConfig();
         Vault.load();

common/src/main/java/com/github/franckyi/ibeeditor/client/KeyBindings.java

@@ -1,25 +1,13 @@
 package com.github.franckyi.ibeeditor.client;
 
-import com.github.franckyi.ibeeditor.ClientPlatformUtil;
 import net.minecraft.client.KeyMapping;
 import org.lwjgl.glfw.GLFW;
 
 public final class KeyBindings {
-    private static KeyMapping editorKey;
-    private static KeyMapping nbtEditorKey;
-    private static KeyMapping snbtEditorKey;
-    private static KeyMapping vaultKey;
-
-    public static void init() {
-        editorKey = register("editor", GLFW.GLFW_KEY_I);
-        nbtEditorKey = register("nbt_editor", GLFW.GLFW_KEY_N);
-        snbtEditorKey = register("snbt_editor", GLFW.GLFW_KEY_R);
-        vaultKey = register("vault", GLFW.GLFW_KEY_J);
-    }
-
-    private static KeyMapping register(String name, int code) {
-        return ClientPlatformUtil.registerKeyBinding("ibeeditor.key." + name, code, "ibeeditor");
-    }
+    private static final KeyMapping editorKey = new KeyMapping("ibeeditor.key.editor", GLFW.GLFW_KEY_I, "ibeeditor");
+    private static final KeyMapping nbtEditorKey = new KeyMapping("ibeeditor.key.nbt_editor", GLFW.GLFW_KEY_N, "ibeeditor");
+    private static final KeyMapping snbtEditorKey = new KeyMapping("ibeeditor.key.snbt_editor", GLFW.GLFW_KEY_R, "ibeeditor");
+    private static final KeyMapping vaultKey = new KeyMapping("ibeeditor.key.vault", GLFW.GLFW_KEY_J, "ibeeditor");
 
     public static KeyMapping getEditorKey() {
         return editorKey;

fabric/src/main/java/com/github/franckyi/ibeeditor/fabric/ClientPlatformUtilImpl.java

@@ -4,10 +4,6 @@
 import net.minecraft.client.KeyMapping;
 
 public class ClientPlatformUtilImpl {
-    public static KeyMapping registerKeyBinding(String name, int code, String category) {
-        return KeyBindingHelper.registerKeyBinding(new KeyMapping(name, code, category));
-    }
-
     public static int getKeyCode(KeyMapping keyMapping) {
         return KeyBindingHelper.getBoundKeyOf(keyMapping).getValue();
     }

fabric/src/main/java/com/github/franckyi/ibeeditor/fabric/FabricIBEEditorModClient.java

@@ -2,7 +2,9 @@
 
 import com.github.franckyi.ibeeditor.client.ClientEventHandler;
 import com.github.franckyi.ibeeditor.client.ClientInit;
+import com.github.franckyi.ibeeditor.client.KeyBindings;
 import net.fabricmc.api.ClientModInitializer;
+import net.fabricmc.fabric.api.client.keybinding.v1.KeyBindingHelper;
 import net.fabricmc.fabric.api.client.screen.v1.ScreenEvents;
 import net.fabricmc.fabric.api.client.screen.v1.ScreenKeyboardEvents;
 import net.minecraft.client.Minecraft;
@@ -17,6 +19,10 @@ public FabricIBEEditorModClient() {
     @Override
     public void onInitializeClient() {
         ClientInit.setup();
+        KeyBindingHelper.registerKeyBinding(KeyBindings.getEditorKey());
+        KeyBindingHelper.registerKeyBinding(KeyBindings.getNBTEditorKey());
+        KeyBindingHelper.registerKeyBinding(KeyBindings.getSNBTEditorKey());
+        KeyBindingHelper.registerKeyBinding(KeyBindings.getVaultKey());
         ScreenEvents.AFTER_INIT.register(this::afterScreenInit);
     }
 

forge/src/main/java/com/github/franckyi/ibeeditor/forge/ClientPlatformUtilImpl.java

@@ -1,15 +1,8 @@
 package com.github.franckyi.ibeeditor.forge;
 
 import net.minecraft.client.KeyMapping;
-import net.minecraftforge.client.ClientRegistry;
 
 public class ClientPlatformUtilImpl {
-    public static KeyMapping registerKeyBinding(String name, int code, String category) {
-        KeyMapping keyMapping = new KeyMapping(name, code, category);
-        ClientRegistry.registerKeyBinding(keyMapping);
-        return keyMapping;
-    }
-
     public static int getKeyCode(KeyMapping keyMapping) {
         return keyMapping.getKey().getValue();
     }

forge/src/main/java/com/github/franckyi/ibeeditor/forge/ForgeIBEEditorMod.java

@@ -1,23 +1,21 @@
 package com.github.franckyi.ibeeditor.forge;
 
-import com.github.franckyi.ibeeditor.client.ClientContext;
-import com.github.franckyi.ibeeditor.client.ClientEventHandler;
-import com.github.franckyi.ibeeditor.client.ClientInit;
-import com.github.franckyi.ibeeditor.client.ModScreenHandler;
+import com.github.franckyi.ibeeditor.client.*;
 import com.github.franckyi.ibeeditor.common.CommonInit;
 import com.github.franckyi.ibeeditor.common.ServerCommandHandler;
 import com.github.franckyi.ibeeditor.common.ServerEventHandler;
 import net.minecraft.client.Minecraft;
 import net.minecraft.client.gui.screens.inventory.AbstractContainerScreen;
 import net.minecraft.server.level.ServerPlayer;
 import net.minecraftforge.api.distmarker.Dist;
-import net.minecraftforge.client.ConfigGuiHandler;
+import net.minecraftforge.client.ConfigScreenHandler;
 import net.minecraftforge.client.event.InputEvent;
+import net.minecraftforge.client.event.RegisterKeyMappingsEvent;
 import net.minecraftforge.client.event.ScreenEvent;
 import net.minecraftforge.common.MinecraftForge;
 import net.minecraftforge.event.entity.player.PlayerEvent;
+import net.minecraftforge.event.level.LevelEvent;
 import net.minecraftforge.event.server.ServerStartingEvent;
-import net.minecraftforge.event.world.WorldEvent;
 import net.minecraftforge.fml.ModLoadingContext;
 import net.minecraftforge.fml.common.Mod;
 import net.minecraftforge.fml.event.lifecycle.FMLClientSetupEvent;
@@ -34,6 +32,14 @@ public ForgeIBEEditorMod() {
         }
         FMLJavaModLoadingContext.get().getModEventBus().addListener(this::onCommonInit);
         FMLJavaModLoadingContext.get().getModEventBus().addListener(this::onClientInit);
+        FMLJavaModLoadingContext.get().getModEventBus().addListener(this::onRegisterKeybindings);
+    }
+
+    private void onRegisterKeybindings(RegisterKeyMappingsEvent event) {
+        event.register(KeyBindings.getEditorKey());
+        event.register(KeyBindings.getNBTEditorKey());
+        event.register(KeyBindings.getSNBTEditorKey());
+        event.register(KeyBindings.getVaultKey());
     }
 
     private void onCommonInit(FMLCommonSetupEvent event) {
@@ -48,7 +54,7 @@ private void onClientInit(FMLClientSetupEvent event) {
         MinecraftForge.EVENT_BUS.addListener(this::onKeyInput);
         MinecraftForge.EVENT_BUS.addListener(this::onKeyPressed);
         MinecraftForge.EVENT_BUS.addListener(this::onWorldUnload);
-        ModLoadingContext.get().registerExtensionPoint(ConfigGuiHandler.ConfigGuiFactory.class, () -> new ConfigGuiHandler.ConfigGuiFactory((minecraft, screen) -> {
+        ModLoadingContext.get().registerExtensionPoint(ConfigScreenHandler.ConfigScreenFactory.class, () -> new ConfigScreenHandler.ConfigScreenFactory((minecraft, screen) -> {
             ModScreenHandler.openSettingsScreen();
             return minecraft.screen;
         }));
@@ -59,26 +65,26 @@ private void onServerStarting(ServerStartingEvent event) {
     }
 
     private void onPlayerLoggedIn(PlayerEvent.PlayerLoggedInEvent event) {
-        ServerEventHandler.onPlayerJoin((ServerPlayer) event.getPlayer());
+        ServerEventHandler.onPlayerJoin((ServerPlayer) event.getEntity());
     }
 
     private void onPlayerLoggedOut(PlayerEvent.PlayerLoggedOutEvent event) {
-        ServerEventHandler.onPlayerLeave((ServerPlayer) event.getPlayer());
+        ServerEventHandler.onPlayerLeave((ServerPlayer) event.getEntity());
     }
 
-    private void onKeyInput(InputEvent.KeyInputEvent e) {
+    private void onKeyInput(InputEvent.Key e) {
         if (Minecraft.getInstance().screen == null) {
             ClientEventHandler.onKeyInput();
         }
     }
 
-    private void onKeyPressed(ScreenEvent.KeyboardKeyPressedEvent.Pre e) {
+    private void onKeyPressed(ScreenEvent.KeyPressed.Pre e) {
         if (e.getScreen() instanceof AbstractContainerScreen screen) {
             e.setCanceled(ClientEventHandler.onScreenEvent(screen, e.getKeyCode()));
         }
     }
 
-    private void onWorldUnload(WorldEvent.Unload event) {
+    private void onWorldUnload(LevelEvent.Unload event) {
         ClientContext.setModInstalledOnServer(false);
     }
 }

forge/src/main/java/com/github/franckyi/ibeeditor/forge/PlatformUtilImpl.java

@@ -41,9 +41,7 @@ private static <P> void registerHandler(NetworkHandler<P> handler, BiConsumer<P,
         channel.messageBuilder(handler.getType(), handler.getId())
                 .decoder(buffer -> handler.getSerializer().read(buffer))
                 .encoder((p, buffer) -> handler.getSerializer().write(p, buffer))
-                .consumer((msg, ctx) -> {
-                    ctx.get().enqueueWork(() -> action.accept(msg, ctx));
-                    ctx.get().setPacketHandled(true);
-                }).add();
+                .consumerMainThread(action)
+                .add();
     }
 }

forge_update.json

@@ -1,7 +1,7 @@
 {
   "homepage": "https://www.curseforge.com/minecraft/mc-mods/ibe-editor",
   "promos": {
-    "1.19-latest": "2.1.1",
-    "1.19-recommended": "2.1.1"
+    "1.19-latest": "2.1.2",
+    "1.19-recommended": "2.1.2"
   }
 }

gradle.properties

@@ -4,13 +4,13 @@ org.gradle.daemon=false
 # IBE Editor
 minecraft_version=1.19
 archives_base_name=IBEEditor
-mod_version=2.1.1
+mod_version=2.1.2
 maven_group=com.github.franckyi.ibeeditor
 # Fabric https://fabricmc.net/develop/
 fabric_loader_version=0.14.8
-fabric_api_version=0.56.0+1.19
+fabric_api_version=0.58.0+1.19
 # Forge https://files.minecraftforge.net/
-forge_version=41.0.38
+forge_version=41.0.109
 # Build and release info
 java_version=17
 major_minecraft_version=1.19

versions.json

@@ -1,4 +1,8 @@
 {
+  "2.1.2": {
+    "type": "release",
+    "changelog": "* fix: bump forge version which should fix crash at startup"
+  },
   "2.1.1": {
     "type": "release",
     "changelog": "* fix: error when trying to open the NBT editor for a block that doesn't have NBT data (#57)\n* fix: letter added at the end of a formatted text input is not formatted when saving"