From 3a7bbe8a56ac9e87fcea85b55b7a3ea4a80eae52 Mon Sep 17 00:00:00 2001 From: Quartz Date: Sat, 21 Sep 2024 21:49:47 +0300 Subject: [PATCH] Update 1.21.1 --- build.gradle | 8 ++++---- gradle.properties | 10 +++++----- gradle/wrapper/gradle-wrapper.properties | 2 +- .../everchanging/GistServerConnector.java | 17 ++++------------- .../everchanging/mixin/ConnectScreenMixin.java | 7 ++----- .../resources/assets/everchanging/icon.png | Bin 453 -> 8602 bytes src/main/resources/everchanging.mixins.json | 2 +- src/main/resources/fabric.mod.json | 6 +++--- 8 files changed, 20 insertions(+), 32 deletions(-) diff --git a/build.gradle b/build.gradle index 05d543b..2911003 100644 --- a/build.gradle +++ b/build.gradle @@ -1,5 +1,5 @@ plugins { - id 'fabric-loom' version '1.5-SNAPSHOT' + id 'fabric-loom' version '1.7-SNAPSHOT' id 'maven-publish' id 'com.github.johnrengelman.shadow' version '7.1.2' id 'java' @@ -40,7 +40,7 @@ processResources { } tasks.withType(JavaCompile).configureEach { - it.options.release = 17 + it.options.release = 21 } java { @@ -49,8 +49,8 @@ java { // If you remove this line, sources will not be generated. withSourcesJar() - sourceCompatibility = JavaVersion.VERSION_17 - targetCompatibility = JavaVersion.VERSION_17 + sourceCompatibility = JavaVersion.VERSION_21 + targetCompatibility = JavaVersion.VERSION_21 } jar { diff --git a/gradle.properties b/gradle.properties index 126d0fc..7f56e8c 100644 --- a/gradle.properties +++ b/gradle.properties @@ -4,14 +4,14 @@ org.gradle.parallel=true # Fabric Properties # check these on https://fabricmc.net/develop -minecraft_version=1.20.1 -yarn_mappings=1.20.1+build.10 -loader_version=0.15.6 +minecraft_version=1.21.1 +yarn_mappings=1.21.1+build.3 +loader_version=0.16.5 # Mod Properties -mod_version=1.0-1.20.1 +mod_version=1.0-1.21.1 maven_group=io.github.magicquartz.everchanging archives_base_name=everchanging # Dependencies -fabric_version=0.88.1+1.20.1 \ No newline at end of file +fabric_version=0.104.0+1.21.1 \ No newline at end of file diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 1af9e09..9355b41 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-8.5-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.10-bin.zip networkTimeout=10000 validateDistributionUrl=true zipStoreBase=GRADLE_USER_HOME diff --git a/src/main/java/io/github/magicquartz/everchanging/GistServerConnector.java b/src/main/java/io/github/magicquartz/everchanging/GistServerConnector.java index da82a96..2bedd3d 100644 --- a/src/main/java/io/github/magicquartz/everchanging/GistServerConnector.java +++ b/src/main/java/io/github/magicquartz/everchanging/GistServerConnector.java @@ -3,21 +3,12 @@ import com.google.gson.JsonObject; import com.google.gson.JsonParser; import net.fabricmc.api.ClientModInitializer; -import net.minecraft.client.MinecraftClient; -import net.minecraft.client.gui.screen.Screen; -import net.minecraft.client.gui.screen.multiplayer.MultiplayerScreen; -import net.minecraft.client.gui.widget.ButtonWidget; -import net.minecraft.client.network.MultiplayerServerListPinger; -import net.minecraft.client.option.ServerList; -import net.minecraft.text.Text; - -import javax.swing.text.StringContent; + import java.io.BufferedReader; import java.io.IOException; import java.io.InputStreamReader; import java.net.HttpURLConnection; import java.net.URI; -import java.net.URISyntaxException; import java.net.URL; import java.nio.charset.StandardCharsets; @@ -43,8 +34,7 @@ else if(gistStr.startsWith("raw:")) else gistContent = "Incorrect format!"; - String ipAddress = parseServerIpFromGistContent(gistContent); - return ipAddress; + return parseServerIpFromGistContent(gistContent); //return ipAddress } catch (IOException e) { e.printStackTrace(); return "Error fetching gist content!"; @@ -60,7 +50,8 @@ private static String fetchGistContentApi(String gistStr, boolean rawId) throws else apiUrl = gistStr; - URL url = new URL(apiUrl); + URI uri = URI.create(apiUrl); + URL url = uri.toURL(); HttpURLConnection connection = (HttpURLConnection) url.openConnection(); connection.setRequestMethod("GET"); //connection.setRequestProperty("Authorization", "token " + GITHUB_TOKEN); diff --git a/src/main/java/io/github/magicquartz/everchanging/mixin/ConnectScreenMixin.java b/src/main/java/io/github/magicquartz/everchanging/mixin/ConnectScreenMixin.java index 259abc9..af261f8 100644 --- a/src/main/java/io/github/magicquartz/everchanging/mixin/ConnectScreenMixin.java +++ b/src/main/java/io/github/magicquartz/everchanging/mixin/ConnectScreenMixin.java @@ -3,19 +3,16 @@ import io.github.magicquartz.everchanging.GistServerConnector; import net.fabricmc.api.EnvType; import net.fabricmc.api.Environment; -import net.minecraft.client.gui.screen.ConnectScreen; +import net.minecraft.client.gui.screen.multiplayer.ConnectScreen; import net.minecraft.client.network.ServerAddress; -import net.minecraft.client.network.ServerInfo; -import org.spongepowered.asm.mixin.Debug; import org.spongepowered.asm.mixin.Mixin; import org.spongepowered.asm.mixin.injection.At; -import org.spongepowered.asm.mixin.injection.ModifyArg; import org.spongepowered.asm.mixin.injection.ModifyVariable; @Environment(value = EnvType.CLIENT) @Mixin(ConnectScreen.class) public class ConnectScreenMixin { - @ModifyVariable(method = "connect", at = @At(value = "HEAD"), argsOnly = true) + @ModifyVariable(method = "connect*", at = @At(value = "HEAD"), argsOnly = true) private static ServerAddress modifyConnectVariable(ServerAddress originalAddress) { if(originalAddress.getAddress().startsWith("gist://")) { diff --git a/src/main/resources/assets/everchanging/icon.png b/src/main/resources/assets/everchanging/icon.png index 047b91f2347de5cf95f23284476fddbe21ba23fe..a5b5b31e89a6b43c55fac9ed2b10cce6e42e4c9b 100644 GIT binary patch literal 8602 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 diff --git a/src/main/resources/everchanging.mixins.json b/src/main/resources/everchanging.mixins.json index bb9e40c..ca940c8 100644 --- a/src/main/resources/everchanging.mixins.json +++ b/src/main/resources/everchanging.mixins.json @@ -1,7 +1,7 @@ { "required": true, "package": "io.github.magicquartz.everchanging.mixin", - "compatibilityLevel": "JAVA_17", + "compatibilityLevel": "JAVA_21", "mixins": [ "ConnectScreenMixin", "AddMixin" diff --git a/src/main/resources/fabric.mod.json b/src/main/resources/fabric.mod.json index 07644e6..8905b6a 100644 --- a/src/main/resources/fabric.mod.json +++ b/src/main/resources/fabric.mod.json @@ -23,9 +23,9 @@ "everchanging.mixins.json" ], "depends": { - "fabricloader": ">=0.15.6", - "minecraft": "~1.20.1", - "java": ">=17", + "fabricloader": ">=0.16.5", + "minecraft": "~1.21.1", + "java": ">=21", "fabric-api": "*" }, "suggests": {