Merge pull request #89 from LostLuma/1.20.0-upgrade

Upgrade to 1.20.0

build.gradle

@@ -1,7 +1,7 @@
 plugins {
-	id 'fabric-loom' version '0.12-SNAPSHOT'
+	id 'fabric-loom' version '1.2.+'
 	id 'maven-publish'
-	id 'org.quiltmc.quilt-mappings-on-loom' version '4.2.0'
+	id 'io.github.p03w.machete' version '2.0.0'
 }
 
 sourceCompatibility = JavaVersion.VERSION_17
@@ -16,12 +16,13 @@ repositories {
 	maven { url = "https://jitpack.io" }
 	maven { url = "https://maven.shedaniel.me/" }
 	maven { url = "https://maven.terraformersmc.com/releases/" }
+	maven { url = "https://maven.quiltmc.org/repository/release" }
 }
 
 dependencies {
 	minecraft "com.mojang:minecraft:${project.minecraft_version}"
 	mappings(loom.layered {
-		addLayer(quiltMappings.mappings("org.quiltmc:quilt-mappings:${minecraft_version}+build.${project.quilt_mappings}:v2"))
+		mappings "org.quiltmc:quilt-mappings:${minecraft_version}+build.${project.quilt_mappings}:intermediary-v2"
 	})
 	modImplementation "net.fabricmc:fabric-loader:${project.loader_version}"
 
@@ -43,11 +44,6 @@ dependencies {
 	modImplementation("com.moandjiezana.toml:toml4j:${project.toml4j_version}")
 	include "com.moandjiezana.toml:toml4j:${project.toml4j_version}"
 
-	// Lazy DFU makes the dev env start up much faster by loading DataFixerUpper lazily, which would otherwise take a long time. We rarely need it anyway.
-	modRuntimeOnly("com.github.astei:lazydfu:${lazydfu_version}") {
-		exclude(module: "fabric-loader")
-	}
-
 	// Nullability Annotations
 	implementation "com.google.code.findbugs:jsr305:${project.findbugs_version}"
 }

gradle.properties

@@ -3,19 +3,18 @@ org.gradle.jvmargs = -Xmx1G
 
 # Fabric Properties
 # check these on https://fabricmc.net/develop/
-minecraft_version = 1.19
+minecraft_version = 1.20
 quilt_mappings = 1
 loader_version = 0.14.7
-fabric_version = 0.55.3+1.19
+fabric_version = 0.83.0+1.20
 
 # Mod Properties
-mod_version = 2.2.0
+mod_version = 2.3.0
 maven_group = juliand665
 archives_base_name = dynamic-fps
 
 # Dependencies
 findbugs_version = 3.0.2
-lazydfu_version = 0.1.2
-modmenu_version = 4.0.0
-cloth_version = 7.0.72
+modmenu_version = 7.0.0
+cloth_version = 11.0.99
 toml4j_version = 0.7.2

gradle/wrapper/gradle-wrapper.properties

@@ -1,5 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.3.3-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.1.1-bin.zip
+networkTimeout=10000
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

gradlew

@@ -55,7 +55,7 @@
 #       Darwin, MinGW, and NonStop.
 #
 #   (3) This script is generated from the Groovy template
-#       https://github.com/gradle/gradle/blob/master/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
+#       https://github.com/gradle/gradle/blob/HEAD/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
 #       within the Gradle project.
 #
 #       You can find Gradle at https://github.com/gradle/gradle/.
@@ -80,10 +80,10 @@ do
     esac
 done
 
-APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit
-
-APP_NAME="Gradle"
+# This is normally unused
+# shellcheck disable=SC2034
 APP_BASE_NAME=${0##*/}
+APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit
 
 # Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
 DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
@@ -143,12 +143,16 @@ fi
 if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then
     case $MAX_FD in #(
       max*)
+        # In POSIX sh, ulimit -H is undefined. That's why the result is checked to see if it worked.
+        # shellcheck disable=SC3045
         MAX_FD=$( ulimit -H -n ) ||
             warn "Could not query maximum file descriptor limit"
     esac
     case $MAX_FD in  #(
       '' | soft) :;; #(
       *)
+        # In POSIX sh, ulimit -n is undefined. That's why the result is checked to see if it worked.
+        # shellcheck disable=SC3045
         ulimit -n "$MAX_FD" ||
             warn "Could not set maximum file descriptor limit to $MAX_FD"
     esac
@@ -205,6 +209,12 @@ set -- \
         org.gradle.wrapper.GradleWrapperMain \
         "$@"
 
+# Stop when "xargs" is not available.
+if ! command -v xargs >/dev/null 2>&1
+then
+    die "xargs is not available"
+fi
+
 # Use "xargs" to parse quoted args.
 #
 # With -n1 it outputs one arg per line, with the quotes and backslashes removed.

gradlew.bat

@@ -14,7 +14,7 @@
 @rem limitations under the License.
 @rem
 
-@if "%DEBUG%" == "" @echo off
+@if "%DEBUG%"=="" @echo off
 @rem ##########################################################################
 @rem
 @rem  Gradle startup script for Windows
@@ -25,7 +25,8 @@
 if "%OS%"=="Windows_NT" setlocal
 
 set DIRNAME=%~dp0
-if "%DIRNAME%" == "" set DIRNAME=.
+if "%DIRNAME%"=="" set DIRNAME=.
+@rem This is normally unused
 set APP_BASE_NAME=%~n0
 set APP_HOME=%DIRNAME%
 
@@ -40,7 +41,7 @@ if defined JAVA_HOME goto findJavaFromJavaHome
 
 set JAVA_EXE=java.exe
 %JAVA_EXE% -version >NUL 2>&1
-if "%ERRORLEVEL%" == "0" goto execute
+if %ERRORLEVEL% equ 0 goto execute
 
 echo.
 echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
@@ -75,13 +76,15 @@ set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
 
 :end
 @rem End local scope for the variables with windows NT shell
-if "%ERRORLEVEL%"=="0" goto mainEnd
+if %ERRORLEVEL% equ 0 goto mainEnd
 
 :fail
 rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of
 rem the _cmd.exe /c_ return code!
-if  not "" == "%GRADLE_EXIT_CONSOLE%" exit 1
-exit /b 1
+set EXIT_CODE=%ERRORLEVEL%
+if %EXIT_CODE% equ 0 set EXIT_CODE=1
+if not ""=="%GRADLE_EXIT_CONSOLE%" exit %EXIT_CODE%
+exit /b %EXIT_CODE%
 
 :mainEnd
 if "%OS%"=="Windows_NT" endlocal

src/main/java/dynamicfps/HudInfoRenderer.java

@@ -3,32 +3,42 @@
 import net.fabricmc.fabric.api.client.rendering.v1.HudRenderCallback;
 import net.minecraft.client.MinecraftClient;
 import net.minecraft.client.font.TextRenderer;
-import net.minecraft.client.util.math.MatrixStack;
+import net.minecraft.client.font.TextRenderer.TextLayerType;
+import net.minecraft.client.gui.GuiGraphics;
 import net.minecraft.text.Text;
 
 import static dynamicfps.util.Localization.localized;
 
+import org.joml.Matrix4f;
+
 public final class HudInfoRenderer implements HudRenderCallback {
 	@Override
-	public void onHudRender(MatrixStack matrices, float delta) {
+	public void onHudRender(GuiGraphics drawContext, float tickDelta) {
 		if (DynamicFPSMod.isDisabled()) {
-			drawCenteredText(matrices, localized("gui", "hud.disabled"), 32);
+			drawCenteredText(drawContext, localized("gui", "hud.disabled"), 32);
 		} else if (DynamicFPSMod.isForcingLowFPS()) {
-			drawCenteredText(matrices, localized("gui", "hud.reducing"), 32);
+			drawCenteredText(drawContext, localized("gui", "hud.reducing"), 32);
 		}
 	}
-	
-	private void drawCenteredText(MatrixStack matrices, Text text, float y) {
+
+	private void drawCenteredText(GuiGraphics drawContext, Text text, float y) {
 		MinecraftClient client = MinecraftClient.getInstance();
 		TextRenderer textRenderer = client.inGameHud.getTextRenderer();
-		
+
 		int windowWidth = client.getWindow().getScaledWidth();
 		int stringWidth = textRenderer.getWidth(text);
-		textRenderer.drawWithShadow(
-			matrices,
+
+		textRenderer.draw(
 			text,
-			(windowWidth - stringWidth) / 2f, y,
-			0xffffff
+			(windowWidth - stringWidth) / 2f,
+			y,
+			0xFFFFFFFF,
+			true,
+			new Matrix4f(),
+			drawContext.getVertexConsumers(),
+			TextLayerType.NORMAL,
+			0,
+			0xFFFFFF
 		);
 	}
 }

src/main/resources/fabric.mod.json

@@ -31,7 +31,8 @@
 	],
 
 	"depends": {
-		"fabricloader": ">=0.4.0",
+		"minecraft": ">=1.20.0",
+		"fabricloader": ">=0.14.7",
 		"fabric-resource-loader-v0": "*",
 		"fabric-rendering-v1": "*",
 		"fabric-lifecycle-events-v1": "*",