Update to 1.21.3

CHANGELOG.md

@@ -1,3 +1,6 @@
+## Folders! 1.2.5 for 1.21.2 & 1.21.3
+Support for 1.21.2 and 1.21.3
+
 ## Folders! 1.2.4 for 1.21
 Fix crash when saving an edited world or deleting a world
 

build.gradle

@@ -1,7 +1,7 @@
 plugins {
-	id 'fabric-loom' version '1.7-SNAPSHOT'
+	id 'fabric-loom' version '1.8-SNAPSHOT'
 	id 'maven-publish'
-	id "me.modmuss50.mod-publish-plugin" version "0.5.1"
+	id "me.modmuss50.mod-publish-plugin" version "0.7.4"
 }
 
 version = project.mod_version + '+' + project.minecraft_version
@@ -93,13 +93,19 @@ publishMods {
 		projectId = "687113"
 		projectSlug = "organizable-play-screens" // Required for discord webhook
 		accessToken = providers.environmentVariable("CURSEFORGE_TOKEN")
-		minecraftVersions.add("1.21")
+		minecraftVersionRange {
+			start = "1.21.2"
+			end = "1.21.3"
+		}
 		requires("fabric-api")
 	}
 	modrinth {
 		projectId = "zKrZtg3n"
 		accessToken = providers.environmentVariable("MODRINTH_TOKEN")
-		minecraftVersions.add("1.21")
+		minecraftVersionRange {
+			start = "1.21.2"
+			end = "1.21.3"
+		}
 	}
 	github {
 		repository = "kevinthegreat1/OrganizablePlayScreens-Fabric"

gradle.properties

@@ -3,21 +3,21 @@ org.gradle.jvmargs=-Xmx1G
 
 # Fabric Properties
 	# check these on https://fabricmc.net/develop
-	minecraft_version = 1.21
-	yarn_mappings = 1.21+build.7
-	loader_version = 0.15.11
+	minecraft_version = 1.21.3
+	yarn_mappings = 1.21.3+build.2
+	loader_version = 0.16.7
 
 # Mod Properties
-	mod_version = 1.2.4
+	mod_version = 1.2.5
 	maven_group = com.kevinthegreat
 	archives_base_name = organizable-play-screens
 
 # Dependencies
-	fabric_version = 0.100.4+1.21
+	fabric_version = 0.107.0+1.21.3
 	# Mod Menu (https://modrinth.com/mod/modmenu/versions)
-	modmenu_version = 11.0.1
-	# Essential (https://repo.essential.gg/repository/maven-public/gg/essential/essential-1.20.4-fabric/maven-metadata.xml)
+	modmenu_version = 12.0.0-beta.1
+	# Essential (https://repo.essential.gg/repository/maven-public/gg/essential/essential-1.20.6-fabric/maven-metadata.xml)
 	essential_minecraft_version = 1.20.6
 	essential_version = 17141+gd6f4cfd3a8
 	# JUnit (https://mvnrepository.com/artifact/org.junit.jupiter/junit-jupiter-api)
-	junit_version = 5.10.3
+	junit_version = 5.11.3

gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.8-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.10.2-bin.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME

gradlew

@@ -15,6 +15,8 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 #
+# SPDX-License-Identifier: Apache-2.0
+#
 
 ##############################################################################
 #
@@ -84,7 +86,8 @@ done
 # shellcheck disable=SC2034
 APP_BASE_NAME=${0##*/}
 # Discard cd standard output in case $CDPATH is set (https://github.com/gradle/gradle/issues/25036)
-APP_HOME=$( cd "${APP_HOME:-./}" > /dev/null && pwd -P ) || exit
+APP_HOME=$( cd -P "${APP_HOME:-./}" > /dev/null && printf '%s
+' "$PWD" ) || exit
 
 # Use the maximum available, or set MAX_FD != -1 to use that value.
 MAX_FD=maximum

gradlew.bat

@@ -13,6 +13,8 @@
 @rem See the License for the specific language governing permissions and
 @rem limitations under the License.
 @rem
+@rem SPDX-License-Identifier: Apache-2.0
+@rem
 
 @if "%DEBUG%"=="" @echo off
 @rem ##########################################################################

src/main/java/com/kevinthegreat/organizableplayscreens/gui/AbstractEntry.java

@@ -7,6 +7,7 @@
 import net.minecraft.client.gui.DrawContext;
 import net.minecraft.client.gui.widget.AlwaysSelectedEntryListWidget;
 import net.minecraft.client.gui.widget.ButtonWidget;
+import net.minecraft.client.render.RenderLayer;
 import net.minecraft.client.sound.PositionedSoundInstance;
 import net.minecraft.sound.SoundEvents;
 import net.minecraft.util.Identifier;
@@ -125,23 +126,23 @@ static void renderEntry(DrawContext context, int index, int y, int x, int mouseX
             int p = mouseY - y;
             if (renderOpenButton) {
                 if (o < 32 && o > 16) {
-                    context.drawGuiTexture(JOIN_HIGHLIGHTED_TEXTURE, x, y, 32, 32);
+                    context.drawGuiTexture(RenderLayer::getGuiTextured, JOIN_HIGHLIGHTED_TEXTURE, x, y, 32, 32);
                 } else {
-                    context.drawGuiTexture(JOIN_TEXTURE, x, y, 32, 32);
+                    context.drawGuiTexture(RenderLayer::getGuiTextured, JOIN_TEXTURE, x, y, 32, 32);
                 }
             }
             if (index > 0) {
                 if (o < 16 && p < 16) {
-                    context.drawGuiTexture(MOVE_UP_HIGHLIGHTED_TEXTURE, x, y, 32, 32);
+                    context.drawGuiTexture(RenderLayer::getGuiTextured, MOVE_UP_HIGHLIGHTED_TEXTURE, x, y, 32, 32);
                 } else {
-                    context.drawGuiTexture(MOVE_UP_TEXTURE, x, y, 32, 32);
+                    context.drawGuiTexture(RenderLayer::getGuiTextured, MOVE_UP_TEXTURE, x, y, 32, 32);
                 }
             }
             if (index < listSize - 1) {
                 if (o < 16 && p > 16) {
-                    context.drawGuiTexture(MOVE_DOWN_HIGHLIGHTED_TEXTURE, x, y, 32, 32);
+                    context.drawGuiTexture(RenderLayer::getGuiTextured, MOVE_DOWN_HIGHLIGHTED_TEXTURE, x, y, 32, 32);
                 } else {
-                    context.drawGuiTexture(MOVE_DOWN_TEXTURE, x, y, 32, 32);
+                    context.drawGuiTexture(RenderLayer::getGuiTextured, MOVE_DOWN_TEXTURE, x, y, 32, 32);
                 }
             }
         }

src/main/resources/fabric.mod.json

@@ -38,8 +38,8 @@
   },
 
   "depends": {
-    "fabricloader": ">=0.15",
-    "minecraft": ">=1.20.3",
-    "java": ">=17"
+    "fabricloader": ">=0.16",
+    "minecraft": ">=1.21.2",
+    "java": ">=21"
   }
 }