diff --git a/gradle.properties b/gradle.properties index 77bc68f..f72c44b 100644 --- a/gradle.properties +++ b/gradle.properties @@ -3,8 +3,8 @@ org.gradle.jvmargs=-Xms32M -Xmx4G -XX:+UseG1GC -XX:+UseStringDeduplication loader_version=0.14.14 -viaver_version=4.6.2-SNAPSHOT -yaml_version=1.33 +viaver_version=4.6.3-SNAPSHOT +yaml_version=2.0 publish_mc_versions=1.19.4, 1.18.2, 1.17.1, 1.16.5, 1.15.2, 1.14.4, 1.8.9 # example: 1.19.1-rc2 diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar index 41d9927..ccebba7 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 ae04661..bdc9a83 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,5 +1,6 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-7.5.1-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.0.2-bin.zip +networkTimeout=10000 zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/gradlew b/gradlew index 1b6c787..79a61d4 100755 --- a/gradlew +++ b/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. diff --git a/gradlew.bat b/gradlew.bat index 107acd3..93e3f59 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,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 diff --git a/settings.gradle b/settings.gradle deleted file mode 100644 index 52606aa..0000000 --- a/settings.gradle +++ /dev/null @@ -1,16 +0,0 @@ -pluginManagement { - repositories { - gradlePluginPortal() - maven { url = 'https://maven.fabricmc.net/' } - } -} - -rootProject.name = "viafabric" - -include "viafabric-mc18" -include "viafabric-mc114" -include "viafabric-mc115" -include "viafabric-mc116" -include "viafabric-mc117" -include "viafabric-mc118" -include "viafabric-mc119" diff --git a/settings.gradle.kts b/settings.gradle.kts new file mode 100644 index 0000000..894a84e --- /dev/null +++ b/settings.gradle.kts @@ -0,0 +1,21 @@ +pluginManagement { + repositories { + gradlePluginPortal() + maven ("https://maven.fabricmc.net/") + } +} + +rootProject.name = "viafabric" + +include("viafabric-mc18") +include("viafabric-mc114") +include("viafabric-mc115") +include("viafabric-mc116") +include("viafabric-mc117") +include("viafabric-mc118") +include("viafabric-mc119") + + +plugins { + id("org.gradle.toolchains.foojay-resolver-convention") version "0.4.0" +} diff --git a/viafabric-mc18/build.gradle.kts b/viafabric-mc18/build.gradle.kts index 0300f42..849a461 100644 --- a/viafabric-mc18/build.gradle.kts +++ b/viafabric-mc18/build.gradle.kts @@ -1,8 +1,8 @@ dependencies { minecraft("com.mojang:minecraft:1.8.9") - mappings("net.legacyfabric:yarn:1.8.9+build.423:v2") + mappings("net.legacyfabric:yarn:1.8.9+build.458:v2") - modImplementation("net.legacyfabric.legacy-fabric-api:legacy-fabric-api:1.8.0+1.8.9") + modImplementation("net.legacyfabric.legacy-fabric-api:legacy-fabric-api:1.9.0+1.8.9") modImplementation("io.github.boogiemonster1o1:rewoven-modmenu:1.0.0+1.8.9") { isTransitive = false } diff --git a/viafabric-mc18/src/main/java/com/viaversion/fabric/mc18/gui/ViaButton.java b/viafabric-mc18/src/main/java/com/viaversion/fabric/mc18/gui/ViaButton.java index 93d6a08..d6b3c1a 100644 --- a/viafabric-mc18/src/main/java/com/viaversion/fabric/mc18/gui/ViaButton.java +++ b/viafabric-mc18/src/main/java/com/viaversion/fabric/mc18/gui/ViaButton.java @@ -32,7 +32,7 @@ public class ViaButton extends ButtonWidget { // Modified copy-paste from LockButtonWidget if (this.visible) { client.getTextureManager().bindTexture(texturePath); - GlStateManager.color4f(1.0F, 1.0F, 1.0F, 1.0F); + GlStateManager.color(1.0F, 1.0F, 1.0F, 1.0F); boolean hover = mouseX >= this.x && mouseY >= this.y && mouseX < this.x + this.width && mouseY < this.y + this.height; int v = startV; if (hover) { diff --git a/viafabric-mc18/src/main/java/com/viaversion/fabric/mc18/gui/ViaConfigScreen.java b/viafabric-mc18/src/main/java/com/viaversion/fabric/mc18/gui/ViaConfigScreen.java index c4f3bc6..5907bd9 100644 --- a/viafabric-mc18/src/main/java/com/viaversion/fabric/mc18/gui/ViaConfigScreen.java +++ b/viafabric-mc18/src/main/java/com/viaversion/fabric/mc18/gui/ViaConfigScreen.java @@ -61,7 +61,7 @@ public class ViaConfigScreen extends Screen implements AbstractViaConfigScreen { //this.children.add(protocolVersion); buttons.add(new ListeneableButton("done".hashCode(), this.width / 2 - 100, this.height - 40, 200, 20, new TranslatableText("gui.done").asUnformattedString(), - (buttonWidget) -> MinecraftClient.getInstance().openScreen(this.parent))); + (buttonWidget) -> MinecraftClient.getInstance().setScreen(this.parent))); } private void onChangeVersionField(String text) { @@ -88,7 +88,7 @@ public class ViaConfigScreen extends Screen implements AbstractViaConfigScreen { private void onClickClientSide(ButtonWidget widget) { if (!ViaFabric.config.isClientSideEnabled()) { - MinecraftClient.getInstance().openScreen(new ConfirmScreen( + MinecraftClient.getInstance().setScreen(new ConfirmScreen( (answer, id) -> { if (answer) { ViaFabric.config.setClientSideEnabled(true); @@ -96,7 +96,7 @@ public class ViaConfigScreen extends Screen implements AbstractViaConfigScreen { ViaFabric.config.saveConfig(); widget.message = getClientSideText().asUnformattedString(); } - MinecraftClient.getInstance().openScreen(this); + MinecraftClient.getInstance().setScreen(this); }, new TranslatableText("gui.enable_client_side.question").asUnformattedString(), new TranslatableText("gui.enable_client_side.warning").asUnformattedString(), diff --git a/viafabric-mc18/src/main/java/com/viaversion/fabric/mc18/mixin/debug/client/MixinDebugHud.java b/viafabric-mc18/src/main/java/com/viaversion/fabric/mc18/mixin/debug/client/MixinDebugHud.java index 209bbf2..697152b 100644 --- a/viafabric-mc18/src/main/java/com/viaversion/fabric/mc18/mixin/debug/client/MixinDebugHud.java +++ b/viafabric-mc18/src/main/java/com/viaversion/fabric/mc18/mixin/debug/client/MixinDebugHud.java @@ -3,6 +3,7 @@ package com.viaversion.fabric.mc18.mixin.debug.client; import com.viaversion.fabric.common.handler.CommonTransformer; import com.viaversion.fabric.common.handler.FabricDecodeHandler; import com.viaversion.viaversion.api.connection.ProtocolInfo; +import com.viaversion.viaversion.api.connection.UserConnection; import io.netty.channel.ChannelHandler; import net.minecraft.client.MinecraftClient; import net.minecraft.client.gui.hud.DebugHud; @@ -24,11 +25,12 @@ public class MixinDebugHud { ChannelHandler viaDecoder = ((MixinClientConnectionAccessor) MinecraftClient.getInstance().getNetworkHandler() .getClientConnection()).getChannel().pipeline().get(CommonTransformer.HANDLER_DECODER_NAME); if (viaDecoder instanceof FabricDecodeHandler) { - ProtocolInfo protocol = ((FabricDecodeHandler) viaDecoder).getInfo().getProtocolInfo(); + UserConnection user = ((FabricDecodeHandler) viaDecoder).getInfo(); + ProtocolInfo protocol = user.getProtocolInfo(); if (protocol != null) { ProtocolVersion serverVer = ProtocolVersion.getProtocol(protocol.getServerProtocolVersion()); ProtocolVersion clientVer = ProtocolVersion.getProtocol(protocol.getProtocolVersion()); - line += " / C: " + clientVer + " S: " + serverVer + " A: " + protocol.getUser().isActive(); + line += " / C: " + clientVer + " S: " + serverVer + " A: " + user.isActive(); } } diff --git a/viafabric-mc18/src/main/java/com/viaversion/fabric/mc18/mixin/gui/client/MixinMultiplayerScreen.java b/viafabric-mc18/src/main/java/com/viaversion/fabric/mc18/mixin/gui/client/MixinMultiplayerScreen.java index 2881313..1340fc3 100644 --- a/viafabric-mc18/src/main/java/com/viaversion/fabric/mc18/mixin/gui/client/MixinMultiplayerScreen.java +++ b/viafabric-mc18/src/main/java/com/viaversion/fabric/mc18/mixin/gui/client/MixinMultiplayerScreen.java @@ -29,7 +29,7 @@ public abstract class MixinMultiplayerScreen extends Screen { 20, // v Hover offset new Identifier("viafabric:textures/gui/widgets.png"), 256, 256, // Texture size - it -> MinecraftClient.getInstance().openScreen(new ViaConfigScreen(this)), + it -> MinecraftClient.getInstance().setScreen(new ViaConfigScreen(this)), new TranslatableText("gui.via_button").asUnformattedString()); if (ViaFabric.config.isHideButton()) enableClientSideViaVersion.visible = false; this.buttons.add(enableClientSideViaVersion);