Update to 1.20.4

build.gradle

@@ -1,5 +1,5 @@
 plugins {
-    id 'fabric-loom' version '1.0-SNAPSHOT'
+    id 'fabric-loom' version '1.5-SNAPSHOT'
     id 'maven-publish'
 }
 

gradle.properties

@@ -1,14 +1,13 @@
 # Done to increase the memory available to gradle.
-org.gradle.jvmargs=-Xmx1G
+org.gradle.jvmargs=-Xmx4G
 # Fabric Properties
 # check these on https://modmuss50.me/fabric.html
-minecraft_version=1.20.1
-yarn_mappings=9
-loader_version=0.14.20
+minecraft_version=1.20.4
+yarn_mappings=3
+loader_version=0.15.6
 # Mod Properties
-mod_version=1.1-1.20
+mod_version=1.2-1.20.4
 maven_group=ca.fxco
 archives_base_name=MoreCullingExtra
 
-moreculling_version=0.19.0-1.20.x
-
+moreculling_version=0.21.0-1.20.x

gradle/wrapper/gradle-wrapper.properties

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

@@ -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/ca/fxco/morecullingextra/mixin/BeaconBlock_glassMixin.java

@@ -2,9 +2,9 @@
 
 import ca.fxco.moreculling.api.block.MoreBlockCulling;
 import ca.fxco.morecullingextra.MoreCullingExtra;
-import net.minecraft.block.AbstractGlassBlock;
 import net.minecraft.block.BeaconBlock;
 import net.minecraft.block.BlockState;
+import net.minecraft.block.TranslucentBlock;
 import net.minecraft.util.math.BlockPos;
 import net.minecraft.util.math.Direction;
 import net.minecraft.world.BlockView;
@@ -23,7 +23,7 @@ public boolean usesCustomShouldDrawFace(BlockState state) {
     @Override
     public Optional<Boolean> customShouldDrawFace(BlockView view, BlockState thisState, BlockState sideState,
                                                   BlockPos thisPos, BlockPos sidePos, Direction side) {
-        if (sideState.getBlock() instanceof AbstractGlassBlock || sideState.getBlock() instanceof BeaconBlock) {
+        if (sideState.getBlock() instanceof TranslucentBlock || sideState.getBlock() instanceof BeaconBlock) {
             return Optional.of(false);
         }
         return Optional.empty();

src/main/java/ca/fxco/morecullingextra/mixin/PaneBlock_glassMixin.java

@@ -2,15 +2,14 @@
 
 import ca.fxco.morecullingextra.MoreCullingExtra;
 import net.minecraft.block.*;
-import net.minecraft.state.property.Property;
 import net.minecraft.util.math.Direction;
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.injection.At;
 import org.spongepowered.asm.mixin.injection.Inject;
 import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable;
 
 @Mixin(PaneBlock.class)
-public class PaneBlock_glassMixin extends HorizontalConnectingBlock {
+public abstract class PaneBlock_glassMixin extends HorizontalConnectingBlock {
 
     public PaneBlock_glassMixin(float radius1, float radius2, float boundingHeight1,
                                 float boundingHeight2, float collisionHeight, Settings settings) {
@@ -30,10 +29,10 @@ public PaneBlock_glassMixin(float radius1, float radius2, float boundingHeight1,
     private void cullAgainstGlass(BlockState state, BlockState stateFrom, Direction direction,
                                   CallbackInfoReturnable<Boolean> cir) {
         if (MoreCullingExtra.CONFIG.paneCulling) {
-            if (stateFrom.getBlock() instanceof AbstractGlassBlock || stateFrom.getBlock() instanceof BeaconBlock) {
+            if (stateFrom.getBlock() instanceof TranslucentBlock || stateFrom.getBlock() instanceof BeaconBlock) {
                 if (!direction.getAxis().isHorizontal()) {
                     cir.setReturnValue(true);
-                } else if (((Boolean) state.get((Property) FACING_PROPERTIES.get(direction))).booleanValue()) {
+                } else if (state.get(FACING_PROPERTIES.get(direction))) {
                     cir.setReturnValue(true);
                 }
             }

src/main/java/ca/fxco/morecullingextra/mixin/AbstractGlassBlock_beaconMixin.java → src/main/java/ca/fxco/morecullingextra/mixin/TranslucentBlock_beaconMixin.java

@@ -2,18 +2,18 @@
 
 import ca.fxco.moreculling.api.block.MoreBlockCulling;
 import ca.fxco.morecullingextra.MoreCullingExtra;
-import net.minecraft.block.AbstractGlassBlock;
 import net.minecraft.block.BeaconBlock;
 import net.minecraft.block.BlockState;
+import net.minecraft.block.TranslucentBlock;
 import net.minecraft.util.math.BlockPos;
 import net.minecraft.util.math.Direction;
 import net.minecraft.world.BlockView;
 import org.spongepowered.asm.mixin.Mixin;
 
 import java.util.Optional;
 
-@Mixin(AbstractGlassBlock.class)
-public class AbstractGlassBlock_beaconMixin implements MoreBlockCulling {
+@Mixin(TranslucentBlock.class)
+public class TranslucentBlock_beaconMixin implements MoreBlockCulling {
 
     @Override
     public boolean usesCustomShouldDrawFace(BlockState state) {

src/main/resources/fabric.mod.json

@@ -26,8 +26,8 @@
   ],
   "depends": {
     "fabricloader": ">=0.14.20",
-    "minecraft": ">=1.20",
-    "moreculling": ">=0.18.1"
+    "minecraft": ">=1.20.4",
+    "moreculling": ">=0.20.3"
   },
   "recommends": {
     "carpet-fixes": "*",

src/main/resources/morecullingextra.mixins.json

@@ -4,7 +4,7 @@
   "package": "ca.fxco.morecullingextra.mixin",
   "compatibilityLevel": "JAVA_17",
   "client": [
-    "AbstractGlassBlock_beaconMixin",
+    "TranslucentBlock_beaconMixin",
     "BeaconBlock_glassMixin",
     "PaneBlock_glassMixin"
   ],