Merge remote-tracking branch 'origin/main'

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
 }

gradle.properties

@@ -14,7 +14,7 @@ mod_version=1.8.9+beta-1
 mod_archives_name=Patcher (OneConfig)
 
 # Gradle Configuration -- DO NOT TOUCH THESE VALUES.
-polyfrost.defaults.loom=1
+polyfrost.defaults.loom=2
 org.gradle.daemon=true
 org.gradle.parallel=true
 org.gradle.configureoncommand=true

gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +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.7-bin.zip
 networkTimeout=10000
+validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

gradlew

@@ -83,7 +83,8 @@ done
 # This is normally unused
 # shellcheck disable=SC2034
 APP_BASE_NAME=${0##*/}
-APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit
+# 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
@@ -130,26 +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=SC3045
+        # 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=SC3045
+        # shellcheck disable=SC2039,SC3045
         ulimit -n "$MAX_FD" ||
             warn "Could not set maximum file descriptor limit to $MAX_FD"
     esac
@@ -198,11 +202,11 @@ fi
 # 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, 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.
+# 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" \

root.gradle.kts

@@ -1,7 +1,7 @@
 plugins {
     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.4.1" // Sets the default versions for Polyfrost Gradle Toolkit
+        val pgtVersion = "0.5.1" // Sets the default versions for Polyfrost Gradle Toolkit
         id("org.polyfrost.multi-version.root") version pgtVersion
     }
 }

src/main/java/club/sk1er/patcher/config/PatcherSoundConfig.java

@@ -44,7 +44,7 @@ public void initialize(Map<ResourceLocation, BasicOption> data, Map<ResourceLoca
                 data.computeIfAbsent(entry.getKey(), location -> {
                     String name = getName(location);
                     //#if MC==11202
-                    //$$ String[] notCategory = entry.getValue().getLocation().getResourcePath().split("\\.");
+                    //$$ String[] notCategory = entry.getValue().getLocation().getPath().split("\\.");
                     //#endif
                     String category =
                         //#if MC==10809

src/main/java/club/sk1er/patcher/hooks/FaceDataHook.java

@@ -0,0 +1,38 @@
+package club.sk1er.patcher.hooks;
+
+import net.minecraft.util.EnumFacing;
+
+import java.util.BitSet;
+import java.util.EnumMap;
+
+public class FaceDataHook {
+
+    private final EnumMap<EnumFacing, BitSet> data;
+    private final int vMax;
+
+    public FaceDataHook(final int uMax, final int vMax) {
+        this.data = new EnumMap<>(EnumFacing.class);
+        this.vMax = vMax;
+        int size = uMax * vMax;
+        BitSet initialData = new BitSet(size);
+        this.data.put(EnumFacing.WEST, initialData);
+        this.data.put(EnumFacing.EAST, new BitSet(size));
+        this.data.put(EnumFacing.UP, new BitSet(size));
+        this.data.put(EnumFacing.DOWN, new BitSet(size));
+    }
+
+    public void set(final EnumFacing facing, final int u, final int v) {
+        BitSet dataSet = this.data.get(facing);
+        dataSet.set(getIndex(u, v));
+    }
+
+    public boolean get(final EnumFacing facing, final int u, final int v) {
+        BitSet dataSet = this.data.get(facing);
+        return dataSet.get(getIndex(u, v));
+    }
+
+    private int getIndex(final int u, final int v) {
+        return v * this.vMax + u;
+    }
+
+}

src/main/java/club/sk1er/patcher/mixins/bugfixes/EntityRendererMixin_AdjustEyeHeightLighting.java

@@ -0,0 +1,24 @@
+package club.sk1er.patcher.mixins.bugfixes;
+
+import net.minecraft.client.Minecraft;
+import net.minecraft.client.renderer.EntityRenderer;
+import net.minecraft.util.BlockPos;
+import org.spongepowered.asm.mixin.Mixin;
+import org.spongepowered.asm.mixin.Shadow;
+import org.spongepowered.asm.mixin.injection.At;
+import org.spongepowered.asm.mixin.injection.ModifyArg;
+
+@Mixin(EntityRenderer.class)
+public class EntityRendererMixin_AdjustEyeHeightLighting {
+
+    //#if MC==10809
+    @Shadow
+    private Minecraft mc;
+
+    @ModifyArg(method = "updateRenderer", at = @At(value = "INVOKE", target = "Lnet/minecraft/client/multiplayer/WorldClient;getLightBrightness(Lnet/minecraft/util/BlockPos;)F"))
+    private BlockPos patcher$accountForEyes(BlockPos par1) {
+        return new BlockPos(mc.getRenderViewEntity().getPositionEyes(1.0F));
+    }
+    //#endif
+
+}