updated to 1.21

build.gradle

@@ -1,10 +1,10 @@
 plugins {
-	id 'fabric-loom' version '0.12-SNAPSHOT'
+	id 'fabric-loom' version '1.6-SNAPSHOT'
 	id 'maven-publish'
 }
 
-sourceCompatibility = JavaVersion.VERSION_17
-targetCompatibility = JavaVersion.VERSION_17
+sourceCompatibility = JavaVersion.VERSION_21
+targetCompatibility = JavaVersion.VERSION_21
 
 archivesBaseName = project.archives_base_name
 version = project.mod_version

gradle.properties

@@ -3,14 +3,14 @@ org.gradle.jvmargs=-Xmx1G
 
 # Fabric Properties
 	# check these on https://fabricmc.net/develop
-	minecraft_version=1.19
-	yarn_mappings=1.19+build.1
-	loader_version=0.14.6
+	minecraft_version=1.21
+	yarn_mappings=1.21+build.1
+	loader_version=0.15.11
 
 # Mod Properties
-	mod_version = 2.0.0
+	mod_version = 2.0.1
 	maven_group = net.web.fabric
 	archives_base_name = website-mod
 
 # Dependencies
-	fabric_version=0.55.3+1.19
+	fabric_version=0.100.1+1.21

gradle/wrapper/gradle-wrapper.properties

@@ -1,5 +1,7 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.4-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.6-bin.zip
+networkTimeout=10000
+validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

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:
 #
@@ -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,13 +80,11 @@ 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##*/}
-
-# 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"'
+# 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
 
 # Use the maximum available, or set MAX_FD != -1 to use that value.
 MAX_FD=maximum
@@ -133,22 +131,29 @@ location of your Java installation."
     fi
 else
     JAVACMD=java
-    which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
+    if ! command -v java >/dev/null 2>&1
+    then
+        die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
 
 Please set the JAVA_HOME variable in your environment to match the
 location of your Java installation."
+    fi
 fi
 
 # Increase the maximum file descriptors if we can.
 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=SC2039,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=SC2039,SC3045
         ulimit -n "$MAX_FD" ||
             warn "Could not set maximum file descriptor limit to $MAX_FD"
     esac
@@ -193,18 +198,28 @@ if "$cygwin" || "$msys" ; then
     done
 fi
 
-# Collect all arguments for the java command;
-#   * $DEFAULT_JVM_OPTS, $JAVA_OPTS, and $GRADLE_OPTS can contain fragments of
-#     shell script including quotes and variable substitutions, so put them in
-#     double quotes to make sure that they get re-expanded; and
-#   * put everything else in single quotes, so that it's not re-expanded.
+
+# 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"'
+
+# Collect all arguments for the java command:
+#   * DEFAULT_JVM_OPTS, JAVA_OPTS, JAVA_OPTS, and optsEnvironmentVar are not allowed to contain shell fragments,
+#     and any embedded shellness will be escaped.
+#   * For example: A user cannot expect ${Hostname} to be expanded, as it is an environment variable and will be
+#     treated as '${Hostname}' itself on the command line.
 
 set -- \
         "-Dorg.gradle.appname=$APP_BASE_NAME" \
         -classpath "$CLASSPATH" \
         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,13 +41,13 @@ 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.
-echo.
-echo Please set the JAVA_HOME variable in your environment to match the
-echo location of your Java installation.
+echo. 1>&2
+echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. 1>&2
+echo. 1>&2
+echo Please set the JAVA_HOME variable in your environment to match the 1>&2
+echo location of your Java installation. 1>&2
 
 goto fail
 
@@ -56,11 +57,11 @@ set JAVA_EXE=%JAVA_HOME%/bin/java.exe
 
 if exist "%JAVA_EXE%" goto execute
 
-echo.
-echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME%
-echo.
-echo Please set the JAVA_HOME variable in your environment to match the
-echo location of your Java installation.
+echo. 1>&2
+echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% 1>&2
+echo. 1>&2
+echo Please set the JAVA_HOME variable in your environment to match the 1>&2
+echo location of your Java installation. 1>&2
 
 goto fail
 
@@ -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/net/web/fabric/WebMain.java

@@ -40,9 +40,9 @@ public void onInitialize() {
         });
         ServerLifecycleEvents.SERVER_STARTING.register(this::onLogicalServerStarting);
 
-        ServerMessageEvents.CHAT_MESSAGE.register((message, sender, typeKey) -> {
+        /*ServerMessageEvents.CHAT_MESSAGE.register((message, sender, typeKey) -> {
             new ChatLog(message, sender, typeKey, null, null);
-        });
+        });*/
     }
 
     private String strArrayToStr(String[] array) {

src/main/java/net/web/fabric/achievements/AchData.java

@@ -12,10 +12,10 @@ public class AchData {
     public boolean done;
 
     public AchData(Advancement advancement, boolean done){
-        this.title = advancement.getDisplay().getTitle().getString();
-        this.des = advancement.getDisplay().getDescription().getString();
-        this.icon = advancement.getDisplay().getIcon();
-        this.id = advancement.getId().toString();
+        this.title = advancement.display().get().getTitle().getString();
+        this.des = advancement.display().get().getDescription().getString();
+        this.icon = advancement.display().get().getIcon();
+        this.id = advancement.display().toString();
         this.done = done;
     }
 }

src/main/java/net/web/fabric/achievements/Achievement.java

@@ -1,6 +1,7 @@
 package net.web.fabric.achievements;
 
 import net.minecraft.advancement.Advancement;
+import net.minecraft.advancement.AdvancementEntry;
 import net.minecraft.server.network.ServerPlayerEntity;
 import net.web.fabric.WebMain;
 
@@ -22,10 +23,10 @@ public static void getAchievement(String player, String uuid) {
                 return;
             } else {
                 Ach ach = new Ach(player);
-                Collection<Advancement> advancements = WebMain.getMinecraftServer().getAdvancementLoader().getAdvancements();
-                for (Advancement a : advancements) {
-                    if (a.getDisplay() != null) {
-                        ach.addAch( new AchData(a, requestedPlayer.getAdvancementTracker().getProgress(a).isDone()));
+                Collection<AdvancementEntry> advancements = WebMain.getMinecraftServer().getAdvancementLoader().getAdvancements();
+                for (AdvancementEntry a : advancements) {
+                    if (a.value().display() != null) {
+                        ach.addAch( new AchData(a.value(), requestedPlayer.getAdvancementTracker().getProgress(a).isDone()));
                     }
                 }
                /* for (Advancement a : advancements) {

src/main/java/net/web/fabric/chat/Chat.java

@@ -25,7 +25,7 @@ public static void chat(String player, String uuid, String msg) {
         if (isDisabled(requestedPlayer)) {
             return;
         } else {
-            WebMain.getMinecraftServer().getPlayerManager().broadcast(Text.literal("Web-").append(requestedPlayer.getDisplayName()).append(": ").append(msg), MessageType.SYSTEM);
+            WebMain.getMinecraftServer().getPlayerManager().broadcast(Text.literal("Web-").append(requestedPlayer.getDisplayName()).append(": ").append(msg), true);
             return;
         }
     }

src/main/java/net/web/fabric/chat/ChatLog.java

@@ -2,9 +2,9 @@
 
 import net.minecraft.network.message.MessageType;
 import net.minecraft.network.message.SignedMessage;
+import net.minecraft.registry.RegistryKey;
 import net.minecraft.server.filter.FilteredMessage;
 import net.minecraft.server.network.ServerPlayerEntity;
-import net.minecraft.util.registry.RegistryKey;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -17,7 +17,7 @@ public class ChatLog {
     public String sender;
     public RegistryKey<MessageType> mt;
 
-    public ChatLog(FilteredMessage<SignedMessage> message, ServerPlayerEntity sender, RegistryKey<MessageType> typeKey, String web, String webMsg) {
+    /*public ChatLog(FilteredMessage<SignedMessage> message, ServerPlayerEntity sender, RegistryKey<MessageType> typeKey, String web, String webMsg) {
         if(web == null || webMsg == null) {
             this.msg = message.filtered().getContent().getString();
             this.sender = sender.getDisplayName().getString();
@@ -30,7 +30,7 @@ public ChatLog(FilteredMessage<SignedMessage> message, ServerPlayerEntity sender
             chatLog.remove(0);
         }
         chatLog.add(this);
-    }
+    }*/
 
     public static List<ChatLog> getChatLogs(){
         return chatLog;

src/main/java/net/web/fabric/commands/CreateAccount.java

@@ -7,6 +7,8 @@
 import net.minecraft.text.Text;
 import net.web.fabric.http.website.login.cred.Encryption;
 
+import java.util.function.Supplier;
+
 import static net.minecraft.server.command.CommandManager.*;
 
 public class CreateAccount {
@@ -25,8 +27,8 @@ public static void register(CommandDispatcher<ServerCommandSource> dispatcher) {
 
     public static int onCreateAccount(CommandContext<ServerCommandSource> context) {
         System.out.println("Player: " + context.getSource().getName());
-        Encryption.write(context.getArgument("username", String.class), context.getArgument("password", String.class), false, context.getSource().getPlayer().getUuidAsString(), context.getSource().getPlayer().getEntityName());
-        context.getSource().sendFeedback(Text.of("created account for " + context.getArgument("username", String.class)), true);
+        Encryption.write(context.getArgument("username", String.class), context.getArgument("password", String.class), false, context.getSource().getPlayer().getUuidAsString(), context.getSource().getPlayer().getName().getString());
+        context.getSource().sendFeedback((Supplier<Text>) Text.of("created account for " + context.getArgument("username", String.class)), true);
         return 1;
     }
 }

src/main/java/net/web/fabric/commands/CreateAccountAdmin.java

@@ -7,6 +7,8 @@
 import net.minecraft.text.Text;
 import net.web.fabric.http.website.login.cred.Encryption;
 
+import java.util.function.Supplier;
+
 import static net.minecraft.server.command.CommandManager.argument;
 import static net.minecraft.server.command.CommandManager.literal;
 
@@ -27,8 +29,8 @@ public static void register(CommandDispatcher<ServerCommandSource> dispatcher) {
 
     public static int onCreateAccount(CommandContext<ServerCommandSource> context) {
         System.out.println("Player: " + context.getSource().getName());
-        Encryption.write(context.getArgument("username", String.class), context.getArgument("password", String.class), true, context.getSource().getPlayer().getUuidAsString(), context.getSource().getPlayer().getEntityName());
-        context.getSource().sendFeedback(Text.of("created account for " + context.getArgument("username", String.class)), true);
+        Encryption.write(context.getArgument("username", String.class), context.getArgument("password", String.class), true, context.getSource().getPlayer().getUuidAsString(), context.getSource().getPlayer().getName().getString());
+        context.getSource().sendFeedback((Supplier<Text>) Text.of("created account for " + context.getArgument("username", String.class)), true);
         return 1;
     }
 }

src/main/java/net/web/fabric/commands/WebsitePort.java

@@ -6,6 +6,8 @@
 import net.minecraft.text.Text;
 import net.web.fabric.http.website.Website;
 
+import java.util.function.Supplier;
+
 import static net.minecraft.server.command.CommandManager.literal;
 
 public class WebsitePort {
@@ -15,7 +17,7 @@ public static void register(CommandDispatcher<ServerCommandSource> dispatcher) {
 
     private static int onGetPort(CommandContext<ServerCommandSource> serverCommandSourceCommandContext) {
         Website.getServerPort();
-        serverCommandSourceCommandContext.getSource().sendFeedback(Text.of(String.valueOf(Website.getServerPort())),true);
+        serverCommandSourceCommandContext.getSource().sendFeedback((Supplier<Text>) Text.of(String.valueOf(Website.getServerPort())),true);
         return 1;
     }
 }