updated to mc 1.20.6

CHANGELOG.md

@@ -1,7 +1,6 @@
 ### Added:
-- Added SpoiledZ compat
+- 
 ### Fixed:
-- Fixed mount dismounting
-- Fixed missing drops
+- 
 ### Changed:
-- Tweaked internals
+- Updated to mc 1.20.6

build.gradle

@@ -1,5 +1,5 @@
 plugins {
-	id 'fabric-loom' version '1.3-SNAPSHOT'
+	id 'fabric-loom' version '1.6-SNAPSHOT'
 	id 'maven-publish'
 }
 
@@ -44,14 +44,14 @@ processResources {
 }
 
 tasks.withType(JavaCompile).configureEach {
-	it.options.release = 17
+	it.options.release = 21
 }
 
 java {
 	withSourcesJar()
 
-	sourceCompatibility = JavaVersion.VERSION_17
-	targetCompatibility = JavaVersion.VERSION_17
+	sourceCompatibility = JavaVersion.VERSION_21
+	targetCompatibility = JavaVersion.VERSION_21
 }
 
 jar {

gradle.properties

@@ -1,18 +1,20 @@
 # Done to increase the memory available to gradle.
 org.gradle.jvmargs=-Xmx1G
+
 # Fabric Properties
-# check these on https://fabricmc.net/use
-	minecraft_version=1.20.1
-	yarn_mappings=1.20.1+build.10
-	loader_version=0.14.24
-    
+	# check these on https://fabricmc.net/use
+	minecraft_version=1.20.6
+	yarn_mappings=1.20.6+build.1
+	loader_version=0.15.11
+
 # Mod Properties
-    mod_version=0.6.0
-    maven_group=net.rpgz
-    archives_base_name=rpgz
+	mod_version = 1.1.1
+	maven_group = net.rpgz
+	archives_base_name = rpgz
 
 # Dependencies
-# currently not on the main fabric site, check on the maven: https://maven.fabricmc.net/net/fabricmc/fabric-api/fabric-api
-	fabric_version=0.90.7+1.20.1
-	cloth_config_version=11.0.99
-	mod_menu_version=7.0.0
+	# currently not on the main fabric site, check on the maven: https://maven.fabricmc.net/net/fabricmc/fabric-api/fabric-api
+	fabric_version=0.98.0+1.20.6
+	cloth_config_version=14.0.126
+	mod_menu_version=10.0.0-beta.1
+

gradle/wrapper/gradle-wrapper.properties

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

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

settings.gradle

@@ -1,10 +1,10 @@
 pluginManagement {
-    repositories {
-        maven {
-            name = 'Fabric'
-            url = 'https://maven.fabricmc.net/'
-        }
-        mavenCentral()
-        gradlePluginPortal()
-    }
-}
+	repositories {
+		maven {
+			name = 'Fabric'
+			url = 'https://maven.fabricmc.net/'
+		}
+		mavenCentral()
+		gradlePluginPortal()
+	}
+}

src/main/java/net/rpgz/mixin/HopperBlockEntityMixin.java

@@ -2,7 +2,6 @@
 
 import java.util.Iterator;
 import java.util.List;
-import java.util.stream.IntStream;
 
 import net.minecraft.world.World;
 import org.spongepowered.asm.mixin.Mixin;
@@ -41,10 +40,13 @@ private static void extractMixin(World world, Hopper hopper, CallbackInfoReturna
                         if (livingEntity.isDead()) {
                             if (((InventoryAccess) livingEntity).getInventory() != null) {
                                 Direction direction = Direction.DOWN;
-                                info.setReturnValue(isInventoryEmpty(((InventoryAccess) livingEntity).getInventory(), direction) ? false
-                                        : getAvailableSlots(((InventoryAccess) livingEntity).getInventory(), direction).anyMatch((i) -> {
-                                            return extract(hopper, ((InventoryAccess) livingEntity).getInventory(), i, direction);
-                                        }));
+
+                                for (int i : getAvailableSlots(((InventoryAccess) livingEntity).getInventory(), direction)) {
+                                    if (!extract(hopper, ((InventoryAccess) livingEntity).getInventory(), i, direction)) {
+                                        continue;
+                                    }
+                                    info.setReturnValue(true);
+                                }
                             }
                         }
                     }
@@ -60,12 +62,7 @@ private static boolean extract(Hopper hopper, Inventory inventory, int slot, Dir
     }
 
     @Shadow
-    private static boolean isInventoryEmpty(Inventory inv, Direction facing) {
-        return false;
-    }
-
-    @Shadow
-    private static IntStream getAvailableSlots(Inventory inventory, Direction side) {
+    private static int[] getAvailableSlots(Inventory inventory, Direction side) {
         return null;
     }
 }

src/main/java/net/rpgz/mixin/MobEntityMixin.java

@@ -62,12 +62,12 @@ public void tickMovement() {
                 }
             } else
             // Water floating
-            if (this.getWorld().containsFluid(box.offset(0.0D, box.getYLength(), 0.0D))) {
+            if (this.getWorld().containsFluid(box.offset(0.0D, box.getLengthY(), 0.0D))) {
                 if (ConfigInit.CONFIG.surfacing_in_water)
                     this.setPos(this.getX(), this.getY() + 0.03D, this.getZ());
                 if (this.canWalkOnFluid(this.getWorld().getFluidState(this.getBlockPos())))
                     this.setPos(this.getX(), this.getY() + 0.03D, this.getZ());
-                else if (this.getWorld().containsFluid(box.offset(0.0D, -box.getYLength() + (box.getYLength() / 5), 0.0D)) && !ConfigInit.CONFIG.surfacing_in_water)
+                else if (this.getWorld().containsFluid(box.offset(0.0D, -box.getLengthY() + (box.getLengthY() / 5), 0.0D)) && !ConfigInit.CONFIG.surfacing_in_water)
                     this.setPos(this.getX(), this.getY() - 0.05D, this.getZ());
             }
         } else {
@@ -90,8 +90,8 @@ protected void updatePostDeath() {
             // Has to get set on server and client
             Box newBoundingBox = new Box(this.getX() - (this.getWidth() / 3.0F), this.getY() - (this.getWidth() / 3.0F), this.getZ() - (this.getWidth() / 3.0F),
                     this.getX() + (this.getWidth() / 1.5F), this.getY() + (this.getWidth() / 1.5F), this.getZ() + (this.getWidth() / 1.5F));
-            if ((this.getDimensions(EntityPose.STANDING).height < 1.0F && this.getDimensions(EntityPose.STANDING).width < 1.0F)
-                    || (this.getDimensions(EntityPose.STANDING).width / this.getDimensions(EntityPose.STANDING).height) > 1.395F) {
+            if ((this.getDimensions(EntityPose.STANDING).height() < 1.0F && this.getDimensions(EntityPose.STANDING).width() < 1.0F)
+                    || (this.getDimensions(EntityPose.STANDING).width() / this.getDimensions(EntityPose.STANDING).height()) > 1.395F) {
                 this.setBoundingBox(newBoundingBox);
             } else {
                 this.setBoundingBox(newBoundingBox.offset(this.getRotationVector(0F, this.bodyYaw).rotateY(-30.0F)));
@@ -126,8 +126,8 @@ protected void updatePostDeath() {
                 // New method to check if inside block
                 Box checkBox = new Box(box.maxX, box.maxY, box.maxZ, box.maxX + 0.001D, box.maxY + 0.001D, box.maxZ + 0.001D);
                 Box checkBoxTwo = new Box(box.minX, box.maxY, box.minZ, box.minX + 0.001D, box.maxY + 0.001D, box.minZ + 0.001D);
-                Box checkBoxThree = new Box(box.maxX - (box.getXLength() / 3D), box.maxY, box.maxZ - (box.getZLength() / 3D), box.maxX + 0.001D - (box.getXLength() / 3D), box.maxY + 0.001D,
-                        box.maxZ + 0.001D - (box.getZLength() / 3D));
+                Box checkBoxThree = new Box(box.maxX - (box.getLengthX() / 3D), box.maxY, box.maxZ - (box.getLengthZ() / 3D), box.maxX + 0.001D - (box.getLengthX() / 3D), box.maxY + 0.001D,
+                        box.maxZ + 0.001D - (box.getLengthZ() / 3D));
                 if (this.getWorld().isRegionLoaded(blockPos, blockPos2)) {
                     if (!this.inventory.isEmpty()
                             && (((!StreamSupport.stream(this.getWorld().getBlockCollisions(this, checkBox).spliterator(), false).allMatch(VoxelShape::isEmpty)

src/main/java/net/rpgz/mixin/client/GameRendererMixin.java

@@ -30,13 +30,13 @@ public class GameRendererMixin {
     @Shadow
     private MinecraftClient client;
 
-    @Inject(method = "updateTargetedEntity", at = @At(value = "INVOKE", target = "Lnet/minecraft/util/profiler/Profiler;pop()V"))
-    private void updateTargetedEntityMixin(float tickDelta, CallbackInfo info) {
+    @Inject(method = "updateCrosshairTarget", at = @At(value = "INVOKE", target = "Lnet/minecraft/util/profiler/Profiler;pop()V"))
+    private void updateCrosshairTargetMixin(float tickDelta, CallbackInfo info) {
         Entity entity = this.client.getCameraEntity();
         if (this.client.crosshairTarget.getType() == HitResult.Type.BLOCK) {
             BlockPos pos = ((BlockHitResult) this.client.crosshairTarget).getBlockPos();
             if (!this.client.world.getBlockState(pos).isFullCube(this.client.world, pos)) {
-                double reachDinstance = (double) this.client.interactionManager.getReachDistance();
+                double reachDinstance = this.client.player.getEntityInteractionRange();
                 Vec3d vec3d = this.client.player.getCameraPosVec(tickDelta);
                 Vec3d vec3d2 = this.client.player.getRotationVec(tickDelta);
                 Vec3d vec3d3 = vec3d.add(vec3d2.x * reachDinstance, vec3d2.y * reachDinstance, vec3d2.z * reachDinstance);

src/main/java/net/rpgz/mixin/client/MobEntityRendererMixin.java

@@ -28,7 +28,7 @@ protected boolean isShaking(T entity) {
     }
 
     @Override
-    protected void setupTransforms(T entity, MatrixStack matrices, float animationProgress, float bodyYaw, float tickDelta) {
+    protected void setupTransforms(T entity, MatrixStack matrices, float animationProgress, float bodyYaw, float tickDelta, float scale) {
         if (entity.deathTime > 0) {
             this.shadowRadius = 0F;
             float f = ((float) entity.deathTime + tickDelta - 1.0F) / 20.0F * 1.6F;
@@ -45,7 +45,7 @@ protected void setupTransforms(T entity, MatrixStack matrices, float animationPr
                 matrices.translate(-(double) ((entity.getHeight() / 2) * f), 0.0D, 0.0D);
             }
         }
-        super.setupTransforms(entity, matrices, animationProgress, bodyYaw, tickDelta);
+        super.setupTransforms(entity, matrices, animationProgress, bodyYaw, tickDelta, scale);
     }
 
     @Override