port to 1.21.11-pre2

DeDiamondPro · DeDiamondPro · commit c1b0c7411ee1 · 2025-11-23T14:59:39.000+01:00
diff --git a/build.gradle.kts b/build.gradle.kts
@@ -70,6 +70,7 @@ val shadeModImplementation: Configuration by configurations.creating {
 
 // Version definitions
 val mcVersion = VersionDefinition( // Used for pre releases and release candidates
+    "1.21.11" to "1.21.11-pre2",
     default = mcPlatform.versionString
 )
 val compatibleMcVersion = VersionDefinition(
@@ -81,6 +82,7 @@ val compatibleMcVersion = VersionDefinition(
     "1.21.5" to VersionRange("1.21.5", "1.21.5", name = "1.21.5"),
     "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", allowAll = true), // TODO: make strict once final build
 )
 val javaVersion = VersionDefinition(
     "1.20.1" to "17",
@@ -100,14 +102,16 @@ val fabricApiVersion = VersionDefinition(
     "1.21.5" to "0.119.4+1.21.5",
     "1.21.8" to "0.129.0+1.21.8",
     "1.21.10" to "0.136.0+1.21.10",
+    "1.21.11" to "0.139.1+1.21.11",
 )
 val modMenuVersion = VersionDefinition(
     "1.20.1" to "7.2.2",
     "1.21.1" to "11.0.3",
     "1.21.4" to "13.0.2",
-    "1.21.5" to "14.0.0-rc.2",
+    "1.21.5" to "14.0.0",
     "1.21.8" to "15.0.0",
     "1.21.10" to "16.0.0-rc.1",
+    "1.21.11" to "17.0.0-alpha.1"
 )
 val neoForgeVersion = VersionDefinition(
     "1.21.1" to "21.1.95",
@@ -140,6 +144,7 @@ val universalMcVersion = VersionDefinition(
     default = mcPlatform.versionString
 )
 val universalVersion = VersionDefinition(
+    "1.21.11" to "${universalMcVersion.get(mcPlatform)}-${mcPlatform.loaderString}:438+feature-1.21.11-fabric",
     default = "${universalMcVersion.get(mcPlatform)}-${mcPlatform.loaderString}:436"
 )
 
@@ -155,7 +160,7 @@ dependencies {
     })
 
     if (mcPlatform.isFabric) {
-        modImplementation("net.fabricmc:fabric-loader:0.17.2")
+        modImplementation("net.fabricmc:fabric-loader:0.17.3")
 
         modImplementation("net.fabricmc:fabric-language-kotlin:${libs.versions.fabric.language.kotlin.get()}")
         modImplementation("net.fabricmc.fabric-api:fabric-api:${fabricApiVersion.get(mcPlatform)}")
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
@@ -4,7 +4,7 @@ kotlin = "2.0.20"
 fabric_language_kotlin = "1.11.0+kotlin.2.0.0" # Use 2.0.0 here since it is the minimum kotlin version we require
 
 # Build system
-arch_loom = "1.11-SNAPSHOT"
+arch_loom = "1.13-SNAPSHOT"
 shadow = "8.1.1"
 publishing = "0.8.3"
 
diff --git a/settings.gradle.kts b/settings.gradle.kts
@@ -45,6 +45,7 @@ val platforms = listOf(
     "1.21.8-neoforge",
     "1.21.8-fabric",
     "1.21.10-fabric",
+    "1.21.11-fabric",
 )
 
 stonecutter {
@@ -54,7 +55,7 @@ stonecutter {
         for (version in platforms) {
             vers(version, version.split('-')[0])
         }
-        vcsVersion = "1.21.10-fabric"
+        vcsVersion = "1.21.11-fabric"
     }
 }
 
diff --git a/src/main/kotlin/dev/dediamondpro/resourcify/Constants.kt b/src/main/kotlin/dev/dediamondpro/resourcify/Constants.kt
@@ -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.7.4"
+    const val VERSION = /*$ mod_version*/ "1.7.5"
     val LOGGER: Logger = LoggerFactory.getLogger(NAME)
 }
diff --git a/src/main/kotlin/dev/dediamondpro/resourcify/elements/Icon.kt b/src/main/kotlin/dev/dediamondpro/resourcify/elements/Icon.kt
@@ -20,11 +20,23 @@ package dev.dediamondpro.resourcify.elements
 import gg.essential.elementa.components.UIContainer
 import gg.essential.elementa.constraints.ColorConstraint
 import gg.essential.elementa.dsl.*
-import net.minecraft.resources.ResourceLocation
 import java.awt.Color
 
-class Icon(icon: ResourceLocation, shadow: Boolean, color: ColorConstraint) : UIContainer() {
-    constructor(icon: ResourceLocation, shadow: Boolean, color: Color = Color.WHITE) : this(
+//? if <1.21.11 {
+/*import net.minecraft.resources.ResourceLocation
+*///?} else
+import net.minecraft.resources.Identifier
+
+class Icon(
+    icon: /*? if <1.21.11 {*/ /*ResourceLocation *//*?} else {*/Identifier /*?}*/,
+    shadow: Boolean,
+    color: ColorConstraint
+) : UIContainer() {
+    constructor(
+        icon: /*? if <1.21.11 {*/ /*ResourceLocation *//*?} else {*/Identifier /*?}*/,
+        shadow: Boolean,
+        color: Color = Color.WHITE
+    ) : this(
         icon, shadow, color.toConstraint()
     )
 
diff --git a/src/main/kotlin/dev/dediamondpro/resourcify/elements/McImage.kt b/src/main/kotlin/dev/dediamondpro/resourcify/elements/McImage.kt
@@ -24,11 +24,17 @@ import gg.essential.elementa.components.UIImage
 import gg.essential.elementa.components.image.ImageProvider
 import gg.essential.universal.UMatrixStack
 import gg.essential.universal.UMinecraft
-import net.minecraft.resources.ResourceLocation
 import java.awt.Color
 import javax.imageio.ImageIO
 
-class McImage(texture: ResourceLocation) : UIComponent(), ImageProvider {
+//? if <1.21.11 {
+/*import net.minecraft.resources.ResourceLocation
+*///?} else
+import net.minecraft.resources.Identifier
+
+class McImage(
+    texture: /*? if <1.21.11 {*/ /*ResourceLocation *//*?} else {*/Identifier /*?}*/
+) : UIComponent(), ImageProvider {
     var backingImage: UIImage? = null
 
     init {
diff --git a/src/main/kotlin/dev/dediamondpro/resourcify/elements/ShadowImage.kt b/src/main/kotlin/dev/dediamondpro/resourcify/elements/ShadowImage.kt
@@ -24,11 +24,15 @@ import gg.essential.elementa.constraints.ColorConstraint
 import gg.essential.elementa.constraints.ConstraintType
 import gg.essential.elementa.constraints.resolution.ConstraintVisitor
 import gg.essential.elementa.dsl.*
-import net.minecraft.resources.ResourceLocation
 import java.awt.Color
 
+//? if <1.21.11 {
+/*import net.minecraft.resources.ResourceLocation
+*///?} else
+import net.minecraft.resources.Identifier
+
 class ShadowImage(
-    asset: ResourceLocation,
+    asset: /*? if <1.21.11 {*/ /*ResourceLocation *//*?} else {*/Identifier /*?}*/,
     imageColor: ColorConstraint = Color.WHITE.toConstraint(),
     shadowColor: ColorConstraint = ShadowColorConstraint(imageColor),
 ) : UIContainer() {
diff --git a/src/main/kotlin/dev/dediamondpro/resourcify/elements/TextIcon.kt b/src/main/kotlin/dev/dediamondpro/resourcify/elements/TextIcon.kt
@@ -26,12 +26,16 @@ import gg.essential.elementa.dsl.childOf
 import gg.essential.elementa.dsl.constrain
 import gg.essential.elementa.dsl.pixels
 import gg.essential.elementa.dsl.toConstraint
-import net.minecraft.resources.ResourceLocation
 import java.awt.Color
 
+//? if <1.21.11 {
+/*import net.minecraft.resources.ResourceLocation
+*///?} else
+import net.minecraft.resources.Identifier
+
 class TextIcon(
     text: String,
-    asset: ResourceLocation,
+    asset: /*? if <1.21.11 {*/ /*ResourceLocation *//*?} else {*/Identifier /*?}*/,
     shadow: Boolean = true,
     color: ColorConstraint = Color.WHITE.toConstraint()
 ) : UIContainer() {
diff --git a/src/main/kotlin/dev/dediamondpro/resourcify/gui/injections/ImageButton.kt b/src/main/kotlin/dev/dediamondpro/resourcify/gui/injections/ImageButton.kt
@@ -21,16 +21,20 @@ 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.client.renderer.RenderType
 import net.minecraft.network.chat.Component
-import net.minecraft.resources.ResourceLocation
 
 //? if >= 1.21.6
 import net.minecraft.client.renderer.RenderPipelines
 
+//? if <1.21.11 {
+/*import net.minecraft.resources.ResourceLocation
+import net.minecraft.client.renderer.RenderType
+*///?} else
+import net.minecraft.resources.Identifier
+
 class ImageButton(
     screen: Screen, private val xFunc: (Int) -> Int, private val yFunc: (Int) -> Int,
-    private val image: ResourceLocation,
+    private val image: /*? if <1.21.11 {*/ /*ResourceLocation *//*?} else {*/Identifier /*?}*/,
     onPress: OnPress,
 ) : Button(
     xFunc.invoke(screen.width), yFunc.invoke(screen.height),
@@ -43,11 +47,20 @@ class ImageButton(
         this.y = yFunc.invoke(screen.height)
     }
 
-    override fun renderWidget(context: GuiGraphics, mouseX: Int, mouseY: Int, delta: Float) {
-        super.renderWidget(context, mouseX, mouseY, delta)
+    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)*/
+
         //? if <= 1.21.5
         /*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)
diff --git a/src/main/kotlin/dev/dediamondpro/resourcify/platform/ThemeReloadListener.kt b/src/main/kotlin/dev/dediamondpro/resourcify/platform/ThemeReloadListener.kt
@@ -21,14 +21,18 @@ import dev.dediamondpro.resourcify.Constants
 import dev.dediamondpro.resourcify.gui.data.Colors
 import dev.dediamondpro.resourcify.util.Utils
 import dev.dediamondpro.resourcify.util.fromJson
-import net.minecraft.resources.ResourceLocation
 import net.minecraft.server.packs.resources.ResourceManager
 import net.minecraft.server.packs.resources.SimplePreparableReloadListener
 import net.minecraft.util.profiling.ProfilerFiller
 
 //? if fabric
 import net.fabricmc.fabric.api.resource.IdentifiableResourceReloadListener
 
+//? if <1.21.11 {
+/*import net.minecraft.resources.ResourceLocation
+*///?} else
+import net.minecraft.resources.Identifier
+
 object ThemeReloadListener : SimplePreparableReloadListener<Map<String, String>>()
     //? if fabric
     ,IdentifiableResourceReloadListener
@@ -49,7 +53,7 @@ object ThemeReloadListener : SimplePreparableReloadListener<Map<String, String>>
     }
 
     //? if fabric {
-    override fun getFabricId(): ResourceLocation {
+    override fun getFabricId(): /*? if <1.21.11 {*/ /*ResourceLocation *//*?} else {*/Identifier /*?}*/ {
         return Utils.createResourceLocation("color-reload-listener")
     }
     //?}
diff --git a/src/main/kotlin/dev/dediamondpro/resourcify/services/curseforge/CurseForgeService.kt b/src/main/kotlin/dev/dediamondpro/resourcify/services/curseforge/CurseForgeService.kt
@@ -28,7 +28,6 @@ import dev.dediamondpro.resourcify.platform.Platform
 import dev.dediamondpro.resourcify.services.*
 import dev.dediamondpro.resourcify.util.*
 import gg.essential.elementa.font.DefaultFonts
-import org.apache.http.client.utils.URIBuilder
 import java.io.File
 import java.net.URI
 import java.time.Instant
@@ -57,7 +56,7 @@ object CurseForgeService : IService {
         offset: Int,
         type: ProjectType
     ): ISearchData? {
-        return URIBuilder("$API/mods/search")
+        return UriBuilder("$API/mods/search")
             .apply {
                 addParameter("searchFilter", query)
                 addParameter("gameId", "432")
@@ -190,7 +189,7 @@ object CurseForgeService : IService {
                 }
                 if (fileCandidate == null && !match.latestFiles.any { it.fileFingerprint == match.file.fileFingerprint }) {
                     fileFutures[match] = supplyAsync {
-                        URIBuilder("$API/mods/${match.id}/files")
+                        UriBuilder("$API/mods/${match.id}/files")
                             .addParameter("gameVersion", mcVersion)
                             // We only care about the most recent match
                             .addParameter("pageSize", "1")
diff --git a/src/main/kotlin/dev/dediamondpro/resourcify/services/modrinth/ModrinthService.kt b/src/main/kotlin/dev/dediamondpro/resourcify/services/modrinth/ModrinthService.kt
@@ -19,7 +19,6 @@ package dev.dediamondpro.resourcify.services.modrinth
 
 import dev.dediamondpro.resourcify.services.*
 import dev.dediamondpro.resourcify.util.*
-import org.apache.http.client.utils.URIBuilder
 import java.io.File
 import java.net.URI
 import java.util.concurrent.CompletableFuture
@@ -40,12 +39,12 @@ object ModrinthService : IService {
         offset: Int,
         type: ProjectType
     ): ISearchData? {
-        return URIBuilder("${API}/search")
-            .setParameter("query", query)
-            .setParameter("facets", buildFacets(type, minecraftVersions, categories))
-            .setParameter("limit", "20")
-            .setParameter("offset", offset.toString())
-            .setParameter("index", sortBy)
+        return UriBuilder("${API}/search")
+            .addParameter("query", query)
+            .addParameter("facets", buildFacets(type, minecraftVersions, categories))
+            .addParameter("limit", "20")
+            .addParameter("offset", offset.toString())
+            .addParameter("index", sortBy)
             .build().getJson<ModrinthSearchData>()
     }
 
@@ -141,7 +140,7 @@ object ModrinthService : IService {
 
     override fun getProjectsFromIds(ids: List<String>): Map<String, IProject> {
         val idString = ids.joinToString(",", "[", "]") { "\"${it}\"" }
-        return URIBuilder("${API}/projects").setParameter("ids", idString)
+        return UriBuilder("${API}/projects").addParameter("ids", idString)
             .build().getJson<List<FullModrinthProject>>()!!
             .associateBy { project -> ids.first { project.getId() == it } }
     }
diff --git a/src/main/kotlin/dev/dediamondpro/resourcify/services/modrinth/ModrinthVersion.kt b/src/main/kotlin/dev/dediamondpro/resourcify/services/modrinth/ModrinthVersion.kt
@@ -20,7 +20,6 @@ package dev.dediamondpro.resourcify.services.modrinth
 import com.google.gson.annotations.SerializedName
 import dev.dediamondpro.resourcify.services.*
 import dev.dediamondpro.resourcify.util.*
-import org.apache.http.client.utils.URIBuilder
 import java.net.URI
 import java.util.concurrent.CompletableFuture
 
@@ -67,7 +66,7 @@ data class ModrinthVersion(
                 it.projectId != null && DependencyType.fromString(it.dependencyType) != null
             }
             val idString = requiredDependencies.joinToString(",", "[", "]") { "\"${it.projectId}\"" }
-            URIBuilder("${ModrinthService.API}/projects").setParameter("ids", idString)
+            UriBuilder("${ModrinthService.API}/projects").addParameter("ids", idString)
                 .build().getJson<List<FullModrinthProject>>()?.map {
                     ModrinthDependency(
                         it,
diff --git a/src/main/kotlin/dev/dediamondpro/resourcify/util/ImageURLUtils.kt b/src/main/kotlin/dev/dediamondpro/resourcify/util/ImageURLUtils.kt
@@ -17,7 +17,6 @@
 
 package dev.dediamondpro.resourcify.util
 
-import org.apache.http.client.utils.URIBuilder
 import java.net.URI
 import javax.imageio.ImageIO
 
@@ -57,12 +56,20 @@ object ImageURLUtils {
         val useProxy = !allowedHostNames.contains(url.host) || !canReadType || width != null || height != null
         return if (!useProxy) {
             if (url.host == "img.shields.io") {
-                URIBuilder(url).setHost("raster.shields.io").build()
+                URI(
+                    url.scheme,
+                    url.userInfo,
+                    "raster.shields.io",
+                    url.port,
+                    url.path,
+                    url.query,
+                    url.fragment
+                )
             } else {
                 url
             }
         } else {
-            URIBuilder("https://wsrv.nl/").apply {
+            UriBuilder("https://wsrv.nl/").apply {
                 addParameter("url", url.toString())
                 if (!canReadType) addParameter("output", "png")
                 if (width != null) addParameter("w", width.toString())
diff --git a/src/main/kotlin/dev/dediamondpro/resourcify/util/UriBuilder.kt b/src/main/kotlin/dev/dediamondpro/resourcify/util/UriBuilder.kt
diff --git a/src/main/kotlin/dev/dediamondpro/resourcify/util/Utils.kt b/src/main/kotlin/dev/dediamondpro/resourcify/util/Utils.kt
diff --git a/stonecutter.gradle.kts b/stonecutter.gradle.kts

Original file line number	Diff line number	Diff line change
`@@ -45,6 +45,7 @@ val platforms = listOf(`
`45`	`45`	`"1.21.8-neoforge",`
`46`	`46`	`"1.21.8-fabric",`
`47`	`47`	`"1.21.10-fabric",`
	`48`	`+ "1.21.11-fabric",`
`48`	`49`	`)`
`49`	`50`
`50`	`51`	`stonecutter {`
`@@ -54,7 +55,7 @@ stonecutter {`
`54`	`55`	`for (version in platforms) {`
`55`	`56`	`vers(version, version.split('-')[0])`
`56`	`57`	`}`
`57`		`- vcsVersion = "1.21.10-fabric"`
	`58`	`+ vcsVersion = "1.21.11-fabric"`
`58`	`59`	`}`
`59`	`60`	`}`
`60`	`61`
Original file line number	Diff line number	Diff line change
`@@ -23,6 +23,6 @@ import org.slf4j.LoggerFactory`
`23`	`23`	`object Constants {`
`24`	`24`	`const val NAME = /$ mod_name/ "Resourcify"`
`25`	`25`	`const val ID = /$ mod_id/ "resourcify"`
`26`		`- const val VERSION = /$ mod_version/ "1.7.4"`
	`26`	`+ const val VERSION = /$ mod_version/ "1.7.5"`
`27`	`27`	`val LOGGER: Logger = LoggerFactory.getLogger(NAME)`
`28`	`28`	`}`