Rework some code and bump dependencies

build.gradle

@@ -1,5 +1,5 @@
 plugins {
-    id 'fabric-loom' version '1.0.12'
+    id 'fabric-loom' version '1.4.+'
     id 'maven-publish'
 }
 
@@ -22,16 +22,7 @@ dependencies {
     // Fabric API. This is technically optional, but you probably want it anyway.
     modImplementation "net.fabricmc.fabric-api:fabric-api:${project.fabric_version}"
 
-    implementation "club.minnced:discord-webhooks:0.8.2"
-    include "club.minnced:discord-webhooks:0.8.2"
-    //noinspection GradlePackageUpdate
-    include "org.json:json:20210307"
-    //noinspection GradlePackageUpdate
-    include "com.squareup.okio:okio-jvm:3.0.0"
-    include "com.squareup.okhttp3:okhttp:4.10.0"
-
-    implementation "org.quiltmc:quilt-json5:1.0.2"
-    include "org.quiltmc:quilt-json5:1.0.2"
+    include(implementation("org.quiltmc.parsers:json:0.2.1"))
 }
 
 processResources {

gradle.properties

@@ -1,14 +1,14 @@
 # Done to increase the memory available to gradle.
-org.gradle.jvmargs=-Xmx1G
+org.gradle.jvmargs=-Xmx2G
 # Fabric Properties
 # check these on https://modmuss50.me/fabric.html
 minecraft_version=1.19.2
 yarn_mappings=1.19.2+build.28
-loader_version=0.14.10
+loader_version=0.15.0
 # Mod Properties
 mod_version=1.1.1
 maven_group=io.github.modrinthsmp
 archives_base_name=fabric-rep-system
 # Dependencies
 # check this on https://modmuss50.me/fabric.html
-fabric_version=0.66.0+1.19.2
+fabric_version=0.77.0+1.19.2

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.2-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.5-bin.zip
+networkTimeout=10000
+validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

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,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,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

src/main/java/io/github/modrinthsmp/fabricrepsystem/FabricRepSystem.java

@@ -5,14 +5,24 @@
 import net.fabricmc.fabric.api.command.v2.CommandRegistrationCallback;
 import net.fabricmc.fabric.api.event.lifecycle.v1.ServerLifecycleEvents;
 import net.fabricmc.fabric.api.networking.v1.ServerPlayConnectionEvents;
+import net.fabricmc.loader.api.FabricLoader;
 import org.slf4j.Logger;
 
+import java.net.http.HttpClient;
 import java.util.HashMap;
 import java.util.Map;
 import java.util.UUID;
 
 public class FabricRepSystem implements ModInitializer {
     public static final Logger LOGGER = LogUtils.getLogger();
+    public static final HttpClient HTTP = HttpClient.newHttpClient();
+    public static final String VERSION = FabricLoader.getInstance()
+        .getModContainer("fabric-rep-system")
+        .orElseThrow()
+        .getMetadata()
+        .getVersion()
+        .getFriendlyString();
+    public static final String USER_AGENT = "FabricRepSystem/" + VERSION;
     public static Map<UUID, ReputationData> reputation = new HashMap<>();
 
     @Override
@@ -22,10 +32,7 @@ public void onInitialize() {
             RepUtils.readConfig();
         });
 
-        ServerLifecycleEvents.SERVER_STOPPED.register(server -> {
-            RepUtils.closeWebhookClient();
-            RepUtils.writeConfig();
-        });
+        ServerLifecycleEvents.SERVER_STOPPED.register(server -> RepUtils.writeConfig());
 
         ServerPlayConnectionEvents.JOIN.register((handler, sender, server) -> {
             UUID uuid = handler.getPlayer().getUuid();

src/main/java/io/github/modrinthsmp/fabricrepsystem/RepCommand.java

@@ -1,7 +1,5 @@
 package io.github.modrinthsmp.fabricrepsystem;
 
-import club.minnced.discord.webhook.send.WebhookEmbed;
-import club.minnced.discord.webhook.send.WebhookEmbedBuilder;
 import com.mojang.authlib.GameProfile;
 import com.mojang.brigadier.CommandDispatcher;
 import com.mojang.brigadier.builder.LiteralArgumentBuilder;
@@ -21,7 +19,13 @@
 import net.minecraft.text.Text;
 import net.minecraft.util.Formatting;
 import net.minecraft.util.math.Vec3d;
+import org.quiltmc.parsers.json.JsonWriter;
 
+import java.io.IOException;
+import java.io.StringWriter;
+import java.io.UncheckedIOException;
+import java.net.http.HttpRequest;
+import java.net.http.HttpResponse;
 import java.text.DecimalFormat;
 import java.time.Instant;
 import java.util.Collection;
@@ -53,7 +57,7 @@ public final class RepCommand {
     private static final SimpleCommandExceptionType REASON_REQUIRED_EXCEPTION = new SimpleCommandExceptionType(
         Text.of("A reason is required, but you didn't specify one.")
     );
-    private static final DecimalFormat COORD_FORMAT = new DecimalFormat("#.#");
+    private static final DecimalFormat COORD_FORMAT = new DecimalFormat("0.0");
 
     private RepCommand() {
     }
@@ -186,22 +190,57 @@ private static int repAdd(CommandContext<ServerCommandSource> ctx, Collection<Ga
                 false
             );
             FabricRepSystem.LOGGER.info(ctx.getSource().getName() + (amount > 0 ? " upvoted " : " downvoted ") + profile.getName() + " with reason: " + (reason == null ? "None Provided" : reason));
-            if (RepUtils.getWebhookClient() != null) {
-                RepUtils.getWebhookClient().send(
-                    new WebhookEmbedBuilder()
-                        .setColor(amount > 0 ? Formatting.GREEN.getColorValue() : Formatting.RED.getColorValue())
-                        .setTitle(new WebhookEmbed.EmbedTitle(
-                            ctx.getSource().getName() + (amount > 0 ? " upvoted " : " downvoted ") + profile.getName(),
-                            null
-                        ))
-                        .setDescription(reason)
-                        .setFooter(new WebhookEmbed.EmbedFooter(
-                            profile.getName() + "'s reputation is now " + repData.getReputation(),
-                            "https://crafatar.com/renders/head/" + profile.getId() + "?overlay=true"
-                        ))
-                        .setTimestamp(Instant.now())
-                        .build()
-                );
+            if (RepUtils.getConfig().getDiscordWebhookUrl() != null) {
+                final StringWriter stringWriter = new StringWriter();
+                try (JsonWriter writer = JsonWriter.json(stringWriter)) {
+                    writer.beginObject();
+                    {
+                        writer.name("embeds").beginArray();
+                        {
+                            writer.beginObject();
+                            {
+                                writer.name("title").value(
+                                    ctx.getSource().getName() + (amount > 0 ? " upvoted " : " downvoted ") + profile.getName()
+                                );
+                                writer.name("description").value(reason);
+                                writer.name("timestamp").value(Instant.now().toString());
+                                writer.name("color").value(
+                                    amount > 0 ? Formatting.GREEN.getColorValue() : Formatting.RED.getColorValue()
+                                );
+                                writer.name("footer").beginObject();
+                                {
+                                    writer.name("text").value(
+                                        profile.getName() + "'s reputation is now " + repData.getReputation()
+                                    );
+                                    writer.name("icon_url").value(
+                                        "https://crafatar.com/renders/head/" + profile.getId() + "?overlay=true"
+                                    );
+                                }
+                                writer.endObject();
+                            }
+                            writer.endObject();
+                        }
+                        writer.endArray();
+                    }
+                    writer.endObject();
+                } catch (IOException e) {
+                    throw new UncheckedIOException(e);
+                }
+                FabricRepSystem.HTTP.sendAsync(
+                    HttpRequest.newBuilder(RepUtils.getConfig().getDiscordWebhookUrl())
+                        .header("User-Agent", FabricRepSystem.USER_AGENT)
+                        .header("Content-Type", "application/json")
+                        .POST(HttpRequest.BodyPublishers.ofString(stringWriter.toString()))
+                        .build(),
+                    HttpResponse.BodyHandlers.ofString()
+                ).thenAccept(response -> {
+                    if (response.statusCode() >= 400) {
+                        FabricRepSystem.LOGGER.error("Failed to send Discord webhook (HTTP {}): {}", response.statusCode(), response.body());
+                    }
+                }).exceptionally(t -> {
+                    FabricRepSystem.LOGGER.error("Failed to send Discord webhook", t);
+                    return null;
+                });
             }
             final ServerPlayerEntity other = ctx.getSource().getServer().getPlayerManager().getPlayer(profile.getId());
             if (other != null) {