Port to 1.18

build.gradle

@@ -17,7 +17,8 @@ apply plugin: 'org.parchmentmc.librarian.forgegradle'
 apply plugin: 'java'
 apply plugin: 'idea'
 apply plugin: 'maven-publish'
-
+apply from: 'https://raw.githubusercontent.com/SizableShrimp/Forge-Class-Remapper/main/classremapper.gradle'
+apply from: 'https://raw.githubusercontent.com/SizableShrimp/ForgeUpdatesRemapper/main/remapper.gradle'
 version = "$mod_version"
 group = "de.ellpeck.actuallyadditions"
 archivesBaseName = "ActuallyAdditions-$game_version"
@@ -26,7 +27,7 @@ if (System.getenv('BUILD_NUMBER') != null) {
     version += "." + System.getenv('BUILD_NUMBER')
 }
 
-java.toolchain.languageVersion = JavaLanguageVersion.of(8)
+java.toolchain.languageVersion = JavaLanguageVersion.of(17)
 
 minecraft {
     mappings channel: 'parchment', version: "${parchment_version}-${game_version}"
@@ -88,8 +89,8 @@ dependencies {
     compileOnly fg.deobf("mezz.jei:jei-${jei_version}:api")
     runtimeOnly fg.deobf("mezz.jei:jei-${jei_version}")
 
-    runtimeOnly fg.deobf("curse.maven:TOP-245211:3319255")
+    runtimeOnly fg.deobf("curse.maven:the-one-probe-245211:3965688")
-    runtimeOnly fg.deobf("curse.maven:MEK-268560:3590099")
+    runtimeOnly fg.deobf("curse.maven:mekanism-268560:3875976")
 }
 
 // not sure if this is still needed

gradle.properties

@@ -6,11 +6,11 @@ org.gradle.daemon=false
 mod_version=1.1.52
 
 # Forge
-game_version=1.16.5
+game_version=1.18.2
-forge_version=36.2.34
+forge_version=40.2.17
 
 # Parchment (Mappings)
-parchment_version=2021.10.17
+parchment_version=2022.11.06
 
 # Other mods
-jei_version=1.16.5:7.7.1.153
+jei_version=1.18.2:9.7.1.255

gradle/wrapper/gradle-wrapper.properties

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

gradlew

@@ -1,78 +1,129 @@
-#!/usr/bin/env sh
+#!/bin/sh
+
+#
+# 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.
+# You may obtain a copy of the License at
+#
+#      https://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
 
 ##############################################################################
-##
+#
-##  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/master/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"
+app_path=$0
-# Need this for relative symlinks.
+
-while [ -h "$PRG" ] ; do
+# Need this for daisy-chained symlinks.
-    ls=`ls -ld "$PRG"`
+while
-    link=`expr "$ls" : '.*-> \(.*\)$'`
+    APP_HOME=${app_path%"${app_path##*/}"}  # leaves a trailing /; empty if no leading path
-    if expr "$link" : '/.*' > /dev/null; then
+    [ -h "$app_path" ]
-        PRG="$link"
+do
-    else
+    ls=$( ls -ld "$app_path" )
-        PRG=`dirname "$PRG"`"/$link"
+    link=${ls#*' -> '}
-    fi
+    case $link in             #(
+      /*)   app_path=$link ;; #(
+      *)    app_path=$APP_HOME$link ;;
+    esac
 done
-SAVED="`pwd`"
+
-cd "`dirname \"$PRG\"`/" >/dev/null
+APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit
-APP_HOME="`pwd -P`"
-cd "$SAVED" >/dev/null
 
 APP_NAME="Gradle"
-APP_BASE_NAME=`basename "$0"`
+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=""
+DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
 
 # 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
+case "$( uname )" in                #(
-  CYGWIN* )
+  CYGWIN* )         cygwin=true  ;; #(
-    cygwin=true
+  Darwin* )         darwin=true  ;; #(
-    ;;
+  MSYS* | MINGW* )  msys=true    ;; #(
-  Darwin* )
+  NONSTOP* )        nonstop=true ;;
-    darwin=true
-    ;;
-  MINGW* )
-    msys=true
-    ;;
-  NONSTOP* )
-    nonstop=true
-    ;;
 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
         # 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
@@ -81,7 +132,7 @@ Please set the JAVA_HOME variable in your environment to match the
 location of your Java installation."
     fi
 else
-    JAVACMD="java"
+    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.
 
 Please set the JAVA_HOME variable in your environment to match the
@@ -89,84 +140,95 @@ location of your Java installation."
 fi
 
 # Increase the maximum file descriptors if we can.
-if [ "$cygwin" = "false" -a "$darwin" = "false" -a "$nonstop" = "false" ] ; then
+if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then
-    MAX_FD_LIMIT=`ulimit -H -n`
+    case $MAX_FD in #(
-    if [ $? -eq 0 ] ; then
+      max*)
-        if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ] ; then
+        MAX_FD=$( ulimit -H -n ) ||
-            MAX_FD="$MAX_FD_LIMIT"
+            warn "Could not query maximum file descriptor limit"
-        fi
+    esac
-        ulimit -n $MAX_FD
+    case $MAX_FD in  #(
-        if [ $? -ne 0 ] ; then
+      '' | soft) :;; #(
-            warn "Could not set maximum file descriptor limit: $MAX_FD"
+      *)
-        fi
+        ulimit -n "$MAX_FD" ||
-    else
+            warn "Could not set maximum file descriptor limit to $MAX_FD"
-        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, switch paths to Windows format before running java
-if $cygwin ; 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=$((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" ;;
     esac
 fi
 
-# Escape application args
+# Collect all arguments for the java command, stacking in reverse order:
-save () {
+#   * args from the command line
-    for i do printf %s\\n "$i" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/" ; done
+#   * the main class name
-    echo " "
+#   * -classpath
-}
+#   * -D...appname settings
-APP_ARGS=$(save "$@")
+#   * --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
+# For Cygwin or MSYS, switch paths to Windows format before running java
-eval set -- $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS "\"-Dorg.gradle.appname=$APP_BASE_NAME\"" -classpath "\"$CLASSPATH\"" org.gradle.wrapper.GradleWrapperMain "$APP_ARGS"
+if "$cygwin" || "$msys" ; then
+    APP_HOME=$( cygpath --path --mixed "$APP_HOME" )
+    CLASSPATH=$( cygpath --path --mixed "$CLASSPATH" )
 
-# by default we should be in the correct project dir, but when run from Finder on Mac, the cwd is wrong
+    JAVACMD=$( cygpath --unix "$JAVACMD" )
-if [ "$(uname)" = "Darwin" ] && [ "$HOME" = "$PWD" ]; then
+
-  cd "$(dirname "$0")"
+    # 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
 
+# 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 \
+        "$@"
+
+# 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

@@ -1,3 +1,19 @@
+@rem
+@rem Copyright 2015 the original author or authors.
+@rem
+@rem Licensed under the Apache License, Version 2.0 (the "License");
+@rem you may not use this file except in compliance with the License.
+@rem You may obtain a copy of the License at
+@rem
+@rem      https://www.apache.org/licenses/LICENSE-2.0
+@rem
+@rem Unless required by applicable law or agreed to in writing, software
+@rem distributed under the License is distributed on an "AS IS" BASIS,
+@rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+@rem See the License for the specific language governing permissions and
+@rem limitations under the License.
+@rem
+
 @if "%DEBUG%" == "" @echo off
 @rem ##########################################################################
 @rem
@@ -13,15 +29,18 @@ 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=
+set DEFAULT_JVM_OPTS="-Xmx64m" "-Xms64m"
 
 @rem Find java.exe
 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.
@@ -35,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%
@@ -45,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

src/generated/resources/.cache/cache

@@ -454,145 +454,145 @@ f657eabc7321de0b05cf92d9ebdd6f5215a685b5 assets/actuallyadditions/models/item/wo
 09674f706bebd8f2631450f1c07f1376b2c3ba01 assets/actuallyadditions/models/item/worm.json
 0b1ab8963077c90a5104b516eab36e56c8a07057 assets/actuallyadditions/models/item/xp_solidifier.json
 ecf1cc8efe1f425334e8e07a6c747641c714c92c assets/actuallyadditions/sounds.json
-56048fd14b61c03380903460ec55fabc2df3eaac data/actuallyadditions/advancements/craft_coal_generator.json
+78a1e3bec8bf9830c1ca098af7e2a9213426f75b data/actuallyadditions/advancements/craft_coal_generator.json
-58d03f96a5c20611e22d8cec90c972d7218064e8 data/actuallyadditions/advancements/craft_coffee_machine.json
+2c8657e98263866b87520fe3de4aaa900cee1758 data/actuallyadditions/advancements/craft_coffee_machine.json
-681bfd8939b4a7843700fe00382f703e80070a38 data/actuallyadditions/advancements/craft_crusher.json
+8746592eda56b4027e896c20fe1a6d0dbcb24bc9 data/actuallyadditions/advancements/craft_crusher.json
-3dfef9d6252198582a16fcc85a1abca2f6bad2e3 data/actuallyadditions/advancements/craft_double_crusher.json
+0c699699a50df43acac86490b3d238c04984c6bb data/actuallyadditions/advancements/craft_double_crusher.json
-04bc0214d706d2011d6450803e406579f2e132f4 data/actuallyadditions/advancements/craft_empowerer.json
+367027f64ba66fd1757c3391c3cd27336ff954c5 data/actuallyadditions/advancements/craft_empowerer.json
-889c1be4720a7da3887cd378e3f98d446af25ae3 data/actuallyadditions/advancements/craft_energyface.json
+0f1e0ac963635b25299c99ebcbe66823985f0f1b data/actuallyadditions/advancements/craft_energyface.json
-45a78c57fcbbced57321c420e1d0dc050a1b2ff5 data/actuallyadditions/advancements/craft_item_interface.json
+c5ed52b759d2a4d61b12d07b57c859c9c0ce8e3a data/actuallyadditions/advancements/craft_item_interface.json
-ef2c3abb1f2dcb31baa00fa6e70d8d8846440266 data/actuallyadditions/advancements/craft_laser_relay.json
+8fcb90f479e353a6b251c62cb323a151a12182c0 data/actuallyadditions/advancements/craft_laser_relay.json
-8f81eeffa15e291e4a7cae6f7464746cd0bc834b data/actuallyadditions/advancements/craft_laser_relay_advanced.json
+8010e063762d9ad376ef6efd02bc9c6bd30004b9 data/actuallyadditions/advancements/craft_laser_relay_advanced.json
-fc1c59cc804274b36d757c59529269bb14841f4a data/actuallyadditions/advancements/craft_laser_relay_extreme.json
+1f9f9b227ebea65d04b3c448bb06c875cfcc746a data/actuallyadditions/advancements/craft_laser_relay_extreme.json
-aff73cb2465d85abf92d94b5843167166c9b2820 data/actuallyadditions/advancements/craft_laser_relay_item.json
+5fef10815f29597800e9015e95af190ca8501bf7 data/actuallyadditions/advancements/craft_laser_relay_item.json
-69532a7bd1b199dacb08f4541fc0c27633b391da data/actuallyadditions/advancements/craft_leaf_generator.json
+c72fcdc4c2b6dc7f757b41b61f6e5063c7dcf49a data/actuallyadditions/advancements/craft_leaf_generator.json
-56c4431e4d61926e07073f5265086e67312c0023 data/actuallyadditions/advancements/craft_liquiface.json
+d8a218723094bc01575a7e0b197f1676347bce57 data/actuallyadditions/advancements/craft_liquiface.json
-f1e0c56dab5fd3516e9d1da7c16831bf4bd3364e data/actuallyadditions/advancements/craft_phantom_face.json
+9d1f0abf32f1200920ba83933511f01cfc7ac203 data/actuallyadditions/advancements/craft_phantom_face.json
-ef621cca24fa11382b856a70fa6f432f081007d7 data/actuallyadditions/advancements/craft_reconstructor.json
+d476883cb50537b8058c08df2d8b2ee42cd66c7a data/actuallyadditions/advancements/craft_reconstructor.json
 d09f28dfb125fc0d58f4e23287d19877db73c0b7 data/actuallyadditions/advancements/make_first_crystal.json
-58c901fc6a544f800e641b2ab9f1f4b25d6dce53 data/actuallyadditions/advancements/pickup_coffee.json
+4d77ce02dec4e2092a6e9e739e85dc0768928a4a data/actuallyadditions/advancements/pickup_coffee.json
 1326c214451f5fef68e330a37bfa0433de723f4c data/actuallyadditions/advancements/root.json
-b679296118ae905d4a15b6bc658cfa7b8048e57f data/actuallyadditions/loot_tables/blocks/atomic_reconstructor.json
+7c476ba0444784e06a50633e488f20deac84b989 data/actuallyadditions/loot_tables/blocks/atomic_reconstructor.json
-de3c64d6a363f8e27078d7f7df1a67e4931fd81c data/actuallyadditions/loot_tables/blocks/battery_box.json
+bb5d55da383e21ce9cd6c05703ae9b16ff59b085 data/actuallyadditions/loot_tables/blocks/battery_box.json
-fb968dc63f2d0a467eff504f3f6ff386080e2433 data/actuallyadditions/loot_tables/blocks/bio_reactor.json
+3c4661088ed15818d8c4b4c63f74175a8b7f5b91 data/actuallyadditions/loot_tables/blocks/bio_reactor.json
-a1b62291e361451916e45a97bb499ecb1b6eb595 data/actuallyadditions/loot_tables/blocks/black_quartz_block.json
+67c5066a4cc1de2775574bb70707b179489511a7 data/actuallyadditions/loot_tables/blocks/black_quartz_block.json
-88d06540d7db61a5f12d4ae728b298978c175528 data/actuallyadditions/loot_tables/blocks/black_quartz_brick_block.json
+74a0519c8b958bbcf26ede292849a8e5435f381f data/actuallyadditions/loot_tables/blocks/black_quartz_brick_block.json
-758ea9d573bad6eb5a9baa480e6ac7cdb3086801 data/actuallyadditions/loot_tables/blocks/black_quartz_brick_slab.json
+d91bbca6576c922b016299fa88c7a89c9c1fbdc0 data/actuallyadditions/loot_tables/blocks/black_quartz_brick_slab.json
-25999ba6adebccd8f8c9aaeac4d569b561c10ff6 data/actuallyadditions/loot_tables/blocks/black_quartz_brick_stair.json
+0d91d745894803c2a0ee7fae8242fff85b63bfbb data/actuallyadditions/loot_tables/blocks/black_quartz_brick_stair.json
-83eae2a8058606f8fd7ad48b4f18b2dd4cf25f91 data/actuallyadditions/loot_tables/blocks/black_quartz_brick_wall.json
+6e60f0b3ba9672668a9bb017f39ded02774d64f0 data/actuallyadditions/loot_tables/blocks/black_quartz_brick_wall.json
-de831ee9fb899a2698a15aa792798e8bc8cec6cd data/actuallyadditions/loot_tables/blocks/black_quartz_ore.json
+51eb09f165b4e7f9221823ff1a7b1398042dd5fc data/actuallyadditions/loot_tables/blocks/black_quartz_ore.json
-284190bea6fa9fefeeb5aa942830fbd8999a4446 data/actuallyadditions/loot_tables/blocks/black_quartz_pillar_block.json
+ad79549ec1bb16cb81b1c17efd3cc24d901c0d66 data/actuallyadditions/loot_tables/blocks/black_quartz_pillar_block.json
-9fa02c71612918d38900fb401c15975cb43a7443 data/actuallyadditions/loot_tables/blocks/black_quartz_pillar_slab.json
+e3e0187a5a3c56469f4719450673fa6f8ed013e5 data/actuallyadditions/loot_tables/blocks/black_quartz_pillar_slab.json
-7a5c8a64366e6302647efa0f6ce033f24e74af89 data/actuallyadditions/loot_tables/blocks/black_quartz_pillar_stair.json
+ccb53f7ab56df2dc28c290dd996e3c317346d146 data/actuallyadditions/loot_tables/blocks/black_quartz_pillar_stair.json
-b12f24fa635a72ea41c5cab68015b47b01e85846 data/actuallyadditions/loot_tables/blocks/black_quartz_pillar_wall.json
+8e2fe41c346ca3cba6d98bdd41a00feafaf2fad7 data/actuallyadditions/loot_tables/blocks/black_quartz_pillar_wall.json
-1fe5db6af5243d718867a3aed2915f60a074420f data/actuallyadditions/loot_tables/blocks/black_quartz_slab.json
+e6e88f9aa1a0ee0171b96ab327e4faf58ab93fbb data/actuallyadditions/loot_tables/blocks/black_quartz_slab.json
-59363fb1bf29cc3eaeda51267d7a3d3451659b85 data/actuallyadditions/loot_tables/blocks/black_quartz_stair.json
+41bbe28a14e07beccfa18914bf2e95410265ebf5 data/actuallyadditions/loot_tables/blocks/black_quartz_stair.json
-9ff4e9ed368bc6c84c8a4a6faf7557eb23856fe0 data/actuallyadditions/loot_tables/blocks/black_quartz_wall.json
+d4b51e2228f12cfd5aa51d4e72b83307656f8607 data/actuallyadditions/loot_tables/blocks/black_quartz_wall.json
-8cd0a700e62111e5a4351788072bf816731ab493 data/actuallyadditions/loot_tables/blocks/breaker.json
+57031055419efa50a97d1653c3227afe9cf8ceed data/actuallyadditions/loot_tables/blocks/breaker.json
-91fae25a55c4f58e5871c6008c5c13f89cb62198 data/actuallyadditions/loot_tables/blocks/canola.json
+83319db556d5b892ff8ab33bce62c8282d1bbf08 data/actuallyadditions/loot_tables/blocks/canola.json
-f3df22f203e8c00ee7ee004bb9b4edfd522f069a data/actuallyadditions/loot_tables/blocks/canola_press.json
+6d7c7d717df570c9b661db11a861483b4fa253e8 data/actuallyadditions/loot_tables/blocks/canola_press.json
-55e8641b836aab36848edf7d0eab33e647571fc8 data/actuallyadditions/loot_tables/blocks/chiseled_black_quartz_block.json
+195eab69b32f2e36f815c66e0f2e88b653fedb0f data/actuallyadditions/loot_tables/blocks/chiseled_black_quartz_block.json
-7b10afffb30390977f1729356e0b4959ccb4cf1c data/actuallyadditions/loot_tables/blocks/chiseled_black_quartz_slab.json
+6b640079b13b9f20bd883df17f763d086e64d11d data/actuallyadditions/loot_tables/blocks/chiseled_black_quartz_slab.json
-6df5538ba7cf057d19728f8e615862a84b9d4bb1 data/actuallyadditions/loot_tables/blocks/chiseled_black_quartz_stair.json
+2acba6eb2a214292df2d0db3fa46701ca7c9508a data/actuallyadditions/loot_tables/blocks/chiseled_black_quartz_stair.json
-092e8773d46f16d80d0c489c4a2d2f8bd5a78799 data/actuallyadditions/loot_tables/blocks/chiseled_black_quartz_wall.json
+b1998a958433d4e5f9ff2a5aa49b4d7cea198393 data/actuallyadditions/loot_tables/blocks/chiseled_black_quartz_wall.json
-bf7743c27757cf5b0dbab9b3e15d1d5ca1ece818 data/actuallyadditions/loot_tables/blocks/coal_generator.json
+6eb4516ae49ddc777468da4adffb2fd3b562a9cc data/actuallyadditions/loot_tables/blocks/coal_generator.json
-01ed45d18335029de7725ae4490077c9280eedd1 data/actuallyadditions/loot_tables/blocks/coffee.json
+3c5adae363db644f6e24c9bab93f8b98e58debeb data/actuallyadditions/loot_tables/blocks/coffee.json
-3285202e3f840d091b8d85dc2c721199fcc96240 data/actuallyadditions/loot_tables/blocks/coffee_machine.json
+3a5fb14238fded1a5bd33163328d02f334a4a5fc data/actuallyadditions/loot_tables/blocks/coffee_machine.json
-317d0377327250f2fe15ff549a1ffa1b7bdade14 data/actuallyadditions/loot_tables/blocks/crusher.json
+56f4a5c8420dc8b69782204a2e7af552e37cd5ab data/actuallyadditions/loot_tables/blocks/crusher.json
-b087c6f44cf0236f52471ec54c026ee30ba0d273 data/actuallyadditions/loot_tables/blocks/crusher_double.json
+17d4d4e009c822f4dc4617ff1a8d51fcf9933429 data/actuallyadditions/loot_tables/blocks/crusher_double.json
-6336ca572b8d81f6e06b43bb925b48bb915b6574 data/actuallyadditions/loot_tables/blocks/diamatine_crystal_block.json
+4c6d8c53c2ac6ee0a08a4c9e7f0f0a046bf19e18 data/actuallyadditions/loot_tables/blocks/diamatine_crystal_block.json
-b9ed4007fec7a382a02b08b231f072df6aa40049 data/actuallyadditions/loot_tables/blocks/diamatine_crystal_cluster.json
+83ae77fd9d3cd2c7c38d3a9f30ef555b4507ac52 data/actuallyadditions/loot_tables/blocks/diamatine_crystal_cluster.json
-7476dbc0cbb3c1a8ce5a3c1562f73fcfb4adcd10 data/actuallyadditions/loot_tables/blocks/display_stand.json
+c69a0c113a49beda5c4a7721d4a7af5b9d2c452c data/actuallyadditions/loot_tables/blocks/display_stand.json
-162331b9fbc67309820a20377575336e63ed3e74 data/actuallyadditions/loot_tables/blocks/dropper.json
+e5a3c083bef3c3819599d6c71ddce4a3d0f257b4 data/actuallyadditions/loot_tables/blocks/dropper.json
-3b93e666ae7c49a182e771063901b27da8dcfb3f data/actuallyadditions/loot_tables/blocks/emeradic_crystal_block.json
+3bb4d9f95ddd88b7e4a004fa8f4727a0e613efde data/actuallyadditions/loot_tables/blocks/emeradic_crystal_block.json
-9fec34737374133601990074c4156334ab3841ad data/actuallyadditions/loot_tables/blocks/emeradic_crystal_cluster.json
+eec807466d0e33b52685a8d9bc776317a013303b data/actuallyadditions/loot_tables/blocks/emeradic_crystal_cluster.json
-aeb229c0c9a5d5f4682430ed4ec78c123e7e871b data/actuallyadditions/loot_tables/blocks/empowered_diamatine_crystal_block.json
+ebae1c4d56e3b5dd5d213ccae4a1ac8237780aa6 data/actuallyadditions/loot_tables/blocks/empowered_diamatine_crystal_block.json
-04f1075d01a9467a6ad00373b73b94869af7a799 data/actuallyadditions/loot_tables/blocks/empowered_emeradic_crystal_block.json
+a2d6ac504f0a09bca011f704ca2f25be6ebb0962 data/actuallyadditions/loot_tables/blocks/empowered_emeradic_crystal_block.json
-00e52dcccbf05f4d332b650ce9374691983b32f1 data/actuallyadditions/loot_tables/blocks/empowered_enori_crystal_block.json
+a7162ee24237ef45f265c5c473da53cede9ff4c8 data/actuallyadditions/loot_tables/blocks/empowered_enori_crystal_block.json
-4c9d1217bab479d6b28c2c2b6a12b8dea9625ca7 data/actuallyadditions/loot_tables/blocks/empowered_palis_crystal_block.json
+cab369964320a3b66f90a835919e669cb0a5ec9a data/actuallyadditions/loot_tables/blocks/empowered_palis_crystal_block.json
-000a65e96a8f3d79f37671a42e00c5700c46cc79 data/actuallyadditions/loot_tables/blocks/empowered_restonia_crystal_block.json
+fcd1cbd35d0bbc06e3e71303476857cae5e40c68 data/actuallyadditions/loot_tables/blocks/empowered_restonia_crystal_block.json
-3b23c1416f7227cdd3c05033cd097e4e95048a12 data/actuallyadditions/loot_tables/blocks/empowered_void_crystal_block.json
+b7b4cd0a896af8a6df7233427040c094afc7889e data/actuallyadditions/loot_tables/blocks/empowered_void_crystal_block.json
-e0ae0923455cc2eedfdfc826d8c408b23373997c data/actuallyadditions/loot_tables/blocks/empowerer.json
+95fcc7dcb49d7a35ff73d6978e97394034a5a219 data/actuallyadditions/loot_tables/blocks/empowerer.json
-8b9f76383b14f0d814126a3279fcf4d4b84867e3 data/actuallyadditions/loot_tables/blocks/ender_casing.json
+9e52c96a713a82d3589cd52b7d43544d1d927d3e data/actuallyadditions/loot_tables/blocks/ender_casing.json
-872ba64002408040096e08a340b956b35c261f57 data/actuallyadditions/loot_tables/blocks/energizer.json
+e83a71b615f0e1b1972a819395296e13c7be56be data/actuallyadditions/loot_tables/blocks/energizer.json
-ce52e2261acccd8092f6033eaa24cb7eb0ace776 data/actuallyadditions/loot_tables/blocks/enervator.json
+be35fcd78bcb7eb299625c3a62456c34184ec21f data/actuallyadditions/loot_tables/blocks/enervator.json
-0310ab57594d1bbbdfc20043a4bbf6a522207e74 data/actuallyadditions/loot_tables/blocks/enori_crystal_block.json
+6ce6b9e6ae9ee02906cd9410d53bf9b975c628b2 data/actuallyadditions/loot_tables/blocks/enori_crystal_block.json
-58de0ea0cc68ec93bf488557e880b9e5f839a338 data/actuallyadditions/loot_tables/blocks/enori_crystal_cluster.json
+0c8c4e819bced6cdc1a887d6b00a07b76452fe36 data/actuallyadditions/loot_tables/blocks/enori_crystal_cluster.json
-24ad472bcaa4536e32865de339ec932f55399de6 data/actuallyadditions/loot_tables/blocks/ethetic_green_block.json
+e9ad8228fa30d5f8d56088d57c445073fa9d380b data/actuallyadditions/loot_tables/blocks/ethetic_green_block.json
-5e2a9930efaa4c815a2874405876878b96478efb data/actuallyadditions/loot_tables/blocks/ethetic_green_slab.json
+9ef0bf1effdb5f3732fbd27617f50fb1672b3ee3 data/actuallyadditions/loot_tables/blocks/ethetic_green_slab.json
-978541de7caae92254b402d85a6fa28be92a2446 data/actuallyadditions/loot_tables/blocks/ethetic_green_stairs.json
+23656b1068400b349adf5ed3fb62265beae1b4ec data/actuallyadditions/loot_tables/blocks/ethetic_green_stairs.json
-6cd9d8105bebca9bb7bd054fa54e60aa7f7229a8 data/actuallyadditions/loot_tables/blocks/ethetic_green_wall.json
+dcf88d90a7c0aaed3745222140dd7762285e4a99 data/actuallyadditions/loot_tables/blocks/ethetic_green_wall.json
-5d20584eddc3887ee6bda8cbb9312ae549dc5307 data/actuallyadditions/loot_tables/blocks/ethetic_white_block.json
+3817a07ac3d8e6b7295185b5b30e945c836bd86e data/actuallyadditions/loot_tables/blocks/ethetic_white_block.json
-bf9c3a7ae7a9f3a6450403292cbcecd922f6aa3b data/actuallyadditions/loot_tables/blocks/ethetic_white_slab.json
+6560b21185ffa6fdc540136cf8e223bc6883202b data/actuallyadditions/loot_tables/blocks/ethetic_white_slab.json
-35c33041660cc162e8283a94ac0be3208a7958ea data/actuallyadditions/loot_tables/blocks/ethetic_white_stairs.json
+cc80737398b55d3244a76b461fcbe71520a1584a data/actuallyadditions/loot_tables/blocks/ethetic_white_stairs.json
-d98534f21c56b8d11f722c8c3c9d0acbeb323554 data/actuallyadditions/loot_tables/blocks/ethetic_white_wall.json
+49605a5bbb985781710584647b3e8c7e4b5a5813 data/actuallyadditions/loot_tables/blocks/ethetic_white_wall.json
-de23e0f60c9ea67e554f6e21425c29a45c205378 data/actuallyadditions/loot_tables/blocks/farmer.json
+f4cc5421009f16223f505379189260b4b6204ec2 data/actuallyadditions/loot_tables/blocks/farmer.json
-0b617808ed4788bbe97fe81efc37290e19ab257d data/actuallyadditions/loot_tables/blocks/feeder.json
+08959a6e9cdac1b59d8015db38d36fb24a04bc7f data/actuallyadditions/loot_tables/blocks/feeder.json
-91a2dd39bb797fb3270367ab77524733fc8aab47 data/actuallyadditions/loot_tables/blocks/fermenting_barrel.json
+650409e01fc826b133e41e1041c8d1d521b9fd40 data/actuallyadditions/loot_tables/blocks/fermenting_barrel.json
-0bcee59a3bdf86cbb604b65a6c9013d21d16c13c data/actuallyadditions/loot_tables/blocks/firework_box.json
+c91f4678917231a691a00716f8cc76f7c0511627 data/actuallyadditions/loot_tables/blocks/firework_box.json
-537ecc108b85896c89bbb50583c15b602bc5d3a9 data/actuallyadditions/loot_tables/blocks/flax.json
+096fc3f758f0b02557bce73588c5f143e908544d data/actuallyadditions/loot_tables/blocks/flax.json
-2c276ba10bd5655d38bb52e5670ba046cf5783b9 data/actuallyadditions/loot_tables/blocks/fluid_collector.json
+88fa30109d1ae55999ded8ff6559cc624d9c98fb data/actuallyadditions/loot_tables/blocks/fluid_collector.json
-0d1f81f93d2bbb37b6ce9a645a1a4ee34bdd0c41 data/actuallyadditions/loot_tables/blocks/fluid_placer.json
+cf193f4e8ff7cd8ad3a1a1b1101bcf5445814ecb data/actuallyadditions/loot_tables/blocks/fluid_placer.json
-a6e2a7783e597f97780fd144706e66b5fdb7d9e0 data/actuallyadditions/loot_tables/blocks/greenhouse_glass.json
+390934605a8630a35993bfa30e47cc3aca2ad595 data/actuallyadditions/loot_tables/blocks/greenhouse_glass.json
-299f001df502fa1aa34384370d06cc698a51c39e data/actuallyadditions/loot_tables/blocks/heat_collector.json
+dc57d4928bf987ce6a3ca4f10201bbd9dfeccb60 data/actuallyadditions/loot_tables/blocks/heat_collector.json
-e116e77ea6f45d0d4b93cde1084c75086413315e data/actuallyadditions/loot_tables/blocks/hopping_item_interface.json
+6d711189bf7dc33281d08f8a90c8383233e3217c data/actuallyadditions/loot_tables/blocks/hopping_item_interface.json
-12c27a8021c6b61cf4304bca94edd2aa5d1ff658 data/actuallyadditions/loot_tables/blocks/iron_casing.json
+733e0d4226ae2775e8c619e8bba71f1515906b31 data/actuallyadditions/loot_tables/blocks/iron_casing.json
-a5d03812083bf4091fdc87b5cca597d8d585c59a data/actuallyadditions/loot_tables/blocks/item_interface.json
+251b67acc2885871d7f9f3e90bb58653028221e1 data/actuallyadditions/loot_tables/blocks/item_interface.json
-d4daeb47a3b5382cf636d64564741f10f4ecf8a2 data/actuallyadditions/loot_tables/blocks/lamp_black.json
+616213a5f05126c426b9c086fbd80b7c417a0676 data/actuallyadditions/loot_tables/blocks/lamp_black.json
-c2dd60733559f76897ad6c03844fe988dcab421c data/actuallyadditions/loot_tables/blocks/lamp_blue.json
+0882989c2d2fa73d9b7eb1134b3bdd39931f7461 data/actuallyadditions/loot_tables/blocks/lamp_blue.json
-012d9cec7b02bef10fd80dd620d28b6f1a83a2ca data/actuallyadditions/loot_tables/blocks/lamp_brown.json
+695c0d10ab6b8dee27e21154a84e24e758560da5 data/actuallyadditions/loot_tables/blocks/lamp_brown.json
-f77f61f3ddc8c7802e8d914ec03eb422faff4505 data/actuallyadditions/loot_tables/blocks/lamp_controller.json
+1462d92d68a90eb29c71c0925ba13cbd7ceb3aec data/actuallyadditions/loot_tables/blocks/lamp_controller.json
-329deb1561247fa9151b819642f9ad47e0dd3e04 data/actuallyadditions/loot_tables/blocks/lamp_cyan.json
+b057482b4f89b58b92271b88977e6238a3ebe2f9 data/actuallyadditions/loot_tables/blocks/lamp_cyan.json
-d08755883b87abce91cca2566ee731246277cef5 data/actuallyadditions/loot_tables/blocks/lamp_gray.json
+cffcbd28f1980e562962ea005f8c58b1e5ad9fd0 data/actuallyadditions/loot_tables/blocks/lamp_gray.json
-0e31ac904f2b973f0233025b33ff4c1db82ef298 data/actuallyadditions/loot_tables/blocks/lamp_green.json
+41be9d52cfee4ef7b84253bddab902f51924ffa7 data/actuallyadditions/loot_tables/blocks/lamp_green.json
-0f2923754794ffadd5cacbe28431b0ca2c0c72b9 data/actuallyadditions/loot_tables/blocks/lamp_light_blue.json
+7a971b3c9384a24ba199b5fad794a7a381dc6fa9 data/actuallyadditions/loot_tables/blocks/lamp_light_blue.json
-d0e7e5aa858caa5044f72c1e46c627f63491ff92 data/actuallyadditions/loot_tables/blocks/lamp_light_gray.json
+3638cb431eccbadb84af54a04643324780da45e9 data/actuallyadditions/loot_tables/blocks/lamp_light_gray.json
-db0e768bed8364ef7ef2d3a48fa61c05432e3481 data/actuallyadditions/loot_tables/blocks/lamp_lime.json
+4bc4f90b90b378a1e5bd4ac3af7452f11733cae5 data/actuallyadditions/loot_tables/blocks/lamp_lime.json
-88162fb4d9dc914d044dbb5d61566683817feac3 data/actuallyadditions/loot_tables/blocks/lamp_magenta.json
+9a1301e0d404659ce76e178d198a61e79dbf48a8 data/actuallyadditions/loot_tables/blocks/lamp_magenta.json
-39e11ae9abdbadf8acbc106b6cd2717cddf72989 data/actuallyadditions/loot_tables/blocks/lamp_orange.json
+6321365d03d3d9e89e00ce956206d919fb34fe70 data/actuallyadditions/loot_tables/blocks/lamp_orange.json
-27a2b2515786a16cc6486a871007eb425b643301 data/actuallyadditions/loot_tables/blocks/lamp_pink.json
+363ca3423176fd84e4ed0e2f754755340064119a data/actuallyadditions/loot_tables/blocks/lamp_pink.json
-30cb4e72f47203629d58c0e94e00bcb0af59a2b0 data/actuallyadditions/loot_tables/blocks/lamp_purple.json
+bd78ccea95b84d4274e1a1837c5a93982624742b data/actuallyadditions/loot_tables/blocks/lamp_purple.json
-67644d8e96d1ae860485da3167bcba6405c5e95e data/actuallyadditions/loot_tables/blocks/lamp_red.json
+7793353acbcdcf245efa93e6d3d11be22a79a384 data/actuallyadditions/loot_tables/blocks/lamp_red.json
-8045cc7dcbf30fef588f759b5e59d26ddc43f93a data/actuallyadditions/loot_tables/blocks/lamp_white.json
+b3e7ddf1c7b1d464a265b4aa352e0b79126723f9 data/actuallyadditions/loot_tables/blocks/lamp_white.json
-569ac4635188b06901e4a4cf103061c4a39e1a15 data/actuallyadditions/loot_tables/blocks/lamp_yellow.json
+d30f652cdb2150ca9d0f47166dc00609f37f5581 data/actuallyadditions/loot_tables/blocks/lamp_yellow.json
-c779aee00da69c0a0b77d10666744717786a42c9 data/actuallyadditions/loot_tables/blocks/laser_relay.json
+2998b41fd240776f6b2f751cbbf21d1ca3c95820 data/actuallyadditions/loot_tables/blocks/laser_relay.json
-a75b6c99f51263dc08a3989b0db7ebb6429d19f0 data/actuallyadditions/loot_tables/blocks/laser_relay_advanced.json
+dd5dc8470140a9b0f776b8058aa242e037ee0b04 data/actuallyadditions/loot_tables/blocks/laser_relay_advanced.json
-d97afdaa98f4202a2fc767599a4e5e34ffbefa71 data/actuallyadditions/loot_tables/blocks/laser_relay_extreme.json
+3f2a6f0a5fb52bd916de8cd3a343526b21c9e6bc data/actuallyadditions/loot_tables/blocks/laser_relay_extreme.json
-3d3b5214b393427238da936b2090f9db08503994 data/actuallyadditions/loot_tables/blocks/laser_relay_fluids.json
+500635b445c60a503f8a920c672fb11fa890019a data/actuallyadditions/loot_tables/blocks/laser_relay_fluids.json
-7ed6dd90358646ca2e7c13801e0679182e30bf9f data/actuallyadditions/loot_tables/blocks/laser_relay_item.json
+d1a32f911e62430f4fbd464775f6381d213d2d04 data/actuallyadditions/loot_tables/blocks/laser_relay_item.json
-4f0c866450d6ce434ee5fba6ad0141b2e5f73b2e data/actuallyadditions/loot_tables/blocks/laser_relay_item_advanced.json
+ddd6ee3c8820d67e5acc1e67acceb8ff99a9351a data/actuallyadditions/loot_tables/blocks/laser_relay_item_advanced.json
-427c0ab203d6e946069912f0f8d5d744d9fe6a54 data/actuallyadditions/loot_tables/blocks/lava_factory_casing.json
+951f738b1ef07b6a626a3c5c39c5cb1c412f2edd data/actuallyadditions/loot_tables/blocks/lava_factory_casing.json
-a26c16e8bf499948ef947d5e7e2e6691e0c7e1a8 data/actuallyadditions/loot_tables/blocks/lava_factory_controller.json
+f3cf4d36f16e08e030c25de5cdfa93976d156a22 data/actuallyadditions/loot_tables/blocks/lava_factory_controller.json
-d2cfb9e1d68cfabcf21f2847cf66760b514bb510 data/actuallyadditions/loot_tables/blocks/leaf_generator.json
+ff91dda525da8b68aba564bfe88555d6c676d595 data/actuallyadditions/loot_tables/blocks/leaf_generator.json
-644aab55582d80b4b1fb9857b1b136b3f50bbe79 data/actuallyadditions/loot_tables/blocks/long_range_breaker.json
+1e745ced069d8181f0ea3d1b132bbb84db8efbac data/actuallyadditions/loot_tables/blocks/long_range_breaker.json
-0317d1a12de12767cac13a5a2c9d173198b7e600 data/actuallyadditions/loot_tables/blocks/oil_generator.json
+a339b6b2a9caa625029385e9604870f5a4f378ea data/actuallyadditions/loot_tables/blocks/oil_generator.json
-8a49a3773ea9ac5f56b68373671fbf535a33ae0b data/actuallyadditions/loot_tables/blocks/palis_crystal_block.json
+47ab98d1402e17a205ec8865f6f7f0d704d9e7a1 data/actuallyadditions/loot_tables/blocks/palis_crystal_block.json
-101ae500268810b6ec90bfcbbecc6ddfdd843e74 data/actuallyadditions/loot_tables/blocks/palis_crystal_cluster.json
+a1b2464021b0a0aa0401ace533dda2d92edacfc9 data/actuallyadditions/loot_tables/blocks/palis_crystal_cluster.json
-84e7d1632faf9762a0112e3d7ba7e83f49a8707a data/actuallyadditions/loot_tables/blocks/phantom_booster.json
+72c97009f21477806dde65eff46eb1758ce224ee data/actuallyadditions/loot_tables/blocks/phantom_booster.json
-388205fa694060ef81e9fd04bcc773a611bde10b data/actuallyadditions/loot_tables/blocks/phantom_breaker.json
+1425c19c5cacf71294ddbb2c12383bb141fcc2f5 data/actuallyadditions/loot_tables/blocks/phantom_breaker.json
-fe259af8c76c75cdd9a2a47d2334528e08e98021 data/actuallyadditions/loot_tables/blocks/phantom_energyface.json
+de00666ae75aa71f352d5b9d3c7c4ea9f62874c6 data/actuallyadditions/loot_tables/blocks/phantom_energyface.json
-81723ca7bdf062c206faa947a4ca839c18e14a0b data/actuallyadditions/loot_tables/blocks/phantom_itemface.json
+36746cc3164805ab46d34892c8206eee0212edb5 data/actuallyadditions/loot_tables/blocks/phantom_itemface.json
-2c59c6d9eb85fb3ec3218262404d2a2cf1efcadb data/actuallyadditions/loot_tables/blocks/phantom_liquiface.json
+0eb15c4cdfdccb5207577be061b773852d715d93 data/actuallyadditions/loot_tables/blocks/phantom_liquiface.json
-d6c0f113ea7c3cc0e8c3a11860792966d516211b data/actuallyadditions/loot_tables/blocks/phantom_placer.json
+8bbc2c05cd1cc0d8cc1d5ec7230056f0691e3bed data/actuallyadditions/loot_tables/blocks/phantom_placer.json
-a365f2f0d80e070d281a7b839c961d36f115abeb data/actuallyadditions/loot_tables/blocks/phantom_redstoneface.json
+27e84fefae09c6f00d88918223be693f43f8f754 data/actuallyadditions/loot_tables/blocks/phantom_redstoneface.json
-13f0d4587dac4822a26fd063a22f6f46c83e9af6 data/actuallyadditions/loot_tables/blocks/placer.json
+51293067f66de14942faa14105f099d931b73885 data/actuallyadditions/loot_tables/blocks/placer.json
-6d9a73f94513ed92c1697d25c5d89145b016ab5d data/actuallyadditions/loot_tables/blocks/player_interface.json
+ba950fc805546f2ed7c2a4d229881dd1f93922a9 data/actuallyadditions/loot_tables/blocks/player_interface.json
-bb5b9781aa9c64a1330eff6d7bb3e6c2c7f3a645 data/actuallyadditions/loot_tables/blocks/powered_furnace.json
+f3a486718523a4cbfad968849e2e68433e629ec5 data/actuallyadditions/loot_tables/blocks/powered_furnace.json
-a92f9584164335ecbcf769bc668289d76cea5d6c data/actuallyadditions/loot_tables/blocks/ranged_collector.json
+91f5fc461c294bcb386fc207d5d286b0eb30dd48 data/actuallyadditions/loot_tables/blocks/ranged_collector.json
-d497fdb4936e1f3fdaa556da79e39f6fcbb405ed data/actuallyadditions/loot_tables/blocks/restonia_crystal_block.json
+91bc0ca71f77559edeb53a1890a9101e705f69f8 data/actuallyadditions/loot_tables/blocks/restonia_crystal_block.json
-7d025b370ad83e847619627002ca835901faf235 data/actuallyadditions/loot_tables/blocks/restonia_crystal_cluster.json
+03058b2216c8e6ba63b8d03d085958265177f767 data/actuallyadditions/loot_tables/blocks/restonia_crystal_cluster.json
-bd374b67213a7ac097fa7586cfa3ec00474816b9 data/actuallyadditions/loot_tables/blocks/rice.json
+7088d02cc3db67b5b0bdafb11238f70c46d8a1ec data/actuallyadditions/loot_tables/blocks/rice.json
-4f42c1d3f01d17c22ab71bd3c33b3161fbe90de7 data/actuallyadditions/loot_tables/blocks/shock_suppressor.json
+5e5b0d4e5f14451d183eb1c62e824070532011fd data/actuallyadditions/loot_tables/blocks/shock_suppressor.json
-7b6d8282ee5863485614a8aa4d3cde7c712a034b data/actuallyadditions/loot_tables/blocks/smooth_black_quartz_block.json
+0d1bb5c5ee2cbd625edd9696e4ec3112df41d800 data/actuallyadditions/loot_tables/blocks/smooth_black_quartz_block.json
-f44b900f61f7210d15533c2e757395c3d767e21b data/actuallyadditions/loot_tables/blocks/smooth_black_quartz_slab.json
+300ea1d06816038e03e2e6ec236b9bb6af757364 data/actuallyadditions/loot_tables/blocks/smooth_black_quartz_slab.json
-7b7cc361433b751446f6c01da60798458d978c07 data/actuallyadditions/loot_tables/blocks/smooth_black_quartz_stair.json
+852df54c2c4b4409ee9fd5d9336f2bf6ce95951a data/actuallyadditions/loot_tables/blocks/smooth_black_quartz_stair.json
-31300f6a16f9d76ad7af7892e76fd31fdacaea39 data/actuallyadditions/loot_tables/blocks/smooth_black_quartz_wall.json
+2ab70e5e713d0cbb22a321d5f1862479bb692dfa data/actuallyadditions/loot_tables/blocks/smooth_black_quartz_wall.json
-4b6d8000f56553da02fef8f780ae6eec4dd3e4a0 data/actuallyadditions/loot_tables/blocks/tiny_torch.json
+fc971ee4bff8fbcca6cfc0e0ef5e0d5120be45c1 data/actuallyadditions/loot_tables/blocks/tiny_torch.json
-2b5543d91fe161b3b5c9cc9f657262791cb8957c data/actuallyadditions/loot_tables/blocks/vertical_digger.json
+a2ea79148f316e1c330774cc5b3de2f7fce0fa73 data/actuallyadditions/loot_tables/blocks/vertical_digger.json
-24602858f30273d46f0dd2082779e9544d7a87a6 data/actuallyadditions/loot_tables/blocks/void_crystal_block.json
+e6ca4acfe5b66ae48056f102c2356ff78aecca64 data/actuallyadditions/loot_tables/blocks/void_crystal_block.json
-45cb53d2b6f2a05bd3a44b1acfc0482d11094222 data/actuallyadditions/loot_tables/blocks/void_crystal_cluster.json
+03f30533040961eff84f574ddb7b546d185b9fc3 data/actuallyadditions/loot_tables/blocks/void_crystal_cluster.json
-069aca316e282ab12ad8ddbcfa3c389f1a13d673 data/actuallyadditions/loot_tables/blocks/wood_casing.json
+a3323427ca7c75ad3a86614f25eda7a9bd483814 data/actuallyadditions/loot_tables/blocks/wood_casing.json
-218c99fd547620a1e6ee186d427dca486212eae0 data/actuallyadditions/loot_tables/blocks/xp_solidifier.json
+818b5655b0c35661f41abb8f94b600f910f992be data/actuallyadditions/loot_tables/blocks/xp_solidifier.json
 64711e28d6fb7579f1ba2fed4a46440e213a2fac data/actuallyadditions/recipes/advanced_coil.json
 d2666ce077d5892a3bffde70ddf53492ec876900 data/actuallyadditions/recipes/advanced_leaf_blower.json
 a91ac0f76c7b325ac3ef0eefe5614d17f1f533d3 data/actuallyadditions/recipes/atomic_reconstructor.json
@@ -842,7 +842,7 @@ f2692c35f23f12a2468dd84a1e66c1c9219a7048 data/actuallyadditions/recipes/laser_wr
 e51e98b13f1949ce31485b93133568792745243c data/actuallyadditions/recipes/leaf_blower.json
 ec31df01057ad65de89068b01f96b3fb9f837bb4 data/actuallyadditions/recipes/lens.json
 634680e59ff81f293e3c44fd871e84fca96336ea data/actuallyadditions/recipes/lens_of_disenchanting.json
-9a958fc55ca0f759841f9813a8449639e175bbcc data/actuallyadditions/recipes/lens_of_the_killer.json
+46bd3a03bb46db005c8de2dcb563d36c01a5210b data/actuallyadditions/recipes/lens_of_the_killer.json
 1d560167a16962d870f0a4bf0cf9e74ac1431b3c data/actuallyadditions/recipes/lens_of_the_miner.json
 701af1122ed158e5d162815a9f744169031698f4 data/actuallyadditions/recipes/liquid_fuel/canola_oil.json
 0c908206a367aa9c04f751d1f69aa50d6d09ce3a data/actuallyadditions/recipes/liquid_fuel/crystallized_canola_oil.json
@@ -892,8 +892,13 @@ d8611ae9f616794678bb7f2d0c253383f09e8b27 data/actuallyadditions/recipes/vertical
 17503be947b6e654606f28e6d07d197eb91abc88 data/actuallyadditions/recipes/wings_of_the_bats.json
 c562b938e29b85572f1b30952f5711bca2c9c899 data/actuallyadditions/recipes/wood_casing.json
 5d0b3e0b27c0a7f82438fd24673866ce087d47f0 data/actuallyadditions/recipes/wooden_aiot.json
+f25af32614eaea3e33bbbe473df3768ed1575261 data/actuallyadditions/tags/blocks/mineable/aio.json
+f455b03ca55c4ab3e7b0e1e60a516332cfe41fa7 data/actuallyadditions/tags/blocks/mineable/drill.json
 a18f00e11fa55ff1b767eeab7a4756c2e0e93429 data/actuallyadditions/tags/items/coffee_beans.json
 1714cd34792c6448f7316094c105e2e953b36e73 data/actuallyadditions/tags/items/crystals.json
 2290b1829e049ab3002f3576379ad58f6d7b6ace data/actuallyadditions/tags/items/drills.json
 8c1e24d7377b6bdf64c13643d94c3826ac925c25 data/actuallyadditions/tags/items/tiny_coals.json
+6d90fc27d45eb34ac60019b82494e90acba77135 data/minecraft/tags/blocks/mineable/axe.json
+be19b436d177039f96f3dea1ce5a8e6e749d4844 data/minecraft/tags/blocks/mineable/pickaxe.json
+925347d0ff7e8c38945bb9782564e5321f2846bd data/minecraft/tags/blocks/needs_stone_tool.json
 84fb4202cf40368e8c1a1d36bca0a4952aa05866 data/minecraft/tags/blocks/walls.json

src/generated/resources/data/actuallyadditions/advancements/craft_coal_generator.json

@@ -21,7 +21,9 @@
       "conditions": {
         "items": [
           {
-            "item": "actuallyadditions:coal_generator"
+            "items": [
+              "actuallyadditions:coal_generator"
+            ]
           }
         ]
       }

src/generated/resources/data/actuallyadditions/advancements/craft_coffee_machine.json

@@ -21,7 +21,9 @@
       "conditions": {
         "items": [
           {
-            "item": "actuallyadditions:coffee_machine"
+            "items": [
+              "actuallyadditions:coffee_machine"
+            ]
           }
         ]
       }

src/generated/resources/data/actuallyadditions/advancements/craft_crusher.json

@@ -21,7 +21,9 @@
       "conditions": {
         "items": [
           {
-            "item": "actuallyadditions:crusher"
+            "items": [
+              "actuallyadditions:crusher"
+            ]
           }
         ]
       }

src/generated/resources/data/actuallyadditions/advancements/craft_double_crusher.json

@@ -21,7 +21,9 @@
       "conditions": {
         "items": [
           {
-            "item": "actuallyadditions:crusher_double"
+            "items": [
+              "actuallyadditions:crusher_double"
+            ]
           }
         ]
       }

src/generated/resources/data/actuallyadditions/advancements/craft_empowerer.json

@@ -21,7 +21,9 @@
       "conditions": {
         "items": [
           {
-            "item": "actuallyadditions:empowerer"
+            "items": [
+              "actuallyadditions:empowerer"
+            ]
           }
         ]
       }

src/generated/resources/data/actuallyadditions/advancements/craft_energyface.json

@@ -21,7 +21,9 @@
       "conditions": {
         "items": [
           {
-            "item": "actuallyadditions:phantom_energyface"
+            "items": [
+              "actuallyadditions:phantom_energyface"
+            ]
           }
         ]
       }

src/generated/resources/data/actuallyadditions/advancements/craft_item_interface.json

@@ -21,7 +21,9 @@
       "conditions": {
         "items": [
           {
-            "item": "actuallyadditions:item_interface"
+            "items": [
+              "actuallyadditions:item_interface"
+            ]
           }
         ]
       }

src/generated/resources/data/actuallyadditions/advancements/craft_laser_relay.json

@@ -21,7 +21,9 @@
       "conditions": {
         "items": [
           {
-            "item": "actuallyadditions:laser_relay"
+            "items": [
+              "actuallyadditions:laser_relay"
+            ]
           }
         ]
       }

src/generated/resources/data/actuallyadditions/advancements/craft_laser_relay_advanced.json

@@ -21,7 +21,9 @@
       "conditions": {
         "items": [
           {
-            "item": "actuallyadditions:laser_relay_advanced"
+            "items": [
+              "actuallyadditions:laser_relay_advanced"
+            ]
           }
         ]
       }

src/generated/resources/data/actuallyadditions/advancements/craft_laser_relay_extreme.json

@@ -21,7 +21,9 @@
       "conditions": {
         "items": [
           {
-            "item": "actuallyadditions:laser_relay_extreme"
+            "items": [
+              "actuallyadditions:laser_relay_extreme"
+            ]
           }
         ]
       }

src/generated/resources/data/actuallyadditions/advancements/craft_laser_relay_item.json

@@ -21,7 +21,9 @@
       "conditions": {
         "items": [
           {
-            "item": "actuallyadditions:laser_relay_item"
+            "items": [
+              "actuallyadditions:laser_relay_item"
+            ]
           }
         ]
       }

src/generated/resources/data/actuallyadditions/advancements/craft_leaf_generator.json

@@ -21,7 +21,9 @@
       "conditions": {
         "items": [
           {
-            "item": "actuallyadditions:leaf_generator"
+            "items": [
+              "actuallyadditions:leaf_generator"
+            ]
           }
         ]
       }

src/generated/resources/data/actuallyadditions/advancements/craft_liquiface.json

@@ -21,7 +21,9 @@
       "conditions": {
         "items": [
           {
-            "item": "actuallyadditions:phantom_liquiface"
+            "items": [
+              "actuallyadditions:phantom_liquiface"
+            ]
           }
         ]
       }

src/generated/resources/data/actuallyadditions/advancements/craft_phantom_face.json

@@ -22,7 +22,9 @@
       "conditions": {
         "items": [
           {
-            "item": "actuallyadditions:phantom_itemface"
+            "items": [
+              "actuallyadditions:phantom_itemface"
+            ]
           }
         ]
       }

src/generated/resources/data/actuallyadditions/advancements/craft_reconstructor.json

@@ -21,7 +21,9 @@
       "conditions": {
         "items": [
           {
-            "item": "actuallyadditions:atomic_reconstructor"
+            "items": [
+              "actuallyadditions:atomic_reconstructor"
+            ]
           }
         ]
       }

src/generated/resources/data/actuallyadditions/advancements/pickup_coffee.json

@@ -21,7 +21,9 @@
       "conditions": {
         "items": [
           {
-            "item": "actuallyadditions:coffee_beans"
+            "items": [
+              "actuallyadditions:coffee_beans"
+            ]
           }
         ]
       }

src/generated/resources/data/actuallyadditions/loot_tables/blocks/atomic_reconstructor.json

@@ -2,7 +2,8 @@
   "type": "minecraft:block",
   "pools": [
     {
-      "rolls": 1,
+      "rolls": 1.0,
+      "bonus_rolls": 0.0,
       "entries": [
         {
           "type": "minecraft:item",

src/generated/resources/data/actuallyadditions/loot_tables/blocks/battery_box.json

@@ -2,7 +2,8 @@
   "type": "minecraft:block",
   "pools": [
     {
-      "rolls": 1,
+      "rolls": 1.0,
+      "bonus_rolls": 0.0,
       "entries": [
         {
           "type": "minecraft:item",

src/generated/resources/data/actuallyadditions/loot_tables/blocks/bio_reactor.json

@@ -2,7 +2,8 @@
   "type": "minecraft:block",
   "pools": [
     {
-      "rolls": 1,
+      "rolls": 1.0,
+      "bonus_rolls": 0.0,
       "entries": [
         {
           "type": "minecraft:item",

src/generated/resources/data/actuallyadditions/loot_tables/blocks/black_quartz_block.json

@@ -2,7 +2,8 @@
   "type": "minecraft:block",
   "pools": [
     {
-      "rolls": 1,
+      "rolls": 1.0,
+      "bonus_rolls": 0.0,
       "entries": [
         {
           "type": "minecraft:item",

src/generated/resources/data/actuallyadditions/loot_tables/blocks/black_quartz_brick_block.json

@@ -2,7 +2,8 @@
   "type": "minecraft:block",
   "pools": [
     {
-      "rolls": 1,
+      "rolls": 1.0,
+      "bonus_rolls": 0.0,
       "entries": [
         {
           "type": "minecraft:item",

src/generated/resources/data/actuallyadditions/loot_tables/blocks/black_quartz_brick_slab.json

@@ -2,7 +2,8 @@
   "type": "minecraft:block",
   "pools": [
     {
-      "rolls": 1,
+      "rolls": 1.0,
+      "bonus_rolls": 0.0,
       "entries": [
         {
           "type": "minecraft:item",

src/generated/resources/data/actuallyadditions/loot_tables/blocks/black_quartz_brick_stair.json

@@ -2,7 +2,8 @@
   "type": "minecraft:block",
   "pools": [
     {
-      "rolls": 1,
+      "rolls": 1.0,
+      "bonus_rolls": 0.0,
       "entries": [
         {
           "type": "minecraft:item",

src/generated/resources/data/actuallyadditions/loot_tables/blocks/black_quartz_brick_wall.json

@@ -2,7 +2,8 @@
   "type": "minecraft:block",
   "pools": [
     {
-      "rolls": 1,
+      "rolls": 1.0,
+      "bonus_rolls": 0.0,
       "entries": [
         {
           "type": "minecraft:item",

src/generated/resources/data/actuallyadditions/loot_tables/blocks/black_quartz_ore.json

@@ -2,7 +2,8 @@
   "type": "minecraft:block",
   "pools": [
     {
-      "rolls": 1,
+      "rolls": 1.0,
+      "bonus_rolls": 0.0,
       "entries": [
         {
           "type": "minecraft:item",

src/generated/resources/data/actuallyadditions/loot_tables/blocks/black_quartz_pillar_block.json

@@ -2,7 +2,8 @@
   "type": "minecraft:block",
   "pools": [
     {
-      "rolls": 1,
+      "rolls": 1.0,
+      "bonus_rolls": 0.0,
       "entries": [
         {
           "type": "minecraft:item",

src/generated/resources/data/actuallyadditions/loot_tables/blocks/black_quartz_pillar_slab.json

@@ -2,7 +2,8 @@
   "type": "minecraft:block",
   "pools": [
     {
-      "rolls": 1,
+      "rolls": 1.0,
+      "bonus_rolls": 0.0,
       "entries": [
         {
           "type": "minecraft:item",

src/generated/resources/data/actuallyadditions/loot_tables/blocks/black_quartz_pillar_stair.json

@@ -2,7 +2,8 @@
   "type": "minecraft:block",
   "pools": [
     {
-      "rolls": 1,
+      "rolls": 1.0,
+      "bonus_rolls": 0.0,
       "entries": [
         {
           "type": "minecraft:item",

src/generated/resources/data/actuallyadditions/loot_tables/blocks/black_quartz_pillar_wall.json

@@ -2,7 +2,8 @@
   "type": "minecraft:block",
   "pools": [
     {
-      "rolls": 1,
+      "rolls": 1.0,
+      "bonus_rolls": 0.0,
       "entries": [
         {
           "type": "minecraft:item",

src/generated/resources/data/actuallyadditions/loot_tables/blocks/black_quartz_slab.json

@@ -2,7 +2,8 @@
   "type": "minecraft:block",
   "pools": [
     {
-      "rolls": 1,
+      "rolls": 1.0,
+      "bonus_rolls": 0.0,
       "entries": [
         {
           "type": "minecraft:item",

src/generated/resources/data/actuallyadditions/loot_tables/blocks/black_quartz_stair.json

@@ -2,7 +2,8 @@
   "type": "minecraft:block",
   "pools": [
     {
-      "rolls": 1,
+      "rolls": 1.0,
+      "bonus_rolls": 0.0,
       "entries": [
         {
           "type": "minecraft:item",

src/generated/resources/data/actuallyadditions/loot_tables/blocks/black_quartz_wall.json

@@ -2,7 +2,8 @@
   "type": "minecraft:block",
   "pools": [
     {
-      "rolls": 1,
+      "rolls": 1.0,
+      "bonus_rolls": 0.0,
       "entries": [
         {
           "type": "minecraft:item",

src/generated/resources/data/actuallyadditions/loot_tables/blocks/breaker.json

@@ -2,7 +2,8 @@
   "type": "minecraft:block",
   "pools": [
     {
-      "rolls": 1,
+      "rolls": 1.0,
+      "bonus_rolls": 0.0,
       "entries": [
         {
           "type": "minecraft:item",

src/generated/resources/data/actuallyadditions/loot_tables/blocks/canola.json

@@ -3,6 +3,7 @@
   "pools": [
     {
       "rolls": 1.0,
+      "bonus_rolls": 0.0,
       "entries": [
         {
           "type": "minecraft:alternatives",
@@ -30,6 +31,7 @@
     },
     {
       "rolls": 1.0,
+      "bonus_rolls": 0.0,
       "entries": [
         {
           "type": "minecraft:item",

src/generated/resources/data/actuallyadditions/loot_tables/blocks/canola_press.json

@@ -2,7 +2,8 @@
   "type": "minecraft:block",
   "pools": [
     {
-      "rolls": 1,
+      "rolls": 1.0,
+      "bonus_rolls": 0.0,
       "entries": [
         {
           "type": "minecraft:item",

src/generated/resources/data/actuallyadditions/loot_tables/blocks/chiseled_black_quartz_block.json

@@ -2,7 +2,8 @@
   "type": "minecraft:block",
   "pools": [
     {
-      "rolls": 1,
+      "rolls": 1.0,
+      "bonus_rolls": 0.0,
       "entries": [
         {
           "type": "minecraft:item",

src/generated/resources/data/actuallyadditions/loot_tables/blocks/chiseled_black_quartz_slab.json

@@ -2,7 +2,8 @@
   "type": "minecraft:block",
   "pools": [
     {
-      "rolls": 1,
+      "rolls": 1.0,
+      "bonus_rolls": 0.0,
       "entries": [
         {
           "type": "minecraft:item",

src/generated/resources/data/actuallyadditions/loot_tables/blocks/chiseled_black_quartz_stair.json

@@ -2,7 +2,8 @@
   "type": "minecraft:block",
   "pools": [
     {
-      "rolls": 1,
+      "rolls": 1.0,
+      "bonus_rolls": 0.0,
       "entries": [
         {
           "type": "minecraft:item",

src/generated/resources/data/actuallyadditions/loot_tables/blocks/chiseled_black_quartz_wall.json

@@ -2,7 +2,8 @@
   "type": "minecraft:block",
   "pools": [
     {
-      "rolls": 1,
+      "rolls": 1.0,
+      "bonus_rolls": 0.0,
       "entries": [
         {
           "type": "minecraft:item",

src/generated/resources/data/actuallyadditions/loot_tables/blocks/coal_generator.json

@@ -2,7 +2,8 @@
   "type": "minecraft:block",
   "pools": [
     {
-      "rolls": 1,
+      "rolls": 1.0,
+      "bonus_rolls": 0.0,
       "entries": [
         {
           "type": "minecraft:item",

src/generated/resources/data/actuallyadditions/loot_tables/blocks/coffee.json

@@ -3,6 +3,7 @@
   "pools": [
     {
       "rolls": 1.0,
+      "bonus_rolls": 0.0,
       "entries": [
         {
           "type": "minecraft:alternatives",
@@ -30,6 +31,7 @@
     },
     {
       "rolls": 1.0,
+      "bonus_rolls": 0.0,
       "entries": [
         {
           "type": "minecraft:item",

src/generated/resources/data/actuallyadditions/loot_tables/blocks/coffee_machine.json

@@ -2,7 +2,8 @@
   "type": "minecraft:block",
   "pools": [
     {
-      "rolls": 1,
+      "rolls": 1.0,
+      "bonus_rolls": 0.0,
       "entries": [
         {
           "type": "minecraft:item",

src/generated/resources/data/actuallyadditions/loot_tables/blocks/crusher.json

@@ -2,7 +2,8 @@
   "type": "minecraft:block",
   "pools": [
     {
-      "rolls": 1,
+      "rolls": 1.0,
+      "bonus_rolls": 0.0,
       "entries": [
         {
           "type": "minecraft:item",

src/generated/resources/data/actuallyadditions/loot_tables/blocks/crusher_double.json

@@ -2,7 +2,8 @@
   "type": "minecraft:block",
   "pools": [
     {
-      "rolls": 1,
+      "rolls": 1.0,
+      "bonus_rolls": 0.0,
       "entries": [
         {
           "type": "minecraft:item",

src/generated/resources/data/actuallyadditions/loot_tables/blocks/diamatine_crystal_block.json

@@ -2,7 +2,8 @@
   "type": "minecraft:block",
   "pools": [
     {
-      "rolls": 1,
+      "rolls": 1.0,
+      "bonus_rolls": 0.0,
       "entries": [
         {
           "type": "minecraft:item",

src/generated/resources/data/actuallyadditions/loot_tables/blocks/diamatine_crystal_cluster.json

@@ -2,7 +2,8 @@
   "type": "minecraft:block",
   "pools": [
     {
-      "rolls": 1,
+      "rolls": 1.0,
+      "bonus_rolls": 0.0,
       "entries": [
         {
           "type": "minecraft:item",

src/generated/resources/data/actuallyadditions/loot_tables/blocks/display_stand.json

@@ -2,7 +2,8 @@
   "type": "minecraft:block",
   "pools": [
     {
-      "rolls": 1,
+      "rolls": 1.0,
+      "bonus_rolls": 0.0,
       "entries": [
         {
           "type": "minecraft:item",

src/generated/resources/data/actuallyadditions/loot_tables/blocks/dropper.json

@@ -2,7 +2,8 @@
   "type": "minecraft:block",
   "pools": [
     {
-      "rolls": 1,
+      "rolls": 1.0,
+      "bonus_rolls": 0.0,
       "entries": [
         {
           "type": "minecraft:item",

src/generated/resources/data/actuallyadditions/loot_tables/blocks/emeradic_crystal_block.json

@@ -2,7 +2,8 @@
   "type": "minecraft:block",
   "pools": [
     {
-      "rolls": 1,
+      "rolls": 1.0,
+      "bonus_rolls": 0.0,
       "entries": [
         {
           "type": "minecraft:item",

src/generated/resources/data/actuallyadditions/loot_tables/blocks/emeradic_crystal_cluster.json

@@ -2,7 +2,8 @@
   "type": "minecraft:block",
   "pools": [
     {
-      "rolls": 1,
+      "rolls": 1.0,
+      "bonus_rolls": 0.0,
       "entries": [
         {
           "type": "minecraft:item",

src/generated/resources/data/actuallyadditions/loot_tables/blocks/empowered_diamatine_crystal_block.json

@@ -2,7 +2,8 @@
   "type": "minecraft:block",
   "pools": [
     {
-      "rolls": 1,
+      "rolls": 1.0,
+      "bonus_rolls": 0.0,
       "entries": [
         {
           "type": "minecraft:item",

src/generated/resources/data/actuallyadditions/loot_tables/blocks/empowered_emeradic_crystal_block.json

@@ -2,7 +2,8 @@
   "type": "minecraft:block",
   "pools": [
     {
-      "rolls": 1,
+      "rolls": 1.0,
+      "bonus_rolls": 0.0,
       "entries": [
         {
           "type": "minecraft:item",

src/generated/resources/data/actuallyadditions/loot_tables/blocks/empowered_enori_crystal_block.json

@@ -2,7 +2,8 @@
   "type": "minecraft:block",
   "pools": [
     {
-      "rolls": 1,
+      "rolls": 1.0,
+      "bonus_rolls": 0.0,
       "entries": [
         {
           "type": "minecraft:item",

src/generated/resources/data/actuallyadditions/loot_tables/blocks/empowered_palis_crystal_block.json

@@ -2,7 +2,8 @@
   "type": "minecraft:block",
   "pools": [
     {
-      "rolls": 1,
+      "rolls": 1.0,
+      "bonus_rolls": 0.0,
       "entries": [
         {
           "type": "minecraft:item",

src/generated/resources/data/actuallyadditions/loot_tables/blocks/empowered_restonia_crystal_block.json

@@ -2,7 +2,8 @@
   "type": "minecraft:block",
   "pools": [
     {
-      "rolls": 1,
+      "rolls": 1.0,
+      "bonus_rolls": 0.0,
       "entries": [
         {
           "type": "minecraft:item",

src/generated/resources/data/actuallyadditions/loot_tables/blocks/empowered_void_crystal_block.json

@@ -2,7 +2,8 @@
   "type": "minecraft:block",
   "pools": [
     {
-      "rolls": 1,
+      "rolls": 1.0,
+      "bonus_rolls": 0.0,
       "entries": [
         {
           "type": "minecraft:item",

src/generated/resources/data/actuallyadditions/loot_tables/blocks/empowerer.json

@@ -2,7 +2,8 @@
   "type": "minecraft:block",
   "pools": [
     {
-      "rolls": 1,
+      "rolls": 1.0,
+      "bonus_rolls": 0.0,
       "entries": [
         {
           "type": "minecraft:item",

src/generated/resources/data/actuallyadditions/loot_tables/blocks/ender_casing.json

@@ -2,7 +2,8 @@
   "type": "minecraft:block",
   "pools": [
     {
-      "rolls": 1,
+      "rolls": 1.0,
+      "bonus_rolls": 0.0,
       "entries": [
         {
           "type": "minecraft:item",

src/generated/resources/data/actuallyadditions/loot_tables/blocks/energizer.json

@@ -2,7 +2,8 @@
   "type": "minecraft:block",
   "pools": [
     {
-      "rolls": 1,
+      "rolls": 1.0,
+      "bonus_rolls": 0.0,
       "entries": [
         {
           "type": "minecraft:item",

src/generated/resources/data/actuallyadditions/loot_tables/blocks/enervator.json

@@ -2,7 +2,8 @@
   "type": "minecraft:block",
   "pools": [
     {
-      "rolls": 1,
+      "rolls": 1.0,
+      "bonus_rolls": 0.0,
       "entries": [
         {
           "type": "minecraft:item",

src/generated/resources/data/actuallyadditions/loot_tables/blocks/enori_crystal_block.json

@@ -2,7 +2,8 @@
   "type": "minecraft:block",
   "pools": [
     {
-      "rolls": 1,
+      "rolls": 1.0,
+      "bonus_rolls": 0.0,
       "entries": [
         {
           "type": "minecraft:item",

src/generated/resources/data/actuallyadditions/loot_tables/blocks/enori_crystal_cluster.json

@@ -2,7 +2,8 @@
   "type": "minecraft:block",
   "pools": [
     {
-      "rolls": 1,
+      "rolls": 1.0,
+      "bonus_rolls": 0.0,
       "entries": [
         {
           "type": "minecraft:item",

src/generated/resources/data/actuallyadditions/loot_tables/blocks/ethetic_green_block.json

@@ -2,7 +2,8 @@
   "type": "minecraft:block",
   "pools": [
     {
-      "rolls": 1,
+      "rolls": 1.0,
+      "bonus_rolls": 0.0,
       "entries": [
         {
           "type": "minecraft:item",

src/generated/resources/data/actuallyadditions/loot_tables/blocks/ethetic_green_slab.json

@@ -2,7 +2,8 @@
   "type": "minecraft:block",
   "pools": [
     {
-      "rolls": 1,
+      "rolls": 1.0,
+      "bonus_rolls": 0.0,
       "entries": [
         {
           "type": "minecraft:item",

src/generated/resources/data/actuallyadditions/loot_tables/blocks/ethetic_green_stairs.json

@@ -2,7 +2,8 @@
   "type": "minecraft:block",
   "pools": [
     {
-      "rolls": 1,
+      "rolls": 1.0,
+      "bonus_rolls": 0.0,
       "entries": [
         {
           "type": "minecraft:item",

src/generated/resources/data/actuallyadditions/loot_tables/blocks/ethetic_green_wall.json

@@ -2,7 +2,8 @@
   "type": "minecraft:block",
   "pools": [
     {
-      "rolls": 1,
+      "rolls": 1.0,
+      "bonus_rolls": 0.0,
       "entries": [
         {
           "type": "minecraft:item",

src/generated/resources/data/actuallyadditions/loot_tables/blocks/ethetic_white_block.json

@@ -2,7 +2,8 @@
   "type": "minecraft:block",
   "pools": [
     {
-      "rolls": 1,
+      "rolls": 1.0,
+      "bonus_rolls": 0.0,
       "entries": [
         {
           "type": "minecraft:item",

src/generated/resources/data/actuallyadditions/loot_tables/blocks/ethetic_white_slab.json

@@ -2,7 +2,8 @@
   "type": "minecraft:block",
   "pools": [
     {
-      "rolls": 1,
+      "rolls": 1.0,
+      "bonus_rolls": 0.0,
       "entries": [
         {
           "type": "minecraft:item",

src/generated/resources/data/actuallyadditions/loot_tables/blocks/ethetic_white_stairs.json

@@ -2,7 +2,8 @@
   "type": "minecraft:block",
   "pools": [
     {
-      "rolls": 1,
+      "rolls": 1.0,
+      "bonus_rolls": 0.0,
       "entries": [
         {
           "type": "minecraft:item",

src/generated/resources/data/actuallyadditions/loot_tables/blocks/ethetic_white_wall.json

@@ -2,7 +2,8 @@
   "type": "minecraft:block",
   "pools": [
     {
-      "rolls": 1,
+      "rolls": 1.0,
+      "bonus_rolls": 0.0,
       "entries": [
         {
           "type": "minecraft:item",

src/generated/resources/data/actuallyadditions/loot_tables/blocks/farmer.json

@@ -2,7 +2,8 @@
   "type": "minecraft:block",
   "pools": [
     {
-      "rolls": 1,
+      "rolls": 1.0,
+      "bonus_rolls": 0.0,
       "entries": [
         {
           "type": "minecraft:item",

src/generated/resources/data/actuallyadditions/loot_tables/blocks/feeder.json

@@ -2,7 +2,8 @@
   "type": "minecraft:block",
   "pools": [
     {
-      "rolls": 1,
+      "rolls": 1.0,
+      "bonus_rolls": 0.0,
       "entries": [
         {
           "type": "minecraft:item",

src/generated/resources/data/actuallyadditions/loot_tables/blocks/fermenting_barrel.json

@@ -2,7 +2,8 @@
   "type": "minecraft:block",
   "pools": [
     {
-      "rolls": 1,
+      "rolls": 1.0,
+      "bonus_rolls": 0.0,
       "entries": [
         {
           "type": "minecraft:item",

src/generated/resources/data/actuallyadditions/loot_tables/blocks/firework_box.json

@@ -2,7 +2,8 @@
   "type": "minecraft:block",
   "pools": [
     {
-      "rolls": 1,
+      "rolls": 1.0,
+      "bonus_rolls": 0.0,
       "entries": [
         {
           "type": "minecraft:item",

src/generated/resources/data/actuallyadditions/loot_tables/blocks/flax.json

@@ -3,6 +3,7 @@
   "pools": [
     {
       "rolls": 1.0,
+      "bonus_rolls": 0.0,
       "entries": [
         {
           "type": "minecraft:alternatives",
@@ -30,6 +31,7 @@
     },
     {
       "rolls": 1.0,
+      "bonus_rolls": 0.0,
       "entries": [
         {
           "type": "minecraft:item",

src/generated/resources/data/actuallyadditions/loot_tables/blocks/fluid_collector.json

@@ -2,7 +2,8 @@
   "type": "minecraft:block",
   "pools": [
     {
-      "rolls": 1,
+      "rolls": 1.0,
+      "bonus_rolls": 0.0,
       "entries": [
         {
           "type": "minecraft:item",

src/generated/resources/data/actuallyadditions/loot_tables/blocks/fluid_placer.json

@@ -2,7 +2,8 @@
   "type": "minecraft:block",
   "pools": [
     {
-      "rolls": 1,
+      "rolls": 1.0,
+      "bonus_rolls": 0.0,
       "entries": [
         {
           "type": "minecraft:item",

src/generated/resources/data/actuallyadditions/loot_tables/blocks/greenhouse_glass.json

@@ -2,7 +2,8 @@
   "type": "minecraft:block",
   "pools": [
     {
-      "rolls": 1,
+      "rolls": 1.0,
+      "bonus_rolls": 0.0,
       "entries": [
         {
           "type": "minecraft:item",

src/generated/resources/data/actuallyadditions/loot_tables/blocks/heat_collector.json

@@ -2,7 +2,8 @@
   "type": "minecraft:block",
   "pools": [
     {
-      "rolls": 1,
+      "rolls": 1.0,
+      "bonus_rolls": 0.0,
       "entries": [
         {
           "type": "minecraft:item",

src/generated/resources/data/actuallyadditions/loot_tables/blocks/hopping_item_interface.json

@@ -2,7 +2,8 @@
   "type": "minecraft:block",
   "pools": [
     {
-      "rolls": 1,
+      "rolls": 1.0,
+      "bonus_rolls": 0.0,
       "entries": [
         {
           "type": "minecraft:item",

src/generated/resources/data/actuallyadditions/loot_tables/blocks/iron_casing.json

@@ -2,7 +2,8 @@
   "type": "minecraft:block",
   "pools": [
     {
-      "rolls": 1,
+      "rolls": 1.0,
+      "bonus_rolls": 0.0,
       "entries": [
         {
           "type": "minecraft:item",

src/generated/resources/data/actuallyadditions/loot_tables/blocks/item_interface.json

@@ -2,7 +2,8 @@
   "type": "minecraft:block",
   "pools": [
     {
-      "rolls": 1,
+      "rolls": 1.0,
+      "bonus_rolls": 0.0,
       "entries": [
         {
           "type": "minecraft:item",

src/generated/resources/data/actuallyadditions/loot_tables/blocks/lamp_black.json

@@ -2,7 +2,8 @@
   "type": "minecraft:block",
   "pools": [
     {
-      "rolls": 1,
+      "rolls": 1.0,
+      "bonus_rolls": 0.0,
       "entries": [
         {
           "type": "minecraft:item",

src/generated/resources/data/actuallyadditions/loot_tables/blocks/lamp_blue.json

@@ -2,7 +2,8 @@
   "type": "minecraft:block",
   "pools": [
     {
-      "rolls": 1,
+      "rolls": 1.0,
+      "bonus_rolls": 0.0,
       "entries": [
         {
           "type": "minecraft:item",

src/generated/resources/data/actuallyadditions/loot_tables/blocks/lamp_brown.json

@@ -2,7 +2,8 @@
   "type": "minecraft:block",
   "pools": [
     {
-      "rolls": 1,
+      "rolls": 1.0,
+      "bonus_rolls": 0.0,
       "entries": [
         {
           "type": "minecraft:item",

src/generated/resources/data/actuallyadditions/loot_tables/blocks/lamp_controller.json

@@ -2,7 +2,8 @@
   "type": "minecraft:block",
   "pools": [
     {
-      "rolls": 1,
+      "rolls": 1.0,
+      "bonus_rolls": 0.0,
       "entries": [
         {
           "type": "minecraft:item",

src/generated/resources/data/actuallyadditions/loot_tables/blocks/lamp_cyan.json

@@ -2,7 +2,8 @@
   "type": "minecraft:block",
   "pools": [
     {
-      "rolls": 1,
+      "rolls": 1.0,
+      "bonus_rolls": 0.0,
       "entries": [
         {
           "type": "minecraft:item",

src/generated/resources/data/actuallyadditions/loot_tables/blocks/lamp_gray.json

@@ -2,7 +2,8 @@
   "type": "minecraft:block",
   "pools": [
     {
-      "rolls": 1,
+      "rolls": 1.0,
+      "bonus_rolls": 0.0,
       "entries": [
         {
           "type": "minecraft:item",

src/generated/resources/data/actuallyadditions/loot_tables/blocks/lamp_green.json

@@ -2,7 +2,8 @@
   "type": "minecraft:block",
   "pools": [
     {
-      "rolls": 1,
+      "rolls": 1.0,
+      "bonus_rolls": 0.0,
       "entries": [
         {
           "type": "minecraft:item",

src/generated/resources/data/actuallyadditions/loot_tables/blocks/lamp_light_blue.json

@@ -2,7 +2,8 @@
   "type": "minecraft:block",
   "pools": [
     {
-      "rolls": 1,
+      "rolls": 1.0,
+      "bonus_rolls": 0.0,
       "entries": [
         {
           "type": "minecraft:item",

src/generated/resources/data/actuallyadditions/loot_tables/blocks/lamp_light_gray.json

@@ -2,7 +2,8 @@
   "type": "minecraft:block",
   "pools": [
     {
-      "rolls": 1,
+      "rolls": 1.0,
+      "bonus_rolls": 0.0,
       "entries": [
         {
           "type": "minecraft:item",

src/generated/resources/data/actuallyadditions/loot_tables/blocks/lamp_lime.json

@@ -2,7 +2,8 @@
   "type": "minecraft:block",
   "pools": [
     {
-      "rolls": 1,
+      "rolls": 1.0,
+      "bonus_rolls": 0.0,
       "entries": [
         {
           "type": "minecraft:item",

src/generated/resources/data/actuallyadditions/loot_tables/blocks/lamp_magenta.json

@@ -2,7 +2,8 @@
   "type": "minecraft:block",
   "pools": [
     {
-      "rolls": 1,
+      "rolls": 1.0,
+      "bonus_rolls": 0.0,
       "entries": [
         {
           "type": "minecraft:item",