fix: NeoForge oddities

Motschen · Motschen · commit 46229b32e824 · 2025-12-24T16:27:54.000+01:00
diff --git a/src/main/java/eu/midnightdust/midnightcontrols/client/mixin/GameRendererMixin.java b/src/main/java/eu/midnightdust/midnightcontrols/client/mixin/GameRendererMixin.java
@@ -38,7 +38,10 @@ public abstract class GameRendererMixin {
         if (this.minecraft.screen != null && MidnightControlsConfig.controlsMode == ControlsMode.CONTROLLER)
             MidnightControlsClient.input.onPreRenderScreen(this.minecraft.screen);
     }
-    @Inject(method = "render", at = @At(value = "TAIL", target = "Lnet/minecraft/client/gui/screens/Screen;renderWithTooltipAndSubtitles(Lnet/minecraft/client/gui/GuiGraphics;IIF)V", shift = At.Shift.AFTER))
+    //? fabric
+    @Inject(method = "render", at = @At(value = "INVOKE, target = "Lnet/minecraft/client/gui/screens/Screen;renderWithTooltipAndSubtitles(Lnet/minecraft/client/gui/GuiGraphics;IIF)V", shift = At.Shift.AFTER))
+    //? neoforge
+    /*@Inject(method = "render", at = @At(value = "INVOKE", target = "Lnet/neoforged/neoforge/client/ClientHooks;drawScreen(Lnet/minecraft/client/gui/screens/Screen;Lnet/minecraft/client/gui/GuiGraphics;IIF)V", shift = At.Shift.AFTER))*/
     private void midnightcontrols$renderVirtualCursor(DeltaTracker tickCounter, boolean tick, CallbackInfo ci, @Local GuiGraphics drawContext) {
         VirtualCursorRenderer.getInstance().renderCursor(drawContext,  minecraft);
         if (MidnightControlsClient.isWayland) WaylandCursorRenderer.getInstance().renderCursor(drawContext, minecraft);
diff --git a/src/main/java/eu/midnightdust/midnightcontrols/client/mixin/InGameHudMixin.java b/src/main/java/eu/midnightdust/midnightcontrols/client/mixin/InGameHudMixin.java
@@ -18,7 +18,10 @@ public class InGameHudMixin {
         MidnightControlsHud.getInstance().init();
     }
 
+    //? fabric
     @Inject(method = "renderHotbarAndDecorations", at = @At("HEAD"))
+    //? neoforge
+    /*@Inject(method = "renderCrosshair", at = @At("HEAD"))*/
     public void midnightcontrols$renderHud(GuiGraphics context, DeltaTracker tickCounter, CallbackInfo ci) {
         MidnightControlsHud.getInstance().render(context, tickCounter);
     }
diff --git a/src/main/java/eu/midnightdust/midnightcontrols/client/util/platform/ItemGroupUtil.java b/src/main/java/eu/midnightdust/midnightcontrols/client/util/platform/ItemGroupUtil.java
@@ -14,7 +14,7 @@
 
 public class ItemGroupUtil {
     public static List<CreativeModeTab> getVisibleGroups(CreativeModeInventoryScreen screen) {
-        return /*? fabric {*/ /*(screen.getItemGroupsOnPage(screen.getCurrentPage())) *//*?} else {*/ (screen.getCurrentPage().getVisibleTabs()) /*?}*/;
+        return /*? fabric {*/ (screen.getItemGroupsOnPage(screen.getCurrentPage())) /*?} else {*/ /*(screen.getCurrentPage().getVisibleTabs()) *//*?}*/;
     }
 
     public static boolean cyclePage(boolean next, CreativeModeInventoryScreen screen) {
diff --git a/src/main/java/eu/midnightdust/midnightcontrols/fabric/MidnightControlsClientFabric.java b/src/main/java/eu/midnightdust/midnightcontrols/fabric/MidnightControlsClientFabric.java
@@ -1,7 +1,7 @@
 package eu.midnightdust.midnightcontrols.fabric;
 
 //? fabric {
-/*import eu.midnightdust.midnightcontrols.MidnightControlsConstants;
+import eu.midnightdust.midnightcontrols.MidnightControlsConstants;
 import eu.midnightdust.midnightcontrols.client.MidnightControlsClient;
 import eu.midnightdust.midnightcontrols.client.MidnightControlsConfig;
 import eu.midnightdust.midnightcontrols.client.MidnightControlsReloadListener;
@@ -81,4 +81,4 @@ public void onResourceManagerReload(ResourceManager manager) {
         });
     }
 }
-*///?}
+//?}
diff --git a/src/main/java/eu/midnightdust/midnightcontrols/fabric/MidnightControlsFabric.java b/src/main/java/eu/midnightdust/midnightcontrols/fabric/MidnightControlsFabric.java
@@ -1,7 +1,7 @@
 package eu.midnightdust.midnightcontrols.fabric;
 
 //? fabric {
-/*import eu.midnightdust.midnightcontrols.ControlsMode;
+import eu.midnightdust.midnightcontrols.ControlsMode;
 import eu.midnightdust.midnightcontrols.MidnightControls;
 import eu.midnightdust.midnightcontrols.MidnightControlsFeature;
 import eu.midnightdust.midnightcontrols.fabric.event.PlayerChangeControlsModeCallback;
@@ -30,4 +30,4 @@ public void onInitialize() {
         });
     }
 }
-*///?}
+//?}
diff --git a/src/main/java/eu/midnightdust/midnightcontrols/fabric/event/MouseClickListener.java b/src/main/java/eu/midnightdust/midnightcontrols/fabric/event/MouseClickListener.java
@@ -1,7 +1,7 @@
 package eu.midnightdust.midnightcontrols.fabric.event;
 
 //? fabric {
-/*import eu.midnightdust.midnightcontrols.client.MidnightControlsConfig;
+import eu.midnightdust.midnightcontrols.client.MidnightControlsConfig;
 import net.fabricmc.fabric.api.client.screen.v1.ScreenMouseEvents;
 import net.minecraft.client.gui.screens.Screen;
 import net.minecraft.client.input.MouseButtonEvent;
@@ -38,4 +38,4 @@ public int hashCode() {
         return screen.hashCode();
     }
 }
-*///?}
+//?}
diff --git a/src/main/java/eu/midnightdust/midnightcontrols/fabric/event/PlayerChangeControlsModeCallback.java b/src/main/java/eu/midnightdust/midnightcontrols/fabric/event/PlayerChangeControlsModeCallback.java
@@ -10,19 +10,19 @@
 package eu.midnightdust.midnightcontrols.fabric.event;
 
 //? fabric {
-/*import eu.midnightdust.midnightcontrols.ControlsMode;
+import eu.midnightdust.midnightcontrols.ControlsMode;
 import net.fabricmc.fabric.api.event.Event;
 import net.fabricmc.fabric.api.event.EventFactory;
 import net.minecraft.world.entity.player.Player;
 import org.jetbrains.annotations.NotNull;
 
-/^*
+/**
  * Represents an event callback which is fired when a player changes the controls mode.
  *
  * @author LambdAurora
  * @version 1.10.0
  * @since 1.1.0
- ^/
+ */
 @FunctionalInterface
 public interface PlayerChangeControlsModeCallback {
     Event<@NotNull PlayerChangeControlsModeCallback> EVENT = EventFactory.createArrayBacked(PlayerChangeControlsModeCallback.class, listeners -> (player, controlsMode) -> {
@@ -33,4 +33,4 @@ public interface PlayerChangeControlsModeCallback {
 
     void apply(@NotNull Player player, @NotNull ControlsMode controlsMode);
 }
-*///?}
+//?}
diff --git a/src/main/java/eu/midnightdust/midnightcontrols/neoforge/MidnightControlsClientNeoforge.java b/src/main/java/eu/midnightdust/midnightcontrols/neoforge/MidnightControlsClientNeoforge.java
@@ -1,7 +1,7 @@
 package eu.midnightdust.midnightcontrols.neoforge;
 
 //? neoforge {
-import eu.midnightdust.midnightcontrols.client.MidnightControlsClient;
+/*import eu.midnightdust.midnightcontrols.client.MidnightControlsClient;
 import eu.midnightdust.midnightcontrols.client.MidnightControlsConfig;
 import eu.midnightdust.midnightcontrols.client.MidnightControlsReloadListener;
 import eu.midnightdust.midnightcontrols.client.util.platform.NetworkUtil;
@@ -90,4 +90,4 @@ public static void onMouseButtonPressed(ScreenEvent.MouseButtonPressed.Pre event
         }
     }
 }
-//?}
+*///?}
diff --git a/src/main/java/eu/midnightdust/midnightcontrols/neoforge/MidnightControlsNeoforge.java b/src/main/java/eu/midnightdust/midnightcontrols/neoforge/MidnightControlsNeoforge.java
@@ -1,7 +1,7 @@
 package eu.midnightdust.midnightcontrols.neoforge;
 
 //? neoforge {
-import eu.midnightdust.midnightcontrols.ControlsMode;
+/*import eu.midnightdust.midnightcontrols.ControlsMode;
 import eu.midnightdust.midnightcontrols.MidnightControls;
 import eu.midnightdust.midnightcontrols.MidnightControlsFeature;
 import eu.midnightdust.midnightcontrols.neoforge.event.PlayerChangeControlsModeEvent;
@@ -38,4 +38,4 @@ public static void registerPayloads(RegisterPayloadHandlersEvent event) {
         }
     }
 }
-//?}
+*///?}
diff --git a/src/main/java/eu/midnightdust/midnightcontrols/neoforge/event/PlayerChangeControlsModeEvent.java b/src/main/java/eu/midnightdust/midnightcontrols/neoforge/event/PlayerChangeControlsModeEvent.java
@@ -1,7 +1,7 @@
 package eu.midnightdust.midnightcontrols.neoforge.event;
 
 //? neoforge {
-import eu.midnightdust.midnightcontrols.ControlsMode;
+/*import eu.midnightdust.midnightcontrols.ControlsMode;
 import net.minecraft.world.entity.player.Player;
 import net.neoforged.bus.api.Event;
 import net.neoforged.fml.event.IModBusEvent;
@@ -11,4 +11,4 @@ public PlayerChangeControlsModeEvent(Player player, ControlsMode controlsMode) {
 
     }
 }
-//?}
+*///?}
diff --git a/stonecutter.gradle.kts b/stonecutter.gradle.kts
@@ -5,7 +5,7 @@ plugins {
     id("com.github.johnrengelman.shadow") version "8.1.1" apply false
     id("me.modmuss50.mod-publish-plugin") version "0.8.4" apply false
 }
-stonecutter active "1.21.11-neoforge" /* [SC] DO NOT EDIT */
+stonecutter active "1.21.11-fabric" /* [SC] DO NOT EDIT */
 
 // See https://stonecutter.kikugie.dev/wiki/config/params
 stonecutter parameters {

Original file line number	Diff line number	Diff line change
`@@ -18,7 +18,10 @@ public class InGameHudMixin {`
`18`	`18`	`MidnightControlsHud.getInstance().init();`
`19`	`19`	`}`
`20`	`20`
	`21`	`+ //? fabric`
`21`	`22`	`@Inject(method = "renderHotbarAndDecorations", at = @At("HEAD"))`
	`23`	`+ //? neoforge`
	`24`	`+ /@Inject(method = "renderCrosshair", at = @At("HEAD"))/`
`22`	`25`	`public void midnightcontrols$renderHud(GuiGraphics context, DeltaTracker tickCounter, CallbackInfo ci) {`
`23`	`26`	`MidnightControlsHud.getInstance().render(context, tickCounter);`
`24`	`27`	`}`
Original file line number	Diff line number	Diff line change
`@@ -14,7 +14,7 @@`
`14`	`14`
`15`	`15`	`public class ItemGroupUtil {`
`16`	`16`	`public static List<CreativeModeTab> getVisibleGroups(CreativeModeInventoryScreen screen) {`
`17`		`- return /? fabric {/ /(screen.getItemGroupsOnPage(screen.getCurrentPage())) //?} else {/ (screen.getCurrentPage().getVisibleTabs()) /?}/;`
	`17`	`+ return /? fabric {/ (screen.getItemGroupsOnPage(screen.getCurrentPage())) /?} else {/ /(screen.getCurrentPage().getVisibleTabs()) //?}/;`
`18`	`18`	`}`
`19`	`19`
`20`	`20`	`public static boolean cyclePage(boolean next, CreativeModeInventoryScreen screen) {`
Original file line number	Diff line number	Diff line change
`@@ -1,7 +1,7 @@`
`1`	`1`	`package eu.midnightdust.midnightcontrols.fabric;`
`2`	`2`
`3`	`3`	`//? fabric {`
`4`		`-/*import eu.midnightdust.midnightcontrols.MidnightControlsConstants;`
	`4`	`+import eu.midnightdust.midnightcontrols.MidnightControlsConstants;`
`5`	`5`	`import eu.midnightdust.midnightcontrols.client.MidnightControlsClient;`
`6`	`6`	`import eu.midnightdust.midnightcontrols.client.MidnightControlsConfig;`
`7`	`7`	`import eu.midnightdust.midnightcontrols.client.MidnightControlsReloadListener;`
`@@ -81,4 +81,4 @@ public void onResourceManagerReload(ResourceManager manager) {`
`81`	`81`	`});`
`82`	`82`	`}`
`83`	`83`	`}`
`84`		`-*///?}`
	`84`	`+//?}`
Original file line number	Diff line number	Diff line change
`@@ -1,7 +1,7 @@`
`1`	`1`	`package eu.midnightdust.midnightcontrols.neoforge;`
`2`	`2`
`3`	`3`	`//? neoforge {`
`4`		`-import eu.midnightdust.midnightcontrols.client.MidnightControlsClient;`
	`4`	`+/*import eu.midnightdust.midnightcontrols.client.MidnightControlsClient;`
`5`	`5`	`import eu.midnightdust.midnightcontrols.client.MidnightControlsConfig;`
`6`	`6`	`import eu.midnightdust.midnightcontrols.client.MidnightControlsReloadListener;`
`7`	`7`	`import eu.midnightdust.midnightcontrols.client.util.platform.NetworkUtil;`
`@@ -90,4 +90,4 @@ public static void onMouseButtonPressed(ScreenEvent.MouseButtonPressed.Pre event`
`90`	`90`	`}`
`91`	`91`	`}`
`92`	`92`	`}`
`93`		`-//?}`
	`93`	`+*///?}`