From 383aa58bae273091bb0fba8b3baff3a2746b3f95 Mon Sep 17 00:00:00 2001
From: BlayTheNinth <1933180+BlayTheNinth@users.noreply.github.com>
Date: Sun, 15 Dec 2024 10:39:33 +0100
Subject: [PATCH] feat: Update Forge to 1.21.4

---
 .../java/net/blay09/mods/kuma/forge/ForgeKumaAPI.java | 11 ++++++-----
 .../blay09/mods/kuma/forge/ForgeKumaAPIClient.java    |  5 ++---
 gradle.properties                                     |  6 +++---
 settings.gradle                                       |  2 +-
 4 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/forge/src/main/java/net/blay09/mods/kuma/forge/ForgeKumaAPI.java b/forge/src/main/java/net/blay09/mods/kuma/forge/ForgeKumaAPI.java
index 4ab3408..ca3d346 100644
--- a/forge/src/main/java/net/blay09/mods/kuma/forge/ForgeKumaAPI.java
+++ b/forge/src/main/java/net/blay09/mods/kuma/forge/ForgeKumaAPI.java
@@ -1,15 +1,16 @@
 package net.blay09.mods.kuma.forge;
 
 import net.minecraftforge.api.distmarker.Dist;
-import net.minecraftforge.fml.DistExecutor;
+import net.minecraftforge.eventbus.api.IEventBus;
 import net.minecraftforge.fml.common.Mod;
+import net.minecraftforge.fml.loading.FMLEnvironment;
 
 @Mod(value = "kuma_api")
 public class ForgeKumaAPI {
 
-    public ForgeKumaAPI() {
-        DistExecutor.runWhenOn(Dist.CLIENT, () -> () -> {
-            ForgeKumaAPIClient.init();
-        });
+    public ForgeKumaAPI(IEventBus modEventBus) {
+        if (FMLEnvironment.dist == Dist.CLIENT) {
+            ForgeKumaAPIClient.init(modEventBus);
+        }
     }
 }
diff --git a/forge/src/main/java/net/blay09/mods/kuma/forge/ForgeKumaAPIClient.java b/forge/src/main/java/net/blay09/mods/kuma/forge/ForgeKumaAPIClient.java
index 5c1a9f5..43ee82d 100644
--- a/forge/src/main/java/net/blay09/mods/kuma/forge/ForgeKumaAPIClient.java
+++ b/forge/src/main/java/net/blay09/mods/kuma/forge/ForgeKumaAPIClient.java
@@ -11,11 +11,10 @@
 import net.minecraftforge.client.event.RegisterKeyMappingsEvent;
 import net.minecraftforge.client.event.ScreenEvent;
 import net.minecraftforge.common.MinecraftForge;
-import net.minecraftforge.fml.javafmlmod.FMLJavaModLoadingContext;
+import net.minecraftforge.eventbus.api.IEventBus;
 
 public class ForgeKumaAPIClient {
-    public static void init() {
-        final var modEventBus = FMLJavaModLoadingContext.get().getModEventBus();
+    public static void init(IEventBus modEventBus) {
         modEventBus.addListener((RegisterKeyMappingsEvent event) -> {
             for (final var managedKeyMapping : ManagedKeyMappingRegistry.getKeyMappings()) {
                 if (managedKeyMapping instanceof VanillaManagedKeyMapping vanillaManagedKeyMapping) {
diff --git a/gradle.properties b/gradle.properties
index 76ba381..7a2fd6e 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -25,9 +25,9 @@ parchment_minecraft=1.21
 parchment_version=2024.07.28
 
 # Forge
-forge_version = 51.0.0
-forge_version_range = [51,)
-forge_loader_version_range = [51,)
+forge_version = 54.0.6
+forge_version_range = [54,)
+forge_loader_version_range = [54,)
 
 # NeoForge
 neoforge_snapshot_url=
diff --git a/settings.gradle b/settings.gradle
index 933b231..bce959e 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -46,4 +46,4 @@ plugins {
 include("common")
 include("fabric")
 include("neoforge")
-//include("forge")
+include("forge")