backend: Re-add stonecutter and support for 1.21.8

Author: MisterCheezeCake

build.gradle.kts

@@ -19,9 +19,9 @@ base {
 loom {
     accessWidenerPath = project.file("src/main/resources/skyblocktweaks.accesswidener")
 
-//    runConfigs.all {
-//        ideConfigGenerated(stonecutter.current.isActive)
-//    }
+    runConfigs.all {
+        ideConfigGenerated(stonecutter.current.isActive)
+    }
 
     runConfigs.remove(runConfigs["server"])
 }
@@ -62,8 +62,8 @@ dependencies {
 //    })
     mappings(loom.layered {
         officialMojangMappings()
-		parchment("org.parchmentmc.data:parchment-${property("minecraft_version")}:${property("parchment_version")}@zip")
-        //mappings("dev.lambdaurora:yalmm-mojbackward:1.21.8+build.${property("yalmm_version")}")
+		parchment("org.parchmentmc.data:parchment-${property("parchment_version")}@zip")
+        mappings("dev.lambdaurora:yalmm-mojbackward:${property("minecraft_version")}+build.${property("yalmm_version")}")
 		// ^ Disabled as of 1/11 due to causing issues with decomp
     })
 	modImplementation ("net.fabricmc:fabric-loader:${property("loader_version")}")

gradle.properties

@@ -10,16 +10,6 @@ modapi_version=1.0.1
 mod_version=0.1.0-Alpha.18
 #mod_version=Unstable
 
-# Fix YALMM
+## Fix YALMM
 fabric.loom.dropNonIntermediateRootMethods=true
 
-minecraft_version=1.21.10
-parchment_version=2025.10.12
-yalmm_version=3
-fabric_version=0.138.4+1.21.10
-
-modapi_fabric_version=1.0.1+build.1+mc1.21
-modmenu_version=16.0.0
-yacl_version=3.8.2+1.21.10-fabric
-rei_version=21.9.812
-support_range=1.21.10

settings.gradle.kts

@@ -6,21 +6,21 @@ pluginManagement {
 		}
 		mavenCentral()
 		gradlePluginPortal()
-//		maven("https://maven.kikugie.dev/releases")
-//		maven("https://maven.kikugie.dev/snapshots")
+		maven("https://maven.kikugie.dev/releases")
+		maven("https://maven.kikugie.dev/snapshots")
 	}
 }
 
-//plugins {
-//	id("dev.kikugie.stonecutter") version "0.7.10"
-//}
+plugins {
+	id("dev.kikugie.stonecutter") version "0.8.2"
+}
+
+stonecutter {
+	kotlinController = true
+	centralScript = "build.gradle.kts"
 
-//stonecutter {
-//	kotlinController = true
-//	centralScript = "build.gradle.kts"
-//
-//	create(rootProject) {
-//		versions("1.21.8")
-//		vcsVersion = "1.21.8"
-//	}
-//}
+	create(rootProject) {
+		versions("1.21.8", "1.21.10")
+		vcsVersion = "1.21.10"
+	}
+}

src/main/java/wtf/cheeze/sbt/config/SBTConfig.java

@@ -27,7 +27,7 @@
 import net.fabricmc.loader.api.FabricLoader;
 import net.minecraft.client.gui.screens.Screen;
 import net.minecraft.network.chat.Component;
-import net.minecraft.resources.ResourceLocation;
+import net.minecraft.resources.Identifier;
 import wtf.cheeze.sbt.config.categories.*;
 import wtf.cheeze.sbt.config.migration.BarColorTransformation;
 import wtf.cheeze.sbt.config.migration.MigrationManager;
@@ -43,7 +43,7 @@ public class  SBTConfig {
     public static final Path PATH = FabricLoader.getInstance().getConfigDir().resolve("skyblocktweaks-config.json");
 
     private static final ConfigClassHandler<ConfigImpl> HANDLER = ConfigClassHandler.createBuilder(ConfigImpl.class)
-            .id(ResourceLocation.fromNamespaceAndPath("skyblocktweaks", "config"))
+            .id(Identifier.fromNamespaceAndPath("skyblocktweaks", "config"))
             .serializer(config -> GsonConfigSerializerBuilder.create(config).appendGsonBuilder(builder -> builder.setFieldNamingPolicy(FieldNamingPolicy.IDENTITY))
                     .setPath(PATH)
                     .build())

src/main/java/wtf/cheeze/sbt/config/SkyblockTweaksScreenMain.java

@@ -25,15 +25,15 @@
 import net.minecraft.client.gui.components.Tooltip;
 import net.minecraft.client.gui.components.Button;
 import net.minecraft.network.chat.Component;
-import net.minecraft.resources.ResourceLocation;
+import net.minecraft.resources.Identifier;
 import wtf.cheeze.sbt.SkyblockTweaks;
 import wtf.cheeze.sbt.hud.HudManager;
 import wtf.cheeze.sbt.utils.render.Colors;
 import wtf.cheeze.sbt.utils.render.RenderUtils;
 import wtf.cheeze.sbt.hud.screen.HudScreen;
 
 public class SkyblockTweaksScreenMain extends Screen {
-    public static final ResourceLocation ICON = ResourceLocation.fromNamespaceAndPath("skyblocktweaks", "icon.png");
+    public static final Identifier ICON = Identifier.fromNamespaceAndPath("skyblocktweaks", "icon.png");
     private final Screen parent;
 
     public SkyblockTweaksScreenMain(Screen parent) {

src/main/java/wtf/cheeze/sbt/config/migration/BarColorTransformation.java

@@ -1,14 +1,14 @@
 package wtf.cheeze.sbt.config.migration;
 
 import com.mojang.blaze3d.pipeline.RenderPipeline;
-import net.minecraft.resources.ResourceLocation;
+import net.minecraft.resources.Identifier;
 import wtf.cheeze.sbt.config.ConfigImpl;
 import wtf.cheeze.sbt.utils.render.Colors;
 
 /**
  * In mod versions prior to 0.1.0-Alpha.8, bar colors (all colors actually), defaulted to RGB ints.
  * This was fine pre 1.21.2 since the shader system was used, which was fine with RGB ints
- * However, in 1.21.2, the shader system was tweaked, and we moved to the color parameter in {@link net.minecraft.client.gui.GuiGraphics#blit(RenderPipeline, ResourceLocation, int, int, float, float, int, int, int, int)}
+ * However, in 1.21.2, the shader system was tweaked, and we moved to the color parameter in {@link net.minecraft.client.gui.GuiGraphics#blit(RenderPipeline, Identifier, int, int, float, float, int, int, int, int)}
  * This method interprets ints as ARGB, not RGB, which resulted in the bars not rendering with default settings due to the alpha value being 0.
  * YACL always treated the color as ARGB, so this issue only affects users who never modified the settings.
  * This transformation checks for the old defaults and updates them to the new defaults.

src/main/java/wtf/cheeze/sbt/config/persistent/PersistentData.java

@@ -25,7 +25,7 @@
 import net.fabricmc.fabric.api.client.event.lifecycle.v1.ClientTickEvents;
 import net.fabricmc.loader.api.FabricLoader;
 import net.minecraft.client.gui.screens.ChatScreen;
-import net.minecraft.resources.ResourceLocation;
+import net.minecraft.resources.Identifier;
 import wtf.cheeze.sbt.utils.skyblock.SkyblockData;
 
 import java.nio.file.Path;
@@ -45,7 +45,7 @@ public ProfileData currentProfile() {
 
     private static final Path pdPath = FabricLoader.getInstance().getConfigDir().resolve("skyblocktweaks-persistent.json");
     private static final ConfigClassHandler<PersistentData> HANDLER = ConfigClassHandler.createBuilder(PersistentData.class)
-            .id(ResourceLocation.fromNamespaceAndPath("skyblocktweaks", "persistent"))
+            .id(Identifier.fromNamespaceAndPath("skyblocktweaks", "persistent"))
             .serializer(config -> GsonConfigSerializerBuilder.create(config).appendGsonBuilder(builder -> builder.setFieldNamingPolicy(FieldNamingPolicy.IDENTITY))
                     .setPath(pdPath)
                     .build())

src/main/java/wtf/cheeze/sbt/events/HudRenderEvents.java

@@ -24,7 +24,7 @@
 import net.fabricmc.fabric.api.event.EventFactory;
 import net.minecraft.client.gui.GuiGraphics;
 import net.minecraft.client.DeltaTracker;
-import net.minecraft.resources.ResourceLocation;
+import net.minecraft.resources.Identifier;
 
 
 /**
@@ -59,9 +59,9 @@ private static Event<HudRenderStage> createEventForStage() {
 
     public static void registerEvents() {
         // TODO: skyblocker doesnt have this issue of rendering breaking if the vanilla hud element is missing
-        HudElementRegistry.attachElementBefore(VanillaHudElements.HOTBAR, ResourceLocation.fromNamespaceAndPath("skyblocktweaks", "after_main_hud"), AFTER_MAIN_HUD.invoker()::onRender);
-        HudElementRegistry.attachElementBefore(VanillaHudElements.CHAT, ResourceLocation.fromNamespaceAndPath("skyblocktweaks", "before_chat"), BEFORE_CHAT.invoker()::onRender);
-        HudElementRegistry.addLast(ResourceLocation.fromNamespaceAndPath("skyblocktweaks", "last"), LAST.invoker()::onRender);
+        HudElementRegistry.attachElementBefore(VanillaHudElements.HOTBAR, Identifier.fromNamespaceAndPath("skyblocktweaks", "after_main_hud"), AFTER_MAIN_HUD.invoker()::onRender);
+        HudElementRegistry.attachElementBefore(VanillaHudElements.CHAT, Identifier.fromNamespaceAndPath("skyblocktweaks", "before_chat"), BEFORE_CHAT.invoker()::onRender);
+        HudElementRegistry.addLast(Identifier.fromNamespaceAndPath("skyblocktweaks", "last"), LAST.invoker()::onRender);
     }
 
     /**

src/main/java/wtf/cheeze/sbt/features/overlay/ReforgeOverlay.java

@@ -28,7 +28,6 @@
 import net.minecraft.client.gui.screens.inventory.AbstractContainerScreen;
 import net.minecraft.client.gui.components.AbstractWidget;
 import net.minecraft.client.gui.components.EditBox;
-import net.minecraft.client.input.KeyEvent;
 import net.minecraft.sounds.SoundEvents;
 import net.minecraft.network.chat.Component;
 import org.lwjgl.glfw.GLFW;
@@ -45,6 +44,8 @@
 import wtf.cheeze.sbt.utils.render.RenderUtils;
 import wtf.cheeze.sbt.utils.skyblock.ItemUtils;
 import wtf.cheeze.sbt.utils.text.TextUtils;
+//? if >1.21.8
+import net.minecraft.client.input.KeyEvent;
 
 import java.util.List;
 import java.util.stream.Stream;
@@ -199,9 +200,22 @@ public boolean keyPressed(int keyCode, int scanCode, int modifiers) {
                     matchWidget.setFocused(false);
                     return true;
                 }
-                if (!inv) return matchWidget.keyPressed(new KeyEvent(keyCode, scanCode, modifiers));
+                if (!inv) return matchWidget.keyPressed(
+                        //?if >1.21.8
+                        new KeyEvent(
+                        keyCode, scanCode, modifiers
+
+                                //?if >1.21.8
+                )
+                );
                 else {
-                    matchWidget.keyPressed(new KeyEvent(keyCode, scanCode, modifiers));
+                    matchWidget.keyPressed(
+                            //?if >1.21.8
+                            new KeyEvent(
+                                    keyCode, scanCode, modifiers
+                                    //?if >1.21.8
+                            )
+                    );
                     return true;
                 }
             }
@@ -210,9 +224,21 @@ public boolean keyPressed(int keyCode, int scanCode, int modifiers) {
                     exclusionWidget.setFocused(false);
                     return true;
                 }
-                if (!inv) return exclusionWidget.keyPressed(new KeyEvent(keyCode, scanCode, modifiers));
+                if (!inv) return exclusionWidget.keyPressed(
+                        //?if >1.21.8
+                        new KeyEvent(
+                                keyCode, scanCode, modifiers
+                                //?if >1.21.8
+                        )
+                );
                 else {
-                    exclusionWidget.keyPressed(new KeyEvent(keyCode, scanCode, modifiers));
+                    exclusionWidget.keyPressed(
+                            //?if >1.21.8
+                            new KeyEvent(
+                                    keyCode, scanCode, modifiers
+                                    //?if >1.21.8
+                            )
+                    );
                     return true;
                 }
             }

src/main/java/wtf/cheeze/sbt/hud/bases/AbstractTickerHud.java

@@ -19,7 +19,7 @@
 package wtf.cheeze.sbt.hud.bases;
 
 import net.minecraft.client.gui.GuiGraphics;
-import net.minecraft.resources.ResourceLocation;
+import net.minecraft.resources.Identifier;
 import org.jetbrains.annotations.NotNull;
 import wtf.cheeze.sbt.features.huds.TickerHud;
 import wtf.cheeze.sbt.hud.bounds.Bounds;
@@ -31,8 +31,8 @@
  * The abstract representation of the ticker HUD, for the implementation, see {@link TickerHud}
  */
 public abstract class AbstractTickerHud extends HUD {
-    private static final ResourceLocation FULL = ResourceLocation.fromNamespaceAndPath("skyblocktweaks", "tickers/full.png");
-    private static final ResourceLocation BLANK = ResourceLocation.fromNamespaceAndPath("skyblocktweaks", "tickers/blank.png");
+    private static final Identifier FULL = Identifier.fromNamespaceAndPath("skyblocktweaks", "tickers/full.png");
+    private static final Identifier BLANK = Identifier.fromNamespaceAndPath("skyblocktweaks", "tickers/blank.png");
     private static final int DIMENSION = 9;
 
     /**