port: 26.1 on NeoForge

Author: Motschen

build-unobfuscated-neoforge.gradle.kts

@@ -48,36 +48,33 @@ dependencies {
     jarJar(midnightlib)
 
     // Compatibility mods
-    compileOnlyApi ("com.terraformersmc:modmenu:${mod.dep("modmenu_version")}") {
-        exclude(group = "net.fabricmc.fabric-api")
-    }
     //compileOnlyApi ("io.github.cottonmc:LibGui:${mod.dep("libgui_version")}")
-    compileOnlyApi ("org.quiltmc:quilt-json5:1.0.0")
     implementation ("maven.modrinth:sodium:${mod.dep("sodium_version")}-fabric")
     compileOnlyApi ("maven.modrinth:emi:${mod.dep("emi_version")}+${loader}")
     compileOnlyApi ("maven.modrinth:emotecraft:${mod.dep("emotecraft_version")}")
     compileOnlyApi ("io.github.kosmx:bendy-lib:${mod.dep("bendylib_version")}")
     compileOnlyApi ("dev.isxander:yet-another-config-lib:${mod.dep("yacl_version")}+${minecraft}-${loader}") {
         exclude(group = "org.quiltmc.parser")
     }
-    compileOnlyApi ("maven.modrinth:inventory-tabs-updated:${mod.dep("inventorytabs_version")}")
-    compileOnlyApi ("maven.modrinth:bedrockify:${mod.dep("bedrockify_version")}")
-    // Required for Inventory Tabs
-    compileOnlyApi("me.shedaniel.cloth:cloth-config-fabric:${mod.dep("clothconfig_version")}") {
-        exclude(group = "net.fabricmc.fabric-api")
+    compileOnlyApi ("maven.modrinth:inventory-tabs-updated:${mod.dep("inventorytabs_version")}") {
+        exclude(group = "me.shedaniel.cloth:cloth-config-neoforge")
+        exclude(group = "me.shedaniel.cloth:cloth-config-fabric")
     }
 
     val spruceui = "dev.lambdaurora:spruceui:${mod.dep("spruceui_version")}"
 
     if (loader == "neoforge") {
-        implementation(spruceui)
+        implementation(spruceui) {
+            exclude(group = "net.fabricmc")
+            exclude(group = "net.fabricmc.fabric-api")
+        }
 
         jarJar("dev.yumi.mc.core:yumi-mc-foundation:${mod.dep("yumimc_version")}")
         jarJar(spruceui)
     }
 }
 neoForge {
-    version = mod.dep("neoforge_loader") as String
+    version = mod.dep("neoforge_loader")
 
     runs {
         register("client") {
@@ -91,12 +88,6 @@ neoForge {
         }
     }
 }
-fletchingTable {
-    accessConverter.register(sourceSets.main) {
-        add("midnightcontrols-26.1.accesswidener")
-    }
-}
-
 
 publishMods {
     val modrinthToken = System.getenv("MODRINTH_TOKEN")

src/main/java/eu/midnightdust/midnightcontrols/client/compat/BedrockifyCompat.java

@@ -9,6 +9,7 @@
 
 package eu.midnightdust.midnightcontrols.client.compat;
 
+//? fabric
 import me.juancarloscp52.bedrockify.client.BedrockifyClient;
 
 /**
@@ -22,6 +23,7 @@ public class BedrockifyCompat implements CompatHandler {
 
     @Override
     public void handle() {
+        //? fabric
         BedrockifyClient.getInstance().settings.disableFlyingMomentum = false;
     }
 }

src/main/java/eu/midnightdust/midnightcontrols/client/gui/cursor/CursorRenderer.java

@@ -21,6 +21,6 @@ public static void drawUnalignedTexturedQuad(RenderPipeline pipeline, Identifier
         DrawContextAccessor accessor = (DrawContextAccessor) context;
         var tex = client.getTextureManager().getTexture(texture);
         //~ if >= 26.1 '.submitGuiElement(' -> '.addGuiElement('
-        accessor.getState().addGuiElement(new UnalignedTexturedQuadGuiElementRenderState(pipeline, TextureSetup.singleTexture(tex.getTextureView(), tex.getSampler()), new Matrix3x2f(context.pose()), x1, y1, x2, y2, u1, u2, v1, v2, 0xffffffff, accessor.getScissorStack().peek()));
+        accessor.getState().addGuiElement(new UnalignedTexturedQuadGuiElementRenderState(pipeline, TextureSetup.singleTexture(tex.getTextureView(), tex.getSampler()), new Matrix3x2f(context.pose()), x1, y1, x2, y2, u1, u2, v1, v2, 0xffffffff, /*? fabric {*/ accessor.getScissorStack().peek() /*?} else {*/ /*context.peekScissorStack()*//*?}*/));
     }
 }

src/main/java/eu/midnightdust/midnightcontrols/client/gui/cursor/UnalignedTexturedQuadGuiElementRenderState.java

@@ -2,8 +2,6 @@
 
 import com.mojang.blaze3d.pipeline.RenderPipeline;
 import com.mojang.blaze3d.vertex.VertexConsumer;
-import net.fabricmc.api.EnvType;
-import net.fabricmc.api.Environment;
 import net.minecraft.client.gui.navigation.ScreenRectangle;
 import net.minecraft.client.gui.render.TextureSetup;
 import net.minecraft.client.renderer.state.gui.GuiElementRenderState;

src/main/java/eu/midnightdust/midnightcontrols/client/gui/widget/ControlsListWidget.java

@@ -25,8 +25,6 @@
 import eu.midnightdust.midnightcontrols.client.controller.ButtonBinding;
 import eu.midnightdust.midnightcontrols.client.controller.ButtonCategory;
 import eu.midnightdust.midnightcontrols.client.controller.InputManager;
-import net.fabricmc.api.EnvType;
-import net.fabricmc.api.Environment;
 import net.minecraft.ChatFormatting;
 import net.minecraft.client.gui.navigation.ScreenAxis;
 import net.minecraft.client.input.KeyEvent;

src/main/java/eu/midnightdust/midnightcontrols/client/mixin/GameRendererMixin.java

@@ -47,7 +47,8 @@ public abstract class GameRendererMixin {
     //~ if >= 26.1 'render' -> 'extractGui'
     @Inject(method = "extractGui", at = @At(value = "INVOKE", target = "Lnet/minecraft/client/gui/screens/Screen;extractRenderStateWithTooltipAndSubtitles(Lnet/minecraft/client/gui/GuiGraphicsExtractor;IIF)V", shift = At.Shift.AFTER))
     //?} else if 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/GuiGraphicsExtractor;IIF)V", shift = At.Shift.AFTER))
+    /*//~ if >= 26.1 'render' -> 'extractGui'
+    @Inject(method = "extractGui", at = @At(value = "INVOKE", target = "Lnet/neoforged/neoforge/client/ClientHooks;drawScreen(Lnet/minecraft/client/gui/screens/Screen;Lnet/minecraft/client/gui/GuiGraphicsExtractor;IIF)V", shift = At.Shift.AFTER))
     *//*?}*/
     private void midnightcontrols$renderVirtualCursor(DeltaTracker tickCounter, boolean tick, /*? if >= 26.1 {*/final boolean resourcesLoaded, /*?}*/ CallbackInfo ci, @Local GuiGraphicsExtractor drawContext) {
         VirtualCursorRenderer.getInstance().renderCursor(drawContext,  minecraft);

src/main/java/eu/midnightdust/midnightcontrols/client/mixin/InGameHudMixin.java

@@ -18,15 +18,17 @@ public class InGameHudMixin {
         MidnightControlsHud.getInstance().init();
     }
 
-    //~ if >= 26.1 'render' -> 'extract'
+
+    //~ if >= 26.1 'render' -> 'extract' {
     //? fabric {
     @Inject(method = "extractHotbarAndDecorations", at = @At("HEAD"))
     //?} else if neoforge {
-    /*@Inject(method = "renderCrosshair", at = @At("HEAD"))
+    /*@Inject(method = "extractCrosshair", at = @At("HEAD"))
     *///?}
-    public void midnightcontrols$renderHud(GuiGraphicsExtractor context, DeltaTracker tickCounter, CallbackInfo ci) {
+    public void midnightcontrols$drawHud(GuiGraphicsExtractor context, DeltaTracker tickCounter, CallbackInfo ci) {
         MidnightControlsHud.getInstance().extractRenderState(context, tickCounter);
     }
+    //~}
 
     @Inject(method = "tick()V", at = @At("HEAD"))
     public void midnightcontrols$tickHud(CallbackInfo ci) {