Add support for 1.21.7/8 Forge

Author: Johni0702

root.gradle.kts

@@ -7,8 +7,10 @@ preprocess {
 
     val fabric12109 = createNode("1.21.9-fabric", 12109, "yarn")
     val neoForge12108 = createNode("1.21.8-neoforge", 12108, "srg")
+    val forge12108 = createNode("1.21.8-forge", 12108, "srg")
     val fabric12108 = createNode("1.21.8-fabric", 12108, "yarn")
     val neoForge12107 = createNode("1.21.7-neoforge", 12107, "srg")
+    val forge12107 = createNode("1.21.7-forge", 12107, "srg")
     val fabric12107 = createNode("1.21.7-fabric", 12107, "yarn")
     val fabric12106 = createNode("1.21.6-fabric", 12106, "yarn")
     val neoForge12105 = createNode("1.21.5-neoforge", 12105, "srg")
@@ -53,8 +55,10 @@ preprocess {
 
     fabric12109.link(fabric12108)
     neoForge12108.link(fabric12108)
+    forge12108.link(fabric12108)
     fabric12108.link(fabric12107)
     neoForge12107.link(fabric12107)
+    forge12107.link(fabric12107)
     fabric12107.link(fabric12106)
     fabric12106.link(fabric12105, file("versions/1.21.6-1.21.5.txt"))
     neoForge12105.link(fabric12105)

settings.gradle.kts

@@ -58,8 +58,10 @@ listOf(
     "1.21.5-neoforge",
     "1.21.6-fabric",
     "1.21.7-fabric",
+    "1.21.7-forge",
     "1.21.7-neoforge",
     "1.21.8-fabric",
+    "1.21.8-forge",
     "1.21.8-neoforge",
     "1.21.9-fabric",
 ).forEach { version ->

src/main/java/gg/essential/partnermod/EssentialPartner.java

@@ -49,7 +49,9 @@
 
 //#if FORGE
 import net.minecraftforge.common.MinecraftForge;
+//#if MC<12107
 import net.minecraftforge.fml.common.eventhandler.SubscribeEvent;
+//#endif
 
 //#if MC>=11600
 //#else
@@ -96,7 +98,7 @@ public class EssentialPartner {
         "1.18.2",
         "1.19.2", "1.19.3", "1.19.4",
         "1.20.1", "1.20.2", "1.20.4", "1.20.6",
-        "1.21.1", "1.21.3", "1.21.4", "1.21.5"
+        "1.21.1", "1.21.3", "1.21.4", "1.21.5", "1.21.7", "1.21.8"
     ));
 
     private static final Set<String> MAIN_MENU_BUTTONS = new HashSet<>(Collections.singletonList("menu.multiplayer"));
@@ -146,8 +148,13 @@ public EssentialPartner() {
         //$$ NeoForge.EVENT_BUS.register(this);
         //$$ NeoForge.EVENT_BUS.register(ModalManager.INSTANCE);
         //#elseif FORGE
+        //#if MC>=12107
+        //$$ // Events are now registered via `addListener` calls in constructor
+        //$$ ModalManager.INSTANCE.getClass();
+        //#else
         MinecraftForge.EVENT_BUS.register(this);
         MinecraftForge.EVENT_BUS.register(ModalManager.INSTANCE);
+        //#endif
         //#else
         //$$ ScreenEvents.AFTER_INIT.register(this::afterScreenInit);
         //$$ ModalManager.INSTANCE.registerEvents();
@@ -286,7 +293,11 @@ private boolean overlaps(int x1, int y1, int w1, int h1, GuiButton button) {
     }
 
     //#if FORGELIKE
+    //#if FORGE && MC>=12107
+    //$$ { ScreenEvent.Init.Post.BUS.addListener(this::screenInitEvent); }
+    //#else
     @SubscribeEvent
+    //#endif
     public void screenInitEvent(
         //#if MC>=11900
         //$$ ScreenEvent.Init.Post event

src/main/java/gg/essential/partnermod/modal/ModalManager.java

@@ -29,8 +29,10 @@
 //#else
 import net.minecraftforge.client.event.GuiScreenEvent;
 //#endif
+//#if MC<12107
 import net.minecraftforge.fml.common.eventhandler.SubscribeEvent;
 //#endif
+//#endif
 
 //#if MC>=12000
 //$$ import net.minecraft.client.gui.DrawContext;
@@ -182,7 +184,11 @@ private boolean handleKeyTyped(int key) {
     //$$ }
     //#else
     //#if MC>=11900
+    //#if FORGE && MC>=12107
+    //$$ { ScreenEvent.Render.Post.BUS.addListener(this::draw); }
+    //#else
     //$$ @SubscribeEvent
+    //#endif
     //$$ public void draw(ScreenEvent.Render.Post event) {
         //#if MC>=12000
         //$$ handleDraw(event.getGuiGraphics());
@@ -191,6 +197,17 @@ private boolean handleKeyTyped(int key) {
         //#endif
     //$$ }
     //$$
+    //#if FORGE && MC>=12107
+    //$$ { ScreenEvent.MouseButtonPressed.Pre.BUS.addListener(this::mouseClicked); }
+    //$$ private boolean mouseClicked(ScreenEvent.MouseButtonPressed.Pre event) {
+    //$$     return handleMouseClick(event.getMouseX(), event.getMouseY());
+    //$$ }
+    //$$
+    //$$ { ScreenEvent.KeyPressed.Pre.BUS.addListener(this::keyPressed); }
+    //$$ private boolean keyPressed(ScreenEvent.KeyPressed.Pre event) {
+    //$$     return handleKeyTyped(event.getKeyCode());
+    //$$ }
+    //#else
     //$$ @SubscribeEvent
     //$$ public void mouseClicked(ScreenEvent.MouseButtonPressed.Pre event) {
     //$$     event.setCanceled(handleMouseClick(event.getMouseX(), event.getMouseY()));
@@ -200,6 +217,7 @@ private boolean handleKeyTyped(int key) {
     //$$ public void keyPressed(ScreenEvent.KeyPressed.Pre event) {
     //$$     event.setCanceled(handleKeyTyped(event.getKeyCode()));
     //$$ }
+    //#endif
     //#elseif MC>=11800
     //$$ @SubscribeEvent
     //$$ public void draw(ScreenEvent.DrawScreenEvent.Post event) {