Port to fabric 1.20.3

.github/workflows/fabric.1.20.2.build.yml → .github/workflows/fabric.1.20.3.build.yml

@@ -1,4 +1,4 @@
-name: Build & Release For Minecraft 1.20.2 - Fabric
+name: Build & Release For Minecraft 1.20.3 - Fabric
 
 on:
   push:

build.gradle

@@ -1,7 +1,7 @@
 plugins {
-    id 'fabric-loom' version '1.0-SNAPSHOT'
+    id 'fabric-loom' version '1.4-SNAPSHOT'
     id 'maven-publish'
-    id "me.modmuss50.mod-publish-plugin" version "0.3.5"
+    id "me.modmuss50.mod-publish-plugin" version "0.4.5"
 }
 
 def ENV = System.getenv()
@@ -136,36 +136,5 @@ publishMods {
         requires {
             slug = 'fabric-api'
         }
-        optional {
-            slug = 'ctm-refabricated'
-        }
     }
 }
-
-/*if (ENV.CURSE_DEPLOY) {
-	curseforge {
-		apiKey = ENV.CURSE_DEPLOY
-		project {
-			id = project.curseforge_id
-			releaseType = "${curseforge_releasetype}"
-			addGameVersion "Fabric"
-			addGameVersion "Java 17"
-			addGameVersion "${minecraft_version}"
-			mainArtifact(remapJar) {
-				displayName = "${mod_name} v${version} - Fabric - ${minecraft_version}"
-				relations {
-					requiredDependency 'fabric-api'
-					optionalDependency 'ctm-refabricated'
-				}
-			}
-			changelog = "changeme"
-		}
-		options {
-			forgeGradleIntegration  = false
-		}
-	}
-}*/
-
-/*afterEvaluate {
-	tasks.curseforge715567.dependsOn remapJar
-}*/

gradle.properties

@@ -4,20 +4,20 @@ org.gradle.parallel=true
 
 # Fabric Properties
 	# check these on https://fabricmc.net/develop
-minecraft_version=1.20.2
+minecraft_version=1.20.3
 yarn_mappings=build.1
-loader_version=0.14.22
+loader_version=0.15.0
 
 # Mod Properties
 	maven_group = net.manmaed
 	archives_base_name = antiblocksrechiseled
 
 # Dependencies
-fabric_version=0.89.0
+fabric_version=0.91.1
 
 #CurseForge Stuff
 mod_name=antiblocksrechiseled
-mod_version=0.5
+mod_version=0.6
 curseforge_id=715567
 curseforge_releasetype=beta
 

gradle/wrapper/gradle-wrapper.properties

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

gradlew

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

src/main/java/net/manmaed/antiblocksrechiseled/blocks/base/AntiButton.java

@@ -1,24 +1,20 @@
 package net.manmaed.antiblocksrechiseled.blocks.base;
 
-import net.fabricmc.fabric.api.object.builder.v1.block.FabricBlockSettings;
 import net.minecraft.block.BlockSetType;
-import net.minecraft.block.BlockState;
 import net.minecraft.block.ButtonBlock;
 import net.minecraft.block.piston.PistonBehavior;
 import net.minecraft.sound.SoundEvent;
 import net.minecraft.sound.SoundEvents;
 
-import java.util.function.ToIntFunction;
-
 
 public class AntiButton extends ButtonBlock {
     public AntiButton() {
-        super(Settings.create()
+        super(BlockSetType.STONE,20,Settings.create()
                 .noCollision()
                 .strength(3.0F)
                 .pistonBehavior(PistonBehavior.DESTROY)
                 .requiresTool()
-                .luminance(light -> 15), BlockSetType.STONE, 20, false);
+                .luminance(light -> 15));
     }
 
     @Override

src/main/java/net/manmaed/antiblocksrechiseled/blocks/base/AntiPressurePlate.java

@@ -12,22 +12,24 @@
 import net.minecraft.util.math.BlockPos;
 import net.minecraft.world.World;
 
-public class AntiPressurePlate extends AbstractPressurePlateBlock {
+public class AntiPressurePlate extends PressurePlateBlock {
+
 
     public static final BooleanProperty POWERED = Properties.POWERED;
     private final AntiPressurePlate.ActivationRule activationRule;
     public AntiPressurePlate() {
-        super(Settings.create()
+        super(BlockSetType.STONE ,Settings.create()
                 .mapColor(MapColor.STONE_GRAY)
                 .solid()
                 .instrument(Instrument.BASEDRUM)
                 .requiresTool()
                 .noCollision()
                 .strength(0.5F)
                 .pistonBehavior(PistonBehavior.DESTROY)
-                .luminance(light -> 15), BlockSetType.STONE);
+                .luminance(light -> 15));
         this.setDefaultState((BlockState)((BlockState)this.stateManager.getDefaultState()).with(POWERED, false));
         this.activationRule = ActivationRule.PLAYERS;
+        ;
     }
 
     @Override
@@ -39,6 +41,8 @@ protected int getRedstoneOutput(BlockState state) {
     protected BlockState setRedstoneOutput(BlockState state, int rsOut) {
         return (BlockState)state.with(POWERED, rsOut > 0) ;
     }
+
+
     @Override
     protected int getRedstoneOutput(World world, BlockPos pos) {
         Class var10000;

src/main/resources/fabric.mod.json

@@ -24,9 +24,9 @@
   },
 
   "depends": {
-    "fabricloader": ">=0.14.22",
+    "fabricloader": ">=0.15.0",
     "fabric-api": "*",
-    "minecraft": "~1.20.2",
+    "minecraft": "~1.20.3",
     "java": ">=17"
   }
 }