Updated to 1.17

README.md

@@ -23,7 +23,7 @@ Fixes Chunk Regen due to StringTag writeUTF() not respecting readUTF() Limits
 * Required options: `false`,`true`
 * Categories: `CARPETFIXES`,`BUGFIX`,`CRASHFIX`
 * Additional notes:
-  * This fixes inventory duping using books and chunk regen using books.
+  * This fixes using books to dupe inventories, regen chunks, and vanilla tick freeze chunks.
 
 ## blockCollisionCheckFix
 Fixes incorrect block collision checks
@@ -80,14 +80,6 @@ Makes it so that hoppers give block updates when placed while powered
 * Categories: `CARPETFIXES`,`BUGFIX`
 * Fixes: [2No2Name's video](https://www.youtube.com/watch?v=QVOONJ1OY44)
 
-## worldgenIncorrectOrderFix
-Fixes World Modifying tasks to be before decorations
-* Type: `boolean`
-* Default value: `false`
-* Required options: `false`,`true`
-* Categories: `CARPETFIXES`,`BUGFIX`,`EXPERIMENTAL`
-* Fixes: [MC-610](https://bugs.mojang.com/browse/MC-610)
-
 ## incorrectBounceLogicFix
 Fixes some entities not bouncing on slime blocks and getting stuck
 * Type: `boolean`
@@ -218,14 +210,6 @@ Fixes Named Blocks not stacking due to useless RepairCost tag
 * Categories: `CARPETFIXES`,`BUGFIX`,`EXPERIMENTAL`
 * Fixes: [MC-197473](https://bugs.mojang.com/browse/MC-197473)
 
-## zombiePiglinTracingFix
-Tracing the target to another dimension does not stop checking for visibility, so that many unnecessary chunks are loaded
-* Type: `boolean`
-* Default value: `false`
-* Required options: `false`,`true`
-* Categories: `CARPETFIXES`,`BUGFIX`,`CRASHFIX`
-* By: *Hendrix-Shen*
-
 ## drownedEnchantedTridentsFix
 Makes enchantments work on tridents thrown by drowned
 * Type: `boolean`
@@ -243,39 +227,13 @@ Fixes target blocks being permanently powered when moved by pistons
 * Categories: `CARPETFIXES`,`BACKPORT`
 * Fixes: [MC-173244](https://bugs.mojang.com/browse/MC-173244)
 
-## portalGeneralItemDupeFix
-Fixes general item dupe using dolphins, and some other dimension change dupes
-* Type: `boolean`
-* Default value: `false`
-* Required options: `false`,`true`
-* Categories: `CARPETFIXES`,`BUGFIX`,`BACKPORT`
-
-## shulkerTeleportFix
-Shulkers do not teleport correctly when going through a portal
-* Type: `boolean`
-* Default value: `false`
-* Required options: `false`,`true`
-* Categories: `CARPETFIXES`,`BUGFIX`,`BACKPORT`
-* Fixes: [MC-139265](https://bugs.mojang.com/browse/MC-139265) in 21w03a
-* By: *Hendrix-Shen*
-
-## drownedMemoryLeakFix
-Fixes Drowned navigation causing memory leak/performance degradation
-* Type: `boolean`
-* Default value: `false`
-* Required options: `false`,`true`
-* Categories: `CARPETFIXES`,`BACKPORT`,`BUGFIX`
-* Fixes: [MC-202246](https://bugs.mojang.com/browse/MC-202246) from 20w45a
-* By: *Fallen-Breath*
-
-## shulkerBoxItemsDropContents
-Backport dropping the contents of a Shulker Box item when its item entity is destroyed
+## lightningRodPermanentlyPoweredFix
+Fixes lightning rods being permanently powered when moved by pistons
 * Type: `boolean`
-* Default value: `false`
+* Default value: `true`
 * Required options: `false`,`true`
 * Categories: `CARPETFIXES`,`BACKPORT`
-* Fixes: [MC-176615](https://bugs.mojang.com/browse/MC-176615) from 20w51a
-* By: *Copetan* from *lunaar-carpet-addons*
+* Fixes: [MC-203718](https://bugs.mojang.com/browse/MC-203718)
 
 ## oldFlintAndSteelBehavior
 Backport 1.12 flint and steel behavior. Flint and steel can be used for updating observers / buds
@@ -291,9 +249,11 @@ Re-introduces multiplayer donkey/llama dupe bug based on disconnecting while rid
 * Type: `boolean`
 * Default value: `true`
 * Required options: `false`,`true`
-* Categories: `CARPETFIXES`,`BUGFIX`,`BACKPORT`
+* Categories: `CARPETFIXES`,`BUGFIX`,`BACKPORT`,`EXPERIMENTAL`
 * Fixes: Fixed [MC-181241](https://bugs.mojang.com/browse/MC-181241) from 18w05a
 * By: *whoImT* from *carpet-addons*
+* Additional notes:
+  * This has not been tested in 1.17 and may not work!
 
 # From Carpet & Other Extensions
 ## lightningKillsDropsFix

build.gradle

@@ -1,5 +1,5 @@
 plugins {
-	id 'fabric-loom' version '0.6-SNAPSHOT'
+	id 'fabric-loom' version '0.8-SNAPSHOT'
 	id 'maven-publish'
 }
 
@@ -9,8 +9,8 @@ repositories {
 	}
 }
 
-sourceCompatibility = JavaVersion.VERSION_1_8
-targetCompatibility = JavaVersion.VERSION_1_8
+sourceCompatibility = JavaVersion.VERSION_16
+targetCompatibility = JavaVersion.VERSION_16
 
 archivesBaseName = project.archives_base_name
 version = project.minecraft_version+'-'+project.mod_version
@@ -24,8 +24,8 @@ dependencies {
 	//to change the versions see the gradle.properties file
 	minecraft "com.mojang:minecraft:${project.minecraft_version}"
 	mappings "net.fabricmc:yarn:${project.yarn_mappings}:v2"
-	modCompile "net.fabricmc:fabric-loader:${project.loader_version}"
-	modCompile "carpet:fabric-carpet:${project.minecraft_version}-${project.carpet_core_version}"
+	modImplementation "net.fabricmc:fabric-loader:${project.loader_version}"
+	modImplementation "carpet:fabric-carpet:${project.minecraft_version}-${project.carpet_core_version}"
 
 	// PSA: Some older mods, compiled on Loom 0.2.1, might have outdated Maven POMs.
 	// You may need to force-disable transitiveness on them.
@@ -34,29 +34,27 @@ dependencies {
 processResources {
 	inputs.property "version", project.version
 
-	from(sourceSets.main.resources.srcDirs) {
-		include "fabric.mod.json"
+	filesMatching("fabric.mod.json") {
 		expand "version": project.version
 	}
-
-	from(sourceSets.main.resources.srcDirs) {
-		exclude "fabric.mod.json"
-	}
 }
 
-// ensure that the encoding is set to UTF-8, no matter what the system default is
-// this fixes some edge cases with special characters not displaying correctly
-// see http://yodaconditions.net/blog/fix-for-java-file-encoding-problems-with-gradle.html
-tasks.withType(JavaCompile) {
-	options.encoding = "UTF-8"
+tasks.withType(JavaCompile).configureEach {
+	// ensure that the encoding is set to UTF-8, no matter what the system default is
+	// this fixes some edge cases with special characters not displaying correctly
+	// see http://yodaconditions.net/blog/fix-for-java-file-encoding-problems-with-gradle.html
+	// If Javadoc is generated, this must be specified in that task too.
+	it.options.encoding = "UTF-8"
+
+	// Minecraft 1.17 (21w19a) upwards uses Java 16.
+	it.options.release = 16
 }
 
-// Loom will automatically attach sourcesJar to a RemapSourcesJar task and to the "build" task
-// if it is present.
-// If you remove this task, sources will not be generated.
-task sourcesJar(type: Jar, dependsOn: classes) {
-	classifier = "sources"
-	from sourceSets.main.allSource
+java {
+	// Loom will automatically attach sourcesJar to a RemapSourcesJar task and to the "build" task
+	// if it is present.
+	// If you remove this line, sources will not be generated.
+	withSourcesJar()
 }
 
 jar {

gradle.properties

@@ -3,14 +3,14 @@ org.gradle.jvmargs=-Xmx1G
 
 # Fabric Properties
 	# check these on https://fabricmc.net/use or https://modmuss50.me/fabric.html
-	minecraft_version=1.16.5
-	yarn_mappings=1.16.5+build.9
-	loader_version=0.10.6+build.214
+	minecraft_version=1.17
+	yarn_mappings=1.17+build.6
+	loader_version=0.11.3
 	# check available versions on maven for the given minecraft version you are using
-	carpet_core_version=1.4.26+v210210
+	carpet_core_version=1.4.40+v210608
 
 # Mod Properties
-	mod_version = 0.0.6
+	mod_version = 0.0.7
 	maven_group = carpetfixes
 	archives_base_name = carpetfixes
 

gradle/wrapper/gradle-wrapper.properties

@@ -1,5 +1,5 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-5.5.1-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.0.2-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

gradlew

@@ -82,6 +82,7 @@ esac
 
 CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar
 
+
 # Determine the Java command to use to start the JVM.
 if [ -n "$JAVA_HOME" ] ; then
     if [ -x "$JAVA_HOME/jre/sh/java" ] ; then
@@ -125,10 +126,11 @@ if $darwin; then
     GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\""
 fi
 
-# For Cygwin, switch paths to Windows format before running java
-if $cygwin ; then
+# For Cygwin or MSYS, switch paths to Windows format before running java
+if [ "$cygwin" = "true" -o "$msys" = "true" ] ; then
     APP_HOME=`cygpath --path --mixed "$APP_HOME"`
     CLASSPATH=`cygpath --path --mixed "$CLASSPATH"`
+
     JAVACMD=`cygpath --unix "$JAVACMD"`
 
     # We build the pattern for arguments to be converted via cygpath
@@ -154,19 +156,19 @@ if $cygwin ; then
         else
             eval `echo args$i`="\"$arg\""
         fi
-        i=$((i+1))
+        i=`expr $i + 1`
     done
     case $i in
-        (0) set -- ;;
-        (1) set -- "$args0" ;;
-        (2) set -- "$args0" "$args1" ;;
-        (3) set -- "$args0" "$args1" "$args2" ;;
-        (4) set -- "$args0" "$args1" "$args2" "$args3" ;;
-        (5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;;
-        (6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;;
-        (7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;;
-        (8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;;
-        (9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;;
+        0) set -- ;;
+        1) set -- "$args0" ;;
+        2) set -- "$args0" "$args1" ;;
+        3) set -- "$args0" "$args1" "$args2" ;;
+        4) set -- "$args0" "$args1" "$args2" "$args3" ;;
+        5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;;
+        6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;;
+        7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;;
+        8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;;
+        9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;;
     esac
 fi
 
@@ -175,14 +177,9 @@ save () {
     for i do printf %s\\n "$i" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/" ; done
     echo " "
 }
-APP_ARGS=$(save "$@")
+APP_ARGS=`save "$@"`
 
 # Collect all arguments for the java command, following the shell quoting and substitution rules
 eval set -- $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS "\"-Dorg.gradle.appname=$APP_BASE_NAME\"" -classpath "\"$CLASSPATH\"" org.gradle.wrapper.GradleWrapperMain "$APP_ARGS"
 
-# by default we should be in the correct project dir, but when run from Finder on Mac, the cwd is wrong
-if [ "$(uname)" = "Darwin" ] && [ "$HOME" = "$PWD" ]; then
-  cd "$(dirname "$0")"
-fi
-
 exec "$JAVACMD" "$@"

gradlew.bat

@@ -29,6 +29,9 @@ if "%DIRNAME%" == "" set DIRNAME=.
 set APP_BASE_NAME=%~n0
 set APP_HOME=%DIRNAME%
 
+@rem Resolve any "." and ".." in APP_HOME to make it shorter.
+for %%i in ("%APP_HOME%") do set APP_HOME=%%~fi
+
 @rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
 set DEFAULT_JVM_OPTS="-Xmx64m" "-Xms64m"
 
@@ -37,7 +40,7 @@ if defined JAVA_HOME goto findJavaFromJavaHome
 
 set JAVA_EXE=java.exe
 %JAVA_EXE% -version >NUL 2>&1
-if "%ERRORLEVEL%" == "0" goto init
+if "%ERRORLEVEL%" == "0" goto execute
 
 echo.
 echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
@@ -51,7 +54,7 @@ goto fail
 set JAVA_HOME=%JAVA_HOME:"=%
 set JAVA_EXE=%JAVA_HOME%/bin/java.exe
 
-if exist "%JAVA_EXE%" goto init
+if exist "%JAVA_EXE%" goto execute
 
 echo.
 echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME%
@@ -61,28 +64,14 @@ echo location of your Java installation.
 
 goto fail
 
-:init
-@rem Get command-line arguments, handling Windows variants
-
-if not "%OS%" == "Windows_NT" goto win9xME_args
-
-:win9xME_args
-@rem Slurp the command line arguments.
-set CMD_LINE_ARGS=
-set _SKIP=2
-
-:win9xME_args_slurp
-if "x%~1" == "x" goto execute
-
-set CMD_LINE_ARGS=%*
-
 :execute
 @rem Setup the command line
 
 set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
 
+
 @rem Execute Gradle
-"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %CMD_LINE_ARGS%
+"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %*
 
 :end
 @rem End local scope for the variables with windows NT shell