fixes in config

Author: JumperOnJava

.gitignore

@@ -42,3 +42,5 @@ replay_*.log
 # tokens
 
 local.properties
+
+.architectury-transformer\debug.log

build.gradle.kts

@@ -45,6 +45,11 @@ dependencies {
     if (loader == "forge") {
         "forge"("net.minecraftforge:forge:${minecraft}-${mod.dep("forge_loader")}")
         mappings("net.fabricmc:yarn:$minecraft+build.${mod.dep("yarn_build")}:v2")
+
+        "io.github.llamalad7:mixinextras-forge:${mod.dep("mixin_extras")}".let {
+            implementation(it)
+            include(it)
+        }
     }
     if (loader == "neoforge") {
         "neoForge"("net.neoforged:neoforge:${mod.dep("neoforge_loader")}")
@@ -74,7 +79,6 @@ loom {
 }
 
 
-val isFabric = loader == "fabric"
 val localProperties = Properties()
 val localPropertiesFile = rootProject.file("local.properties")
 if (localPropertiesFile.exists()) {
@@ -85,14 +89,14 @@ publishMods {
     val curseforgeToken = localProperties.getProperty("publish.curseforgeToken", "")
 
 
-    file = project.tasks.jar.get().archiveFile
+    file = project.tasks.remapJar.get().archiveFile
     dryRun = modrinthToken == null || curseforgeToken == null
 
     displayName =
         "${mod.name} ${loader.replaceFirstChar { it.uppercase() }} ${property("mod.mc_title")}-${mod.version}"
     version = mod.version
     changelog = rootProject.file("CHANGELOG.md").readText()
-    type = STABLE
+    type = BETA
 
     modLoaders.add(loader)
 
@@ -101,7 +105,7 @@ publishMods {
         projectId = property("publish.modrinth").toString()
         accessToken = modrinthToken
         targets.forEach(minecraftVersions::add)
-        if (isFabric) {
+        if (loader == "fabric") {
             requires("fabric-api")
             optional("modmenu")
         }
@@ -111,7 +115,7 @@ publishMods {
         projectId = property("publish.curseforge").toString()
         accessToken = curseforgeToken.toString()
         targets.forEach(minecraftVersions::add)
-        if (isFabric) {
+        if (loader == "fabric") {
             requires("fabric-api")
             optional("modmenu")
         }

gradle.properties

@@ -7,7 +7,7 @@ org.gradle.parallel=true
 #org.gradle.configureondemand=true
 
 # Mod properties
-mod.version=2.0.0
+mod.version=2.0.0-beta
 mod.group=io.github.jumperonjava
 mod.id=customcursor
 mod.name=Custom cursor

src/main/java/io/github/jumperonjava/customcursor/mixin/GameRendererMixin.java

@@ -1,12 +1,16 @@
 package io.github.jumperonjava.customcursor.mixin;
 
+//? if !forge
+/*import com.llamalad7.mixinextras.sugar.Local;*/
 import io.github.jumperonjava.customcursor.CursorRenderer;
 import net.minecraft.client.MinecraftClient;
 import net.minecraft.client.gui.DrawContext;
 import net.minecraft.client.render.GameRenderer;
 import net.minecraft.client.render.RenderTickCounter;
 import net.minecraft.client.util.Window;
 import net.minecraft.client.util.math.MatrixStack;
+import net.minecraft.util.crash.CrashReport;
+import net.minecraft.util.crash.CrashReportSection;
 import net.minecraft.util.profiler.Profiler;
 import org.jetbrains.annotations.Nullable;
 import org.joml.Matrix4f;
@@ -22,21 +26,26 @@
 public class GameRendererMixin {
     @Shadow @Nullable protected MinecraftClient client;
 
-    //? if < 1.21.3
-    @Inject(method = "render",at = @At(value = "INVOKE", target = "Lnet/minecraft/util/profiler/Profiler;push(Ljava/lang/String;)V", ordinal = 1),locals = LocalCapture.CAPTURE_FAILSOFT)
 
-    //? if < 1.21 {
-    
+    //? if = 1.20.1 {
+    @Inject(method = "render",at = @At(value = "INVOKE", target = "Lnet/minecraft/util/profiler/Profiler;push(Ljava/lang/String;)V",ordinal = 1),locals = LocalCapture.CAPTURE_FAILHARD)
     void renderCursor(float tickDelta, long startTime, boolean tick, CallbackInfo ci, int i, int j, Window window, Matrix4f matrix4f, MatrixStack matrixStack, DrawContext drawContext){
         CursorRenderer.render(drawContext,i,j,tickDelta);
     }
-     //?} elif < 1.21.3 {
-    /*void renderCursor(RenderTickCounter tickCounter, boolean tick, CallbackInfo ci, boolean bl, int i, int j, Window window, Matrix4f matrix4f, Matrix4fStack matrix4fStack, DrawContext drawContext){
+    //?} elif = 1.20.4 {
+    /*@Inject(method = "render", at = @At(value = "INVOKE", target = "Lnet/minecraft/client/gui/DrawContext;draw()V", shift = At.Shift.BEFORE))
+    void renderCursor(float tickDelta, long startTime, boolean tick, CallbackInfo ci, @Local(ordinal = 0) int i, @Local(ordinal = 1) int j, @Local DrawContext drawContext){
+        CursorRenderer.render(drawContext,i,j,tickDelta);
+    }
+     *///?} elif = 1.21.1 {
+    
+    /*@Inject(method = "render", at = @At(value = "INVOKE", target = "Lnet/minecraft/client/gui/DrawContext;draw()V", shift = At.Shift.BEFORE))
+    void renderCursor(RenderTickCounter tickCounter, boolean tick, CallbackInfo ci, @Local(ordinal = 0) int i, @Local(ordinal = 1) int j, @Local DrawContext drawContext){
         CursorRenderer.render(drawContext,i,j,tickCounter.getLastDuration());
     }
     *///?} else {
-    /*@Inject(method = "render",at = @At(value = "INVOKE", target = "Lnet/minecraft/client/gui/DrawContext;draw()V"),locals = LocalCapture.CAPTURE_FAILSOFT)
-    void renderCursor(RenderTickCounter tickCounter, boolean tick, CallbackInfo ci, Profiler profiler, boolean bl, int i, int j, Window window, Matrix4f matrix4f, Matrix4fStack matrix4fStack, DrawContext drawContext){
+    /*@Inject(method = "render", at = @At(value = "INVOKE", target = "Lnet/minecraft/client/gui/DrawContext;draw()V", shift = At.Shift.BEFORE))
+    void renderCursor(RenderTickCounter tickCounter, boolean tick, CallbackInfo ci, @Local(ordinal = 0) int i, @Local(ordinal = 1) int j, @Local DrawContext drawContext){
         CursorRenderer.render(drawContext,i,j,tickCounter.getLastDuration());
     }
     *///?}

unused/forge/build.gradle.kts

@@ -53,10 +53,10 @@ dependencies {
     minecraft("com.mojang:minecraft:$minecraft")
     mappings("net.fabricmc:yarn:$minecraft+build.${common.mod.dep("yarn_build")}:v2")
     "forge"("net.minecraftforge:forge:$minecraft-${common.mod.dep("forge_loader")}")
-//    "io.github.llamalad7:mixinextras-forge:${mod.dep("mixin_extras")}".let {
-//        implementation(it)
-//        include(it)
-//    }
+    "io.github.llamalad7:mixinextras-forge:${mod.dep("mixin_extras")}".let {
+        implementation(it)
+        include(it)
+    }
 
     commonBundle(project(common.path, "namedElements")) { isTransitive = false }
     shadowBundle(project(common.path, "transformProductionForge")) { isTransitive = false }