Skip to content

Commit 2f5c0e9

Browse files
committed
Add support for 1.21.7/8 Forge
1 parent bf2bf6c commit 2f5c0e9

File tree

4 files changed

+36
-1
lines changed

4 files changed

+36
-1
lines changed

root.gradle.kts

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,10 @@ preprocess {
77

88
val fabric12109 = createNode("1.21.9-fabric", 12109, "yarn")
99
val neoForge12108 = createNode("1.21.8-neoforge", 12108, "srg")
10+
val forge12108 = createNode("1.21.8-forge", 12108, "srg")
1011
val fabric12108 = createNode("1.21.8-fabric", 12108, "yarn")
1112
val neoForge12107 = createNode("1.21.7-neoforge", 12107, "srg")
13+
val forge12107 = createNode("1.21.7-forge", 12107, "srg")
1214
val fabric12107 = createNode("1.21.7-fabric", 12107, "yarn")
1315
val fabric12106 = createNode("1.21.6-fabric", 12106, "yarn")
1416
val neoForge12105 = createNode("1.21.5-neoforge", 12105, "srg")
@@ -53,8 +55,10 @@ preprocess {
5355

5456
fabric12109.link(fabric12108)
5557
neoForge12108.link(fabric12108)
58+
forge12108.link(fabric12108)
5659
fabric12108.link(fabric12107)
5760
neoForge12107.link(fabric12107)
61+
forge12107.link(fabric12107)
5862
fabric12107.link(fabric12106)
5963
fabric12106.link(fabric12105, file("versions/1.21.6-1.21.5.txt"))
6064
neoForge12105.link(fabric12105)

settings.gradle.kts

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -58,8 +58,10 @@ listOf(
5858
"1.21.5-neoforge",
5959
"1.21.6-fabric",
6060
"1.21.7-fabric",
61+
"1.21.7-forge",
6162
"1.21.7-neoforge",
6263
"1.21.8-fabric",
64+
"1.21.8-forge",
6365
"1.21.8-neoforge",
6466
"1.21.9-fabric",
6567
).forEach { version ->

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

Lines changed: 12 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,9 @@
4949

5050
//#if FORGE
5151
import net.minecraftforge.common.MinecraftForge;
52+
//#if MC<12107
5253
import net.minecraftforge.fml.common.eventhandler.SubscribeEvent;
54+
//#endif
5355

5456
//#if MC>=11600
5557
//#else
@@ -96,7 +98,7 @@ public class EssentialPartner {
9698
"1.18.2",
9799
"1.19.2", "1.19.3", "1.19.4",
98100
"1.20.1", "1.20.2", "1.20.4", "1.20.6",
99-
"1.21.1", "1.21.3", "1.21.4", "1.21.5"
101+
"1.21.1", "1.21.3", "1.21.4", "1.21.5", "1.21.7", "1.21.8"
100102
));
101103

102104
private static final Set<String> MAIN_MENU_BUTTONS = new HashSet<>(Collections.singletonList("menu.multiplayer"));
@@ -146,8 +148,13 @@ public EssentialPartner() {
146148
//$$ NeoForge.EVENT_BUS.register(this);
147149
//$$ NeoForge.EVENT_BUS.register(ModalManager.INSTANCE);
148150
//#elseif FORGE
151+
//#if MC>=12107
152+
//$$ // Events are now registered via `addListener` calls in constructor
153+
//$$ ModalManager.INSTANCE.getClass();
154+
//#else
149155
MinecraftForge.EVENT_BUS.register(this);
150156
MinecraftForge.EVENT_BUS.register(ModalManager.INSTANCE);
157+
//#endif
151158
//#else
152159
//$$ ScreenEvents.AFTER_INIT.register(this::afterScreenInit);
153160
//$$ ModalManager.INSTANCE.registerEvents();
@@ -286,7 +293,11 @@ private boolean overlaps(int x1, int y1, int w1, int h1, GuiButton button) {
286293
}
287294

288295
//#if FORGELIKE
296+
//#if FORGE && MC>=12107
297+
//$$ { ScreenEvent.Init.Post.BUS.addListener(this::screenInitEvent); }
298+
//#else
289299
@SubscribeEvent
300+
//#endif
290301
public void screenInitEvent(
291302
//#if MC>=11900
292303
//$$ ScreenEvent.Init.Post event

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

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -29,8 +29,10 @@
2929
//#else
3030
import net.minecraftforge.client.event.GuiScreenEvent;
3131
//#endif
32+
//#if MC<12107
3233
import net.minecraftforge.fml.common.eventhandler.SubscribeEvent;
3334
//#endif
35+
//#endif
3436

3537
//#if MC>=12000
3638
//$$ import net.minecraft.client.gui.DrawContext;
@@ -182,7 +184,11 @@ private boolean handleKeyTyped(int key) {
182184
//$$ }
183185
//#else
184186
//#if MC>=11900
187+
//#if FORGE && MC>=12107
188+
//$$ { ScreenEvent.Render.Post.BUS.addListener(this::draw); }
189+
//#else
185190
//$$ @SubscribeEvent
191+
//#endif
186192
//$$ public void draw(ScreenEvent.Render.Post event) {
187193
//#if MC>=12000
188194
//$$ handleDraw(event.getGuiGraphics());
@@ -191,6 +197,17 @@ private boolean handleKeyTyped(int key) {
191197
//#endif
192198
//$$ }
193199
//$$
200+
//#if FORGE && MC>=12107
201+
//$$ { ScreenEvent.MouseButtonPressed.Pre.BUS.addListener(this::mouseClicked); }
202+
//$$ private boolean mouseClicked(ScreenEvent.MouseButtonPressed.Pre event) {
203+
//$$ return handleMouseClick(event.getMouseX(), event.getMouseY());
204+
//$$ }
205+
//$$
206+
//$$ { ScreenEvent.KeyPressed.Pre.BUS.addListener(this::keyPressed); }
207+
//$$ private boolean keyPressed(ScreenEvent.KeyPressed.Pre event) {
208+
//$$ return handleKeyTyped(event.getKeyCode());
209+
//$$ }
210+
//#else
194211
//$$ @SubscribeEvent
195212
//$$ public void mouseClicked(ScreenEvent.MouseButtonPressed.Pre event) {
196213
//$$ event.setCanceled(handleMouseClick(event.getMouseX(), event.getMouseY()));
@@ -200,6 +217,7 @@ private boolean handleKeyTyped(int key) {
200217
//$$ public void keyPressed(ScreenEvent.KeyPressed.Pre event) {
201218
//$$ event.setCanceled(handleKeyTyped(event.getKeyCode()));
202219
//$$ }
220+
//#endif
203221
//#elseif MC>=11800
204222
//$$ @SubscribeEvent
205223
//$$ public void draw(ScreenEvent.DrawScreenEvent.Post event) {

0 commit comments

Comments
 (0)