feat(update): update to 1.21.3 and add feature request in #51

Author: HttpRafa

.devcontainer/Dockerfile

@@ -0,0 +1,8 @@
+# Use the official ArchLinux image with a AUR helper installed
+FROM ghcr.io/greyltc-org/archlinux-aur:paru
+
+RUN pacman-key --init
+RUN pacman -Syu --noconfirm
+
+# Install required packages
+RUN pacman -S base-devel git openssh nano jdk21-openjdk gradle --noconfirm

.devcontainer/devcontainer.json

@@ -0,0 +1,12 @@
+{
+    "name": "Development Container",
+    "dockerFile": "Dockerfile",
+    "customizations": {
+        "vscode": {
+            "settings": {
+                "terminal.integrated.shell.linux": "/bin/bash"
+            },
+            "extensions": []
+        }
+    }
+}

build.gradle

@@ -1,6 +1,6 @@
 plugins {
     id "architectury-plugin" version "3.4-SNAPSHOT"
-    id "dev.architectury.loom" version "1.6-SNAPSHOT" apply false
+    id "dev.architectury.loom" version "1.7-SNAPSHOT" apply false
 }
 
 architectury {

common/src/main/java/de/rafael/modflared/mixin/client/ServerEntryMixin.java

@@ -7,6 +7,7 @@
 import net.minecraft.client.gui.screen.multiplayer.MultiplayerScreen;
 import net.minecraft.client.gui.screen.multiplayer.MultiplayerServerListWidget;
 import net.minecraft.client.network.ServerInfo;
+import net.minecraft.client.render.RenderLayer;
 import net.minecraft.text.Text;
 import net.minecraft.util.Formatting;
 import net.minecraft.util.Identifier;
@@ -28,15 +29,15 @@ public abstract class ServerEntryMixin {
     @Shadow @Final private MultiplayerScreen screen;
 
     @Unique
-    private static final Identifier MODFLARED_INDICATOR_TEXTURE = Identifier.of(Modflared.MOD_ID, "textures/gui/indicator.png");
+    private static final Identifier MODFLARED_INDICATOR_TEXTURE = Identifier.of(Modflared.MOD_ID, "icon/indicator");
 
     @Inject(method = "render", at = @At("TAIL"))
     public void render(@NotNull DrawContext context, int index, int y, int x, int entryWidth, int entryHeight, int mouseX, int mouseY, boolean hovered, float tickDelta, CallbackInfo ci) {
         var tunnelStatus = ((IServerInfo) server).getTunnelStatus();
         if(tunnelStatus != null && tunnelStatus.state() == TunnelStatus.State.USE) {
             int xOffset = entryWidth - 15;
             int yOffset = 10 + 1;
-            context.drawTexture(MODFLARED_INDICATOR_TEXTURE, x + xOffset, y + yOffset, 0, 0, 10, 10, 10, 10);
+            context.drawGuiTexture(RenderLayer::getGuiTextured, MODFLARED_INDICATOR_TEXTURE, x + xOffset, y + yOffset, 10, 10);
 
             // Tooltip
             int l = mouseX - x;

common/src/main/java/de/rafael/modflared/tunnel/RunningTunnel.java

@@ -18,6 +18,7 @@
 import java.io.*;
 import java.net.InetSocketAddress;
 import java.util.concurrent.CompletableFuture;
+import java.util.zip.CRC32;
 
 public record RunningTunnel(Access access, Process process) {
 
@@ -59,12 +60,24 @@ public void closeTunnel() {
     public record Access(String protocol, String hostname, InetSocketAddress tunnelAddress) {
         @Contract("_ -> new")
         public static @NotNull Access localWithRandomPort(String host) {
-            return new Access("tcp", host, new InetSocketAddress("127.0.0.1", (int) (Math.random() * 10000 + 25565)));
+            return new Access("tcp", host, new InetSocketAddress("127.0.0.1", computePort(host)));
         }
 
         public String @NotNull [] command(@NotNull String fileName, boolean prefix) {
             return new String[] {(prefix && Platform.get() != Platform.WINDOWS ? "./" : "") + fileName, "access", protocol, "--hostname", hostname, "--url", tunnelAddress.getHostString() + ":" + tunnelAddress.getPort()};
         }
+
+        public static int computePort(@NotNull String host) {
+            final int MIN_PORT = 25565;
+            final int MAX_PORT = 65530;
+            final int RANGE = MAX_PORT - MIN_PORT + 1;
+
+            CRC32 crc32 = new CRC32();
+            crc32.update(host.getBytes());
+            long hash = crc32.getValue();
+
+            return (int) ((hash % RANGE) + MIN_PORT);
+        }
     }
 
 }

…ets/modflared/textures/gui/indicator.png …/textures/gui/sprites/icon/indicator.pngcommon/src/main/resources/assets/modflared/textures/gui/indicator.png renamed to common/src/main/resources/assets/modflared/textures/gui/sprites/icon/indicator.png common/src/main/resources/assets/modflared/textures/gui/indicator.png renamed to common/src/main/resources/assets/modflared/textures/gui/sprites/icon/indicator.png

@@ -3,21 +3,21 @@ org.gradle.jvmargs=-Xmx2G
 org.gradle.parallel=true
 
 # Game Properties
-minecraft_version=1.21
-yarn_version=1.21+build.7
+minecraft_version=1.21.3
+yarn_version=1.21.3+build.2
 yarn_mappings_patch=1.21+build.4
 enabled_platforms=fabric,neoforge
 
 # Mod Properties
 archives_base_name=modflared
 mod_version=1.2.2
 maven_group=de.rafael
-mod_minecraft_version=1.21
+mod_minecraft_version=1.21.3
 
 # Loader Properties
-fabric_loader_version=0.15.11
-fabric_api_version=0.100.4+1.21
-neoforge_version=21.0.42-beta
+fabric_loader_version=0.16.9
+fabric_api_version=0.108.0+1.21.3
+neoforge_version=21.3.31-beta
 
 # Modrinth Properties
 modrinth_project_id=modflared

gradle.properties

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

gradle/wrapper/gradle-wrapper.jar

@@ -15,6 +15,8 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 #
+# SPDX-License-Identifier: Apache-2.0
+#
 
 ##############################################################################
 #
@@ -55,7 +57,7 @@
 #       Darwin, MinGW, and NonStop.
 #
 #   (3) This script is generated from the Groovy template
-#       https://github.com/gradle/gradle/blob/HEAD/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
+#       https://github.com/gradle/gradle/blob/HEAD/platforms/jvm/plugins-application/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
 #       within the Gradle project.
 #
 #       You can find Gradle at https://github.com/gradle/gradle/.
@@ -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