bump neoforge

TeamLapen · Jan 20, 2024 · 2f1374a · 2f1374a
1 parent 0fd84f5
commit 2f1374a
Show file tree

Hide file tree

Showing 4 changed files with 18 additions and 20 deletions.
diff --git a/gradle.properties b/gradle.properties
@@ -6,7 +6,7 @@ org.gradle.debug=false
 # forge
 minecraft_version=1.20.4
 minecraft_version_range=[1.20.4,1.21)
-forge_version=20.4.83-beta
+forge_version=20.4.118-beta
 forge_version_range=[20.4,)
 loader_version_range=[1,)
 parchment_minecraft_version=1.20.2

diff --git a/src/main/java/de/teamlapen/vampirism/client/core/ClientRegistryHandler.java b/src/main/java/de/teamlapen/vampirism/client/core/ClientRegistryHandler.java
@@ -15,6 +15,7 @@ public static void init(IEventBus modbus){
         modbus.addListener(ModEntitiesRender::onAddLayers);
         modbus.addListener(ModBlocksRender::registerBlockEntityRenderers);
         modbus.addListener(ModScreens::registerScreenOverlays);
+        modbus.addListener(ModScreens::registerScreens);
         modbus.addListener(ModBlocksRender::registerBlockColors);
         modbus.addListener(ModItemsRender::registerColors);
         modbus.addListener(ModParticleFactories::registerFactories);

diff --git a/src/main/java/de/teamlapen/vampirism/client/core/ModScreens.java b/src/main/java/de/teamlapen/vampirism/client/core/ModScreens.java
@@ -4,32 +4,30 @@
 import de.teamlapen.vampirism.client.gui.screens.*;
 import de.teamlapen.vampirism.client.gui.screens.taskboard.TaskBoardScreen;
 import de.teamlapen.vampirism.core.ModContainer;
-import net.minecraft.client.gui.screens.MenuScreens;
-import net.neoforged.api.distmarker.Dist;
-import net.neoforged.api.distmarker.OnlyIn;
 import net.neoforged.neoforge.client.event.RegisterGuiOverlaysEvent;
+import net.neoforged.neoforge.client.event.RegisterMenuScreensEvent;
 import net.neoforged.neoforge.client.gui.overlay.VanillaGuiOverlay;
 import org.jetbrains.annotations.NotNull;
 
 public class ModScreens {
     /**
      * Call on serial loading queue to avoid possible issues with parallel access
      */
-    public static void registerScreensUnsafe() {
-        MenuScreens.register(ModContainer.HUNTER_TABLE.get(), HunterTableScreen::new);
-        MenuScreens.register(ModContainer.ALCHEMICAL_CAULDRON.get(), AlchemicalCauldronScreen::new);
-        MenuScreens.register(ModContainer.WEAPON_TABLE.get(), WeaponTableScreen::new);
-        MenuScreens.register(ModContainer.HUNTER_TRAINER.get(), HunterTrainerScreen::new);
-        MenuScreens.register(ModContainer.HUNTER_BASIC.get(), HunterBasicScreen::new);
-        MenuScreens.register(ModContainer.ALTAR_INFUSION.get(), AltarInfusionScreen::new);
-        MenuScreens.register(ModContainer.BLOOD_GRINDER.get(), BloodGrinderScreen::new);
-        MenuScreens.register(ModContainer.MINION.get(), MinionScreen::new);
-        MenuScreens.register(ModContainer.TASK_MASTER.get(), TaskBoardScreen::new);
-        MenuScreens.register(ModContainer.EXTENDED_POTION_TABLE.get(), PotionTableScreen::new);
-        MenuScreens.register(ModContainer.VAMPIRISM.get(), VampirismContainerScreen::new);
-        MenuScreens.register(ModContainer.ALCHEMICAL_TABLE.get(), AlchemyTableScreen::new);
-        MenuScreens.register(ModContainer.VAMPIRE_BEACON.get(), VampireBeaconScreen::new);
-        MenuScreens.register(ModContainer.REVERT_BACK.get(), InjectionChairRevertBackScreen::new);
+    public static void registerScreens(RegisterMenuScreensEvent event) {
+        event.register(ModContainer.HUNTER_TABLE.get(), HunterTableScreen::new);
+        event.register(ModContainer.ALCHEMICAL_CAULDRON.get(), AlchemicalCauldronScreen::new);
+        event.register(ModContainer.WEAPON_TABLE.get(), WeaponTableScreen::new);
+        event.register(ModContainer.HUNTER_TRAINER.get(), HunterTrainerScreen::new);
+        event.register(ModContainer.HUNTER_BASIC.get(), HunterBasicScreen::new);
+        event.register(ModContainer.ALTAR_INFUSION.get(), AltarInfusionScreen::new);
+        event.register(ModContainer.BLOOD_GRINDER.get(), BloodGrinderScreen::new);
+        event.register(ModContainer.MINION.get(), MinionScreen::new);
+        event.register(ModContainer.TASK_MASTER.get(), TaskBoardScreen::new);
+        event.register(ModContainer.EXTENDED_POTION_TABLE.get(), PotionTableScreen::new);
+        event.register(ModContainer.VAMPIRISM.get(), VampirismContainerScreen::new);
+        event.register(ModContainer.ALCHEMICAL_TABLE.get(), AlchemyTableScreen::new);
+        event.register(ModContainer.VAMPIRE_BEACON.get(), VampireBeaconScreen::new);
+        event.register(ModContainer.REVERT_BACK.get(), InjectionChairRevertBackScreen::new);
     }
 
     static void registerScreenOverlays(@NotNull RegisterGuiOverlaysEvent event) {

diff --git a/src/main/java/de/teamlapen/vampirism/proxy/ClientProxy.java b/src/main/java/de/teamlapen/vampirism/proxy/ClientProxy.java
@@ -175,7 +175,6 @@ public void onInitStep(@NotNull Step step, @NotNull ParallelDispatchEvent event)
             }
             case LOAD_COMPLETE -> {
                 event.enqueueWork(ModItemsRender::registerItemModelPropertyUnsafe);
-                event.enqueueWork(ModScreens::registerScreensUnsafe);
             }
             default -> {
             }