pre2 version for 1.20.3

build.gradle

@@ -1,15 +1,18 @@
 plugins {
-	id 'fabric-loom' version '0.11-SNAPSHOT'
+	id 'fabric-loom' version '1.4-SNAPSHOT'
 	id 'maven-publish'
 }
 
 sourceCompatibility = JavaVersion.VERSION_17
 targetCompatibility = JavaVersion.VERSION_17
 
-archivesBaseName = project.archives_base_name
 version = project.mod_version
 group = project.maven_group
 
+base {
+	archivesName = project.archives_base_name
+}
+
 repositories {
 	// Add repositories to retrieve artifacts from in here.
 	// You should only use this when depending on other mods because
@@ -63,11 +66,14 @@ java {
 	// if it is present.
 	// If you remove this line, sources will not be generated.
 	withSourcesJar()
+
+	sourceCompatibility = JavaVersion.VERSION_17
+	targetCompatibility = JavaVersion.VERSION_17
 }
 
 jar {
 	from("LICENSE") {
-		rename { "${it}_${project.archivesBaseName}"}
+		rename { "${it}_${project.base.archivesName.get()}"}
 	}
 }
 

gradle.properties

@@ -3,18 +3,18 @@
 	org.gradle.parallel=true
 
 # Fabric Properties
-	# check these on https://fabricmc.net/versions.html
-	minecraft_version=1.20.2
-	yarn_mappings=1.20.2+build.1
-	loader_version=0.14.22
+# check these on https://fabricmc.net/develop
+minecraft_version=1.20.3-pre2
+yarn_mappings=1.20.3-pre2+build.5
+loader_version=0.14.24
 
 # Mod Properties
-	mod_version = 1.20.2.2
+	mod_version = 1.20.3.1
 	maven_group = de.jottyfan.minecraft
 	archives_base_name = quickiefabric
 
 # Dependencies
-	fabric_version=0.89.1+1.20.2
+	fabric_version=0.90.12+1.20.3
 
 # for ExtendedLeavesBlock
-  terraform_wood_api_version=7.0.1
+  terraform_wood_api_version=9.0.0-alpha.3

gradle/wrapper/gradle-wrapper.properties

@@ -1,5 +1,7 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.3-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.3-bin.zip
+networkTimeout=10000
+validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

gradlew

@@ -1,7 +1,7 @@
-#!/usr/bin/env sh
+#!/bin/sh
 
 #
-# Copyright 2015 the original author or authors.
+# Copyright © 2015-2021 the original authors.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -17,67 +17,98 @@
 #
 
 ##############################################################################
-##
-##  Gradle start up script for UN*X
-##
+#
+#   Gradle start up script for POSIX generated by Gradle.
+#
+#   Important for running:
+#
+#   (1) You need a POSIX-compliant shell to run this script. If your /bin/sh is
+#       noncompliant, but you have some other compliant shell such as ksh or
+#       bash, then to run this script, type that shell name before the whole
+#       command line, like:
+#
+#           ksh Gradle
+#
+#       Busybox and similar reduced shells will NOT work, because this script
+#       requires all of these POSIX shell features:
+#         * functions;
+#         * expansions «$var», «${var}», «${var:-default}», «${var+SET}»,
+#           «${var#prefix}», «${var%suffix}», and «$( cmd )»;
+#         * compound commands having a testable exit status, especially «case»;
+#         * various built-in commands including «command», «set», and «ulimit».
+#
+#   Important for patching:
+#
+#   (2) This script targets any POSIX shell, so it avoids extensions provided
+#       by Bash, Ksh, etc; in particular arrays are avoided.
+#
+#       The "traditional" practice of packing multiple parameters into a
+#       space-separated string is a well documented source of bugs and security
+#       problems, so this is (mostly) avoided, by progressively accumulating
+#       options in "$@", and eventually passing that to Java.
+#
+#       Where the inherited environment variables (DEFAULT_JVM_OPTS, JAVA_OPTS,
+#       and GRADLE_OPTS) rely on word-splitting, this is performed explicitly;
+#       see the in-line comments for details.
+#
+#       There are tweaks for specific operating systems such as AIX, CygWin,
+#       Darwin, MinGW, and NonStop.
+#
+#   (3) This script is generated from the Groovy template
+#       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/.
+#
 ##############################################################################
 
 # Attempt to set APP_HOME
+
 # Resolve links: $0 may be a link
-PRG="$0"
-# Need this for relative symlinks.
-while [ -h "$PRG" ] ; do
-    ls=`ls -ld "$PRG"`
-    link=`expr "$ls" : '.*-> \(.*\)$'`
-    if expr "$link" : '/.*' > /dev/null; then
-        PRG="$link"
-    else
-        PRG=`dirname "$PRG"`"/$link"
-    fi
+app_path=$0
+
+# Need this for daisy-chained symlinks.
+while
+    APP_HOME=${app_path%"${app_path##*/}"}  # leaves a trailing /; empty if no leading path
+    [ -h "$app_path" ]
+do
+    ls=$( ls -ld "$app_path" )
+    link=${ls#*' -> '}
+    case $link in             #(
+      /*)   app_path=$link ;; #(
+      *)    app_path=$APP_HOME$link ;;
+    esac
 done
-SAVED="`pwd`"
-cd "`dirname \"$PRG\"`/" >/dev/null
-APP_HOME="`pwd -P`"
-cd "$SAVED" >/dev/null
 
-APP_NAME="Gradle"
-APP_BASE_NAME=`basename "$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"'
+# This is normally unused
+# shellcheck disable=SC2034
+APP_BASE_NAME=${0##*/}
+APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit
 
 # Use the maximum available, or set MAX_FD != -1 to use that value.
-MAX_FD="maximum"
+MAX_FD=maximum
 
 warn () {
     echo "$*"
-}
+} >&2
 
 die () {
     echo
     echo "$*"
     echo
     exit 1
-}
+} >&2
 
 # OS specific support (must be 'true' or 'false').
 cygwin=false
 msys=false
 darwin=false
 nonstop=false
-case "`uname`" in
-  CYGWIN* )
-    cygwin=true
-    ;;
-  Darwin* )
-    darwin=true
-    ;;
-  MSYS* | MINGW* )
-    msys=true
-    ;;
-  NONSTOP* )
-    nonstop=true
-    ;;
+case "$( uname )" in                #(
+  CYGWIN* )         cygwin=true  ;; #(
+  Darwin* )         darwin=true  ;; #(
+  MSYS* | MINGW* )  msys=true    ;; #(
+  NONSTOP* )        nonstop=true ;;
 esac
 
 CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar
@@ -87,9 +118,9 @@ CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar
 if [ -n "$JAVA_HOME" ] ; then
     if [ -x "$JAVA_HOME/jre/sh/java" ] ; then
         # IBM's JDK on AIX uses strange locations for the executables
-        JAVACMD="$JAVA_HOME/jre/sh/java"
+        JAVACMD=$JAVA_HOME/jre/sh/java
     else
-        JAVACMD="$JAVA_HOME/bin/java"
+        JAVACMD=$JAVA_HOME/bin/java
     fi
     if [ ! -x "$JAVACMD" ] ; then
         die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME
@@ -98,88 +129,120 @@ Please set the JAVA_HOME variable in your environment to match the
 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.
+    JAVACMD=java
+    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" = "false" -a "$darwin" = "false" -a "$nonstop" = "false" ] ; then
-    MAX_FD_LIMIT=`ulimit -H -n`
-    if [ $? -eq 0 ] ; then
-        if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ] ; then
-            MAX_FD="$MAX_FD_LIMIT"
-        fi
-        ulimit -n $MAX_FD
-        if [ $? -ne 0 ] ; then
-            warn "Could not set maximum file descriptor limit: $MAX_FD"
-        fi
-    else
-        warn "Could not query maximum file descriptor limit: $MAX_FD_LIMIT"
-    fi
-fi
-
-# For Darwin, add options to specify how the application appears in the dock
-if $darwin; then
-    GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\""
-fi
-
-# 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
-    ROOTDIRSRAW=`find -L / -maxdepth 1 -mindepth 1 -type d 2>/dev/null`
-    SEP=""
-    for dir in $ROOTDIRSRAW ; do
-        ROOTDIRS="$ROOTDIRS$SEP$dir"
-        SEP="|"
-    done
-    OURCYGPATTERN="(^($ROOTDIRS))"
-    # Add a user-defined pattern to the cygpath arguments
-    if [ "$GRADLE_CYGPATTERN" != "" ] ; then
-        OURCYGPATTERN="$OURCYGPATTERN|($GRADLE_CYGPATTERN)"
-    fi
-    # Now convert the arguments - kludge to limit ourselves to /bin/sh
-    i=0
-    for arg in "$@" ; do
-        CHECK=`echo "$arg"|egrep -c "$OURCYGPATTERN" -`
-        CHECK2=`echo "$arg"|egrep -c "^-"`                                 ### Determine if an option
-
-        if [ $CHECK -ne 0 ] && [ $CHECK2 -eq 0 ] ; then                    ### Added a condition
-            eval `echo args$i`=`cygpath --path --ignore --mixed "$arg"`
-        else
-            eval `echo args$i`="\"$arg\""
-        fi
-        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" ;;
+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
+        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
+        ulimit -n "$MAX_FD" ||
+            warn "Could not set maximum file descriptor limit to $MAX_FD"
     esac
 fi
 
-# Escape application args
-save () {
-    for i do printf %s\\n "$i" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/" ; done
-    echo " "
-}
-APP_ARGS=`save "$@"`
+# Collect all arguments for the java command, stacking in reverse order:
+#   * args from the command line
+#   * the main class name
+#   * -classpath
+#   * -D...appname settings
+#   * --module-path (only if needed)
+#   * DEFAULT_JVM_OPTS, JAVA_OPTS, and GRADLE_OPTS environment variables.
 
-# 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"
+# For Cygwin or MSYS, switch paths to Windows format before running java
+if "$cygwin" || "$msys" ; then
+    APP_HOME=$( cygpath --path --mixed "$APP_HOME" )
+    CLASSPATH=$( cygpath --path --mixed "$CLASSPATH" )
+
+    JAVACMD=$( cygpath --unix "$JAVACMD" )
+
+    # Now convert the arguments - kludge to limit ourselves to /bin/sh
+    for arg do
+        if
+            case $arg in                                #(
+              -*)   false ;;                            # don't mess with options #(
+              /?*)  t=${arg#/} t=/${t%%/*}              # looks like a POSIX filepath
+                    [ -e "$t" ] ;;                      #(
+              *)    false ;;
+            esac
+        then
+            arg=$( cygpath --path --ignore --mixed "$arg" )
+        fi
+        # Roll the args list around exactly as many times as the number of
+        # args, so each arg winds up back in the position where it started, but
+        # possibly modified.
+        #
+        # NB: a `for` loop captures its iteration list before it begins, so
+        # changing the positional parameters here affects neither the number of
+        # iterations, nor the values presented in `arg`.
+        shift                   # remove old arg
+        set -- "$@" "$arg"      # push replacement arg
+    done
+fi
+
+
+# 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, 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.
+
+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.
+#
+# In Bash we could simply go:
+#
+#   readarray ARGS < <( xargs -n1 <<<"$var" ) &&
+#   set -- "${ARGS[@]}" "$@"
+#
+# but POSIX shell has neither arrays nor command substitution, so instead we
+# post-process each arg (as a line of input to sed) to backslash-escape any
+# character that might be a shell metacharacter, then use eval to reverse
+# that process (while maintaining the separation between arguments), and wrap
+# the whole thing up as a single "set" statement.
+#
+# This will of course break if any of these variables contains a newline or
+# an unmatched quote.
+#
+
+eval "set -- $(
+        printf '%s\n' "$DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS" |
+        xargs -n1 |
+        sed ' s~[^-[:alnum:]+,./:=@_]~\\&~g; ' |
+        tr '\n' ' '
+    )" '"$@"'
 
 exec "$JAVACMD" "$@"

gradlew.bat

@@ -26,6 +26,7 @@ if "%OS%"=="Windows_NT" setlocal
 
 set DIRNAME=%~dp0
 if "%DIRNAME%"=="" set DIRNAME=.
+@rem This is normally unused
 set APP_BASE_NAME=%~n0
 set APP_HOME=%DIRNAME%
 
@@ -40,7 +41,7 @@ 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.
@@ -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/de/jottyfan/minecraft/quickiefabric/blockentity/ItemHoarderBlockEntity.java

@@ -81,7 +81,7 @@ public class ItemHoarderBlockEntity extends LootableContainerBlockEntity {
 	@Override
 	public void writeNbt(NbtCompound nbt) {
 		super.writeNbt(nbt);
-		if (!this.serializeLootTable(nbt)) {
+		if (!this.writeLootTable(nbt)) {
 			Inventories.writeNbt(nbt, this.stacks);
 		}
 	}
@@ -90,7 +90,7 @@ public class ItemHoarderBlockEntity extends LootableContainerBlockEntity {
 	public void readNbt(NbtCompound nbt) {
 		super.readNbt(nbt);
 		this.stacks = DefaultedList.ofSize(this.size(), ItemStack.EMPTY);
-		if (!this.deserializeLootTable(nbt)) {
+		if (!this.readLootTable(nbt)) {
 			Inventories.readNbt(nbt, this.stacks);
 		}
 	}
@@ -104,8 +104,8 @@ public class ItemHoarderBlockEntity extends LootableContainerBlockEntity {
 		return 54; // container chest size (9 * 6)
 	}
 
-	@Override
-	protected DefaultedList<ItemStack> getInvStackList() {
+	@Override // before: getInvStackList
+	protected DefaultedList<ItemStack> method_11282() {
 		return stacks;
 	}
 

src/main/java/de/jottyfan/minecraft/quickiefabric/blocks/BlockCottonplant.java

@@ -46,9 +46,9 @@ public class BlockCottonplant extends CropBlock {
 	}
 
 	@Override
-	public void onBreak(World world, BlockPos pos, BlockState state, PlayerEntity player) {
+	public BlockState onBreak(World world, BlockPos pos, BlockState state, PlayerEntity player) {
 		spawnHarvested(world, pos, state);
-		super.onBreak(world, pos, state, player);
+		return super.onBreak(world, pos, state, player);
 	}
 
 	@Override

src/main/java/de/jottyfan/minecraft/quickiefabric/blocks/BlockDirtSalpeter.java

@@ -4,11 +4,13 @@ import java.util.Arrays;
 import java.util.List;
 import java.util.Random;
 
+import com.mojang.serialization.MapCodec;
+
 import de.jottyfan.minecraft.quickiefabric.items.QuickieItems;
 import net.fabricmc.fabric.api.object.builder.v1.block.FabricBlockSettings;
 import net.minecraft.block.BlockState;
 import net.minecraft.block.Blocks;
-import net.minecraft.block.GravelBlock;
+import net.minecraft.block.FallingBlock;
 import net.minecraft.item.ItemStack;
 import net.minecraft.item.Items;
 import net.minecraft.loot.context.LootContextParameterSet.Builder;
@@ -18,7 +20,7 @@ import net.minecraft.loot.context.LootContextParameterSet.Builder;
  * @author jotty
  *
  */
-public class BlockDirtSalpeter extends GravelBlock {
+public class BlockDirtSalpeter extends FallingBlock {
 
 	public BlockDirtSalpeter() {
 		super(FabricBlockSettings.create().hardness(3.1f));
@@ -35,4 +37,10 @@ public class BlockDirtSalpeter extends GravelBlock {
 				: new ItemStack[] { salpeterStack, dirtStack };
 		return Arrays.asList(spawnies);
 	}
+
+	@Override
+	protected MapCodec<? extends FallingBlock> getCodec() {
+		// TODO Auto-generated method stub
+		return null;
+	}
 }

src/main/java/de/jottyfan/minecraft/quickiefabric/blocks/BlockDrillDown.java

@@ -3,6 +3,8 @@ package de.jottyfan.minecraft.quickiefabric.blocks;
 import java.util.ArrayList;
 import java.util.List;
 
+import com.mojang.serialization.MapCodec;
+
 import de.jottyfan.minecraft.quickiefabric.blockentity.DrillBlockDownEntity;
 import net.fabricmc.fabric.api.object.builder.v1.block.FabricBlockSettings;
 import net.minecraft.block.BlockEntityProvider;
@@ -48,4 +50,9 @@ public class BlockDrillDown extends FallingBlock implements BlockEntityProvider
 	public <T extends BlockEntity> BlockEntityTicker<T> getTicker(World world, BlockState state, BlockEntityType<T> type){
 		return (world1, pos, state1, be) -> DrillBlockDownEntity.tick(world1, pos, state1, be);
 	}
+
+	@Override
+	protected MapCodec<? extends FallingBlock> getCodec() {
+		return null; // TODO: what to return here?
+	}
 }

src/main/java/de/jottyfan/minecraft/quickiefabric/blocks/BlockDrillEast.java

@@ -3,6 +3,8 @@ package de.jottyfan.minecraft.quickiefabric.blocks;
 import java.util.ArrayList;
 import java.util.List;
 
+import com.mojang.serialization.MapCodec;
+
 import de.jottyfan.minecraft.quickiefabric.blockentity.DrillBlockEastEntity;
 import net.fabricmc.fabric.api.object.builder.v1.block.FabricBlockSettings;
 import net.minecraft.block.BlockEntityProvider;
@@ -49,4 +51,10 @@ public class BlockDrillEast extends FallingBlock implements BlockEntityProvider
 	public <T extends BlockEntity> BlockEntityTicker<T> getTicker(World world, BlockState state, BlockEntityType<T> type){
 		return (world1, pos, state1, be) -> DrillBlockEastEntity.tick(world1, pos, state1, be);
 	}
+
+	@Override
+	protected MapCodec<? extends FallingBlock> getCodec() {
+		// TODO Auto-generated method stub
+		return null;
+	}
 }

src/main/java/de/jottyfan/minecraft/quickiefabric/blocks/BlockDrillNorth.java

@@ -3,6 +3,8 @@ package de.jottyfan.minecraft.quickiefabric.blocks;
 import java.util.ArrayList;
 import java.util.List;
 
+import com.mojang.serialization.MapCodec;
+
 import de.jottyfan.minecraft.quickiefabric.blockentity.DrillBlockNorthEntity;
 import net.fabricmc.fabric.api.object.builder.v1.block.FabricBlockSettings;
 import net.minecraft.block.BlockEntityProvider;
@@ -49,4 +51,10 @@ public class BlockDrillNorth extends FallingBlock implements BlockEntityProvider
 	public <T extends BlockEntity> BlockEntityTicker<T> getTicker(World world, BlockState state, BlockEntityType<T> type){
 		return (world1, pos, state1, be) -> DrillBlockNorthEntity.tick(world1, pos, state1, be);
 	}
+
+	@Override
+	protected MapCodec<? extends FallingBlock> getCodec() {
+		// TODO Auto-generated method stub
+		return null;
+	}
 }

src/main/java/de/jottyfan/minecraft/quickiefabric/blocks/BlockDrillSouth.java

@@ -3,6 +3,8 @@ package de.jottyfan.minecraft.quickiefabric.blocks;
 import java.util.ArrayList;
 import java.util.List;
 
+import com.mojang.serialization.MapCodec;
+
 import de.jottyfan.minecraft.quickiefabric.blockentity.DrillBlockSouthEntity;
 import net.fabricmc.fabric.api.object.builder.v1.block.FabricBlockSettings;
 import net.minecraft.block.BlockEntityProvider;
@@ -49,4 +51,10 @@ public class BlockDrillSouth extends FallingBlock implements BlockEntityProvider
 	public <T extends BlockEntity> BlockEntityTicker<T> getTicker(World world, BlockState state, BlockEntityType<T> type){
 		return (world1, pos, state1, be) -> DrillBlockSouthEntity.tick(world1, pos, state1, be);
 	}
+
+	@Override
+	protected MapCodec<? extends FallingBlock> getCodec() {
+		// TODO Auto-generated method stub
+		return null;
+	}
 }

src/main/java/de/jottyfan/minecraft/quickiefabric/blocks/BlockDrillWest.java

@@ -3,6 +3,8 @@ package de.jottyfan.minecraft.quickiefabric.blocks;
 import java.util.ArrayList;
 import java.util.List;
 
+import com.mojang.serialization.MapCodec;
+
 import de.jottyfan.minecraft.quickiefabric.blockentity.DrillBlockWestEntity;
 import net.fabricmc.fabric.api.object.builder.v1.block.FabricBlockSettings;
 import net.minecraft.block.BlockEntityProvider;
@@ -49,4 +51,10 @@ public class BlockDrillWest extends FallingBlock implements BlockEntityProvider
 	public <T extends BlockEntity> BlockEntityTicker<T> getTicker(World world, BlockState state, BlockEntityType<T> type){
 		return (world1, pos, state1, be) -> DrillBlockWestEntity.tick(world1, pos, state1, be);
 	}
+
+	@Override
+	protected MapCodec<? extends FallingBlock> getCodec() {
+		// TODO Auto-generated method stub
+		return null;
+	}
 }

src/main/java/de/jottyfan/minecraft/quickiefabric/blocks/BlockItemhoarder.java

@@ -61,7 +61,7 @@ public class BlockItemhoarder extends Block implements BlockEntityProvider {
 	}
 
 	@Override
-	public void onBreak(World world, BlockPos pos, BlockState state, PlayerEntity player) {
+	public BlockState onBreak(World world, BlockPos pos, BlockState state, PlayerEntity player) {
 		BlockEntity blockEntity = world.getBlockEntity(pos);
 		if (blockEntity instanceof ItemHoarderBlockEntity) {
 			ItemHoarderBlockEntity ihbe = (ItemHoarderBlockEntity) blockEntity;
@@ -69,7 +69,7 @@ public class BlockItemhoarder extends Block implements BlockEntityProvider {
 				ItemScatterer.spawn(world, pos.getX(), pos.getY(), pos.getZ(), stack);
 			}
 		}
-		super.onBreak(world, pos, state, player);
+		return super.onBreak(world, pos, state, player);
 	}
 
 	@Override

src/main/java/de/jottyfan/minecraft/quickiefabric/blocks/BlockKelpstack.java

@@ -3,9 +3,11 @@ package de.jottyfan.minecraft.quickiefabric.blocks;
 import java.util.Arrays;
 import java.util.List;
 
+import com.mojang.serialization.MapCodec;
+
 import net.fabricmc.fabric.api.object.builder.v1.block.FabricBlockSettings;
 import net.minecraft.block.BlockState;
-import net.minecraft.block.GravelBlock;
+import net.minecraft.block.FallingBlock;
 import net.minecraft.item.ItemStack;
 import net.minecraft.item.Items;
 import net.minecraft.loot.context.LootContextParameterSet.Builder;
@@ -16,7 +18,7 @@ import net.minecraft.sound.BlockSoundGroup;
  * @author jotty
  *
  */
-public class BlockKelpstack extends GravelBlock {
+public class BlockKelpstack extends FallingBlock {
 
 	public BlockKelpstack() {
 		super(FabricBlockSettings.create().hardness(0.1f).slipperiness(1.0f)
@@ -27,4 +29,10 @@ public class BlockKelpstack extends GravelBlock {
 	public List<ItemStack> getDroppedStacks(BlockState blockState, Builder builder) {
 		return Arrays.asList(new ItemStack[] { new ItemStack(Items.KELP, 9) });
 	}
+
+	@Override
+	protected MapCodec<? extends FallingBlock> getCodec() {
+		// TODO Auto-generated method stub
+		return null;
+	}
 }

src/main/java/de/jottyfan/minecraft/quickiefabric/blocks/BlockLavahoarder.java

@@ -31,7 +31,7 @@ import net.minecraft.world.World;
 public class BlockLavahoarder extends Block implements BlockEntityProvider {
 
 	public BlockLavahoarder() {
-		super(FabricBlockSettings.create().hardness(2.5f).luminance(16));
+		super(FabricBlockSettings.create().hardness(2.5f).luminance(state -> 15));
 	}
 
 	@Override

src/main/java/de/jottyfan/minecraft/quickiefabric/blocks/BlockMonsterhoarder.java

@@ -5,10 +5,7 @@ import java.util.List;
 
 import de.jottyfan.minecraft.quickiefabric.blockentity.MonsterHoarderBlockEntity;
 import net.fabricmc.fabric.api.object.builder.v1.block.FabricBlockSettings;
-import net.minecraft.block.Block;
-import net.minecraft.block.BlockEntityProvider;
-import net.minecraft.block.BlockRenderType;
-import net.minecraft.block.BlockState;
+import net.minecraft.block.*;
 import net.minecraft.block.entity.BlockEntity;
 import net.minecraft.block.entity.BlockEntityTicker;
 import net.minecraft.block.entity.BlockEntityType;
@@ -27,8 +24,9 @@ import net.minecraft.world.World;
  */
 public class BlockMonsterhoarder extends Block implements BlockEntityProvider {
 
+
 	public BlockMonsterhoarder() {
-		super(FabricBlockSettings.create().hardness(2.5f).luminance(20));
+		super(FabricBlockSettings.create().hardness(2.5f).luminance(state -> 15));
 	}
 
 	@Override

src/main/java/de/jottyfan/minecraft/quickiefabric/blocks/BlockOreDeepslateSulphor.java

@@ -3,6 +3,7 @@ package de.jottyfan.minecraft.quickiefabric.blocks;
 import java.util.Arrays;
 import java.util.List;
 
+import de.jottyfan.minecraft.quickiefabric.blocks.help.IntProviderHelper;
 import de.jottyfan.minecraft.quickiefabric.items.QuickieItems;
 import net.fabricmc.fabric.api.object.builder.v1.block.FabricBlockSettings;
 import net.minecraft.block.BlockState;
@@ -19,7 +20,7 @@ import net.minecraft.loot.context.LootContextParameterSet.Builder;
 public class BlockOreDeepslateSulphor extends ExperienceDroppingBlock {
 
 	public BlockOreDeepslateSulphor() {
-		super(FabricBlockSettings.create().hardness(1.9f).requiresTool());
+		super(IntProviderHelper.of(0, 2), FabricBlockSettings.create().hardness(1.9f).requiresTool());
 	}
 
 	@Override

src/main/java/de/jottyfan/minecraft/quickiefabric/blocks/BlockOreNetherSulphor.java

@@ -3,6 +3,7 @@ package de.jottyfan.minecraft.quickiefabric.blocks;
 import java.util.Arrays;
 import java.util.List;
 
+import de.jottyfan.minecraft.quickiefabric.blocks.help.IntProviderHelper;
 import de.jottyfan.minecraft.quickiefabric.items.QuickieItems;
 import net.fabricmc.fabric.api.object.builder.v1.block.FabricBlockSettings;
 import net.minecraft.block.BlockState;
@@ -19,7 +20,7 @@ import net.minecraft.loot.context.LootContextParameterSet.Builder;
 public class BlockOreNetherSulphor extends ExperienceDroppingBlock {
 
 	public BlockOreNetherSulphor() {
-		super(FabricBlockSettings.create().hardness(2.1f).requiresTool());
+		super(IntProviderHelper.of(0, 2), FabricBlockSettings.create().hardness(2.1f).requiresTool());
 	}
 
 	@Override

src/main/java/de/jottyfan/minecraft/quickiefabric/blocks/BlockOreSalpeter.java

@@ -3,6 +3,7 @@ package de.jottyfan.minecraft.quickiefabric.blocks;
 import java.util.Arrays;
 import java.util.List;
 
+import de.jottyfan.minecraft.quickiefabric.blocks.help.IntProviderHelper;
 import de.jottyfan.minecraft.quickiefabric.items.QuickieItems;
 import net.fabricmc.fabric.api.object.builder.v1.block.FabricBlockSettings;
 import net.minecraft.block.BlockState;
@@ -19,7 +20,7 @@ import net.minecraft.util.math.random.Random;
 public class BlockOreSalpeter extends ExperienceDroppingBlock {
 
 	public BlockOreSalpeter() {
-		super(FabricBlockSettings.create().hardness(3.1f).requiresTool());
+		super(IntProviderHelper.of(0, 2), FabricBlockSettings.create().hardness(3.1f).requiresTool());
 	}
 
 	@Override

src/main/java/de/jottyfan/minecraft/quickiefabric/blocks/BlockOreSandSalpeter.java

@@ -3,6 +3,7 @@ package de.jottyfan.minecraft.quickiefabric.blocks;
 import java.util.Arrays;
 import java.util.List;
 
+import de.jottyfan.minecraft.quickiefabric.blocks.help.IntProviderHelper;
 import de.jottyfan.minecraft.quickiefabric.items.QuickieItems;
 import net.fabricmc.fabric.api.object.builder.v1.block.FabricBlockSettings;
 import net.minecraft.block.BlockState;
@@ -20,7 +21,7 @@ import net.minecraft.util.math.random.Random;
 public class BlockOreSandSalpeter extends ExperienceDroppingBlock {
 
 	public BlockOreSandSalpeter() {
-		super(FabricBlockSettings.create().hardness(2.9f).requiresTool());
+		super(IntProviderHelper.of(0, 2), FabricBlockSettings.create().hardness(2.9f).requiresTool());
 	}
 
 	@Override

src/main/java/de/jottyfan/minecraft/quickiefabric/blocks/BlockOreSulphor.java

@@ -3,6 +3,7 @@ package de.jottyfan.minecraft.quickiefabric.blocks;
 import java.util.Arrays;
 import java.util.List;
 
+import de.jottyfan.minecraft.quickiefabric.blocks.help.IntProviderHelper;
 import de.jottyfan.minecraft.quickiefabric.items.QuickieItems;
 import net.fabricmc.fabric.api.object.builder.v1.block.FabricBlockSettings;
 import net.minecraft.block.BlockState;
@@ -19,7 +20,7 @@ import net.minecraft.loot.context.LootContextParameterSet.Builder;
 public class BlockOreSulphor extends ExperienceDroppingBlock {
 
 	public BlockOreSulphor() {
-		super(FabricBlockSettings.create().hardness(1.9f).requiresTool());
+		super(IntProviderHelper.of(0, 2), FabricBlockSettings.create().hardness(1.9f).requiresTool());
 	}
 
 	@Override

src/main/java/de/jottyfan/minecraft/quickiefabric/blocks/BlockSalpeter.java

@@ -3,6 +3,7 @@ package de.jottyfan.minecraft.quickiefabric.blocks;
 import java.util.Arrays;
 import java.util.List;
 
+import de.jottyfan.minecraft.quickiefabric.blocks.help.IntProviderHelper;
 import de.jottyfan.minecraft.quickiefabric.items.QuickieItems;
 import net.fabricmc.fabric.api.object.builder.v1.block.FabricBlockSettings;
 import net.minecraft.block.BlockState;
@@ -18,7 +19,7 @@ import net.minecraft.loot.context.LootContextParameterSet.Builder;
 public class BlockSalpeter extends ExperienceDroppingBlock {
 
 	public BlockSalpeter() {
-		super(FabricBlockSettings.create().hardness(0.5f));
+		super(IntProviderHelper.of(0, 2), FabricBlockSettings.create().hardness(0.5f));
 	}
 
 	@Override

src/main/java/de/jottyfan/minecraft/quickiefabric/blocks/BlockSandSalpeter.java

@@ -3,11 +3,13 @@ package de.jottyfan.minecraft.quickiefabric.blocks;
 import java.util.Arrays;
 import java.util.List;
 
+import com.mojang.serialization.MapCodec;
+
 import de.jottyfan.minecraft.quickiefabric.items.QuickieItems;
 import net.fabricmc.fabric.api.object.builder.v1.block.FabricBlockSettings;
 import net.minecraft.block.BlockState;
 import net.minecraft.block.Blocks;
-import net.minecraft.block.GravelBlock;
+import net.minecraft.block.FallingBlock;
 import net.minecraft.item.ItemStack;
 import net.minecraft.loot.context.LootContextParameterSet.Builder;
 import net.minecraft.util.math.random.Random;
@@ -17,7 +19,7 @@ import net.minecraft.util.math.random.Random;
  * @author jotty
  *
  */
-public class BlockSandSalpeter extends GravelBlock {
+public class BlockSandSalpeter extends FallingBlock {
 
 	public BlockSandSalpeter() {
 		super(FabricBlockSettings.create().hardness(3.1f).requiresTool());
@@ -27,4 +29,10 @@ public class BlockSandSalpeter extends GravelBlock {
 	public List<ItemStack> getDroppedStacks(BlockState state, Builder builder) {
 			return Arrays.asList(new ItemStack[] { new ItemStack(QuickieItems.SALPETER, 3 + Random.create().nextInt(2)), new ItemStack(Blocks.SAND) });
 	}
+
+	@Override
+	protected MapCodec<? extends FallingBlock> getCodec() {
+		// TODO Auto-generated method stub
+		return null;
+	}
 }

src/main/java/de/jottyfan/minecraft/quickiefabric/blocks/BlockSpeedpowder.java

@@ -3,10 +3,12 @@ package de.jottyfan.minecraft.quickiefabric.blocks;
 import java.util.Arrays;
 import java.util.List;
 
+import com.mojang.serialization.MapCodec;
+
 import de.jottyfan.minecraft.quickiefabric.items.QuickieItems;
 import net.fabricmc.fabric.api.object.builder.v1.block.FabricBlockSettings;
 import net.minecraft.block.BlockState;
-import net.minecraft.block.GravelBlock;
+import net.minecraft.block.FallingBlock;
 import net.minecraft.item.ItemStack;
 import net.minecraft.loot.context.LootContextParameterSet.Builder;
 import net.minecraft.world.explosion.Explosion;
@@ -16,10 +18,10 @@ import net.minecraft.world.explosion.Explosion;
  * @author jotty
  *
  */
-public class BlockSpeedpowder extends GravelBlock {
+public class BlockSpeedpowder extends FallingBlock {
 
 	public BlockSpeedpowder() {
-		super(FabricBlockSettings.create());
+		super(FabricBlockSettings.create().luminance(state -> 12));
 	}
 
 	@Override
@@ -31,4 +33,10 @@ public class BlockSpeedpowder extends GravelBlock {
 	public boolean shouldDropItemsOnExplosion(Explosion explosion) {
 		return true;
 	}
+
+	@Override
+	protected MapCodec<? extends FallingBlock> getCodec() {
+		// TODO Auto-generated method stub
+		return null;
+	}
 }

src/main/java/de/jottyfan/minecraft/quickiefabric/blocks/BlockSpreader.java

@@ -2,6 +2,8 @@ package de.jottyfan.minecraft.quickiefabric.blocks;
 
 import java.util.List;
 
+import com.mojang.serialization.MapCodec;
+
 import de.jottyfan.minecraft.quickiefabric.blockentity.BlockSpreaderEntity;
 import de.jottyfan.minecraft.quickiefabric.blockentity.QuickieFabricBlockEntity;
 import net.fabricmc.fabric.api.object.builder.v1.block.FabricBlockSettings;
@@ -48,4 +50,10 @@ public class BlockSpreader extends BlockWithEntity {
 	public List<ItemStack> getDroppedStacks(BlockState state, Builder builder) {
 		return List.of(new ItemStack(QuickieBlocks.BLOCKSPREADER.asItem()));
 	}
+
+	@Override
+	protected MapCodec<? extends BlockWithEntity> getCodec() {
+		// TODO Auto-generated method stub
+		return null;
+	}
 }

src/main/java/de/jottyfan/minecraft/quickiefabric/blocks/BlockStackerDown.java

@@ -2,6 +2,8 @@ package de.jottyfan.minecraft.quickiefabric.blocks;
 
 import java.util.List;
 
+import com.mojang.serialization.MapCodec;
+
 import de.jottyfan.minecraft.quickiefabric.blockentity.BlockStackerEntity;
 import de.jottyfan.minecraft.quickiefabric.blockentity.QuickieFabricBlockEntity;
 import de.jottyfan.minecraft.quickiefabric.blocks.help.BlockStacker;
@@ -102,4 +104,10 @@ public class BlockStackerDown extends BlockWithEntity implements BlockStacker {
 	public int getComparatorOutput(BlockState state, World world, BlockPos pos) {
 		return ScreenHandler.calculateComparatorOutput(world.getBlockEntity(pos));
 	}
+
+	@Override
+	protected MapCodec<? extends BlockWithEntity> getCodec() {
+		// TODO Auto-generated method stub
+		return null;
+	}
 }

src/main/java/de/jottyfan/minecraft/quickiefabric/blocks/BlockStackerEast.java

@@ -2,6 +2,8 @@ package de.jottyfan.minecraft.quickiefabric.blocks;
 
 import java.util.List;
 
+import com.mojang.serialization.MapCodec;
+
 import de.jottyfan.minecraft.quickiefabric.blockentity.BlockStackerEntity;
 import de.jottyfan.minecraft.quickiefabric.blockentity.QuickieFabricBlockEntity;
 import de.jottyfan.minecraft.quickiefabric.blocks.help.BlockStacker;
@@ -102,4 +104,10 @@ public class BlockStackerEast extends BlockWithEntity implements BlockStacker {
 	public int getComparatorOutput(BlockState state, World world, BlockPos pos) {
 		return ScreenHandler.calculateComparatorOutput(world.getBlockEntity(pos));
 	}
+
+	@Override
+	protected MapCodec<? extends BlockWithEntity> getCodec() {
+		// TODO Auto-generated method stub
+		return null;
+	}
 }

src/main/java/de/jottyfan/minecraft/quickiefabric/blocks/BlockStackerNorth.java

@@ -2,6 +2,8 @@ package de.jottyfan.minecraft.quickiefabric.blocks;
 
 import java.util.List;
 
+import com.mojang.serialization.MapCodec;
+
 import de.jottyfan.minecraft.quickiefabric.blockentity.BlockStackerEntity;
 import de.jottyfan.minecraft.quickiefabric.blockentity.QuickieFabricBlockEntity;
 import de.jottyfan.minecraft.quickiefabric.blocks.help.BlockStacker;
@@ -102,4 +104,10 @@ public class BlockStackerNorth extends BlockWithEntity implements BlockStacker {
 	public int getComparatorOutput(BlockState state, World world, BlockPos pos) {
 		return ScreenHandler.calculateComparatorOutput(world.getBlockEntity(pos));
 	}
+
+	@Override
+	protected MapCodec<? extends BlockWithEntity> getCodec() {
+		// TODO Auto-generated method stub
+		return null;
+	}
 }

src/main/java/de/jottyfan/minecraft/quickiefabric/blocks/BlockStackerSouth.java

@@ -2,6 +2,8 @@ package de.jottyfan.minecraft.quickiefabric.blocks;
 
 import java.util.List;
 
+import com.mojang.serialization.MapCodec;
+
 import de.jottyfan.minecraft.quickiefabric.blockentity.BlockStackerEntity;
 import de.jottyfan.minecraft.quickiefabric.blockentity.QuickieFabricBlockEntity;
 import de.jottyfan.minecraft.quickiefabric.blocks.help.BlockStacker;
@@ -102,4 +104,10 @@ public class BlockStackerSouth extends BlockWithEntity implements BlockStacker {
 	public int getComparatorOutput(BlockState state, World world, BlockPos pos) {
 		return ScreenHandler.calculateComparatorOutput(world.getBlockEntity(pos));
 	}
+
+	@Override
+	protected MapCodec<? extends BlockWithEntity> getCodec() {
+		// TODO Auto-generated method stub
+		return null;
+	}
 }

src/main/java/de/jottyfan/minecraft/quickiefabric/blocks/BlockStackerUp.java

@@ -2,6 +2,8 @@ package de.jottyfan.minecraft.quickiefabric.blocks;
 
 import java.util.List;
 
+import com.mojang.serialization.MapCodec;
+
 import de.jottyfan.minecraft.quickiefabric.blockentity.BlockStackerEntity;
 import de.jottyfan.minecraft.quickiefabric.blockentity.QuickieFabricBlockEntity;
 import de.jottyfan.minecraft.quickiefabric.blocks.help.BlockStacker;
@@ -102,4 +104,10 @@ public class BlockStackerUp extends BlockWithEntity implements BlockStacker {
 	public int getComparatorOutput(BlockState state, World world, BlockPos pos) {
 		return ScreenHandler.calculateComparatorOutput(world.getBlockEntity(pos));
 	}
+
+	@Override
+	protected MapCodec<? extends BlockWithEntity> getCodec() {
+		// TODO Auto-generated method stub
+		return null;
+	}
 }

src/main/java/de/jottyfan/minecraft/quickiefabric/blocks/BlockStackerWest.java

@@ -2,6 +2,8 @@ package de.jottyfan.minecraft.quickiefabric.blocks;
 
 import java.util.List;
 
+import com.mojang.serialization.MapCodec;
+
 import de.jottyfan.minecraft.quickiefabric.blockentity.BlockStackerEntity;
 import de.jottyfan.minecraft.quickiefabric.blockentity.QuickieFabricBlockEntity;
 import de.jottyfan.minecraft.quickiefabric.blocks.help.BlockStacker;
@@ -102,4 +104,10 @@ public class BlockStackerWest extends BlockWithEntity implements BlockStacker {
 	public int getComparatorOutput(BlockState state, World world, BlockPos pos) {
 		return ScreenHandler.calculateComparatorOutput(world.getBlockEntity(pos));
 	}
+
+	@Override
+	protected MapCodec<? extends BlockWithEntity> getCodec() {
+		// TODO Auto-generated method stub
+		return null;
+	}
 }

src/main/java/de/jottyfan/minecraft/quickiefabric/blocks/BlockSulphor.java

@@ -3,6 +3,7 @@ package de.jottyfan.minecraft.quickiefabric.blocks;
 import java.util.Arrays;
 import java.util.List;
 
+import de.jottyfan.minecraft.quickiefabric.blocks.help.IntProviderHelper;
 import de.jottyfan.minecraft.quickiefabric.items.QuickieItems;
 import net.fabricmc.fabric.api.object.builder.v1.block.FabricBlockSettings;
 import net.minecraft.block.BlockState;
@@ -18,7 +19,7 @@ import net.minecraft.loot.context.LootContextParameterSet.Builder;
 public class BlockSulphor extends ExperienceDroppingBlock {
 
 	public BlockSulphor() {
-		super(FabricBlockSettings.create().hardness(0.5f));
+		super(IntProviderHelper.of(0, 2), FabricBlockSettings.create().hardness(0.5f));
 	}
 
 	@Override

src/main/java/de/jottyfan/minecraft/quickiefabric/blocks/QuickieBlocks.java

@@ -1,7 +1,5 @@
 package de.jottyfan.minecraft.quickiefabric.blocks;
 
-import net.minecraft.item.ItemConvertible;
-
 /**
  *
  * @author jotty

src/main/java/de/jottyfan/minecraft/quickiefabric/blocks/help/IntProviderHelper.java

@@ -0,0 +1,37 @@
+package de.jottyfan.minecraft.quickiefabric.blocks.help;
+
+import net.minecraft.util.math.intprovider.IntProvider;
+import net.minecraft.util.math.intprovider.IntProviderType;
+import net.minecraft.util.math.random.Random;
+
+/**
+ *
+ * @author jotty
+ *
+ */
+public class IntProviderHelper {
+	public static final IntProvider of(Integer min, Integer max) {
+		return new IntProvider() {
+
+			@Override
+			public IntProviderType<?> getType() {
+				return IntProviderType.CONSTANT;
+			}
+
+			@Override
+			public int getMin() {
+				return min;
+			}
+
+			@Override
+			public int getMax() {
+				return max;
+			}
+
+			@Override
+			public int get(Random random) {
+				return random.nextBetween(min, max);
+			}
+		};
+	}
+}

src/main/java/de/jottyfan/minecraft/quickiefabric/init/RegistryManager.java

@@ -77,6 +77,7 @@ public class RegistryManager {
 							stacks.add(new ItemStack(QuickieItems.SALPETER));
 							stacks.add(new ItemStack(QuickieItems.SULPHOR));
 							stacks.add(new ItemStack(QuickieItems.SPEEDPOWDER));
+							stacks.add(new ItemStack(QuickieItems.QUICKIEPOWDER));
 							stacks.add(new ItemStack(QuickieItems.LEVELUP));
 							stacks.add(new ItemStack(QuickieItems.PENCIL));
 							stacks.add(new ItemStack(QuickieItems.ROTTEN_FLESH_STRIPES));
@@ -219,6 +220,7 @@ public class RegistryManager {
 	public static final void registerItems() {
 		LOGGER.debug("registering quickiefabric items");
 		registerItem(QuickieItems.SPEEDPOWDER, "speedpowder");
+		registerItem(QuickieItems.QUICKIEPOWDER, "quickiepowder");
 		registerItem(QuickieItems.LEVELUP, "levelup");
 		registerItem(QuickieItems.PENCIL, "pencil");
 		registerItem(QuickieItems.SALPETER, "salpeter");

src/main/java/de/jottyfan/minecraft/quickiefabric/items/ItemQuickiepowder.java

@@ -0,0 +1,16 @@
+package de.jottyfan.minecraft.quickiefabric.items;
+
+import net.fabricmc.fabric.api.item.v1.FabricItemSettings;
+import net.minecraft.item.Item;
+
+/**
+ *
+ * @author jotty
+ *
+ */
+public class ItemQuickiepowder extends Item {
+
+	public ItemQuickiepowder() {
+		super(new FabricItemSettings());
+	}
+}

src/main/java/de/jottyfan/minecraft/quickiefabric/items/QuickieItems.java

@@ -7,6 +7,7 @@ package de.jottyfan.minecraft.quickiefabric.items;
  */
 public class QuickieItems {
 	public static final ItemSpeedpowder SPEEDPOWDER = new ItemSpeedpowder();
+	public static final ItemQuickiepowder QUICKIEPOWDER = new ItemQuickiepowder();
 	public static final ItemLevelup LEVELUP = new ItemLevelup();
 	public static final ItemPencil PENCIL = new ItemPencil();
 	public static final ItemSalpeter SALPETER = new ItemSalpeter();

src/main/java/de/jottyfan/minecraft/quickiefabric/mixin/BlockBreakMixin.java

@@ -3,7 +3,7 @@ package de.jottyfan.minecraft.quickiefabric.mixin;
 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.CallbackInfo;
+import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable;
 
 import de.jottyfan.minecraft.quickiefabric.event.BreakBlockCallback;
 import net.minecraft.block.Block;
@@ -21,8 +21,8 @@ import net.minecraft.world.World;
 @Mixin(Block.class)
 public class BlockBreakMixin {
 
-	@Inject(at = @At("HEAD"), method = "onBreak(Lnet/minecraft/world/World;Lnet/minecraft/util/math/BlockPos;Lnet/minecraft/block/BlockState;Lnet/minecraft/entity/player/PlayerEntity;)V")
-	private void onBreak(final World world, final BlockPos blockPos, final BlockState blockState, final PlayerEntity playerEntity, final CallbackInfo info) {
+	@Inject(at = @At("HEAD"), method = "onBreak(Lnet/minecraft/world/World;Lnet/minecraft/util/math/BlockPos;Lnet/minecraft/block/BlockState;Lnet/minecraft/entity/player/PlayerEntity;)Lnet/minecraft/block/BlockState;")
+	private void onBreak(final World world, final BlockPos blockPos, final BlockState blockState, final PlayerEntity playerEntity, final CallbackInfoReturnable<BlockBreakMixin> info) {
 		ActionResult result = BreakBlockCallback.EVENT.invoker().injectBlockBreakCallback(world, blockPos, blockState, playerEntity);
 		if (result == ActionResult.FAIL) {
 			info.cancel();

src/main/java/de/jottyfan/minecraft/quickiefabric/tools/ToolSpeedpowderHoe.java

@@ -79,7 +79,7 @@ public class ToolSpeedpowderHoe extends HoeItem implements ToolRangeable {
 	@Override
 	public boolean canBreakNeighbors(BlockState blockState) {
 		return super.isSuitableFor(blockState)
-				|| Blocks.GRASS.equals(blockState.getBlock())
+				|| Blocks.TALL_GRASS.equals(blockState.getBlock())
 				|| Blocks.FERN.equals(blockState.getBlock())
 				|| Blocks.LARGE_FERN.equals(blockState.getBlock());
 	}

src/main/resources/assets/quickiefabric/lang/de_de.json

@@ -6,6 +6,7 @@
   "item.quickiefabric.speedpowderhoe": "Fluchtpulverfeldhacke",
   "item.quickiefabric.speedpowderwaterhoe": "bewässerte Fluchtpulverfeldhacke",
 	"item.quickiefabric.speedpowder": "Fluchtpulver",
+	"item.quickiefabric.quickiepowder": "Eilpulver",
 	"item.quickiefabric.sulphor": "Schwefel",
 	"item.quickiefabric.salpeter": "Salpeter",
 	"item.quickiefabric.construction0": "leerer Bauplan",

src/main/resources/assets/quickiefabric/lang/en_us.json

@@ -6,6 +6,7 @@
   "item.quickiefabric.speedpowderhoe": "speedpowder hoe",
   "item.quickiefabric.speedpowderwaterhoe": "watered speedpowder hoe",
 	"item.quickiefabric.speedpowder": "speedpowder",
+	"item.quickiefabric.quickiepowder": "hurrypowder",
 	"item.quickiefabric.sulphor": "sulfur",
 	"item.quickiefabric.salpeter": "salpeter",
 	"item.quickiefabric.construction0": "empty building plan",

src/main/resources/assets/quickiefabric/models/item/quickiepowder.json

@@ -0,0 +1,6 @@
+{
+    "parent": "item/coal",
+    "textures": {
+        "layer0": "quickiefabric:item/quickiepowder"
+    }
+}

src/main/resources/data/quickiefabric/recipes/quickiepowder.json

@@ -0,0 +1,15 @@
+{
+	"type": "minecraft:crafting_shapeless",
+	"ingredients": [
+		{
+			"item": "quickiefabric:speedpowder"
+		},
+		{
+			"item": "minecraft:slime_ball"
+		}
+	],
+	"result": {
+		"item": "quickiefabric:quickiepowder",
+		"count": 2
+	}
+}

src/main/resources/fabric.mod.json

@@ -26,10 +26,10 @@
 		"quickiefabric.mixins.json"
 	],
 	"depends": {
-		"fabricloader": ">=0.14.22",
-		"fabric": "*",
-		"minecraft": "1.20.2",
-		"java": ">=17"
+		"fabricloader": ">=0.14.24",
+		"minecraft": "~1.20.2",
+		"java": ">=17",
+		"fabric-api": "*"
 	},
 	"suggests": {
 		"flamingo": "*"