Merge branch 'main' into main

build.gradle

@@ -1,5 +1,5 @@
 plugins {
-    id 'fabric-loom' version '1.7-SNAPSHOT'
+    id 'fabric-loom' version '1.8.10'
     id 'maven-publish'
 }
 
@@ -26,6 +26,7 @@ repositories {
     maven { url = "https://maven.isxander.dev/snapshots" }
     maven { url = "https://oss.sonatype.org/content/repositories/snapshots/" }
     maven { url = uri("https://maven.noxcrew.com/public") }
+    maven { url = uri("https://maven.enginehub.org/repo/") }
     exclusiveContent {
         forRepository {
             maven {
@@ -47,17 +48,15 @@ dependencies {
 
     // Fabric API. This is technically optional, but you probably want it anyway.
     modImplementation "net.fabricmc.fabric-api:fabric-api:${project.fabric_version}"
-    modApi("dev.isxander:yet-another-config-lib:3.5.0+1.21-fabric") {
+    modApi("dev.isxander:yet-another-config-lib:3.6.2+1.21.2-fabric") {
         exclude(group: "com.twelvemonkeys.common")
         exclude(group: "com.twelvemonkeys.imageio")
     }
 
-    modApi("com.terraformersmc:modmenu:11.0.2")
+    modApi("com.terraformersmc:modmenu:12.0.0")
 
     implementation include('com.github.JnCrMx:discord-game-sdk4j:v0.5.5')
-    modApi("com.noxcrew.noxesium:fabric:2.3.2") {
-        exclude(group: "org.khelekore")
-    }
+    modApi("com.noxcrew.noxesium:fabric:2.4.1")
 }
 
 processResources {

gradle.properties

@@ -2,13 +2,13 @@
 org.gradle.jvmargs=-Xmx1G
 # Fabric Properties
 # check these on https://modmuss50.me/fabric.html
-minecraft_version=1.21.1
-yarn_mappings=1.21.1+build.3
-loader_version=0.16.5
+minecraft_version=1.21.3
+yarn_mappings=1.21.3+build.2
+loader_version=0.16.9
 # Mod Properties
-mod_version=1.6.10
+mod_version=1.7.0
 maven_group=net.asodev
 archives_base_name=islandutils
 # Dependencies
 # check this on https://modmuss50.me/fabric.html
-fabric_version=0.105.0+1.21.1
+fabric_version=0.110.0+1.21.3

gradle/wrapper/gradle-wrapper.properties

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

gradlew

@@ -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/master/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/.
@@ -80,13 +82,12 @@ 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 -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
@@ -133,22 +134,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 +201,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

@@ -13,8 +13,10 @@
 @rem See the License for the specific language governing permissions and
 @rem limitations under the License.
 @rem
+@rem SPDX-License-Identifier: Apache-2.0
+@rem
 
-@if "%DEBUG%" == "" @echo off
+@if "%DEBUG%"=="" @echo off
 @rem ##########################################################################
 @rem
 @rem  Gradle startup script for Windows
@@ -25,7 +27,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 +43,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 +59,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 +78,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/asodev/islandutils/IslandUtilsClient.java

@@ -1,10 +1,10 @@
 package net.asodev.islandutils;
 
 import com.mojang.blaze3d.platform.InputConstants;
-import com.mojang.brigadier.builder.LiteralArgumentBuilder;
 import net.asodev.islandutils.discord.DiscordPresenceUpdator;
 import net.asodev.islandutils.modules.DisguiseKeybind;
 import net.asodev.islandutils.modules.NoxesiumIntegration;
+import net.asodev.islandutils.modules.music.MusicManager;
 import net.asodev.islandutils.modules.plobby.PlobbyFeatures;
 import net.asodev.islandutils.modules.plobby.PlobbyJoinCodeCopy;
 import net.asodev.islandutils.modules.splits.SplitManager;
@@ -13,7 +13,6 @@
 import net.asodev.islandutils.state.MccIslandState;
 import net.asodev.islandutils.util.ChatUtils;
 import net.asodev.islandutils.util.IslandUtilsCommand;
-import net.asodev.islandutils.util.MusicUtil;
 import net.asodev.islandutils.util.Utils;
 import net.fabricmc.api.ClientModInitializer;
 import net.fabricmc.api.EnvType;
@@ -55,6 +54,7 @@ public void onInitializeClient() {
             SplitUI.setupFallbackRenderer();
         }
         new NoxesiumIntegration().init();
+        MusicManager.init();
     }
 
     public static void onJoinMCCI(boolean isProduction) {
@@ -75,11 +75,4 @@ public static void onJoinMCCI(boolean isProduction) {
         MccIslandState.setGame(Game.HUB);
         IslandUtilsEvents.JOIN_MCCI.invoker().onEvent();
     }
-
-    public static class Commands {
-        public static LiteralArgumentBuilder<?> resetMusic = net.minecraft.commands.Commands.literal("resetmusic").executes(ctx -> {
-            MusicUtil.resetMusic(ctx);
-            return 1;
-        });
-    }
 }

src/main/java/net/asodev/islandutils/discord/DiscordPresenceUpdator.java

@@ -24,7 +24,7 @@ public class DiscordPresenceUpdator {
     // dear contributors:
     // i am sorry.
 
-    @Nullable static Activity activity;
+    @Nullable public static Activity activity;
     public static UUID timeLeftBossbar = null;
     public static Instant started;
     private static boolean bigRatMode = false;
@@ -84,8 +84,12 @@ public static void updatePlace(Game game) {
             activity.assets().setLargeImage(game.name().toLowerCase());
             activity.assets().setLargeText(game.getName());
             activity.assets().setSmallImage("mcci");
-
-            if (game != Game.HUB)
+
+            if (game == Game.FISHING) {
+                FishingPresenceUpdator.updateFishingPlace();
+                REMAIN_STATE = null;
+                ROUND_STATE = null;
+            } else if (game != Game.HUB)
                 activity.setDetails(I18n.get("islandutils.discordPresence.details.playing", game.getName()));
             else {
                 activity.setDetails(I18n.get("islandutils.discordPresence.details.inHub"));
@@ -184,6 +188,8 @@ public static void updateActivity() {
         Core core = DiscordPresence.core;
         if (core == null || !core.isOpen()) return;
 
+        activity.timestamps().setStart(started);
+
         if (bigRatMode) {
             overrideActivityWithBigRat();
         }

src/main/java/net/asodev/islandutils/discord/FishingPresenceUpdator.java

@@ -0,0 +1,54 @@
+package net.asodev.islandutils.discord;
+
+import net.asodev.islandutils.IslandUtilsEvents;
+import net.asodev.islandutils.state.Game;
+import net.asodev.islandutils.state.MccIslandState;
+
+import java.time.Instant;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+import static net.asodev.islandutils.discord.DiscordPresenceUpdator.activity;
+
+public class FishingPresenceUpdator {
+    public static List<String> temperatures = List.of("temperate", "tropical", "barren");
+    public static Map<String, String> islandNames = new HashMap<>();
+
+    static {
+        islandNames.put("temperate_1", "Verdant Woods");
+        islandNames.put("temperate_2", "Floral Forest");
+        islandNames.put("temperate_3", "Dark Grove");
+        islandNames.put("temperate_grotto", "Sunken Swamp");
+
+        islandNames.put("tropical_1", "Tropical Overgrowth");
+        islandNames.put("tropical_2", "Coral Shores");
+        islandNames.put("tropical_3", "Twisted Swamp");
+        islandNames.put("tropical_grotto", "Mirrored Oasis");
+
+        islandNames.put("barren_1", "Ancient Sands");
+        islandNames.put("barren_2", "Blazing Canyon");
+        islandNames.put("barren_3", "Ashen Wastes");
+        islandNames.put("barren_grotto", "Volcanic Springs");
+    }
+
+    public static void init() {
+    }
+
+    public static void updateFishingPlace() {
+        if (activity == null) return;
+
+        String place = islandNames.get(MccIslandState.getSubType());
+        if (place != null) {
+            activity.setDetails("In the " + place);
+            activity.assets().setLargeImage(MccIslandState.getSubType().toLowerCase());
+            activity.assets().setLargeText(place);
+
+            activity.assets().setSmallImage("fishing");
+            activity.assets().setSmallText("Fishing");
+        } else {
+            activity.assets().setLargeImage("fishing");
+            activity.assets().setLargeText("Fishing");
+        }
+    }
+}