Merge branch 'master' into autogg

build.gradle.kts

@@ -12,7 +12,7 @@ plugins {
     id("org.polyfrost.defaults.java")
     id("org.polyfrost.defaults.loom")
     id("com.github.johnrengelman.shadow")
-    id("net.kyori.blossom") version "1.3.1"
+    id("net.kyori.blossom") version "1.3.2"
     id("signing")
     java
 }
@@ -95,9 +95,9 @@ repositories {
 // Configures the libraries/dependencies for your mod.
 dependencies {
     // Adds the OneConfig library, so we can develop with it.
-    modCompileOnly("cc.polyfrost:oneconfig-$platform:0.2.1-alpha+")
+    modCompileOnly("cc.polyfrost:oneconfig-$platform:0.2.2-alpha+")
 
-    modRuntimeOnly("me.djtheredstoner:DevAuth-${if (platform.isFabric) "fabric" else if (platform.isLegacyForge) "forge-legacy" else "forge-latest"}:1.1.2")
+    modRuntimeOnly("me.djtheredstoner:DevAuth-${if (platform.isFabric) "fabric" else if (platform.isLegacyForge) "forge-legacy" else "forge-latest"}:1.2.0")
 
     // If we are building for legacy forge, includes the launch wrapper with `shade` as we configured earlier.
     if (platform.isLegacyForge) {

gradle.properties

@@ -5,7 +5,7 @@ mod_version = 1.6.2
 mod_archives_name=Hytils Reborn
 
 # Gradle Configuration -- DO NOT TOUCH THESE VALUES.
-polyfrost.defaults.loom=1
+polyfrost.defaults.loom=3
 org.gradle.daemon=true
 org.gradle.parallel=true
 org.gradle.configureoncommand=true

gradle/wrapper/gradle-wrapper.properties

@@ -1,5 +1,7 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.4-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.8-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,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

root.gradle.kts

@@ -1,7 +1,7 @@
 plugins {
-    kotlin("jvm") version "1.8.22" apply false
+    kotlin("jvm") version "1.9.10" apply false
     id("org.polyfrost.multi-version.root")
-    id("com.github.johnrengelman.shadow") version "7.1.2" apply false
+    id("com.github.johnrengelman.shadow") version "8.1.1" apply false
 }
 
 preprocess {

settings.gradle.kts

@@ -7,7 +7,7 @@ pluginManagement {
         maven("https://repo.polyfrost.org/releases") // Adds the Polyfrost maven repository to get Polyfrost Gradle Toolkit
     }
     plugins {
-        val pgtVersion = "0.2.9" // Sets the default versions for Polyfrost Gradle Toolkit
+        val pgtVersion = "0.6.2" // Sets the default versions for Polyfrost Gradle Toolkit
         id("org.polyfrost.multi-version.root") version pgtVersion
     }
 }

src/main/java/org/polyfrost/hytils/config/HytilsConfig.java

@@ -1068,6 +1068,125 @@ public class HytilsConfig extends Config {
     )
     public static boolean silentLobby;
 
+    @Switch(
+        name = "Disable Stepping Sounds",
+        description = "Remove sounds created by stepping.",
+        category = "Lobby", subcategory = "Sounds"
+    )
+    public static boolean lobbyDisableSteppingSounds;
+
+    @Switch(
+        name = "Disable Slime Sounds",
+        description = "Remove sounds created by slimes.",
+        category = "Lobby", subcategory = "Sounds"
+    )
+    public static boolean lobbyDisableSlimeSounds;
+
+    @Switch(
+        name = "Disable Dragon Sounds",
+        description = "Remove sounds created by dragons.",
+        category = "Lobby", subcategory = "Sounds"
+    )
+    public static boolean lobbyDisableDragonSounds;
+
+    @Switch(
+        name = "Disable Wither Sounds",
+        description = "Remove sounds created by withers & wither skeletons.",
+        category = "Lobby", subcategory = "Sounds"
+    )
+    public static boolean lobbyDisableWitherSounds;
+
+    @Switch(
+        name = "Disable Item Pickup Sounds",
+        description = "Remove sounds created by picking up an item.",
+        category = "Lobby", subcategory = "Sounds"
+    )
+    public static boolean lobbyDisableItemPickupSounds;
+
+    @Switch(
+        name = "Disable Experience Orb Sounds",
+        description = "Remove sounds created by experience orbs.",
+        category = "Lobby", subcategory = "Sounds"
+    )
+    public static boolean lobbyDisableExperienceOrbSounds;
+
+    @Switch(
+        name = "Disable Primed TNT Sounds",
+        description = "Remove sounds created by primed TNT.",
+        category = "Lobby", subcategory = "Sounds"
+    )
+    public static boolean lobbyDisablePrimedTntSounds;
+
+    @Switch(
+        name = "Disable Explosion Sounds",
+        description = "Remove sounds created by explosions.",
+        category = "Lobby", subcategory = "Sounds"
+    )
+    public static boolean lobbyDisableExplosionSounds;
+
+    @Switch(
+        name = "Disable Delivery Man Sounds",
+        description = "Remove sounds created by delivery man events.",
+        category = "Lobby", subcategory = "Sounds"
+    )
+    public static boolean lobbyDisableDeliveryManSounds;
+
+    @Switch(
+        name = "Disable Note Block Sounds",
+        description = "Remove sounds created by Note Blocks.",
+        category = "Lobby", subcategory = "Sounds"
+    )
+    public static boolean lobbyDisableNoteBlockSounds;
+
+    @Switch(
+        name = "Disable Firework Sounds",
+        description = "Remove sounds created by fireworks.",
+        category = "Lobby", subcategory = "Sounds"
+    )
+    public static boolean lobbyDisableFireworkSounds;
+
+    @Switch(
+        name = "Disable Levelup Sounds",
+        description = "Remove sounds created by someone leveling up.",
+        category = "Lobby", subcategory = "Sounds"
+    )
+    public static boolean lobbyDisableLevelupSounds;
+
+    @Switch(
+        name = "Disable Arrow Sounds",
+        description = "Remove sounds created by arrows.",
+        category = "Lobby", subcategory = "Sounds"
+    )
+    public static boolean lobbyDisableArrowSounds;
+
+    @Switch(
+        name = "Disable Bat Sounds",
+        description = "Remove sounds created by bats.",
+        category = "Lobby", subcategory = "Sounds"
+    )
+    public static boolean lobbyDisableBatSounds;
+
+    @Switch(
+        name = "Disable Fire Sounds",
+        description = "Remove sounds created by fire.",
+        category = "Lobby", subcategory = "Sounds"
+    )
+    public static boolean lobbyDisableFireSounds;
+
+    @Switch(
+        name = "Disable Enderman Sounds",
+        description = "Remove sounds created by endermen.",
+        category = "Lobby", subcategory = "Sounds"
+    )
+    public static boolean lobbyDisableEndermanSounds;
+
+    @Switch(
+        name = "Disable Door Sounds",
+        description = "Disable sounds caused by doors, trapdoors, and fence gates",
+        category = "Lobby", subcategory = "Sounds"
+    )
+    public static boolean lobbyDisableDoorSounds;
+
     @Switch(
         name = "Remove Limbo AFK Title",
         description = "Remove the AFK title when you get sent to limbo for being AFK.",
@@ -1197,6 +1316,14 @@ public HytilsConfig() {
         //addDependency("editHeightOverlay", "heightOverlay");
         addDependency("manuallyEditHeightOverlay", "heightOverlay");
         //addDependency("editHeightOverlay", "manuallyEditHeightOverlay");
+
+        Arrays.asList(
+            "lobbyDisableSteppingSounds", "lobbyDisableSlimeSounds", "lobbyDisableDragonSounds", "lobbyDisableWitherSounds",
+            "lobbyDisableItemPickupSounds", "lobbyDisableExperienceOrbSounds", "lobbyDisablePrimedTntSounds",
+            "lobbyDisableExplosionSounds", "lobbyDisableDeliveryManSounds", "lobbyDisableMysteryBoxSounds",
+            "lobbyDisableFireworkSounds", "lobbyDisableLevelupSounds", "lobbyDisableArrowSounds", "lobbyDisableBatSounds",
+            "lobbyDisableFireSounds", "lobbyDisableEndermanSounds", "lobbyDisableDoorSounds"
+        ).forEach(property -> addDependency(property, "Silent Lobby", () -> !silentLobby));
     }
 
     public void hideTabulous() {

src/main/java/org/polyfrost/hytils/handlers/game/miniwalls/MiddleBeaconMiniWalls.java

@@ -54,6 +54,6 @@ public boolean shouldMakeBeacon() {
     @SubscribeEvent
     public void onRenderWorldLast(RenderWorldLastEvent event) {
         if (!shouldMakeBeacon()) return;
-        WaypointUtil.renderBeaconBeam(block, HytilsConfig.miniWallsMiddleBeaconColor.getRGB(), 1.0f, event.partialTicks);
+        WaypointUtil.renderBeaconBeam(block, HytilsConfig.miniWallsMiddleBeaconColor, event.partialTicks);
     }
 }