26.1-rc2 port

DeDiamondPro · DeDiamondPro · commit d3089adea01d · 2026-03-20T22:19:17.000+01:00
diff --git a/build.gradle.kts b/build.gradle.kts
@@ -1,6 +1,6 @@
 /*
  * This file is part of Resourcify
- * Copyright (C) 2023-2025 DeDiamondPro
+ * Copyright (C) 2023-2026 DeDiamondPro
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
@@ -20,6 +20,9 @@ import dev.dediamondpro.buildsource.Platform
 import dev.dediamondpro.buildsource.VersionDefinition
 import dev.dediamondpro.buildsource.VersionRange
 import net.fabricmc.loom.task.RemapJarTask
+import org.jetbrains.kotlin.gradle.dsl.JvmTarget
+import org.jetbrains.kotlin.gradle.dsl.KotlinVersion
+import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
 
 plugins {
     alias(libs.plugins.kotlin)
@@ -76,7 +79,7 @@ val shadeModImplementation: Configuration by configurations.creating {
 
 // Version definitions
 val mcVersion = VersionDefinition( // Used for pre releases and release candidates
-    "26.1" to "26.1-pre-2",
+    "26.1" to "26.1-rc-2",
     default = mcPlatform.versionString
 )
 val compatibleMcVersion = VersionDefinition(
@@ -89,7 +92,7 @@ val compatibleMcVersion = VersionDefinition(
     "1.21.8" to VersionRange("1.21.6", "1.21.8", name = "1.21.8"),
     "1.21.10" to VersionRange("1.21.9", "1.21.10", name = "1.21.10"),
     "1.21.11" to VersionRange("1.21.11", "1.21.11", name = "1.21.11"),
-    "26.1" to VersionRange("26.1", "26.2", inclusive = false, name = "26.1")
+    "26.1" to VersionRange("26.1", "26.2", inclusive = false, name = "26.1", allowAll = true) // TODO: remove allow all for final release
 )
 val javaVersion = VersionDefinition(
     "1.20.1" to "17",
@@ -169,7 +172,7 @@ dependencies {
 
     if (mcPlatform.isFabric) {
         val modImpl = if (mcPlatform.isObfuscated) "modImplementation" else "implementation"
-        add(modImpl, "net.fabricmc:fabric-loader:0.17.3")
+        add(modImpl, "net.fabricmc:fabric-loader:0.18.4")
         add(modImpl, "net.fabricmc:fabric-language-kotlin:${libs.versions.fabric.language.kotlin.get()}")
         add(modImpl, "net.fabricmc.fabric-api:fabric-api:${fabricApiVersion.get(mcPlatform)}")
         add(modImpl, "com.terraformersmc:modmenu:${modMenuVersion.get(mcPlatform)}")
@@ -303,6 +306,7 @@ tasks {
         }
     } else {
         named("shadowJar") { finalizedBy("copyJar") }
+        named<Jar>("jar") { enabled = false }
     }
     register<Copy>("copyJar") {
         File("${project.rootDir}/jars").mkdir()
@@ -330,7 +334,13 @@ tasks {
         if (!mcPlatform.isForgeLike) exclude("pack.mcmeta")
         if (!mcPlatform.isForge && (!mcPlatform.isNeoForge || mcPlatform.version >= 12005)) exclude("META-INF/mods.toml")
         if (!mcPlatform.isNeoForge || mcPlatform.version < 12005) exclude("META-INF/neoforge.mods.toml")
-        if (mcPlatform.minor == 20) exclude("1.21.resourcify.accesswidener") else exclude("1.20.resourcify.accesswidener")
+        // Exclude all access wideners and mixin configs except the active ones
+        listOf("1.20.resourcify", "1.21.resourcify", "1.21.9.resourcify", "26.1.resourcify")
+            .filter { it != accessWidener }
+            .forEach { exclude("$it.accesswidener") }
+        listOf("mixins.resourcify.json", "mixins.resourcify-1.21.11.json")
+            .filter { it != mixinPath }
+            .forEach { exclude(it) }
     }
     withType<Jar> {
         from(rootProject.file("LICENSE"))
@@ -341,3 +351,10 @@ tasks {
 configure<JavaPluginExtension> {
     toolchain.languageVersion.set(JavaLanguageVersion.of(javaVersion.get(mcPlatform)))
 }
+
+tasks.withType<KotlinCompile>().configureEach {
+    compilerOptions {
+        jvmTarget.set(JvmTarget.fromTarget(javaVersion.get(mcPlatform)))
+        apiVersion.set(KotlinVersion.KOTLIN_2_0)
+    }
+}
diff --git a/buildSrc/build.gradle.kts b/buildSrc/build.gradle.kts
@@ -1,6 +1,6 @@
 /*
  * This file is part of Resourcify
- * Copyright (C) 2025 DeDiamondPro
+ * Copyright (C) 2025-2026 DeDiamondPro
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
@@ -21,4 +21,8 @@ plugins {
 
 repositories {
     mavenCentral()
+}
+
+kotlin {
+    jvmToolchain(21)
 }
diff --git a/buildSrc/src/main/java/dev/dediamondpro/buildsource/VersionRange.kt b/buildSrc/src/main/java/dev/dediamondpro/buildsource/VersionRange.kt
@@ -1,6 +1,6 @@
 /*
  * This file is part of Resourcify
- * Copyright (C) 2025 DeDiamondPro
+ * Copyright (C) 2025-2026 DeDiamondPro
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
@@ -36,7 +36,7 @@ class VersionRange(
     fun getFabricRange(): String {
         if (allowAll) return "*"
         return buildString {
-            append(">= $startVersion")
+            append(">=$startVersion")
             if (!openEnd && inclusive) append(" <=$endVersion")
             else if (!openEnd) append(" <$endVersion")
         }
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
@@ -5,7 +5,7 @@ fabric_language_kotlin = "1.11.0+kotlin.2.0.0" # Use 2.0.0 here since it is the
 
 # Build system
 arch_loom = "1.15.45"
-shadow = "8.1.1"
+shadow = "9.3.2"
 publishing = "0.8.3"
 
 # Markdown
@@ -32,7 +32,7 @@ kotlin = { id = "org.jetbrains.kotlin.jvm", version.ref = "kotlin" }
 
 # Build system
 arch_loom = { id = "gg.essential.loom", version.ref = "arch_loom" }
-shadow = { id = "com.github.johnrengelman.shadow", version.ref = "shadow" }
+shadow = { id = "com.gradleup.shadow", version.ref = "shadow" }
 publishing = { id = "me.modmuss50.mod-publish-plugin", version.ref = "publishing" }
 
 [bundles]
diff --git a/src/main/java/dev/dediamondpro/resourcify/mixins/MixinUIImage.java b/src/main/java/dev/dediamondpro/resourcify/mixins/MixinUIImage.java
@@ -17,7 +17,7 @@
 
 package dev.dediamondpro.resourcify.mixins;
 
-//?if >=1.21.11{
+//? if >=1.21.11 {
 
 import com.mojang.blaze3d.systems.RenderSystem;
 import com.mojang.blaze3d.textures.AddressMode;
diff --git a/src/main/java/dev/dediamondpro/resourcify/mixins/MixinURenderPass.java b/src/main/java/dev/dediamondpro/resourcify/mixins/MixinURenderPass.java
@@ -17,7 +17,7 @@
 
 package dev.dediamondpro.resourcify.mixins;
 
-//?if >=1.21.11{
+//? if >=1.21.11 {
 
 import com.mojang.blaze3d.textures.GpuSampler;
 import dev.dediamondpro.resourcify.util.UFilterHandler;
diff --git a/src/main/java/dev/dediamondpro/resourcify/util/UFilterHandler.java b/src/main/java/dev/dediamondpro/resourcify/util/UFilterHandler.java
@@ -17,7 +17,7 @@
 
 package dev.dediamondpro.resourcify.util;
 
-//?if >=1.21.11{
+//? if >=1.21.11 {
 
 import com.mojang.blaze3d.textures.GpuSampler;
 
diff --git a/src/main/kotlin/dev/dediamondpro/resourcify/Constants.kt b/src/main/kotlin/dev/dediamondpro/resourcify/Constants.kt
@@ -1,6 +1,6 @@
 /*
  * This file is part of Resourcify
- * Copyright (C) 2023-2025 DeDiamondPro
+ * Copyright (C) 2023-2026 DeDiamondPro
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
@@ -23,6 +23,6 @@ import org.slf4j.LoggerFactory
 object Constants {
     const val NAME = /*$ mod_name*/ "Resourcify"
     const val ID = /*$ mod_id*/ "resourcify"
-    const val VERSION = /*$ mod_version*/ "1.8.0"
+    const val VERSION = /*$ mod_version*/ "1.8.1"
     val LOGGER: Logger = LoggerFactory.getLogger(NAME)
 }
diff --git a/src/main/kotlin/dev/dediamondpro/resourcify/gui/injections/ImageButton.kt b/src/main/kotlin/dev/dediamondpro/resourcify/gui/injections/ImageButton.kt
@@ -1,6 +1,6 @@
 /*
  * This file is part of Resourcify
- * Copyright (C) 2024-2025 DeDiamondPro
+ * Copyright (C) 2024-2026 DeDiamondPro
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
@@ -18,11 +18,16 @@
 package dev.dediamondpro.resourcify.gui.injections
 
 import com.mojang.blaze3d.systems.RenderSystem
-import net.minecraft.client.gui.GuiGraphics
 import net.minecraft.client.gui.components.Button
 import net.minecraft.client.gui.screens.Screen
 import net.minecraft.network.chat.Component
 
+//? if >= 26.1 {
+import net.minecraft.client.gui.GuiGraphicsExtractor
+//?} else {
+/*import net.minecraft.client.gui.GuiGraphics
+*///?}
+
 //? if >= 1.21.6
 import net.minecraft.client.renderer.RenderPipelines
 
@@ -47,24 +52,38 @@ class ImageButton(
         this.y = yFunc.invoke(screen.height)
     }
 
-    override fun /*? if <1.21.11 {*/ /*renderWidget *//*?} else {*/ renderContents /*?}*/ (
+    //? if <26.1 {
+    /*override fun /^? if <1.21.11 {^/ /^renderWidget ^//^?} else {^/ renderContents /^?}^/ (
         context: GuiGraphics,
         mouseX: Int,
         mouseY: Int,
         delta: Float
     ) {
         //? if <1.21.11
-        /*super.renderWidget(context, mouseX, mouseY, delta)*/
+        /^super.renderWidget(context, mouseX, mouseY, delta)^/
 
         //? if <= 1.21.5
-        /*RenderSystem.setShaderColor(1f, 1f, 1f, 1f)*/
+        /^RenderSystem.setShaderColor(1f, 1f, 1f, 1f)^/
         //? if >= 1.21.6 {
         //? if >=1.21.11
         renderDefaultSprite(context)
         context.blit(RenderPipelines.GUI_TEXTURED, image, x + 2, y + 2, 0f, 0f, width - 4, height - 4, 16, 16)
         //?} else if >= 1.21.2 {
-        /*context.blit(RenderType::guiTextured, image, x + 2, y + 2, 0f, 0f, width - 4, height - 4, 16, 16)
-        *///?} else
-        /*context.blit(image, x + 2, y + 2, 0f, 0f, width - 4, height - 4, 16, 16)*/
+        /^context.blit(RenderType::guiTextured, image, x + 2, y + 2, 0f, 0f, width - 4, height - 4, 16, 16)
+        ^///?} else
+        /^context.blit(image, x + 2, y + 2, 0f, 0f, width - 4, height - 4, 16, 16)^/
+    }
+    *///?}
+
+    //? if >=26.1 {
+    override fun extractContents(
+        graphics: GuiGraphicsExtractor,
+        mouseX: Int,
+        mouseY: Int,
+        a: Float
+    ) {
+        this.extractDefaultSprite(graphics)
+        graphics.blit(RenderPipelines.GUI_TEXTURED, image, x + 2, y + 2, 0f, 0f, width - 4, height - 4, 16, 16)
     }
+    //?}
 }
diff --git a/src/main/kotlin/dev/dediamondpro/resourcify/gui/update/components/UpdateCard.kt b/src/main/kotlin/dev/dediamondpro/resourcify/gui/update/components/UpdateCard.kt
@@ -1,6 +1,6 @@
 /*
  * This file is part of Resourcify
- * Copyright (C) 2023-2025 DeDiamondPro
+ * Copyright (C) 2023-2026 DeDiamondPro
  *
  * This program is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
@@ -49,6 +49,7 @@ import net.minecraft.client.gui.screens.packs.PackSelectionScreen
 import java.awt.Color
 import java.io.File
 import java.util.concurrent.locks.ReentrantLock
+import java.util.function.Consumer
 
 
 class UpdateCard(
@@ -288,8 +289,10 @@ class UpdateCard(
                                         // Call the list change method
                                         //? if <1.21.9 {
                                         /*model.onListChanged.run()
-                                        *///?} else
-                                        model.onListChanged.accept(null)
+                                        *///?} else {
+                                        @Suppress("UNCHECKED_CAST")
+                                        (model.onListChanged as Consumer<PackSelectionModel.EntryBase?>).accept(null)
+                                        //?}
                                         break
                                     }
                                 }
diff --git a/src/main/kotlin/dev/dediamondpro/resourcify/gui/world/WorldDownloadingScreen.kt b/src/main/kotlin/dev/dediamondpro/resourcify/gui/world/WorldDownloadingScreen.kt
@@ -1,3 +1,20 @@
+/*
+ * This file is part of Resourcify
+ * Copyright (C) 2026 DeDiamondPro
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License Version 3 as published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program. If not, see <https://www.gnu.org/licenses/>.
+ */
+
 package dev.dediamondpro.resourcify.gui.world
 
 import dev.dediamondpro.resourcify.Constants
@@ -6,7 +23,6 @@ import dev.dediamondpro.resourcify.util.DownloadManager
 import dev.dediamondpro.resourcify.util.runAsync
 import gg.essential.universal.UScreen
 import net.minecraft.client.Minecraft
-import net.minecraft.client.gui.GuiGraphics
 import net.minecraft.client.gui.components.Button
 import net.minecraft.client.gui.screens.DisconnectedScreen
 import net.minecraft.client.gui.screens.Screen
@@ -20,8 +36,10 @@ import kotlin.math.round
 
 //? if >=1.20.5 {
 import net.minecraft.client.gui.screens.GenericMessageScreen
-//?} else
-/*import net.minecraft.client.gui.screens.GenericDirtMessageScreen*/
+//?} else {
+/*import net.minecraft.client.gui.screens.GenericDirtMessageScreen
+import net.minecraft.client.gui.GuiGraphics
+*///?}
 
 class WorldDownloadingScreen(val parent: PaginatedScreen, val world: File, val uri: URI) :
 /*? if >=1.20.5 {*/ GenericMessageScreen /*?} else {*/ /*Screen *//*?}*/
@@ -79,15 +97,13 @@ class WorldDownloadingScreen(val parent: PaginatedScreen, val world: File, val u
         /*this.textWidget = newText*/
     }
 
-    override fun render(guiGraphics: GuiGraphics, mouseX: Int, mouseY: Int, partialTick: Float) {
-        //? if >=1.20.5 {
-        super.render(guiGraphics, mouseX, mouseY, partialTick)
-        //?} else {
-        /*this.renderDirtBackground(guiGraphics)
+    //? if <1.20.5 {
+    /*override fun render(guiGraphics: GuiGraphics, mouseX: Int, mouseY: Int, partialTick: Float) {
+        this.renderDirtBackground(guiGraphics)
         guiGraphics.drawCenteredString(this.font, this.textWidget, this.width / 2, this.height / 2, 16777215)
         super.render(guiGraphics, mouseX, mouseY, partialTick)
-        *///?}
     }
+    *///?}
 
     private fun getTextWidth(): Int {
         //? if >=1.20.5 {
diff --git a/stonecutter.gradle.kts b/stonecutter.gradle.kts
@@ -19,7 +19,7 @@ plugins {
     id("dev.kikugie.stonecutter")
     alias(libs.plugins.arch.loom) apply false
 }
-stonecutter active "1.21.11-fabric" /* [SC] DO NOT EDIT */
+stonecutter active "26.1-fabric" /* [SC] DO NOT EDIT */
 
 stonecutter tasks {
     val ordering = versionComparator.thenComparingInt {
