stonecutter: cleanup

build.gradle.kts

@@ -83,9 +83,6 @@ dependencies {
         modCompileOnly ("dev.lambdaurora.lambdynamiclights:lambdynamiclights-api:${mod.jigsaw("ldl_version")}")
         modCompileOnly ("dev.lambdaurora.lambdynamiclights:lambdynamiclights-runtime:${mod.jigsaw("ldl_version")}")
     }
-    if (loader == "forge") {
-        "forge"("net.minecraftforge:forge:${minecraft}-${mod.dep("forge_loader")}")
-    }
     if (loader == "neoforge") {
         "neoForge"("net.neoforged:neoforge:${mod.dep("neoforge_loader")}")
 
@@ -243,7 +240,7 @@ tasks.build {
 
 stonecutter {
     constants {
-        arrayOf("fabric", "neoforge", "forge").forEach { it -> put(it, loader == it) }
+        arrayOf("fabric", "neoforge").forEach { it -> put(it, loader == it) }
     }
 
     replacements.string {

settings.gradle.kts

@@ -23,7 +23,6 @@ stonecutter {
         }
         //i would recommend to use neoforge for mc > 1.20.1, i haven't tested template for forge on versions higher than that
         mc("fabric","1.20.1", "1.21.1", "1.21.5", "1.21.8", "1.21.10")
-        mc("forge","1.20.1")
         //WARNING: neoforge uses mods.toml instead of neoforge.mods.toml for versions 1.20.4 (?) and earlier
         mc("neoforge", "1.21.1", "1.21.5", "1.21.8", "1.21.10")
     }

src/main/java/net/puzzlemc/gui/screen/widget/PuzzleOptionListWidget.java

@@ -63,8 +63,8 @@ public class PuzzleOptionListWidget extends MidnightConfigListWidget {
         var entry = new ButtonEntry(buttons, text, info);
         this.addEntry(entry);
     }
-    public void /*? if >= 1.21 {*/ renderWidget /*?} else {*/ /*renderList*/ /*?}*/(GuiGraphics context, int mouseX, int mouseY, float delta) {
-        super./*? if >= 1.21 {*/ renderWidget /*?} else {*/ /*renderList*/ /*?}*/(context, mouseX, mouseY, delta);
+    public void /*? if >= 1.21 {*/ renderWidget /*?} else {*/ /*renderList *//*?}*/(GuiGraphics context, int mouseX, int mouseY, float delta) {
+        super./*? if >= 1.21 {*/ renderWidget /*?} else {*/ /*renderList *//*?}*/(context, mouseX, mouseY, delta);
         ButtonEntry e = this.getHovered();
         if (minecraft.screen instanceof PuzzleOptionsScreen page && e != null && !e.buttons.isEmpty() &&
                 e.text.getContents() instanceof TranslatableContents content) {

src/main/java/net/puzzlemc/splashscreen/mixin/MixinNeoForgeLoadingOverlay.java

@@ -1,6 +1,6 @@
 package net.puzzlemc.splashscreen.mixin;
 
-//? neoforge || forge {
+//? neoforge {
 /*import net.minecraft.client.Minecraft;
 import net.minecraft.client.gui.GuiGraphics;
 import net.minecraft.client.gui.screens.LoadingOverlay;

versions/1.20.1-forge/gradle.properties

@@ -1,13 +0,0 @@
-mod.mc_dep_fabric==1.20.1
-mod.mc_dep_forgelike=[1.20, 1.20.1]
-mod.mc_title=1.20.1
-mod.mc_targets=1.20.1
-
-deps.forge_loader=47.3.0
-deps.neoforge_loader=[UNSUPPORTED]
-
-deps.fabric_version=0.92.3+1.20.1
-
-deps.modmenu_version=[UNSUPPORTED]
-
-loom.platform=forge