diff --git a/build.gradle b/build.gradle index c654fb4..6610751 100644 --- a/build.gradle +++ b/build.gradle @@ -1,8 +1,8 @@ plugins { - id 'fabric-loom' version '0.11-SNAPSHOT' + id 'fabric-loom' version '0.12-SNAPSHOT' } -group = 'dev.lazurite' +group 'dev.lazurite' version spectater_version dependencies { @@ -11,7 +11,16 @@ dependencies { modImplementation "net.fabricmc:fabric-loader:$fabric_loader_version" } -processResources { +java { + toolchain.languageVersion = JavaLanguageVersion.of 17 + withSourcesJar() +} + +jar { + from 'LICENSE' +} + +tasks.withType(ProcessResources) { inputs.properties( 'version': project.version, 'min_minecraft_version': min_minecraft_version, @@ -26,12 +35,3 @@ processResources { ) } } - -java { - toolchain.languageVersion = JavaLanguageVersion.of 17 - withSourcesJar() -} - -jar { - from 'LICENSE' -} diff --git a/gradle.properties b/gradle.properties index 68c0b03..7cbe45e 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,9 +1,10 @@ org.gradle.jvmargs=-Xmx2G -min_minecraft_version=~1.18 -min_fabric_loader_version=>0.12.8 +min_minecraft_version=~1.19 +# 0.14.8 needed for 1.19.1 +min_fabric_loader_version=>=0.14.8 -minecraft_version=1.18.1 -fabric_loader_version=0.13.1 +minecraft_version=1.19.1 +fabric_loader_version=0.14.8 -spectater_version=2.0.1 +spectater_version=2.0.2 diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar index 7454180..249e583 100644 Binary files a/gradle/wrapper/gradle-wrapper.jar and b/gradle/wrapper/gradle-wrapper.jar differ diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 2e6e589..8049c68 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,5 +1,5 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-7.3.3-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-7.5-bin.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/gradlew b/gradlew index c53aefa..a69d9cb 100644 --- a/gradlew +++ b/gradlew @@ -1,7 +1,7 @@ #!/bin/sh # -# Copyright © 2015-2021 the original authors. +# Copyright © 2015-2021 the original authors. # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. @@ -32,10 +32,10 @@ # Busybox and similar reduced shells will NOT work, because this script # requires all of these POSIX shell features: # * functions; -# * expansions «$var», «${var}», «${var:-default}», «${var+SET}», -# «${var#prefix}», «${var%suffix}», and «$( cmd )»; -# * compound commands having a testable exit status, especially «case»; -# * various built-in commands including «command», «set», and «ulimit». +# * expansions «$var», «${var}», «${var:-default}», «${var+SET}», +# «${var#prefix}», «${var%suffix}», and «$( cmd )»; +# * compound commands having a testable exit status, especially «case»; +# * various built-in commands including «command», «set», and «ulimit». # # Important for patching: # @@ -205,6 +205,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. diff --git a/gradlew.bat b/gradlew.bat index 107acd3..f127cfd 100644 --- a/gradlew.bat +++ b/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,7 @@ if "%OS%"=="Windows_NT" setlocal set DIRNAME=%~dp0 -if "%DIRNAME%" == "" set DIRNAME=. +if "%DIRNAME%"=="" set DIRNAME=. set APP_BASE_NAME=%~n0 set APP_HOME=%DIRNAME% @@ -40,7 +40,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 +75,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 diff --git a/src/main/resources/spectater.mixins.json b/src/main/resources/spectater.mixins.json index a433e71..effa1b3 100644 --- a/src/main/resources/spectater.mixins.json +++ b/src/main/resources/spectater.mixins.json @@ -2,12 +2,10 @@ "required": true, "minVersion": "0.8", "package": "dev.lazurite.spectater.mixin", - "compatibilityLevel": "JAVA_16", - "mixins": [ - ], + "compatibilityLevel": "JAVA_17", "client": [ - "ClientPlayerEntityMixin", - "access.ILocalPlayerMixin" + "access.ILocalPlayerMixin", + "ClientPlayerEntityMixin" ], "injectors": { "defaultRequire": 1