fix Forge build for 1.21.6

Author: way2muchnoise

Forge/src/main/java/betteradvancements/forge/BetterAdvancements.java

@@ -12,15 +12,17 @@
 import net.minecraftforge.fml.javafmlmod.FMLJavaModLoadingContext;
 import net.minecraftforge.fml.loading.FMLEnvironment;
 
+import java.lang.invoke.MethodHandles;
+
 @Mod(Constants.ID)
 public class BetterAdvancements {
-        public BetterAdvancements() {
+        public BetterAdvancements(FMLJavaModLoadingContext context) {
         //Make sure the mod being absent on the other network side does not cause the client to display the server as incompatible
-        ModLoadingContext.get().registerExtensionPoint(IExtensionPoint.DisplayTest.class, () -> new IExtensionPoint.DisplayTest(()-> IExtensionPoint.DisplayTest.IGNORESERVERONLY, (remote, isServer)-> true));
+        context.registerExtensionPoint(IExtensionPoint.DisplayTest.class, () -> new IExtensionPoint.DisplayTest(()-> IExtensionPoint.DisplayTest.IGNORESERVERONLY, (remote, isServer)-> true));
 
         if (FMLEnvironment.dist == Dist.CLIENT) {
-            ModLoadingContext.get().registerConfig(ModConfig.Type.CLIENT, Config.CLIENT);
-            FMLJavaModLoadingContext.get().getModEventBus().register(Config.instance);
+            context.registerConfig(ModConfig.Type.CLIENT, Config.CLIENT);
+            context.getModBusGroup().register(MethodHandles.publicLookup(), Config.instance);
             MinecraftForge.EVENT_BUS.register(GuiOpenHandler.instance);
         }
     }

Forge/src/main/java/betteradvancements/forge/ForgeEventHelper.java

@@ -8,19 +8,20 @@
 import betteradvancements.common.platform.IEventHelper;
 import net.minecraft.advancements.AdvancementNode;
 import net.minecraftforge.common.MinecraftForge;
+import net.minecraftforge.event.ForgeEventFactory;
 
 public class ForgeEventHelper implements IEventHelper {
     @Override
     public IAdvancementMovedEvent postAdvancementMovementEvent(IBetterAdvancementEntryGui gui) {
         final AdvancementMovedEvent event = new AdvancementMovedEvent(gui);
-        MinecraftForge.EVENT_BUS.post(event);
+        AdvancementMovedEvent.BUS.fire(event);
         return event;
     }
 
     @Override
     public IAdvancementDrawConnectionsEvent postAdvancementDrawConnectionsEvent(AdvancementNode advancement) {
         final AdvancementDrawConnectionsEvent event = new AdvancementDrawConnectionsEvent(advancement);
-        MinecraftForge.EVENT_BUS.post(event);
+        AdvancementDrawConnectionsEvent.BUS.fire(event);
         return event;
     }
 }

Forge/src/main/java/betteradvancements/forge/config/Config.java

@@ -3,7 +3,7 @@
 import betteradvancements.common.reference.Constants;
 import com.electronwill.nightconfig.core.file.CommentedFileConfig;
 import net.minecraftforge.common.ForgeConfigSpec;
-import net.minecraftforge.eventbus.api.SubscribeEvent;
+import net.minecraftforge.eventbus.api.listener.SubscribeEvent;
 import net.minecraftforge.fml.event.config.ModConfigEvent;
 
 

Forge/src/main/java/betteradvancements/forge/handler/GuiOpenHandler.java

@@ -11,8 +11,8 @@
 import net.minecraft.client.multiplayer.ClientAdvancements;
 import net.minecraft.network.chat.Component;
 import net.minecraftforge.client.event.ScreenEvent;
-import net.minecraftforge.eventbus.api.EventPriority;
-import net.minecraftforge.eventbus.api.SubscribeEvent;
+import net.minecraftforge.eventbus.api.listener.Priority;
+import net.minecraftforge.eventbus.api.listener.SubscribeEvent;
 
 import java.util.*;
 
@@ -26,9 +26,8 @@ private GuiOpenHandler() {
     @SubscribeEvent
     public void onGuiOpen(ScreenEvent.Opening event) {
         if (event.getScreen() instanceof AdvancementsScreen) {
-            event.setCanceled(true);
             Minecraft mc = Minecraft.getInstance();
-            mc.setScreen(new BetterAdvancementsScreen(mc.player.connection.getAdvancements()));
+            event.setNewScreen(new BetterAdvancementsScreen(mc.player.connection.getAdvancements()));
         }
     }
 
@@ -42,7 +41,7 @@ public void onGuiOpened(final ScreenEvent.Init.Post event) {
         }
     }
 
-    @SubscribeEvent(priority = EventPriority.HIGH) // put on HIGH to be before Triumph sorting, giving them priority
+    @SubscribeEvent(priority = Priority.HIGH) // put on HIGH to be before Triumph sorting, giving them priority
     public void onGuiAboutToOpen(final ScreenEvent.Init.Pre event) {
         if (event.getScreen() instanceof BetterAdvancementsScreen) {
             if (BetterAdvancementsScreen.orderTabsAlphabetically) {

ForgeApi/src/main/java/betteradvancements/forge/api/event/AdvancementDrawConnectionsEvent.java

@@ -6,14 +6,16 @@
 import betteradvancements.common.api.event.IAdvancementDrawConnectionsEvent;
 import net.minecraft.advancements.AdvancementHolder;
 import net.minecraft.advancements.AdvancementNode;
-import net.minecraftforge.eventbus.api.Event;
+import net.minecraftforge.eventbus.api.bus.EventBus;
+import net.minecraftforge.eventbus.api.event.MutableEvent;
 
 /**
  *  Event fired during advancement connection drawing.
  *  
  *  Used for adding extra connection lines.
  */
-public class AdvancementDrawConnectionsEvent extends Event implements IAdvancementDrawConnectionsEvent {
+public class AdvancementDrawConnectionsEvent extends MutableEvent implements IAdvancementDrawConnectionsEvent {
+    public static final EventBus<AdvancementDrawConnectionsEvent> BUS = EventBus.create(AdvancementDrawConnectionsEvent.class);
     /**
      * Advancement having its connection lines drawn.
      */

ForgeApi/src/main/java/betteradvancements/forge/api/event/AdvancementMovedEvent.java

@@ -3,12 +3,14 @@
 import betteradvancements.common.api.IBetterAdvancementEntryGui;
 import betteradvancements.common.api.event.IAdvancementMovedEvent;
 import net.minecraft.advancements.AdvancementNode;
-import net.minecraftforge.eventbus.api.Event;
+import net.minecraftforge.eventbus.api.bus.EventBus;
+import net.minecraftforge.eventbus.api.event.MutableEvent;
 
 /**
  *  Event fired after an advancement has been moved in the gui and the mouse button has been released.
  */
-public class AdvancementMovedEvent extends Event implements IAdvancementMovedEvent {
+public class AdvancementMovedEvent extends MutableEvent implements IAdvancementMovedEvent {
+    public static final EventBus<AdvancementMovedEvent> BUS = EventBus.create(AdvancementMovedEvent.class);
     /**
      * Advancement that has been moved.
      */