[Fabric] Add 1.20.3-pre1 support

Author: me4502

buildSrc/build.gradle.kts

@@ -52,7 +52,7 @@ dependencies {
     implementation("org.jfrog.buildinfo:build-info-extractor-gradle:4.32.0")
     implementation("org.spongepowered:spongegradle-plugin-development:2.1.1")
     implementation("org.spongepowered:vanillagradle:0.2.1-20230603.203956-54")
-    implementation("net.minecraftforge.gradle:ForgeGradle:6.0.13")
+    implementation("net.minecraftforge.gradle:ForgeGradle:6.0.16")
     implementation("net.fabricmc:fabric-loom:$loomVersion")
     implementation("net.fabricmc:sponge-mixin:$mixinVersion")
     implementation("org.enginehub.gradle:gradle-codecov-plugin:0.2.0")

gradle.properties

@@ -4,5 +4,5 @@ version=7.2.18-SNAPSHOT
 org.gradle.jvmargs=-Xmx2G
 org.gradle.parallel=true
 
-loom.version=1.3.9
+loom.version=1.4.4
 mixin.version=0.12.5+mixin.0.8.5

gradle/wrapper/gradle-wrapper.jar

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

gradle/wrapper/gradle-wrapper.properties

@@ -83,10 +83,8 @@ done
 # This is normally unused
 # shellcheck disable=SC2034
 APP_BASE_NAME=${0##*/}
-APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit
-
-# 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,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
@@ -197,11 +198,15 @@ 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" \

gradlew

@@ -121,7 +121,9 @@ protected String[] getDefaultDisallowedBlocks() {
                 BlockTypes.YELLOW_BED,
                 BlockTypes.POWERED_RAIL,
                 BlockTypes.DETECTOR_RAIL,
+                // Keep grass for <1.20.3 compat
                 BlockTypes.GRASS,
+                BlockTypes.SHORT_GRASS,
                 BlockTypes.DEAD_BUSH,
                 BlockTypes.MOVING_PISTON,
                 BlockTypes.PISTON_HEAD,

worldedit-core/src/main/java/com/sk89q/worldedit/LocalConfiguration.java

@@ -85,7 +85,11 @@ public class MultiStageReorder extends AbstractBufferingExtent implements Reorde
         priorityMap.put(BlockTypes.RED_BED, PlacementPriority.LAST);
         priorityMap.put(BlockTypes.WHITE_BED, PlacementPriority.LAST);
         priorityMap.put(BlockTypes.YELLOW_BED, PlacementPriority.LAST);
-        priorityMap.put(BlockTypes.GRASS, PlacementPriority.LAST);
+        // Keep "grass" for <1.20.3 compat
+        @SuppressWarnings("deprecation")
+        BlockType grass = BlockTypes.GRASS;
+        priorityMap.put(grass, PlacementPriority.LAST);
+        priorityMap.put(BlockTypes.SHORT_GRASS, PlacementPriority.LAST);
         priorityMap.put(BlockTypes.TALL_GRASS, PlacementPriority.LAST);
         priorityMap.put(BlockTypes.ROSE_BUSH, PlacementPriority.LAST);
         priorityMap.put(BlockTypes.DANDELION, PlacementPriority.LAST);

worldedit-core/src/main/java/com/sk89q/worldedit/extent/reorder/MultiStageReorder.java

@@ -26,6 +26,7 @@
 import com.sk89q.worldedit.function.pattern.RandomPattern;
 import com.sk89q.worldedit.math.BlockVector3;
 import com.sk89q.worldedit.world.block.BlockState;
+import com.sk89q.worldedit.world.block.BlockType;
 import com.sk89q.worldedit.world.block.BlockTypes;
 
 /**
@@ -95,7 +96,12 @@ public static Pattern getDesertPattern() {
      */
     public static Pattern getTemperatePattern() {
         RandomPattern pattern = new RandomPattern();
-        pattern.add(BlockTypes.GRASS.getDefaultState(), 300);
+        BlockType grass = BlockTypes.SHORT_GRASS;
+        if (grass == null) {
+            // Fallback for <1.20.3 compat
+            grass = BlockTypes.GRASS;
+        }
+        pattern.add(grass.getDefaultState(), 300);
         pattern.add(BlockTypes.POPPY.getDefaultState(), 5);
         pattern.add(BlockTypes.DANDELION.getDefaultState(), 5);
         return pattern;

worldedit-core/src/main/java/com/sk89q/worldedit/function/generator/FloraGenerator.java

@@ -410,7 +410,7 @@ public final class BlockTypes {
     @Nullable public static final BlockType GRANITE_SLAB = get("minecraft:granite_slab");
     @Nullable public static final BlockType GRANITE_STAIRS = get("minecraft:granite_stairs");
     @Nullable public static final BlockType GRANITE_WALL = get("minecraft:granite_wall");
-    @Nullable public static final BlockType GRASS = get("minecraft:grass");
+    @Deprecated @Nullable public static final BlockType GRASS = get("minecraft:grass");
     @Nullable public static final BlockType GRASS_BLOCK = get("minecraft:grass_block");
     @Deprecated @Nullable public static final BlockType GRASS_PATH = get("minecraft:grass_path");
     @Nullable public static final BlockType GRAVEL = get("minecraft:gravel");
@@ -839,6 +839,7 @@ public final class BlockTypes {
     @Nullable public static final BlockType SEA_LANTERN = get("minecraft:sea_lantern");
     @Nullable public static final BlockType SEA_PICKLE = get("minecraft:sea_pickle");
     @Nullable public static final BlockType SEAGRASS = get("minecraft:seagrass");
+    @Nullable public static final BlockType SHORT_GRASS = get("minecraft:short_grass");
     @Nullable public static final BlockType SHROOMLIGHT = get("minecraft:shroomlight");
     @Nullable public static final BlockType SHULKER_BOX = get("minecraft:shulker_box");
     @Deprecated @Nullable public static final BlockType SIGN = get("minecraft:sign");

worldedit-core/src/main/java/com/sk89q/worldedit/world/block/BlockTypes.java

@@ -22,8 +22,8 @@ applyShadowConfiguration()
 apply(plugin = "fabric-loom")
 apply(plugin = "java-library")
 
-val minecraftVersion = "1.20.2"
-val loaderVersion = "0.14.22"
+val minecraftVersion = "1.20.3-pre1"
+val loaderVersion = "0.14.24"
 
 val fabricApiConfiguration: Configuration = configurations.create("fabricApi")
 
@@ -64,7 +64,7 @@ dependencies {
         .toSet()
     // [2] Request the matching dependency from fabric-loom
     for (wantedDependency in wantedDependencies) {
-        val dep = project.the<FabricApiExtension>().module(wantedDependency, "0.89.1+1.20.2")
+        val dep = project.the<FabricApiExtension>().module(wantedDependency, "0.90.11+1.20.3")
         "include"(dep)
         "modImplementation"(dep)
     }