Updated radial menu to match 1.18, with build mode categories, descriptions and new icons. Changed reach upgrade recipes.

.gitattributes

@@ -1,5 +0,0 @@
-# Disable autocrlf on generated files, they always generate with LF
-# Add any extra files or paths here to make git stop saying they
-# are changed when only line endings change.
-src/generated/**/.cache/cache text eol=lf
-src/generated/**/*.json text eol=lf

build.gradle

@@ -1,24 +1,31 @@
-plugins {
-    id 'eclipse'
-    id 'maven-publish'
-    id 'net.minecraftforge.gradle' version '5.1.+'
+buildscript {
+    repositories {
+        maven { url = 'https://files.minecraftforge.net/maven' }
+        jcenter()
+        mavenCentral()
+    }
+    dependencies {
+        classpath group: 'net.minecraftforge.gradle', name: 'ForgeGradle', version: '5.1+', changing: true
+    }
 }
+apply plugin: 'net.minecraftforge.gradle'
+// Only edit below this line, the above code adds and enables the necessary things for Forge to be setup.
+apply plugin: 'eclipse'
+apply plugin: 'maven-publish'
 
-version = '1.19-2.40'
-group = 'nl.requios.effortlessbuilding'
+version = '1.16.3-2.32'
+group = 'nl.requios.effortlessbuilding' // http://maven.apache.org/guides/mini/guide-naming-conventions.html
 archivesBaseName = 'effortlessbuilding'
 
-// Mojang ships Java 17 to end users in 1.18+, so your mod should target Java 17.
-java.toolchain.languageVersion = JavaLanguageVersion.of(17)
+sourceCompatibility = targetCompatibility = compileJava.sourceCompatibility = compileJava.targetCompatibility = '1.8' // Need this here so eclipse task generates correctly.
 
-println "Java: ${System.getProperty 'java.version'}, JVM: ${System.getProperty 'java.vm.version'} (${System.getProperty 'java.vendor'}), Arch: ${System.getProperty 'os.arch'}"
 minecraft {
     // The mappings can be changed at any time, and must be in the following format.
     // snapshot_YYYYMMDD   Snapshot are built nightly.
     // stable_#            Stables are built at the discretion of the MCP team.
     // Use non-default mappings at your own risk. they may not always work.
     // Simply re-run your setup task after changing the mappings to update your workspace.
-    mappings channel: 'official', version: '1.19.2'
+    mappings channel: 'official', version: '1.16.5'
     accessTransformer = file('src/main/resources/META-INF/accesstransformer.cfg')
     // makeObfSourceJar = false // an Srg named sources jar is made by default. uncomment this to disable.
 
@@ -34,13 +41,6 @@ minecraft {
             // Recommended logging level for the console
             property 'forge.logging.console.level', 'debug'
 
-            // Comma-separated list of namespaces to load gametests from. Empty = all namespaces.
-            property 'forge.enabledGameTestNamespaces', 'effortlessbuilding'
-
-            // Flywheel
-            property 'mixin.env.remapRefMap', 'true'
-            property 'mixin.env.refMapRemappingFile', "${projectDir}/build/createSrgToMcp/output.srg"
-
             mods {
                 effortlessbuilding {
                     source sourceSets.main
@@ -51,35 +51,12 @@ minecraft {
         server {
             workingDirectory project.file('run')
 
+            // Recommended logging data for a userdev environment (SCAN,REGISTRIES,REGISTRYDUMP)
             property 'forge.logging.markers', 'REGISTRIES'
 
+            // Recommended logging level for the console
             property 'forge.logging.console.level', 'debug'
 
-            property 'forge.enabledGameTestNamespaces', 'effortlessbuilding'
-
-            // Flywheel
-            property 'mixin.env.remapRefMap', 'true'
-            property 'mixin.env.refMapRemappingFile', "${projectDir}/build/createSrgToMcp/output.srg"
-
-            mods {
-                effortlessbuilding {
-                    source sourceSets.main
-                }
-            }
-        }
-		
-        // This run config launches GameTestServer and runs all registered gametests, then exits.
-        // By default, the server will crash when no gametests are provided.
-        // The gametest system is also enabled by default for other run configs under the /test command.
-        gameTestServer {
-            workingDirectory project.file('run')
-
-            property 'forge.logging.markers', 'REGISTRIES'
-
-            property 'forge.logging.console.level', 'debug'
-
-            property 'forge.enabledGameTestNamespaces', 'effortlessbuilding'
-
             mods {
                 effortlessbuilding {
                     source sourceSets.main
@@ -90,8 +67,10 @@ minecraft {
         data {
             workingDirectory project.file('run')
 
+            // Recommended logging data for a userdev environment (SCAN,REGISTRIES,REGISTRYDUMP)
             property 'forge.logging.markers', 'REGISTRIES'
 
+            // Recommended logging level for the console
             property 'forge.logging.console.level', 'debug'
 
             // Specify the modid for data generation, where to output the resulting resource, and where to look for existing resources.
@@ -106,46 +85,30 @@ minecraft {
     }
 }
 
-// Include resources generated by data generators.
-sourceSets.main.resources { srcDir 'src/generated/resources' }
-
-repositories {
-    // Put repositories for dependencies here
-    // ForgeGradle automatically adds the Forge maven and Maven Central for you
-
-    // If you have mod jar dependencies in ./libs, you can declare them as a repository like so:
-    // flatDir {
-    //     dir 'libs'
-    // }
-
-    //Flywheel
-    maven {
-        name "tterrag maven"
-        url "https://maven.tterrag.com/"
-    }
-}
-
 dependencies {
-    // Specify the version of Minecraft to use. If this is any group other than 'net.minecraft', it is assumed
-    // that the dep is a ForgeGradle 'patcher' dependency, and its patches will be applied.
+    // Specify the version of Minecraft to use, If this is any group other then 'net.minecraft' it is assumed
+    // that the dep is a ForgeGradle 'patcher' dependency. And it's patches will be applied.
     // The userdev artifact is a special name and will get all sorts of transformations applied to it.
-    minecraft 'net.minecraftforge:forge:1.19.2-43.1.47'
+    minecraft 'net.minecraftforge:forge:1.16.3-34.0.9'
 
-    // Real mod deobf dependency examples - these get remapped to your current mappings
-    // compileOnly fg.deobf("mezz.jei:jei-${mc_version}:${jei_version}:api") // Adds JEI API as a compile dependency
-    // runtimeOnly fg.deobf("mezz.jei:jei-${mc_version}:${jei_version}") // Adds the full JEI mod as a runtime dependency
-    // implementation fg.deobf("com.tterrag.registrate:Registrate:MC${mc_version}-${registrate_version}") // Adds registrate as a dependency
+    // You may put jars on which you depend on in ./libs or you may define them like so..
+    // compile "some.group:artifact:version:classifier"
+    // compile "some.group:artifact:version"
 
-    // Examples using mod jars from ./libs
-    // implementation fg.deobf("blank:coolmod-${mc_version}:${coolmod_version}")
+    // Real examples
+    // compile 'com.mod-buildcraft:buildcraft:6.0.8:dev'  // adds buildcraft to the dev env
+    // compile 'com.googlecode.efficient-java-matrix-library:ejml:0.24' // adds ejml to the dev env
+
+    // The 'provided' configuration is for optional dependencies that exist at compile-time but might not at runtime.
+    // provided 'com.mod-buildcraft:buildcraft:6.0.8:dev'
+
+    // These dependencies get remapped to your current MCP mappings
+    // deobf 'com.mod-buildcraft:buildcraft:6.0.8:dev'
 
     // For more info...
     // http://www.gradle.org/docs/current/userguide/artifact_dependencies_tutorial.html
     // http://www.gradle.org/docs/current/userguide/dependency_management.html
 
-    //Flywheel
-    //Versions: https://maven.tterrag.com/com/jozufozu/flywheel/flywheel-forge-1.19.2/
-    implementation fg.deobf("com.jozufozu.flywheel:flywheel-forge-1.19.2:0.6.8-13")
 }
 
 // Example for how to get properties into the manifest for reading by the runtime..
@@ -156,18 +119,18 @@ jar {
             "Specification-Vendor": "requios",
             "Specification-Version": "1", // We are version 1 of ourselves
             "Implementation-Title": project.name,
-            "Implementation-Version": project.jar.archiveVersion,
+            "Implementation-Version": "${version}",
             "Implementation-Vendor" :"requios",
             "Implementation-Timestamp": new Date().format("yyyy-MM-dd'T'HH:mm:ssZ")
         ])
     }
 }
 
-// Example configuration to allow publishing using the maven-publish plugin
+// Example configuration to allow publishing using the maven-publish task
 // This is the preferred method to reobfuscate your jar file
 jar.finalizedBy('reobfJar') 
 // However if you are in a multi-project build, dev time needs unobfed jar files, so you can delay the obfuscation until publishing by doing
-// publish.dependsOn('reobfJar')
+//publish.dependsOn('reobfJar')
 
 publishing {
     publications {
@@ -177,11 +140,7 @@ publishing {
     }
     repositories {
         maven {
-            url "file://${project.projectDir}/mcmodsrepo"
+            url "file:///${project.projectDir}/mcmodsrepo"
         }
     }
 }
-
-tasks.withType(JavaCompile).configureEach {
-    options.encoding = 'UTF-8' // Use the UTF-8 charset for Java compilation
-}

gradle/wrapper/gradle-wrapper.properties

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

gradlew

@@ -1,7 +1,7 @@
-#!/bin/sh
+#!/usr/bin/env bash
 
 #
-# Copyright <20> 2015-2021 the original authors.
+# Copyright 2015 the original author or authors.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -17,101 +17,67 @@
 #
 
 ##############################################################################
-#
-#   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 <20>$var<61>, <20>${var}<7D>, <20>${var:-default}<7D>, <20>${var+SET}<7D>,
-#           <20>${var#prefix}<7D>, <20>${var%suffix}<7D>, and <20>$( cmd )<29>;
-#         * compound commands having a testable exit status, especially <20>case<73>;
-#         * various built-in commands including <20>command<6E>, <20>set<65>, and <20>ulimit<69>.
-#
-#   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/.
-#
+##
+##  Gradle start up script for UN*X
+##
 ##############################################################################
 
 # Attempt to set APP_HOME
-
 # Resolve links: $0 may be a link
-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
+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
 done
-
-APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit
+SAVED="`pwd`"
+cd "`dirname \"$PRG\"`/" >/dev/null
+APP_HOME="`pwd -P`"
+cd "$SAVED" >/dev/null
 
 APP_NAME="Gradle"
-APP_BASE_NAME=${0##*/}
+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"'
 
 # 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
@@ -121,9 +87,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
@@ -132,7 +98,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
@@ -140,95 +106,78 @@ location of your Java installation."
 fi
 
 # Increase the maximum file descriptors if we can.
-if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then
-    case $MAX_FD in #(
-      max*)
-        MAX_FD=$( ulimit -H -n ) ||
-            warn "Could not query maximum file descriptor limit"
-    esac
-    case $MAX_FD in  #(
-      '' | soft) :;; #(
-      *)
-        ulimit -n "$MAX_FD" ||
-            warn "Could not set maximum file descriptor limit to $MAX_FD"
-    esac
+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
 
-# 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.
+# 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" || "$msys" ; then
-    APP_HOME=$( cygpath --path --mixed "$APP_HOME" )
-    CLASSPATH=$( cygpath --path --mixed "$CLASSPATH" )
+if [ "$cygwin" = "true" -o "$msys" = "true" ] ; then
+    APP_HOME=`cygpath --path --mixed "$APP_HOME"`
+    CLASSPATH=`cygpath --path --mixed "$CLASSPATH"`
 
-    JAVACMD=$( cygpath --unix "$JAVACMD" )
+    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
+    # 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" ;;
+    esac
 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.
+ARGV=("$@")
+eval set -- $DEFAULT_JVM_OPTS
 
-set -- \
-        "-Dorg.gradle.appname=$APP_BASE_NAME" \
-        -classpath "$CLASSPATH" \
-        org.gradle.wrapper.GradleWrapperMain \
-        "$@"
+IFS=$'
+' read -rd '' -a JAVA_OPTS_ARR <<< "$(echo $JAVA_OPTS | xargs -n1)"
+IFS=$'
+' read -rd '' -a GRADLE_OPTS_ARR <<< "$(echo $GRADLE_OPTS | xargs -n1)"
 
-# 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" "$@"
+exec "$JAVACMD" "$@" "${JAVA_OPTS_ARR[@]}" "${GRADLE_OPTS_ARR[@]}" "-Dorg.gradle.appname=$APP_BASE_NAME" -classpath "$CLASSPATH" org.gradle.wrapper.GradleWrapperMain "${ARGV[@]}"

settings.gradle

@@ -1,6 +0,0 @@
-pluginManagement {
-    repositories {
-        gradlePluginPortal()
-        maven { url = 'https://maven.minecraftforge.net/' }
-    }
-}

src/main/java/nl/requios/effortlessbuilding/BuildConfig.java

@@ -1,9 +1,8 @@
 package nl.requios.effortlessbuilding;
 
 import net.minecraftforge.common.ForgeConfigSpec;
-import nl.requios.effortlessbuilding.create.foundation.render.SuperByteBufferCache;
 
-public class CommonConfig {
+public class BuildConfig {
 
 	private static final ForgeConfigSpec.Builder builder = new ForgeConfigSpec.Builder();
 	public static final Reach reach = new Reach(builder);
@@ -55,20 +54,40 @@ public class CommonConfig {
 	}
 
 	public static class SurvivalBalancers {
+		public final ForgeConfigSpec.ConfigValue<Boolean> breakFar;
+		public final ForgeConfigSpec.ConfigValue<Boolean> increasedMiningTime;
+		public final ForgeConfigSpec.ConfigValue<Integer> miningTimePercentage;
 		public final ForgeConfigSpec.ConfigValue<Integer> quickReplaceMiningLevel;
 		public final ForgeConfigSpec.ConfigValue<Integer> undoStackSize;
 
 		public SurvivalBalancers(ForgeConfigSpec.Builder builder) {
 			builder.push("SurvivalBalancers");
 
+			breakFar = builder
+				.comment("Allows a survival player to break blocks that are far away, in addition to placing blocks.",
+					"Note: this allows insta-breaking of blocks in survival.")
+				.define("breakFar", false);
+
+			increasedMiningTime = builder
+				.comment("Increases the time to mine a block when breaking multiple at once.",
+					"Mining time depends on how many blocks, what type of blocks, and the percentage below.",
+					"Example: breaking 1 dirt + 1 obsidian takes the time of breaking 1 dirt + 1 obsidian.")
+				.define("increasedMiningTime", true);
+
+			miningTimePercentage = builder
+				.comment("How much the mining time of each additional block counts towards an increased mining time.",
+					"A percentage between 0% and 100%, where 0% is the same as disabling it,",
+					"and 100% takes as much time as breaking each block individually.",
+					"The block in front of you always counts as 100%.")
+				.defineInRange("miningTimePercentage", 50, 0, 200);
+
 			quickReplaceMiningLevel = builder
 				.comment("Determines what blocks can be replaced in survival.",
 					"-1: only blocks that can be harvested by hand (default)",
 					"0: blocks that can be harvested with wooden or gold tools",
 					"1: blocks that can be harvested with stone tools",
 					"2: blocks that can be harvested with iron tools",
-					"3: blocks that can be harvested with diamond tools",
-					"4: blocks that can be harvested with netherite tools")
+					"3: blocks that can be harvested with diamond tools")
 				.defineInRange("quickReplaceMiningLevel", -1, -1, 3);
 
 			undoStackSize = builder
@@ -81,21 +100,33 @@ public class CommonConfig {
 	}
 
 	public static class Visuals {
-		public final ForgeConfigSpec.ConfigValue<Integer> appearAnimationLength;
-		public final ForgeConfigSpec.ConfigValue<Integer> breakAnimationLength;
+		public final ForgeConfigSpec.ConfigValue<Boolean> alwaysShowBlockPreview;
+		public final ForgeConfigSpec.ConfigValue<Double> dissolveTimeMultiplier;
+		public final ForgeConfigSpec.ConfigValue<Integer> shaderTreshold;
+		public final ForgeConfigSpec.ConfigValue<Boolean> useShaders;
 
 		public Visuals(ForgeConfigSpec.Builder builder) {
 			builder.push("Visuals");
 
-			appearAnimationLength = builder
-				.comment("How long it takes for a block to appear when placed in ticks.",
-					"Set to 0 to disable animation.")
-				.define("appearAnimationLength", 5);
+			alwaysShowBlockPreview = builder
+				.comment("Show a block preview if you have a block in hand even in the 'Normal' build mode")
+				.define("alwaysShowBlockPreview", false);
 
-			breakAnimationLength = builder
-				.comment("How long the break animation is in ticks.",
-					"Set to 0 to disable animation.")
-				.define("breakAnimationLength", 10);
+			dissolveTimeMultiplier = builder
+				.comment("How long the dissolve effect takes when placing blocks.",
+					"Default between 30 and 60 ticks, you can multiply that here.",
+					"Recommended values:",
+					"Snappy: 0.7",
+					"Relaxing: 1.5")
+				.define("dissolveTimeMultiplier", 1.0);
+
+			shaderTreshold = builder
+				.comment("Switch to using the simple performance shader when placing more than this many blocks.")
+				.define("shaderTreshold", 1500);
+
+			useShaders = builder
+				.comment("Use fancy shaders while placing blocks")
+				.define("useShaders", true);
 
 			builder.pop();
 		}

src/main/java/nl/requios/effortlessbuilding/ClientConfig.java

@@ -1,36 +0,0 @@
-package nl.requios.effortlessbuilding;
-
-import net.minecraftforge.common.ForgeConfigSpec;
-
-public class ClientConfig {
-
-	private static final ForgeConfigSpec.Builder builder = new ForgeConfigSpec.Builder();
-	public static final Visuals visuals = new Visuals(builder);
-	public static final ForgeConfigSpec spec = builder.build();
-
-	public static class Visuals {
-		public final ForgeConfigSpec.ConfigValue<Boolean> showBlockPreviews;
-		public final ForgeConfigSpec.ConfigValue<Boolean> alwaysShowBlockPreview;
-		public final ForgeConfigSpec.ConfigValue<Integer> maxBlockPreviews;
-
-		public Visuals(ForgeConfigSpec.Builder builder) {
-			builder.push("Visuals");
-
-			showBlockPreviews = builder
-					.comment("Show previews of the blocks while placing them")
-					.define("useShaders", true);
-
-			alwaysShowBlockPreview = builder
-				.comment("Show a block preview if you have a block in hand even in the 'Disabled' build mode")
-				.define("alwaysShowBlockPreview", false);
-
-			maxBlockPreviews = builder
-				.comment("Don't show block previews when placing more than this many blocks. " +
-						 "The outline will always be rendered.")
-				.define("shaderTreshold", 500);
-
-
-			builder.pop();
-		}
-	}
-}

src/main/java/nl/requios/effortlessbuilding/ClientEvents.java

@@ -1,337 +0,0 @@
-package nl.requios.effortlessbuilding;
-
-import com.mojang.blaze3d.platform.InputConstants;
-import com.mojang.blaze3d.vertex.DefaultVertexFormat;
-import net.minecraft.ChatFormatting;
-import net.minecraft.client.KeyMapping;
-import net.minecraft.client.Minecraft;
-import net.minecraft.client.gui.screens.Screen;
-import net.minecraft.client.player.LocalPlayer;
-import net.minecraft.client.renderer.ShaderInstance;
-import net.minecraft.core.BlockPos;
-import net.minecraft.resources.ResourceLocation;
-import net.minecraft.sounds.SoundSource;
-import net.minecraft.world.InteractionHand;
-import net.minecraft.world.entity.player.Player;
-import net.minecraft.world.item.BlockItem;
-import net.minecraft.world.item.ItemStack;
-import net.minecraft.world.level.ClipContext;
-import net.minecraft.world.level.Level;
-import net.minecraft.world.level.block.SoundType;
-import net.minecraft.world.level.block.state.BlockState;
-import net.minecraft.world.phys.BlockHitResult;
-import net.minecraft.world.phys.HitResult;
-import net.minecraft.world.phys.Vec3;
-import net.minecraftforge.api.distmarker.Dist;
-import net.minecraftforge.client.event.InputEvent;
-import net.minecraftforge.client.event.RegisterKeyMappingsEvent;
-import net.minecraftforge.client.event.RegisterShadersEvent;
-import net.minecraftforge.client.event.ScreenEvent;
-import net.minecraftforge.client.settings.KeyConflictContext;
-import net.minecraftforge.client.settings.KeyModifier;
-import net.minecraftforge.event.TickEvent;
-import net.minecraftforge.eventbus.api.SubscribeEvent;
-import net.minecraftforge.fml.common.Mod.EventBusSubscriber;
-import nl.requios.effortlessbuilding.buildmode.BuildModes;
-import nl.requios.effortlessbuilding.buildmode.ModeOptions;
-import nl.requios.effortlessbuilding.buildmode.ModeSettingsManager;
-import nl.requios.effortlessbuilding.buildmodifier.ModifierSettingsManager;
-import nl.requios.effortlessbuilding.compatibility.CompatHelper;
-import nl.requios.effortlessbuilding.gui.buildmode.PlayerSettingsGui;
-import nl.requios.effortlessbuilding.gui.buildmode.RadialMenu;
-import nl.requios.effortlessbuilding.gui.buildmodifier.ModifierSettingsGui;
-import nl.requios.effortlessbuilding.helper.ReachHelper;
-import nl.requios.effortlessbuilding.network.*;
-import nl.requios.effortlessbuilding.render.BuildRenderTypes;
-import org.lwjgl.glfw.GLFW;
-
-import java.io.IOException;
-
-@EventBusSubscriber(Dist.CLIENT)
-public class ClientEvents {
-
-    public static KeyMapping[] keyBindings;
-    public static HitResult previousLookAt;
-    public static HitResult currentLookAt;
-    public static int ticksInGame = 0;
-    private static int placeCooldown = 0;
-    private static int breakCooldown = 0;
-
-    //Mod Bus Events
-    @EventBusSubscriber(value = Dist.CLIENT, bus = EventBusSubscriber.Bus.MOD)
-    public static class ModBusEvents {
-
-        @SubscribeEvent
-        public static void registerKeyMappings(RegisterKeyMappingsEvent event) {
-            EffortlessBuilding.log("Registering KeyMappings!");
-
-            // register key bindings
-            keyBindings = new KeyMapping[6];
-
-            // instantiate the key bindings
-            keyBindings[0] = new KeyMapping("key.effortlessbuilding.hud.desc", KeyConflictContext.IN_GAME, InputConstants.getKey(GLFW.GLFW_KEY_KP_ADD, 0), "key.effortlessbuilding.category");
-            keyBindings[1] = new KeyMapping("key.effortlessbuilding.replace.desc", KeyConflictContext.IN_GAME, InputConstants.getKey(GLFW.GLFW_KEY_KP_SUBTRACT, 0), "key.effortlessbuilding.category");
-            keyBindings[2] = new KeyMapping("key.effortlessbuilding.mode.desc", KeyConflictContext.IN_GAME, InputConstants.getKey(GLFW.GLFW_KEY_LEFT_ALT, 0), "key.effortlessbuilding.category");
-            keyBindings[3] = new KeyMapping("key.effortlessbuilding.undo.desc", KeyConflictContext.IN_GAME, KeyModifier.CONTROL, InputConstants.getKey(GLFW.GLFW_KEY_Z, 0), "key.effortlessbuilding.category");
-            keyBindings[4] = new KeyMapping("key.effortlessbuilding.redo.desc", KeyConflictContext.IN_GAME, KeyModifier.CONTROL, InputConstants.getKey(GLFW.GLFW_KEY_Y, 0), "key.effortlessbuilding.category");
-            keyBindings[5] = new KeyMapping("key.effortlessbuilding.altplacement.desc", KeyConflictContext.IN_GAME, InputConstants.getKey(GLFW.GLFW_KEY_LEFT_CONTROL, 0), "key.effortlessbuilding.category");
-
-            for (KeyMapping keyBinding : keyBindings) {
-                event.register(keyBinding);
-            }
-        }
-
-        @SubscribeEvent
-        public static void registerShaders(RegisterShadersEvent event) throws IOException {
-            event.registerShader(new ShaderInstance(event.getResourceManager(),
-                            new ResourceLocation(EffortlessBuilding.MODID, "dissolve"),
-                            DefaultVertexFormat.BLOCK),
-                    shaderInstance -> BuildRenderTypes.dissolveShaderInstance = shaderInstance);
-        }
-    }
-
-    @SubscribeEvent
-    public static void onClientTick(TickEvent.ClientTickEvent event) {
-        if (event.phase == TickEvent.Phase.START) {
-            onMouseInput();
-
-            //Update previousLookAt
-            HitResult objectMouseOver = Minecraft.getInstance().hitResult;
-            //Checking for null is necessary! Even in vanilla when looking down ladders it is occasionally null (instead of Type MISS)
-            if (objectMouseOver == null) return;
-
-            if (currentLookAt == null) {
-                currentLookAt = objectMouseOver;
-                previousLookAt = objectMouseOver;
-                return;
-            }
-
-            if (objectMouseOver.getType() == HitResult.Type.BLOCK) {
-                if (currentLookAt.getType() != HitResult.Type.BLOCK) {
-                    currentLookAt = objectMouseOver;
-                    previousLookAt = objectMouseOver;
-                } else {
-                    if (((BlockHitResult) currentLookAt).getBlockPos() != ((BlockHitResult) objectMouseOver).getBlockPos()) {
-                        previousLookAt = currentLookAt;
-                        currentLookAt = objectMouseOver;
-                    }
-                }
-            }
-        } else if (event.phase == TickEvent.Phase.END) {
-            Screen gui = Minecraft.getInstance().screen;
-            if (gui == null || !gui.isPauseScreen()) {
-                ticksInGame++;
-            }
-        }
-
-    }
-
-    private static void onMouseInput() {
-        Minecraft mc = Minecraft.getInstance();
-        LocalPlayer player = mc.player;
-        if (player == null) return;
-        BuildModes.BuildModeEnum buildMode = ModeSettingsManager.getModeSettings(player).getBuildMode();
-
-        if (mc.screen != null ||
-            buildMode == BuildModes.BuildModeEnum.DISABLED ||
-            RadialMenu.instance.isVisible()) {
-            return;
-        }
-
-        if (mc.options.keyUse.isDown()) {
-
-            //KeyBinding.setKeyBindState(mc.gameSettings.keyBindUseItem.getKeyCode(), false);
-
-            if (placeCooldown <= 0) {
-                placeCooldown = 4;
-
-                ItemStack currentItemStack = player.getItemInHand(InteractionHand.MAIN_HAND);
-                if (currentItemStack.getItem() instanceof BlockItem ||
-                    (CompatHelper.isItemBlockProxy(currentItemStack) && !player.isShiftKeyDown())) {
-
-                    ItemStack itemStack = CompatHelper.getItemBlockFromStack(currentItemStack);
-
-                    //find position in distance
-                    HitResult lookingAt = getLookingAt(player);
-                    if (lookingAt != null && lookingAt.getType() == HitResult.Type.BLOCK) {
-                        BlockHitResult blockLookingAt = (BlockHitResult) lookingAt;
-
-                        BuildModes.onBlockPlacedMessage(player, new BlockPlacedMessage(blockLookingAt, true));
-                        PacketHandler.INSTANCE.sendToServer(new BlockPlacedMessage(blockLookingAt, true));
-
-                        //play sound if further than normal
-                        if ((blockLookingAt.getLocation().subtract(player.getEyePosition(1f))).lengthSqr() > 25f &&
-                            itemStack.getItem() instanceof BlockItem) {
-
-                            BlockState state = ((BlockItem) itemStack.getItem()).getBlock().defaultBlockState();
-                            BlockPos blockPos = blockLookingAt.getBlockPos();
-                            SoundType soundType = state.getBlock().getSoundType(state, player.level, blockPos, player);
-                            player.level.playSound(player, player.blockPosition(), soundType.getPlaceSound(), SoundSource.BLOCKS,
-                                    0.4f, soundType.getPitch());
-                            player.swing(InteractionHand.MAIN_HAND);
-                        }
-                    } else {
-                        BuildModes.onBlockPlacedMessage(player, new BlockPlacedMessage());
-                        PacketHandler.INSTANCE.sendToServer(new BlockPlacedMessage());
-                    }
-                }
-            } else if (buildMode == BuildModes.BuildModeEnum.SINGLE) {
-                placeCooldown--;
-                if (ModeOptions.getBuildSpeed() == ModeOptions.ActionEnum.FAST_SPEED) placeCooldown = 0;
-            }
-        } else {
-            placeCooldown = 0;
-        }
-
-        if (mc.options.keyAttack.isDown()) {
-
-            //Break block in distance in creative (or survival if enabled in config)
-            if (breakCooldown <= 0) {
-                breakCooldown = 4;
-
-                HitResult lookingAt = getLookingAt(player);
-                if (lookingAt != null && lookingAt.getType() == HitResult.Type.BLOCK) {
-                    BlockHitResult blockLookingAt = (BlockHitResult) lookingAt;
-
-                    BuildModes.onBlockBrokenMessage(player, new BlockBrokenMessage(blockLookingAt));
-                    PacketHandler.INSTANCE.sendToServer(new BlockBrokenMessage(blockLookingAt));
-
-                    //play sound if further than normal
-                    if ((blockLookingAt.getLocation().subtract(player.getEyePosition(1f))).lengthSqr() > 25f) {
-
-                        BlockPos blockPos = blockLookingAt.getBlockPos();
-                        BlockState state = player.level.getBlockState(blockPos);
-                        SoundType soundtype = state.getBlock().getSoundType(state, player.level, blockPos, player);
-                        player.level.playSound(player, player.blockPosition(), soundtype.getBreakSound(), SoundSource.BLOCKS,
-                                0.4f, soundtype.getPitch());
-                        player.swing(InteractionHand.MAIN_HAND);
-                    }
-                } else {
-                    BuildModes.onBlockBrokenMessage(player, new BlockBrokenMessage());
-                    PacketHandler.INSTANCE.sendToServer(new BlockBrokenMessage());
-                }
-            } else if (buildMode == BuildModes.BuildModeEnum.SINGLE) {
-                breakCooldown--;
-                if (ModeOptions.getBuildSpeed() == ModeOptions.ActionEnum.FAST_SPEED) breakCooldown = 0;
-            }
-
-            //EffortlessBuilding.packetHandler.sendToServer(new CancelModeMessage());
-
-        } else {
-            breakCooldown = 0;
-        }
-    }
-
-    @SubscribeEvent(receiveCanceled = true)
-    public static void onKeyPress(InputEvent.Key event) {
-        LocalPlayer player = Minecraft.getInstance().player;
-        if (player == null)
-            return;
-
-        //Remember to send packet to server if necessary
-        //Show Modifier Settings GUI
-        if (keyBindings[0].consumeClick()) {
-            openModifierSettings();
-        }
-
-        //QuickReplace toggle
-        if (keyBindings[1].consumeClick()) {
-            ModifierSettingsManager.ModifierSettings modifierSettings = ModifierSettingsManager.getModifierSettings(player);
-            modifierSettings.setQuickReplace(!modifierSettings.doQuickReplace());
-            EffortlessBuilding.log(player, "Set " + ChatFormatting.GOLD + "Quick Replace " + ChatFormatting.RESET + (
-                    modifierSettings.doQuickReplace() ? "on" : "off"));
-            PacketHandler.INSTANCE.sendToServer(new ModifierSettingsMessage(modifierSettings));
-        }
-
-        //Radial menu
-        if (keyBindings[2].isDown()) {
-            if (ReachHelper.getMaxReach(player) > 0) {
-                if (!RadialMenu.instance.isVisible()) {
-                    Minecraft.getInstance().setScreen(RadialMenu.instance);
-                }
-            } else {
-                EffortlessBuilding.log(player, "Build modes are disabled until your reach has increased. Increase your reach with craftable reach upgrades.");
-            }
-        }
-
-        //Undo (Ctrl+Z)
-        if (keyBindings[3].consumeClick()) {
-            ModeOptions.ActionEnum action = ModeOptions.ActionEnum.UNDO;
-            ModeOptions.performAction(player, action);
-            PacketHandler.INSTANCE.sendToServer(new ModeActionMessage(action));
-        }
-
-        //Redo (Ctrl+Y)
-        if (keyBindings[4].consumeClick()) {
-            ModeOptions.ActionEnum action = ModeOptions.ActionEnum.REDO;
-            ModeOptions.performAction(player, action);
-            PacketHandler.INSTANCE.sendToServer(new ModeActionMessage(action));
-        }
-
-        //Change placement mode
-        if (keyBindings[5].consumeClick()) {
-            //Toggle between first two actions of the first option of the current build mode
-            BuildModes.BuildModeEnum currentBuildMode = ModeSettingsManager.getModeSettings(player).getBuildMode();
-            if (currentBuildMode.options.length > 0) {
-                ModeOptions.OptionEnum option = currentBuildMode.options[0];
-                if (option.actions.length >= 2) {
-                    if (ModeOptions.getOptionSetting(option) == option.actions[0]) {
-                        ModeOptions.performAction(player, option.actions[1]);
-                        PacketHandler.INSTANCE.sendToServer(new ModeActionMessage(option.actions[1]));
-                    } else {
-                        ModeOptions.performAction(player, option.actions[0]);
-                        PacketHandler.INSTANCE.sendToServer(new ModeActionMessage(option.actions[0]));
-                    }
-                }
-            }
-        }
-
-    }
-
-    public static void openModifierSettings() {
-        Minecraft mc = Minecraft.getInstance();
-        LocalPlayer player = mc.player;
-        if (player == null) return;
-
-        //Disabled if max reach is 0, might be set in the config that way.
-        if (ReachHelper.getMaxReach(player) == 0) {
-            EffortlessBuilding.log(player, "Build modifiers are disabled until your reach has increased. Increase your reach with craftable reach upgrades.");
-        } else {
-            mc.setScreen(new ModifierSettingsGui());
-        }
-    }
-
-    public static void openPlayerSettings() {
-        Minecraft mc = Minecraft.getInstance();
-        mc.setScreen(new PlayerSettingsGui());
-    }
-
-    @SubscribeEvent
-    public static void onGuiOpen(ScreenEvent event) {
-        Player player = Minecraft.getInstance().player;
-        if (player != null) {
-            BuildModes.initializeMode(player);
-        }
-    }
-
-    public static boolean isKeybindDown(int keybindIndex) {
-        return InputConstants.isKeyDown(
-                Minecraft.getInstance().getWindow().getWindow(),
-                keyBindings[2].getKey().getValue());
-    }
-
-    public static HitResult getLookingAt(Player player) {
-        Level world = player.level;
-
-        //base distance off of player ability (config)
-        float raytraceRange = ReachHelper.getPlacementReach(player);
-
-        Vec3 look = player.getLookAngle();
-        Vec3 start = new Vec3(player.getX(), player.getY() + player.getEyeHeight(), player.getZ());
-        Vec3 end = new Vec3(player.getX() + look.x * raytraceRange, player.getY() + player.getEyeHeight() + look.y * raytraceRange, player.getZ() + look.z * raytraceRange);
-//        return player.rayTrace(raytraceRange, 1f, RayTraceFluidMode.NEVER);
-        //TODO 1.14 check if correct
-        return world.clip(new ClipContext(start, end, ClipContext.Block.COLLIDER, ClipContext.Fluid.NONE, player));
-    }
-
-}

src/main/java/nl/requios/effortlessbuilding/EffortlessBuilding.java

@@ -1,28 +1,29 @@
 package nl.requios.effortlessbuilding;
 
-import net.minecraft.network.chat.Component;
-import net.minecraft.world.entity.player.Player;
-import net.minecraft.world.inventory.AbstractContainerMenu;
-import net.minecraft.world.inventory.MenuType;
-import net.minecraft.world.item.Item;
-import net.minecraftforge.api.distmarker.Dist;
-import net.minecraftforge.common.MinecraftForge;
-import net.minecraftforge.eventbus.api.IEventBus;
+import net.minecraft.entity.player.PlayerEntity;
+import net.minecraft.inventory.container.Container;
+import net.minecraft.inventory.container.ContainerType;
+import net.minecraft.item.Item;
+import net.minecraft.util.text.StringTextComponent;
+import net.minecraftforge.common.capabilities.CapabilityManager;
+import net.minecraftforge.eventbus.api.SubscribeEvent;
 import net.minecraftforge.fml.DistExecutor;
 import net.minecraftforge.fml.ModLoadingContext;
+import net.minecraftforge.fml.RegistryObject;
 import net.minecraftforge.fml.common.Mod;
 import net.minecraftforge.fml.config.ModConfig;
+import net.minecraftforge.fml.event.lifecycle.FMLClientSetupEvent;
 import net.minecraftforge.fml.event.lifecycle.FMLCommonSetupEvent;
 import net.minecraftforge.fml.javafmlmod.FMLJavaModLoadingContext;
-import net.minecraftforge.network.IContainerFactory;
+import net.minecraftforge.fml.network.IContainerFactory;
 import net.minecraftforge.registries.DeferredRegister;
 import net.minecraftforge.registries.ForgeRegistries;
-import net.minecraftforge.registries.RegistryObject;
+import nl.requios.effortlessbuilding.capability.ModeCapabilityManager;
+import nl.requios.effortlessbuilding.capability.ModifierCapabilityManager;
 import nl.requios.effortlessbuilding.compatibility.CompatHelper;
 import nl.requios.effortlessbuilding.gui.DiamondRandomizerBagContainer;
 import nl.requios.effortlessbuilding.gui.GoldenRandomizerBagContainer;
 import nl.requios.effortlessbuilding.gui.RandomizerBagContainer;
-import nl.requios.effortlessbuilding.helper.DelayedBlockPlacer;
 import nl.requios.effortlessbuilding.item.*;
 import nl.requios.effortlessbuilding.network.PacketHandler;
 import nl.requios.effortlessbuilding.proxy.ClientProxy;
@@ -31,20 +32,19 @@ import nl.requios.effortlessbuilding.proxy.ServerProxy;
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
 
+// The value here should match an entry in the META-INF/mods.toml file
 @Mod(EffortlessBuilding.MODID)
+@Mod.EventBusSubscriber(bus = Mod.EventBusSubscriber.Bus.MOD)
 public class EffortlessBuilding {
-
 	public static final String MODID = "effortlessbuilding";
 	public static final Logger logger = LogManager.getLogger();
 
 	public static EffortlessBuilding instance;
-	public static IProxy proxy = DistExecutor.safeRunForDist(() -> ClientProxy::new, () -> ServerProxy::new);
-
-	public static final DelayedBlockPlacer DELAYED_BLOCK_PLACER = new DelayedBlockPlacer();
+	public static IProxy proxy = DistExecutor.runForDist(() -> ClientProxy::new, () -> ServerProxy::new);
 
 	//Registration
 	private static final DeferredRegister<Item> ITEMS = DeferredRegister.create(ForgeRegistries.ITEMS, MODID);
-	private static final DeferredRegister<MenuType<?>> CONTAINERS = DeferredRegister.create(ForgeRegistries.MENU_TYPES, EffortlessBuilding.MODID);
+	private static final DeferredRegister<ContainerType<?>> CONTAINERS = DeferredRegister.create(ForgeRegistries.CONTAINERS, EffortlessBuilding.MODID);
 
 	public static final RegistryObject<Item> RANDOMIZER_BAG_ITEM = ITEMS.register("randomizer_bag", RandomizerBagItem::new);
 	public static final RegistryObject<Item> GOLDEN_RANDOMIZER_BAG_ITEM = ITEMS.register("golden_randomizer_bag", GoldenRandomizerBagItem::new);
@@ -53,37 +53,25 @@ public class EffortlessBuilding {
 	public static final RegistryObject<Item> REACH_UPGRADE_2_ITEM = ITEMS.register("reach_upgrade2", ReachUpgrade2Item::new);
 	public static final RegistryObject<Item> REACH_UPGRADE_3_ITEM = ITEMS.register("reach_upgrade3", ReachUpgrade3Item::new);
 
-	public static final RegistryObject<MenuType<RandomizerBagContainer>> RANDOMIZER_BAG_CONTAINER = CONTAINERS.register("randomizer_bag", () -> registerContainer(RandomizerBagContainer::new));
-	public static final RegistryObject<MenuType<GoldenRandomizerBagContainer>> GOLDEN_RANDOMIZER_BAG_CONTAINER = CONTAINERS.register("golden_randomizer_bag", () -> registerContainer(GoldenRandomizerBagContainer::new));
-	public static final RegistryObject<MenuType<DiamondRandomizerBagContainer>> DIAMOND_RANDOMIZER_BAG_CONTAINER = CONTAINERS.register("diamond_randomizer_bag", () -> registerContainer(DiamondRandomizerBagContainer::new));
+	public static final RegistryObject<ContainerType<RandomizerBagContainer>> RANDOMIZER_BAG_CONTAINER = CONTAINERS.register("randomizer_bag", () -> registerContainer(RandomizerBagContainer::new));
+	public static final RegistryObject<ContainerType<GoldenRandomizerBagContainer>> GOLDEN_RANDOMIZER_BAG_CONTAINER = CONTAINERS.register("golden_randomizer_bag", () -> registerContainer(GoldenRandomizerBagContainer::new));
+	public static final RegistryObject<ContainerType<DiamondRandomizerBagContainer>> DIAMOND_RANDOMIZER_BAG_CONTAINER = CONTAINERS.register("diamond_randomizer_bag", () -> registerContainer(DiamondRandomizerBagContainer::new));
 
 	public EffortlessBuilding() {
 		instance = this;
 
-		ModLoadingContext modLoadingContext = ModLoadingContext.get();
-		IEventBus modEventBus = FMLJavaModLoadingContext.get().getModEventBus();
-		IEventBus forgeEventBus = MinecraftForge.EVENT_BUS;
-
-		modEventBus.addListener(EffortlessBuilding::setup);
-
-		DistExecutor.unsafeRunWhenOn(Dist.CLIENT, () -> () -> EffortlessBuildingClient.onConstructorClient(modEventBus, forgeEventBus));
+		// Register ourselves for server and other game events we are interested in
+		FMLJavaModLoadingContext.get().getModEventBus().register(this);
 
 		ITEMS.register(FMLJavaModLoadingContext.get().getModEventBus());
 		CONTAINERS.register(FMLJavaModLoadingContext.get().getModEventBus());
 
 		//Register config
-		ModLoadingContext.get().registerConfig(ModConfig.Type.COMMON, CommonConfig.spec);
-		ModLoadingContext.get().registerConfig(ModConfig.Type.CLIENT, ClientConfig.spec);
+		ModLoadingContext.get().registerConfig(ModConfig.Type.COMMON, BuildConfig.spec);
 	}
 
-	public static void setup(final FMLCommonSetupEvent event) {
-		PacketHandler.register();
-
-		CompatHelper.setup();
-	}
-
-	public static <T extends AbstractContainerMenu> MenuType<T> registerContainer(IContainerFactory<T> fact){
-		MenuType<T> type = new MenuType<T>(fact);
+	public static <T extends Container> ContainerType<T> registerContainer(IContainerFactory<T> fact){
+		ContainerType<T> type = new ContainerType<T>(fact);
 		return type;
 	}
 
@@ -91,17 +79,37 @@ public class EffortlessBuilding {
 		logger.info(msg);
 	}
 
-	public static void log(Player player, String msg) {
+	public static void log(PlayerEntity player, String msg) {
 		log(player, msg, false);
 	}
 
-	public static void log(Player player, String msg, boolean actionBar) {
-		player.displayClientMessage(Component.literal(msg), actionBar);
+	public static void log(PlayerEntity player, String msg, boolean actionBar) {
+		player.displayClientMessage(new StringTextComponent(msg), actionBar);
 	}
 
 	//Log with translation supported, call either on client or server (which then sends a message)
-	public static void logTranslate(Player player, String prefix, String translationKey, String suffix, boolean actionBar) {
+	public static void logTranslate(PlayerEntity player, String prefix, String translationKey, String suffix, boolean actionBar) {
 		proxy.logTranslate(player, prefix, translationKey, suffix, actionBar);
 	}
 
+	@SubscribeEvent
+	public void setup(final FMLCommonSetupEvent event) {
+		CapabilityManager.INSTANCE.register(ModifierCapabilityManager.IModifierCapability.class, new ModifierCapabilityManager.Storage(), ModifierCapabilityManager.ModifierCapability::new);
+		CapabilityManager.INSTANCE.register(ModeCapabilityManager.IModeCapability.class, new ModeCapabilityManager.Storage(), ModeCapabilityManager.ModeCapability::new);
+
+		PacketHandler.register();
+
+		//TODO 1.13 config
+//        ConfigManager.sync(MODID, Config.Type.INSTANCE);
+
+		proxy.setup(event);
+
+		CompatHelper.setup();
+	}
+
+	@SubscribeEvent
+	public void clientSetup(final FMLClientSetupEvent event) {
+
+		proxy.clientSetup(event);
+	}
 }

src/main/java/nl/requios/effortlessbuilding/EffortlessBuildingClient.java

@@ -1,21 +0,0 @@
-package nl.requios.effortlessbuilding;
-
-import net.minecraft.client.gui.screens.MenuScreens;
-import net.minecraftforge.eventbus.api.IEventBus;
-import net.minecraftforge.fml.event.lifecycle.FMLClientSetupEvent;
-import nl.requios.effortlessbuilding.gui.DiamondRandomizerBagScreen;
-import nl.requios.effortlessbuilding.gui.GoldenRandomizerBagScreen;
-import nl.requios.effortlessbuilding.gui.RandomizerBagScreen;
-
-public class EffortlessBuildingClient {
-
-    public static void onConstructorClient(IEventBus modEventBus, IEventBus forgeEventBus) {
-        modEventBus.addListener(EffortlessBuildingClient::clientSetup);
-    }
-
-    public static void clientSetup(final FMLClientSetupEvent event) {
-        MenuScreens.register(EffortlessBuilding.RANDOMIZER_BAG_CONTAINER.get(), RandomizerBagScreen::new);
-        MenuScreens.register(EffortlessBuilding.GOLDEN_RANDOMIZER_BAG_CONTAINER.get(), GoldenRandomizerBagScreen::new);
-        MenuScreens.register(EffortlessBuilding.DIAMOND_RANDOMIZER_BAG_CONTAINER.get(), DiamondRandomizerBagScreen::new);
-    }
-}

src/main/java/nl/requios/effortlessbuilding/EventHandler.java

@@ -1,88 +1,63 @@
 package nl.requios.effortlessbuilding;
 
-import net.minecraft.world.InteractionHand;
-import net.minecraft.world.item.BlockItem;
-import net.minecraft.world.item.ItemStack;
-import net.minecraft.world.level.block.Blocks;
-import net.minecraft.world.entity.Entity;
-import net.minecraft.world.entity.player.Player;
-import net.minecraft.server.level.ServerPlayer;
-import net.minecraft.resources.ResourceLocation;
-import net.minecraftforge.common.capabilities.RegisterCapabilitiesEvent;
+import net.minecraft.block.BlockState;
+import net.minecraft.block.Blocks;
+import net.minecraft.entity.Entity;
+import net.minecraft.entity.player.PlayerEntity;
+import net.minecraft.entity.player.ServerPlayerEntity;
+import net.minecraft.util.ResourceLocation;
+import net.minecraft.util.math.BlockPos;
+import net.minecraft.world.World;
 import net.minecraftforge.common.util.FakePlayer;
 import net.minecraftforge.event.AttachCapabilitiesEvent;
-import net.minecraftforge.event.TickEvent;
 import net.minecraftforge.event.entity.player.PlayerEvent;
-import net.minecraftforge.event.level.BlockEvent;
+import net.minecraftforge.event.world.BlockEvent;
 import net.minecraftforge.eventbus.api.SubscribeEvent;
-import net.minecraftforge.fml.common.Mod.EventBusSubscriber;
-import net.minecraftforge.network.PacketDistributor;
+import net.minecraftforge.fml.common.Mod;
+import net.minecraftforge.fml.network.PacketDistributor;
 import nl.requios.effortlessbuilding.buildmode.BuildModes;
 import nl.requios.effortlessbuilding.buildmode.ModeSettingsManager;
+import nl.requios.effortlessbuilding.buildmodifier.BuildModifiers;
 import nl.requios.effortlessbuilding.buildmodifier.ModifierSettingsManager;
 import nl.requios.effortlessbuilding.buildmodifier.UndoRedo;
 import nl.requios.effortlessbuilding.capability.ModeCapabilityManager;
 import nl.requios.effortlessbuilding.capability.ModifierCapabilityManager;
-import nl.requios.effortlessbuilding.compatibility.CompatHelper;
 import nl.requios.effortlessbuilding.helper.ReachHelper;
+import nl.requios.effortlessbuilding.helper.SurvivalHelper;
 import nl.requios.effortlessbuilding.network.AddUndoMessage;
 import nl.requios.effortlessbuilding.network.ClearUndoMessage;
 import nl.requios.effortlessbuilding.network.PacketHandler;
 import nl.requios.effortlessbuilding.network.RequestLookAtMessage;
 
-@EventBusSubscriber
-public class CommonEvents {
+import java.util.List;
 
-	//Mod Bus Events
-	@EventBusSubscriber(bus = EventBusSubscriber.Bus.MOD)
-	public static class ModBusEvents {
-
-		@SubscribeEvent
-		public void registerCapabilities(RegisterCapabilitiesEvent event){
-			event.register(ModifierCapabilityManager.IModifierCapability.class);
-			event.register(ModeCapabilityManager.IModeCapability.class);
-		}
-	}
+@Mod.EventBusSubscriber
+public class EventHandler {
 
 	@SubscribeEvent
 	public static void attachCapabilities(AttachCapabilitiesEvent<Entity> event) {
 		if (event.getObject() instanceof FakePlayer) return;
-		if (event.getObject() instanceof Player) {
+		if (event.getObject() instanceof PlayerEntity) {
 			event.addCapability(new ResourceLocation(EffortlessBuilding.MODID, "build_modifier"), new ModifierCapabilityManager.Provider());
 			event.addCapability(new ResourceLocation(EffortlessBuilding.MODID, "build_mode"), new ModeCapabilityManager.Provider());
 		}
 	}
 
-	@SubscribeEvent
-	public static void onTick(TickEvent.LevelTickEvent event) {
-		if (event.phase != TickEvent.Phase.START) return;
-
-		EffortlessBuilding.DELAYED_BLOCK_PLACER.tick();
-	}
-
 	@SubscribeEvent
 	public static void onBlockPlaced(BlockEvent.EntityPlaceEvent event) {
-		if (event.getLevel().isClientSide()) return;
+		if (event.getWorld().isClientSide()) return;
 
-		if (!(event.getEntity() instanceof Player)) return;
+		if (!(event.getEntity() instanceof PlayerEntity)) return;
 
 		if (event.getEntity() instanceof FakePlayer) return;
 
 		//Cancel event if necessary
-		ServerPlayer player = ((ServerPlayer) event.getEntity());
+		ServerPlayerEntity player = ((ServerPlayerEntity) event.getEntity());
 		BuildModes.BuildModeEnum buildMode = ModeSettingsManager.getModeSettings(player).getBuildMode();
 		ModifierSettingsManager.ModifierSettings modifierSettings = ModifierSettingsManager.getModifierSettings(player);
 
-		if (buildMode != BuildModes.BuildModeEnum.DISABLED) {
-
-			//Only cancel if itemblock in hand
-			//Fixed issue with e.g. Create Wrench shift-rightclick disassembling being cancelled.
-			ItemStack currentItemStack = player.getItemInHand(InteractionHand.MAIN_HAND);
-			if (currentItemStack.getItem() instanceof BlockItem ||
-				(CompatHelper.isItemBlockProxy(currentItemStack) && !player.isShiftKeyDown())) {
+		if (buildMode != BuildModes.BuildModeEnum.NORMAL) {
 			event.setCanceled(true);
-			}
-
 		} else if (modifierSettings.doQuickReplace()) {
 			//Cancel event and send message if QuickReplace
 			event.setCanceled(true);
@@ -105,14 +80,14 @@ public class CommonEvents {
 
 	@SubscribeEvent
 	public static void onBlockBroken(BlockEvent.BreakEvent event) {
-		if (event.getLevel().isClientSide()) return;
+		if (event.getWorld().isClientSide()) return;
 
 		if (event.getPlayer() instanceof FakePlayer) return;
 
 		//Cancel event if necessary
 		//If cant break far then dont cancel event ever
 		BuildModes.BuildModeEnum buildMode = ModeSettingsManager.getModeSettings(event.getPlayer()).getBuildMode();
-		if (buildMode != BuildModes.BuildModeEnum.DISABLED && ReachHelper.canBreakFar(event.getPlayer())) {
+		if (buildMode != BuildModes.BuildModeEnum.NORMAL && ReachHelper.canBreakFar(event.getPlayer())) {
 			event.setCanceled(true);
 		} else {
 			//NORMAL mode, let vanilla handle block breaking
@@ -121,49 +96,88 @@ public class CommonEvents {
 			BuildModes.onBlockBroken(event.getPlayer(), event.getPos(), false);
 
 			//Add to undo stack in client
-			if (event.getPlayer() instanceof ServerPlayer && event.getState() != null && event.getPos() != null) {
-				PacketDistributor.PacketTarget packetTarget = PacketDistributor.PLAYER.with(() -> (ServerPlayer) event.getPlayer());
+			if (event.getPlayer() instanceof ServerPlayerEntity && event.getState() != null && event.getPos() != null) {
+				PacketDistributor.PacketTarget packetTarget = PacketDistributor.PLAYER.with(() -> (ServerPlayerEntity) event.getPlayer());
 				if (packetTarget != null)
 					PacketHandler.INSTANCE.send(packetTarget, new AddUndoMessage(event.getPos(), event.getState(), Blocks.AIR.defaultBlockState()));
 			}
 		}
 	}
 
+	@SubscribeEvent
+	public static void breakSpeed(PlayerEvent.BreakSpeed event) {
+		//Disable if config says so
+		if (!BuildConfig.survivalBalancers.increasedMiningTime.get()) return;
+
+		if (event.getPlayer() instanceof FakePlayer) return;
+
+		PlayerEntity player = event.getPlayer();
+		World world = player.level;
+		BlockPos pos = event.getPos();
+
+		//EffortlessBuilding.log(player, String.valueOf(event.getNewSpeed()));
+
+		float originalBlockHardness = event.getState().getDestroySpeed(world, pos);
+		if (originalBlockHardness < 0) return; //Dont break bedrock
+		float totalBlockHardness = 0;
+		//get coordinates
+		List<BlockPos> coordinates = BuildModifiers.findCoordinates(player, pos);
+		for (int i = 1; i < coordinates.size(); i++) {
+			BlockPos coordinate = coordinates.get(i);
+			//get existing blockstates at those coordinates
+			BlockState blockState = world.getBlockState(coordinate);
+			//add hardness for each blockstate, if can break
+			if (SurvivalHelper.canBreak(world, player, coordinate))
+				totalBlockHardness += blockState.getDestroySpeed(world, coordinate);
+		}
+
+		//Grabbing percentage from config
+		float percentage = (float) BuildConfig.survivalBalancers.miningTimePercentage.get() / 100;
+		totalBlockHardness *= percentage;
+		totalBlockHardness += originalBlockHardness;
+
+		float newSpeed = event.getOriginalSpeed() / totalBlockHardness * originalBlockHardness;
+		if (Float.isNaN(newSpeed) || newSpeed == 0f) newSpeed = 1f;
+		event.setNewSpeed(newSpeed);
+
+		//EffortlessBuilding.log(player, String.valueOf(event.getNewSpeed()));
+	}
+
 	@SubscribeEvent
 	public static void onPlayerLoggedIn(PlayerEvent.PlayerLoggedInEvent event) {
-		if (event.getEntity() instanceof FakePlayer) return;
-		Player player = event.getEntity();
+		if (event.getPlayer() instanceof FakePlayer) return;
+		PlayerEntity player = event.getPlayer();
 		ModifierSettingsManager.handleNewPlayer(player);
 		ModeSettingsManager.handleNewPlayer(player);
 	}
 
 	@SubscribeEvent
 	public static void onPlayerLoggedOut(PlayerEvent.PlayerLoggedOutEvent event) {
-		if (event.getEntity() instanceof FakePlayer) return;
-		Player player = event.getEntity();
+		if (event.getPlayer() instanceof FakePlayer) return;
+		PlayerEntity player = event.getPlayer();
 		if (player.getCommandSenderWorld().isClientSide) return;
 
 		UndoRedo.clear(player);
-		PacketHandler.INSTANCE.send(PacketDistributor.PLAYER.with(() -> (ServerPlayer) player), new ClearUndoMessage());
+		PacketHandler.INSTANCE.send(PacketDistributor.PLAYER.with(() -> (ServerPlayerEntity) player), new ClearUndoMessage());
 	}
 
 	@SubscribeEvent
 	public static void onPlayerRespawn(PlayerEvent.PlayerRespawnEvent event) {
-		if (event.getEntity() instanceof FakePlayer) return;
-		Player player = event.getEntity();
+		if (event.getPlayer() instanceof FakePlayer) return;
+		PlayerEntity player = event.getPlayer();
 		ModifierSettingsManager.handleNewPlayer(player);
 		ModeSettingsManager.handleNewPlayer(player);
 	}
 
 	@SubscribeEvent
 	public static void onPlayerChangedDimension(PlayerEvent.PlayerChangedDimensionEvent event) {
-		if (event.getEntity() instanceof FakePlayer) return;
-		Player player = event.getEntity();
+		if (event.getPlayer() instanceof FakePlayer) return;
+		PlayerEntity player = event.getPlayer();
 		if (player.getCommandSenderWorld().isClientSide) return;
 
 		//Set build mode to normal
 		ModeSettingsManager.ModeSettings modeSettings = ModeSettingsManager.getModeSettings(player);
-		modeSettings.setBuildMode(BuildModes.BuildModeEnum.DISABLED);
+		modeSettings.setBuildMode(BuildModes.BuildModeEnum.NORMAL);
 		ModeSettingsManager.setModeSettings(player, modeSettings);
 
 		//Disable modifiers
@@ -177,20 +191,18 @@ public class CommonEvents {
 		ModeSettingsManager.handleNewPlayer(player);
 
 		UndoRedo.clear(player);
-		PacketHandler.INSTANCE.send(PacketDistributor.PLAYER.with(() -> (ServerPlayer) player), new ClearUndoMessage());
+		PacketHandler.INSTANCE.send(PacketDistributor.PLAYER.with(() -> (ServerPlayerEntity) player), new ClearUndoMessage());
 	}
 
 	@SubscribeEvent
 	public static void onPlayerClone(PlayerEvent.Clone event) {
-		if (event.getEntity() instanceof FakePlayer) return;
+		if (event.getPlayer() instanceof FakePlayer) return;
 		//Attach capabilities on death, otherwise crash
-		Player oldPlayer = event.getOriginal();
+		PlayerEntity oldPlayer = event.getOriginal();
 		oldPlayer.revive();
 
-		Player newPlayer = event.getEntity();
+		PlayerEntity newPlayer = event.getPlayer();
 		ModifierSettingsManager.setModifierSettings(newPlayer, ModifierSettingsManager.getModifierSettings(oldPlayer));
 		ModeSettingsManager.setModeSettings(newPlayer, ModeSettingsManager.getModeSettings(oldPlayer));
 	}
-
-
 }

src/main/java/nl/requios/effortlessbuilding/ModClientEventHandler.java

@@ -0,0 +1,46 @@
+package nl.requios.effortlessbuilding;
+
+import net.minecraft.client.Minecraft;
+import net.minecraft.client.renderer.texture.AtlasTexture;
+import net.minecraft.client.renderer.texture.TextureAtlasSprite;
+import net.minecraft.util.ResourceLocation;
+import net.minecraftforge.api.distmarker.Dist;
+import net.minecraftforge.client.event.TextureStitchEvent;
+import net.minecraftforge.eventbus.api.SubscribeEvent;
+import net.minecraftforge.fml.common.Mod;
+import nl.requios.effortlessbuilding.buildmode.BuildModes;
+import nl.requios.effortlessbuilding.buildmode.ModeOptions;
+
+import java.util.HashMap;
+
+@Mod.EventBusSubscriber(bus = Mod.EventBusSubscriber.Bus.MOD, value = {Dist.CLIENT})
+public class ModClientEventHandler {
+
+	private static final HashMap<BuildModes.BuildModeEnum, ResourceLocation> buildModeIcons = new HashMap<>();
+	private static final HashMap<ModeOptions.ActionEnum, ResourceLocation> modeOptionIcons = new HashMap<>();
+
+	@SubscribeEvent
+	public static void onTextureStitch(final TextureStitchEvent.Pre event) {
+		EffortlessBuilding.log("Stitching textures");
+		//register icon textures
+		for (final BuildModes.BuildModeEnum mode : BuildModes.BuildModeEnum.values()) {
+			final ResourceLocation spriteLocation = new ResourceLocation(EffortlessBuilding.MODID, "icons/" + mode.name().toLowerCase());
+			event.addSprite(spriteLocation);
+			buildModeIcons.put(mode, spriteLocation);
+		}
+
+		for (final ModeOptions.ActionEnum action : ModeOptions.ActionEnum.values()) {
+			final ResourceLocation spriteLocation = new ResourceLocation(EffortlessBuilding.MODID, "icons/" + action.name().toLowerCase());
+			event.addSprite(spriteLocation);
+			modeOptionIcons.put(action, spriteLocation);
+		}
+	}
+
+	public static TextureAtlasSprite getBuildModeIcon(BuildModes.BuildModeEnum mode) {
+		return Minecraft.getInstance().getModelManager().getAtlas(AtlasTexture.LOCATION_BLOCKS).getSprite(buildModeIcons.get(mode));
+	}
+
+	public static TextureAtlasSprite getModeOptionIcon(ModeOptions.ActionEnum action) {
+		return Minecraft.getInstance().getModelManager().getAtlas(AtlasTexture.LOCATION_BLOCKS).getSprite(modeOptionIcons.get(action));
+	}
+}

src/main/java/nl/requios/effortlessbuilding/buildmode/BaseBuildMode.java

@@ -1,9 +1,9 @@
 package nl.requios.effortlessbuilding.buildmode;
 
-import net.minecraft.world.entity.player.Player;
-import net.minecraft.core.Direction;
-import net.minecraft.core.BlockPos;
-import net.minecraft.world.phys.Vec3;
+import net.minecraft.entity.player.PlayerEntity;
+import net.minecraft.util.Direction;
+import net.minecraft.util.math.BlockPos;
+import net.minecraft.util.math.vector.Vector3d;
 
 import java.util.Dictionary;
 import java.util.Hashtable;
@@ -16,24 +16,24 @@ public abstract class BaseBuildMode implements IBuildMode {
 	protected Dictionary<UUID, Integer> rightClickServerTable = new Hashtable<>();
 	protected Dictionary<UUID, BlockPos> firstPosTable = new Hashtable<>();
 	protected Dictionary<UUID, Direction> sideHitTable = new Hashtable<>();
-	protected Dictionary<UUID, Vec3> hitVecTable = new Hashtable<>();
+	protected Dictionary<UUID, Vector3d> hitVecTable = new Hashtable<>();
 
 	@Override
-	public void initialize(Player player) {
+	public void initialize(PlayerEntity player) {
 		rightClickClientTable.put(player.getUUID(), 0);
 		rightClickServerTable.put(player.getUUID(), 0);
 		firstPosTable.put(player.getUUID(), BlockPos.ZERO);
 		sideHitTable.put(player.getUUID(), Direction.UP);
-		hitVecTable.put(player.getUUID(), Vec3.ZERO);
+		hitVecTable.put(player.getUUID(), Vector3d.ZERO);
 	}
 
 	@Override
-	public Direction getSideHit(Player player) {
+	public Direction getSideHit(PlayerEntity player) {
 		return sideHitTable.get(player.getUUID());
 	}
 
 	@Override
-	public Vec3 getHitVec(Player player) {
+	public Vector3d getHitVec(PlayerEntity player) {
 		return hitVecTable.get(player.getUUID());
 	}
 }

src/main/java/nl/requios/effortlessbuilding/buildmode/BuildModes.java

@@ -1,12 +1,12 @@
 package nl.requios.effortlessbuilding.buildmode;
 
-import com.mojang.math.Vector4f;
-import net.minecraft.world.entity.player.Player;
-import net.minecraft.core.Direction;
-import net.minecraft.core.BlockPos;
-import net.minecraft.world.level.ClipContext;
-import net.minecraft.world.phys.HitResult;
-import net.minecraft.world.phys.Vec3;
+import net.minecraft.entity.player.PlayerEntity;
+import net.minecraft.util.Direction;
+import net.minecraft.util.math.BlockPos;
+import net.minecraft.util.math.RayTraceContext;
+import net.minecraft.util.math.RayTraceResult;
+import net.minecraft.util.math.vector.Vector3d;
+import net.minecraft.util.math.vector.Vector4f;
 import nl.requios.effortlessbuilding.EffortlessBuilding;
 import nl.requios.effortlessbuilding.buildmode.buildmodes.*;
 import nl.requios.effortlessbuilding.buildmodifier.BuildModifiers;
@@ -27,16 +27,16 @@ public class BuildModes {
 
 	//Static variables are shared between client and server in singleplayer
 	//We need them separate
-	public static Dictionary<Player, Boolean> currentlyBreakingClient = new Hashtable<>();
-	public static Dictionary<Player, Boolean> currentlyBreakingServer = new Hashtable<>();
+	public static Dictionary<PlayerEntity, Boolean> currentlyBreakingClient = new Hashtable<>();
+	public static Dictionary<PlayerEntity, Boolean> currentlyBreakingServer = new Hashtable<>();
 
 	//Uses a network message to get the previous raytraceresult from the player
 	//The server could keep track of all raytraceresults but this might lag with many players
 	//Raytraceresult is needed for sideHit and hitVec
-	public static void onBlockPlacedMessage(Player player, BlockPlacedMessage message) {
+	public static void onBlockPlacedMessage(PlayerEntity player, BlockPlacedMessage message) {
 
 		//Check if not in the middle of breaking
-		Dictionary<Player, Boolean> currentlyBreaking = player.level.isClientSide ? currentlyBreakingClient : currentlyBreakingServer;
+		Dictionary<PlayerEntity, Boolean> currentlyBreaking = player.level.isClientSide ? currentlyBreakingClient : currentlyBreakingServer;
 		if (currentlyBreaking.get(player) != null && currentlyBreaking.get(player)) {
 			//Cancel breaking
 			initializeMode(player);
@@ -53,6 +53,7 @@ public class BuildModes {
 			startPos = message.getBlockPos();
 
 			//Offset in direction of sidehit if not quickreplace and not replaceable
+			//TODO 1.13 replaceable
 			boolean replaceable = player.level.getBlockState(startPos).getMaterial().isReplaceable();
 			boolean becomesDoubleSlab = SurvivalHelper.doesBecomeDoubleSlab(player, startPos, message.getSideHit());
 			if (!modifierSettings.doQuickReplace() && !replaceable && !becomesDoubleSlab) {
@@ -66,7 +67,7 @@ public class BuildModes {
 
 			//Check if player reach does not exceed startpos
 			int maxReach = ReachHelper.getMaxReach(player);
-			if (buildMode != BuildModeEnum.DISABLED && player.blockPosition().distSqr(startPos) > maxReach * maxReach) {
+			if (buildMode != BuildModeEnum.NORMAL && player.blockPosition().distSqr(startPos) > maxReach * maxReach) {
 				EffortlessBuilding.log(player, "Placement exceeds your reach.");
 				return;
 			}
@@ -90,7 +91,7 @@ public class BuildModes {
 		Direction sideHit = buildMode.instance.getSideHit(player);
 		if (sideHit == null) sideHit = message.getSideHit();
 
-		Vec3 hitVec = buildMode.instance.getHitVec(player);
+		Vector3d hitVec = buildMode.instance.getHitVec(player);
 		if (hitVec == null) hitVec = message.getHitVec();
 
 		BuildModifiers.onBlockPlaced(player, coordinates, sideHit, hitVec, message.getPlaceStartPos());
@@ -98,26 +99,25 @@ public class BuildModes {
 		//Only works when finishing a buildmode is equal to placing some blocks
 		//No intermediate blocks allowed
 		currentlyBreaking.remove(player);
+
 	}
 
 	//Use a network message to break blocks in the distance using clientside mouse input
-	public static void onBlockBrokenMessage(Player player, BlockBrokenMessage message) {
+	public static void onBlockBrokenMessage(PlayerEntity player, BlockBrokenMessage message) {
 		BlockPos startPos = message.isBlockHit() ? message.getBlockPos() : null;
 		onBlockBroken(player, startPos, true);
 	}
 
-	public static void onBlockBroken(Player player, BlockPos startPos, boolean breakStartPos) {
+	public static void onBlockBroken(PlayerEntity player, BlockPos startPos, boolean breakStartPos) {
 
 		//Check if not in the middle of placing
-		Dictionary<Player, Boolean> currentlyBreaking = player.level.isClientSide ? currentlyBreakingClient : currentlyBreakingServer;
+		Dictionary<PlayerEntity, Boolean> currentlyBreaking = player.level.isClientSide ? currentlyBreakingClient : currentlyBreakingServer;
 		if (currentlyBreaking.get(player) != null && !currentlyBreaking.get(player)) {
 			//Cancel placing
 			initializeMode(player);
 			return;
 		}
 
-		if (!ReachHelper.canBreakFar(player)) return;
-
 		//If first click
 		if (currentlyBreaking.get(player) == null) {
 			//If startpos is null, dont do anything
@@ -129,7 +129,7 @@ public class BuildModes {
 
 		//Get coordinates
 		BuildModeEnum buildMode = modeSettings.getBuildMode();
-		List<BlockPos> coordinates = buildMode.instance.onRightClick(player, startPos, Direction.UP, Vec3.ZERO, true);
+		List<BlockPos> coordinates = buildMode.instance.onRightClick(player, startPos, Direction.UP, Vector3d.ZERO, true);
 
 		if (coordinates.isEmpty()) {
 			currentlyBreaking.put(player, true);
@@ -144,7 +144,7 @@ public class BuildModes {
 		currentlyBreaking.remove(player);
 	}
 
-	public static List<BlockPos> findCoordinates(Player player, BlockPos startPos, boolean skipRaytrace) {
+	public static List<BlockPos> findCoordinates(PlayerEntity player, BlockPos startPos, boolean skipRaytrace) {
 		List<BlockPos> coordinates = new ArrayList<>();
 
 		ModeSettingsManager.ModeSettings modeSettings = ModeSettingsManager.getModeSettings(player);
@@ -153,58 +153,61 @@ public class BuildModes {
 		return coordinates;
 	}
 
-	public static void initializeMode(Player player) {
+	public static void initializeMode(PlayerEntity player) {
 		//Resetting mode, so not placing or breaking
-		Dictionary<Player, Boolean> currentlyBreaking = player.level.isClientSide ? currentlyBreakingClient : currentlyBreakingServer;
+		Dictionary<PlayerEntity, Boolean> currentlyBreaking = player.level.isClientSide ? currentlyBreakingClient : currentlyBreakingServer;
 		currentlyBreaking.remove(player);
 
 		ModeSettingsManager.getModeSettings(player).getBuildMode().instance.initialize(player);
 	}
 
-	public static boolean isCurrentlyPlacing(Player player) {
-		Dictionary<Player, Boolean> currentlyBreaking = player.level.isClientSide ? currentlyBreakingClient : currentlyBreakingServer;
+	public static boolean isCurrentlyPlacing(PlayerEntity player) {
+		Dictionary<PlayerEntity, Boolean> currentlyBreaking = player.level.isClientSide ? currentlyBreakingClient : currentlyBreakingServer;
 		return currentlyBreaking.get(player) != null && !currentlyBreaking.get(player);
 	}
 
-	public static boolean isCurrentlyBreaking(Player player) {
-		Dictionary<Player, Boolean> currentlyBreaking = player.level.isClientSide ? currentlyBreakingClient : currentlyBreakingServer;
+	public static boolean isCurrentlyBreaking(PlayerEntity player) {
+		Dictionary<PlayerEntity, Boolean> currentlyBreaking = player.level.isClientSide ? currentlyBreakingClient : currentlyBreakingServer;
 		return currentlyBreaking.get(player) != null && currentlyBreaking.get(player);
 	}
 
 	//Either placing or breaking
-	public static boolean isActive(Player player) {
-		Dictionary<Player, Boolean> currentlyBreaking = player.level.isClientSide ? currentlyBreakingClient : currentlyBreakingServer;
+	public static boolean isActive(PlayerEntity player) {
+		Dictionary<PlayerEntity, Boolean> currentlyBreaking = player.level.isClientSide ? currentlyBreakingClient : currentlyBreakingServer;
 		return currentlyBreaking.get(player) != null;
 	}
 
 	//Find coordinates on a line bound by a plane
-	public static Vec3 findXBound(double x, Vec3 start, Vec3 look) {
+	public static Vector3d findXBound(double x, Vector3d start, Vector3d look) {
 		//then y and z are
 		double y = (x - start.x) / look.x * look.y + start.y;
 		double z = (x - start.x) / look.x * look.z + start.z;
 
-		return new Vec3(x, y, z);
+		return new Vector3d(x, y, z);
 	}
 
-	public static Vec3 findYBound(double y, Vec3 start, Vec3 look) {
+
+	//-- Common build mode functionality --//
+
+	public static Vector3d findYBound(double y, Vector3d start, Vector3d look) {
 		//then x and z are
 		double x = (y - start.y) / look.y * look.x + start.x;
 		double z = (y - start.y) / look.y * look.z + start.z;
 
-		return new Vec3(x, y, z);
+		return new Vector3d(x, y, z);
 	}
 
-	public static Vec3 findZBound(double z, Vec3 start, Vec3 look) {
+	public static Vector3d findZBound(double z, Vector3d start, Vector3d look) {
 		//then x and y are
 		double x = (z - start.z) / look.z * look.x + start.x;
 		double y = (z - start.z) / look.z * look.y + start.y;
 
-		return new Vec3(x, y, z);
+		return new Vector3d(x, y, z);
 	}
 
 	//Use this instead of player.getLookVec() in any buildmodes code
-	public static Vec3 getPlayerLookVec(Player player) {
-		Vec3 lookVec = player.getLookAngle();
+	public static Vector3d getPlayerLookVec(PlayerEntity player) {
+		Vector3d lookVec = player.getLookAngle();
 		double x = lookVec.x;
 		double y = lookVec.y;
 		double z = lookVec.z;
@@ -224,16 +227,16 @@ public class BuildModes {
 		if (Math.abs(z - 1.0) < 0.0001) z = 0.9999;
 		if (Math.abs(z + 1.0) < 0.0001) z = -0.9999;
 
-		return new Vec3(x, y, z);
+		return new Vector3d(x, y, z);
 	}
 
-	public static boolean isCriteriaValid(Vec3 start, Vec3 look, int reach, Player player, boolean skipRaytrace, Vec3 lineBound, Vec3 planeBound, double distToPlayerSq) {
+	public static boolean isCriteriaValid(Vector3d start, Vector3d look, int reach, PlayerEntity player, boolean skipRaytrace, Vector3d lineBound, Vector3d planeBound, double distToPlayerSq) {
 		boolean intersects = false;
 		if (!skipRaytrace) {
 			//collision within a 1 block radius to selected is fine
-			ClipContext rayTraceContext = new ClipContext(start, lineBound, ClipContext.Block.COLLIDER, ClipContext.Fluid.NONE, player);
-			HitResult rayTraceResult = player.level.clip(rayTraceContext);
-			intersects = rayTraceResult != null && rayTraceResult.getType() == HitResult.Type.BLOCK &&
+			RayTraceContext rayTraceContext = new RayTraceContext(start, lineBound, RayTraceContext.BlockMode.COLLIDER, RayTraceContext.FluidMode.NONE, player);
+			RayTraceResult rayTraceResult = player.level.clip(rayTraceContext);
+			intersects = rayTraceResult != null && rayTraceResult.getType() == RayTraceResult.Type.BLOCK &&
 				planeBound.subtract(rayTraceResult.getLocation()).lengthSqr() > 4;
 		}
 
@@ -243,8 +246,8 @@ public class BuildModes {
 	}
 
 	public enum BuildModeEnum {
-		DISABLED("normal", new Disabled(), BuildModeCategoryEnum.BASIC),
-		SINGLE("normal_plus", new Single(), BuildModeCategoryEnum.BASIC, OptionEnum.BUILD_SPEED),
+		NORMAL("normal", new Normal(), BuildModeCategoryEnum.BASIC),
+		NORMAL_PLUS("normal_plus", new NormalPlus(), BuildModeCategoryEnum.BASIC, OptionEnum.BUILD_SPEED),
 		LINE("line", new Line(), BuildModeCategoryEnum.BASIC /*, OptionEnum.THICKNESS*/),
 		WALL("wall", new Wall(), BuildModeCategoryEnum.BASIC, OptionEnum.FILL),
 		FLOOR("floor", new Floor(), BuildModeCategoryEnum.BASIC, OptionEnum.FILL),
@@ -255,14 +258,11 @@ public class BuildModes {
 		CIRCLE("circle", new Circle(), BuildModeCategoryEnum.CIRCULAR, OptionEnum.CIRCLE_START, OptionEnum.FILL),
 		CYLINDER("cylinder", new Cylinder(), BuildModeCategoryEnum.CIRCULAR, OptionEnum.CIRCLE_START, OptionEnum.FILL),
 		SPHERE("sphere", new Sphere(), BuildModeCategoryEnum.CIRCULAR, OptionEnum.CIRCLE_START, OptionEnum.FILL);
-//		PYRAMID("pyramid", new Pyramid(), BuildModeCategoryEnum.ROOF),
-//		CONE("cone", new Cone(), BuildModeCategoryEnum.ROOF),
-//		DOME("dome", new Dome(), BuildModeCategoryEnum.ROOF);
 
-		private final String name;
-		public final IBuildMode instance;
+		public String name;
+		public IBuildMode instance;
 		public final BuildModeCategoryEnum category;
-		public final OptionEnum[] options;
+		public OptionEnum[] options;
 
 		BuildModeEnum(String name, IBuildMode instance, BuildModeCategoryEnum category, OptionEnum... options) {
 			this.name = name;

src/main/java/nl/requios/effortlessbuilding/buildmode/IBuildMode.java

@@ -1,25 +1,25 @@
 package nl.requios.effortlessbuilding.buildmode;
 
-import net.minecraft.world.entity.player.Player;
-import net.minecraft.core.Direction;
-import net.minecraft.core.BlockPos;
-import net.minecraft.world.phys.Vec3;
+import net.minecraft.entity.player.PlayerEntity;
+import net.minecraft.util.Direction;
+import net.minecraft.util.math.BlockPos;
+import net.minecraft.util.math.vector.Vector3d;
 
 import java.util.List;
 
 public interface IBuildMode {
 
 	//Fired when a player selects a buildmode and when it needs to initializeMode
-	void initialize(Player player);
+	void initialize(PlayerEntity player);
 
 	//Fired when a block would be placed
 	//Return a list of coordinates where you want to place blocks
-	List<BlockPos> onRightClick(Player player, BlockPos blockPos, Direction sideHit, Vec3 hitVec, boolean skipRaytrace);
+	List<BlockPos> onRightClick(PlayerEntity player, BlockPos blockPos, Direction sideHit, Vector3d hitVec, boolean skipRaytrace);
 
 	//Fired continuously for visualization purposes
-	List<BlockPos> findCoordinates(Player player, BlockPos blockPos, boolean skipRaytrace);
+	List<BlockPos> findCoordinates(PlayerEntity player, BlockPos blockPos, boolean skipRaytrace);
 
-	Direction getSideHit(Player player);
+	Direction getSideHit(PlayerEntity player);
 
-	Vec3 getHitVec(Player player);
+	Vector3d getHitVec(PlayerEntity player);
 }

src/main/java/nl/requios/effortlessbuilding/buildmode/ModeOptions.java

@@ -1,8 +1,7 @@
 package nl.requios.effortlessbuilding.buildmode;
 
-import net.minecraft.world.entity.player.Player;
-import net.minecraft.ChatFormatting;
-import nl.requios.effortlessbuilding.ClientEvents;
+import net.minecraft.entity.player.PlayerEntity;
+import net.minecraft.util.text.TextFormatting;
 import nl.requios.effortlessbuilding.EffortlessBuilding;
 import nl.requios.effortlessbuilding.buildmodifier.ModifierSettingsManager;
 import nl.requios.effortlessbuilding.buildmodifier.UndoRedo;
@@ -61,7 +60,7 @@ public class ModeOptions {
 	}
 
 	//Called on both client and server
-	public static void performAction(Player player, ActionEnum action) {
+	public static void performAction(PlayerEntity player, ActionEnum action) {
 		if (action == null) return;
 
 		switch (action) {
@@ -74,16 +73,16 @@ public class ModeOptions {
 			case REPLACE:
 				ModifierSettingsManager.ModifierSettings modifierSettings = ModifierSettingsManager.getModifierSettings(player);
 				modifierSettings.setQuickReplace(!modifierSettings.doQuickReplace());
-				EffortlessBuilding.log(player, "Set " + ChatFormatting.GOLD + "Quick Replace " + ChatFormatting.RESET + (
+				EffortlessBuilding.log(player, "Set " + TextFormatting.GOLD + "Quick Replace " + TextFormatting.RESET + (
 					modifierSettings.doQuickReplace() ? "on" : "off"), true);
 				break;
 			case OPEN_MODIFIER_SETTINGS:
 				if (player.level.isClientSide)
-					ClientEvents.openModifierSettings();
+					ClientProxy.openModifierSettings();
 				break;
 			case OPEN_PLAYER_SETTINGS:
 				if (player.level.isClientSide)
-					ClientEvents.openPlayerSettings();
+					ClientProxy.openPlayerSettings();
 				break;
 
 			case NORMAL_SPEED:

src/main/java/nl/requios/effortlessbuilding/buildmode/ModeSettingsManager.java

@@ -1,10 +1,10 @@
 package nl.requios.effortlessbuilding.buildmode;
 
-import net.minecraft.world.entity.player.Player;
-import net.minecraft.server.level.ServerPlayer;
+import net.minecraft.entity.player.PlayerEntity;
+import net.minecraft.entity.player.ServerPlayerEntity;
 import net.minecraftforge.common.util.LazyOptional;
 import net.minecraftforge.fml.common.Mod;
-import net.minecraftforge.network.PacketDistributor;
+import net.minecraftforge.fml.network.PacketDistributor;
 import nl.requios.effortlessbuilding.EffortlessBuilding;
 import nl.requios.effortlessbuilding.capability.ModeCapabilityManager;
 import nl.requios.effortlessbuilding.helper.ReachHelper;
@@ -16,33 +16,34 @@ import javax.annotation.Nonnull;
 @Mod.EventBusSubscriber
 public class ModeSettingsManager {
 
-	//Retrieves the buildsettings of a player through the modeCapability capability
+	//Retrieves the buildsettings of a player through the modifierCapability capability
 	//Never returns null
 	@Nonnull
-	public static ModeSettings getModeSettings(Player player) {
+	public static ModeSettings getModeSettings(PlayerEntity player) {
 		LazyOptional<ModeCapabilityManager.IModeCapability> modeCapability =
-			player.getCapability(ModeCapabilityManager.MODE_CAPABILITY, null);
+			player.getCapability(ModeCapabilityManager.modeCapability, null);
 
 		if (modeCapability.isPresent()) {
 			ModeCapabilityManager.IModeCapability capability = modeCapability.orElse(null);
-			if (capability.getModeData() == null){
+			if (capability.getModeData() == null) {
 				capability.setModeData(new ModeSettings());
 			}
 			return capability.getModeData();
 		}
 
-		EffortlessBuilding.logger.warn("Player does not have modeCapability: " + player);
+		//Player does not have modeCapability capability
 		//Return dummy settings
 		return new ModeSettings();
+//        throw new IllegalArgumentException("Player does not have modeCapability capability");
 	}
 
-	public static void setModeSettings(Player player, ModeSettings modeSettings) {
+	public static void setModeSettings(PlayerEntity player, ModeSettings modeSettings) {
 		if (player == null) {
 			EffortlessBuilding.log("Cannot set buildmode settings, player is null");
 			return;
 		}
 		LazyOptional<ModeCapabilityManager.IModeCapability> modeCapability =
-			player.getCapability(ModeCapabilityManager.MODE_CAPABILITY, null);
+			player.getCapability(ModeCapabilityManager.modeCapability, null);
 
 		modeCapability.ifPresent((capability) -> {
 			capability.setModeData(modeSettings);
@@ -55,7 +56,7 @@ public class ModeSettingsManager {
 		}
 	}
 
-	public static String sanitize(ModeSettings modeSettings, Player player) {
+	public static String sanitize(ModeSettings modeSettings, PlayerEntity player) {
 		int maxReach = ReachHelper.getMaxReach(player);
 		String error = "";
 
@@ -64,7 +65,7 @@ public class ModeSettingsManager {
 		return error;
 	}
 
-	public static void handleNewPlayer(Player player) {
+	public static void handleNewPlayer(PlayerEntity player) {
 		//Makes sure player has mode settings (if it doesnt it will create it)
 		getModeSettings(player);
 
@@ -72,12 +73,12 @@ public class ModeSettingsManager {
 		if (!player.level.isClientSide) {
 			//Send to client
 			ModeSettingsMessage msg = new ModeSettingsMessage(getModeSettings(player));
-			PacketHandler.INSTANCE.send(PacketDistributor.PLAYER.with(() -> (ServerPlayer) player), msg);
+			PacketHandler.INSTANCE.send(PacketDistributor.PLAYER.with(() -> (ServerPlayerEntity) player), msg);
 		}
 	}
 
 	public static class ModeSettings {
-		private BuildModes.BuildModeEnum buildMode = BuildModes.BuildModeEnum.DISABLED;
+		private BuildModes.BuildModeEnum buildMode = BuildModes.BuildModeEnum.NORMAL;
 
 		public ModeSettings() {
 		}

src/main/java/nl/requios/effortlessbuilding/buildmode/ThreeClicksBuildMode.java

@@ -1,9 +1,9 @@
 package nl.requios.effortlessbuilding.buildmode;
 
-import net.minecraft.world.entity.player.Player;
-import net.minecraft.core.Direction;
-import net.minecraft.core.BlockPos;
-import net.minecraft.world.phys.Vec3;
+import net.minecraft.entity.player.PlayerEntity;
+import net.minecraft.util.Direction;
+import net.minecraft.util.math.BlockPos;
+import net.minecraft.util.math.vector.Vector3d;
 import nl.requios.effortlessbuilding.helper.ReachHelper;
 
 import java.util.*;
@@ -12,18 +12,18 @@ public abstract class ThreeClicksBuildMode extends BaseBuildMode {
 	protected Dictionary<UUID, BlockPos> secondPosTable = new Hashtable<>();
 
 	//Finds height after floor has been chosen in buildmodes with 3 clicks
-	public static BlockPos findHeight(Player player, BlockPos secondPos, boolean skipRaytrace) {
-		Vec3 look = BuildModes.getPlayerLookVec(player);
-		Vec3 start = new Vec3(player.getX(), player.getY() + player.getEyeHeight(), player.getZ());
+	public static BlockPos findHeight(PlayerEntity player, BlockPos secondPos, boolean skipRaytrace) {
+		Vector3d look = BuildModes.getPlayerLookVec(player);
+		Vector3d start = new Vector3d(player.getX(), player.getY() + player.getEyeHeight(), player.getZ());
 
 		List<HeightCriteria> criteriaList = new ArrayList<>(3);
 
 		//X
-		Vec3 xBound = BuildModes.findXBound(secondPos.getX(), start, look);
+		Vector3d xBound = BuildModes.findXBound(secondPos.getX(), start, look);
 		criteriaList.add(new HeightCriteria(xBound, secondPos, start));
 
 		//Z
-		Vec3 zBound = BuildModes.findZBound(secondPos.getZ(), start, look);
+		Vector3d zBound = BuildModes.findZBound(secondPos.getZ(), start, look);
 		criteriaList.add(new HeightCriteria(zBound, secondPos, start));
 
 		//Remove invalid criteria
@@ -56,13 +56,13 @@ public abstract class ThreeClicksBuildMode extends BaseBuildMode {
 	}
 
 	@Override
-	public void initialize(Player player) {
+	public void initialize(PlayerEntity player) {
 		super.initialize(player);
 		secondPosTable.put(player.getUUID(), BlockPos.ZERO);
 	}
 
 	@Override
-	public List<BlockPos> onRightClick(Player player, BlockPos blockPos, Direction sideHit, Vec3 hitVec, boolean skipRaytrace) {
+	public List<BlockPos> onRightClick(PlayerEntity player, BlockPos blockPos, Direction sideHit, Vector3d hitVec, boolean skipRaytrace) {
 		List<BlockPos> list = new ArrayList<>();
 
 		Dictionary<UUID, Integer> rightClickTable = player.level.isClientSide ? rightClickClientTable : rightClickServerTable;
@@ -104,7 +104,7 @@ public abstract class ThreeClicksBuildMode extends BaseBuildMode {
 	}
 
 	@Override
-	public List<BlockPos> findCoordinates(Player player, BlockPos blockPos, boolean skipRaytrace) {
+	public List<BlockPos> findCoordinates(PlayerEntity player, BlockPos blockPos, boolean skipRaytrace) {
 		List<BlockPos> list = new ArrayList<>();
 		Dictionary<UUID, Integer> rightClickTable = player.level.isClientSide ? rightClickClientTable : rightClickServerTable;
 		int rightClickNr = rightClickTable.get(player.getUUID());
@@ -173,24 +173,24 @@ public abstract class ThreeClicksBuildMode extends BaseBuildMode {
 	}
 
 	//Finds the place of the second block pos
-	protected abstract BlockPos findSecondPos(Player player, BlockPos firstPos, boolean skipRaytrace);
+	protected abstract BlockPos findSecondPos(PlayerEntity player, BlockPos firstPos, boolean skipRaytrace);
 
 	//Finds the place of the third block pos
-	protected abstract BlockPos findThirdPos(Player player, BlockPos firstPos, BlockPos secondPos, boolean skipRaytrace);
+	protected abstract BlockPos findThirdPos(PlayerEntity player, BlockPos firstPos, BlockPos secondPos, boolean skipRaytrace);
 
 	//After first and second pos are known, we want to visualize the blocks in a way (like floor for cube)
-	protected abstract List<BlockPos> getIntermediateBlocks(Player player, int x1, int y1, int z1, int x2, int y2, int z2);
+	protected abstract List<BlockPos> getIntermediateBlocks(PlayerEntity player, int x1, int y1, int z1, int x2, int y2, int z2);
 
 	//After first, second and third pos are known, we want all the blocks
-	protected abstract List<BlockPos> getFinalBlocks(Player player, int x1, int y1, int z1, int x2, int y2, int z2, int x3, int y3, int z3);
+	protected abstract List<BlockPos> getFinalBlocks(PlayerEntity player, int x1, int y1, int z1, int x2, int y2, int z2, int x3, int y3, int z3);
 
 	static class HeightCriteria {
-		Vec3 planeBound;
-		Vec3 lineBound;
+		Vector3d planeBound;
+		Vector3d lineBound;
 		double distToLineSq;
 		double distToPlayerSq;
 
-		HeightCriteria(Vec3 planeBound, BlockPos secondPos, Vec3 start) {
+		HeightCriteria(Vector3d planeBound, BlockPos secondPos, Vector3d start) {
 			this.planeBound = planeBound;
 			this.lineBound = toLongestLine(this.planeBound, secondPos);
 			this.distToLineSq = this.lineBound.subtract(this.planeBound).lengthSqr();
@@ -198,14 +198,14 @@ public abstract class ThreeClicksBuildMode extends BaseBuildMode {
 		}
 
 		//Make it from a plane into a line, on y axis only
-		private Vec3 toLongestLine(Vec3 boundVec, BlockPos secondPos) {
+		private Vector3d toLongestLine(Vector3d boundVec, BlockPos secondPos) {
 			BlockPos bound = new BlockPos(boundVec);
-			return new Vec3(secondPos.getX(), bound.getY(), secondPos.getZ());
+			return new Vector3d(secondPos.getX(), bound.getY(), secondPos.getZ());
 		}
 
 		//check if its not behind the player and its not too close and not too far
 		//also check if raytrace from player to block does not intersect blocks
-		public boolean isValid(Vec3 start, Vec3 look, int reach, Player player, boolean skipRaytrace) {
+		public boolean isValid(Vector3d start, Vector3d look, int reach, PlayerEntity player, boolean skipRaytrace) {
 
 			return BuildModes.isCriteriaValid(start, look, reach, player, skipRaytrace, lineBound, planeBound, distToPlayerSq);
 		}

src/main/java/nl/requios/effortlessbuilding/buildmode/TwoClicksBuildMode.java

@@ -1,9 +1,9 @@
 package nl.requios.effortlessbuilding.buildmode;
 
-import net.minecraft.world.entity.player.Player;
-import net.minecraft.core.Direction;
-import net.minecraft.core.BlockPos;
-import net.minecraft.world.phys.Vec3;
+import net.minecraft.entity.player.PlayerEntity;
+import net.minecraft.util.Direction;
+import net.minecraft.util.math.BlockPos;
+import net.minecraft.util.math.vector.Vector3d;
 import nl.requios.effortlessbuilding.helper.ReachHelper;
 
 import java.util.ArrayList;
@@ -14,7 +14,7 @@ import java.util.UUID;
 public abstract class TwoClicksBuildMode extends BaseBuildMode {
 
 	@Override
-	public List<BlockPos> onRightClick(Player player, BlockPos blockPos, Direction sideHit, Vec3 hitVec, boolean skipRaytrace) {
+	public List<BlockPos> onRightClick(PlayerEntity player, BlockPos blockPos, Direction sideHit, Vector3d hitVec, boolean skipRaytrace) {
 		List<BlockPos> list = new ArrayList<>();
 
 		Dictionary<UUID, Integer> rightClickTable = player.level.isClientSide ? rightClickClientTable : rightClickServerTable;
@@ -44,7 +44,7 @@ public abstract class TwoClicksBuildMode extends BaseBuildMode {
 	}
 
 	@Override
-	public List<BlockPos> findCoordinates(Player player, BlockPos blockPos, boolean skipRaytrace) {
+	public List<BlockPos> findCoordinates(PlayerEntity player, BlockPos blockPos, boolean skipRaytrace) {
 		List<BlockPos> list = new ArrayList<>();
 		Dictionary<UUID, Integer> rightClickTable = player.level.isClientSide ? rightClickClientTable : rightClickServerTable;
 		int rightClickNr = rightClickTable.get(player.getUUID());
@@ -79,8 +79,8 @@ public abstract class TwoClicksBuildMode extends BaseBuildMode {
 	}
 
 	//Finds the place of the second block pos based on criteria (floor must be on same height as first click, wall on same plane etc)
-	protected abstract BlockPos findSecondPos(Player player, BlockPos firstPos, boolean skipRaytrace);
+	protected abstract BlockPos findSecondPos(PlayerEntity player, BlockPos firstPos, boolean skipRaytrace);
 
 	//After first and second pos are known, we want all the blocks
-	protected abstract List<BlockPos> getAllBlocks(Player player, int x1, int y1, int z1, int x2, int y2, int z2);
+	protected abstract List<BlockPos> getAllBlocks(PlayerEntity player, int x1, int y1, int z1, int x2, int y2, int z2);
 }

src/main/java/nl/requios/effortlessbuilding/buildmode/buildmodes/Circle.java

@@ -1,8 +1,8 @@
 package nl.requios.effortlessbuilding.buildmode.buildmodes;
 
-import net.minecraft.world.entity.player.Player;
-import net.minecraft.core.BlockPos;
-import net.minecraft.util.Mth;
+import net.minecraft.entity.player.PlayerEntity;
+import net.minecraft.util.math.BlockPos;
+import net.minecraft.util.math.MathHelper;
 import nl.requios.effortlessbuilding.buildmode.ModeOptions;
 import nl.requios.effortlessbuilding.buildmode.TwoClicksBuildMode;
 
@@ -11,7 +11,7 @@ import java.util.List;
 
 public class Circle extends TwoClicksBuildMode {
 
-	public static List<BlockPos> getCircleBlocks(Player player, int x1, int y1, int z1, int x2, int y2, int z2) {
+	public static List<BlockPos> getCircleBlocks(PlayerEntity player, int x1, int y1, int z1, int x2, int y2, int z2) {
 		List<BlockPos> list = new ArrayList<>();
 
 		float centerX = x1;
@@ -26,8 +26,8 @@ public class Circle extends TwoClicksBuildMode {
 			z1 = (int) (centerZ - (z2 - centerZ));
 		}
 
-		float radiusX = Mth.abs(x2 - centerX);
-		float radiusZ = Mth.abs(z2 - centerZ);
+		float radiusX = MathHelper.abs(x2 - centerX);
+		float radiusZ = MathHelper.abs(z2 - centerZ);
 
 		if (ModeOptions.getFill() == ModeOptions.ActionEnum.FULL)
 			addCircleBlocks(list, x1, y1, z1, x2, y2, z2, centerX, centerZ, radiusX, radiusZ);
@@ -66,24 +66,24 @@ public class Circle extends TwoClicksBuildMode {
 	}
 
 	private static float distance(float x1, float z1, float x2, float z2) {
-		return Mth.sqrt((x2 - x1) * (x2 - x1) + (z2 - z1) * (z2 - z1));
+		return MathHelper.sqrt((x2 - x1) * (x2 - x1) + (z2 - z1) * (z2 - z1));
 	}
 
 	public static float calculateEllipseRadius(float centerX, float centerZ, float radiusX, float radiusZ, int x, int z) {
 		//https://math.stackexchange.com/questions/432902/how-to-get-the-radius-of-an-ellipse-at-a-specific-angle-by-knowing-its-semi-majo
-		float theta = (float) Mth.atan2(z - centerZ, x - centerX);
-		float part1 = radiusX * radiusX * Mth.sin(theta) * Mth.sin(theta);
-		float part2 = radiusZ * radiusZ * Mth.cos(theta) * Mth.cos(theta);
-		return radiusX * radiusZ / Mth.sqrt(part1 + part2);
+		float theta = (float) MathHelper.atan2(z - centerZ, x - centerX);
+		float part1 = radiusX * radiusX * MathHelper.sin(theta) * MathHelper.sin(theta);
+		float part2 = radiusZ * radiusZ * MathHelper.cos(theta) * MathHelper.cos(theta);
+		return radiusX * radiusZ / MathHelper.sqrt(part1 + part2);
 	}
 
 	@Override
-	protected BlockPos findSecondPos(Player player, BlockPos firstPos, boolean skipRaytrace) {
+	protected BlockPos findSecondPos(PlayerEntity player, BlockPos firstPos, boolean skipRaytrace) {
 		return Floor.findFloor(player, firstPos, skipRaytrace);
 	}
 
 	@Override
-	protected List<BlockPos> getAllBlocks(Player player, int x1, int y1, int z1, int x2, int y2, int z2) {
+	protected List<BlockPos> getAllBlocks(PlayerEntity player, int x1, int y1, int z1, int x2, int y2, int z2) {
 		return getCircleBlocks(player, x1, y1, z1, x2, y2, z2);
 	}
 }

src/main/java/nl/requios/effortlessbuilding/buildmode/buildmodes/Cone.java

@@ -1,31 +0,0 @@
-package nl.requios.effortlessbuilding.buildmode.buildmodes;
-
-import net.minecraft.core.BlockPos;
-import net.minecraft.world.entity.player.Player;
-import nl.requios.effortlessbuilding.buildmode.ThreeClicksBuildMode;
-
-import java.util.List;
-
-public class Cone extends ThreeClicksBuildMode {
-
-	@Override
-	protected BlockPos findSecondPos(Player player, BlockPos firstPos, boolean skipRaytrace) {
-		return Floor.findFloor(player, firstPos, skipRaytrace);
-	}
-
-	@Override
-	protected BlockPos findThirdPos(Player player, BlockPos firstPos, BlockPos secondPos, boolean skipRaytrace) {
-		return findHeight(player, secondPos, skipRaytrace);
-	}
-
-	@Override
-	protected List<BlockPos> getIntermediateBlocks(Player player, int x1, int y1, int z1, int x2, int y2, int z2) {
-		return Floor.getFloorBlocks(player, x1, y1, z1, x2, y2, z2);
-	}
-
-	@Override
-	protected List<BlockPos> getFinalBlocks(Player player, int x1, int y1, int z1, int x2, int y2, int z2, int x3, int y3, int z3) {
-		//TODO
-		return SlopeFloor.getSlopeFloorBlocks(player, x1, y1, z1, x2, y2, z2, x3, y3, z3);
-	}
-}

src/main/java/nl/requios/effortlessbuilding/buildmode/buildmodes/Cube.java

@@ -1,7 +1,7 @@
 package nl.requios.effortlessbuilding.buildmode.buildmodes;
 
-import net.minecraft.world.entity.player.Player;
-import net.minecraft.core.BlockPos;
+import net.minecraft.entity.player.PlayerEntity;
+import net.minecraft.util.math.BlockPos;
 import nl.requios.effortlessbuilding.buildmode.ModeOptions;
 import nl.requios.effortlessbuilding.buildmode.ThreeClicksBuildMode;
 
@@ -10,7 +10,7 @@ import java.util.List;
 
 public class Cube extends ThreeClicksBuildMode {
 
-	public static List<BlockPos> getFloorBlocksUsingCubeFill(Player player, int x1, int y1, int z1, int x2, int y2, int z2) {
+	public static List<BlockPos> getFloorBlocksUsingCubeFill(PlayerEntity player, int x1, int y1, int z1, int x2, int y2, int z2) {
 		List<BlockPos> list = new ArrayList<>();
 
 		if (ModeOptions.getCubeFill() == ModeOptions.ActionEnum.CUBE_SKELETON)
@@ -21,7 +21,7 @@ public class Cube extends ThreeClicksBuildMode {
 		return list;
 	}
 
-	public static List<BlockPos> getCubeBlocks(Player player, int x1, int y1, int z1, int x2, int y2, int z2) {
+	public static List<BlockPos> getCubeBlocks(PlayerEntity player, int x1, int y1, int z1, int x2, int y2, int z2) {
 		List<BlockPos> list = new ArrayList<>();
 
 		switch (ModeOptions.getCubeFill()) {
@@ -80,22 +80,22 @@ public class Cube extends ThreeClicksBuildMode {
 	}
 
 	@Override
-	protected BlockPos findSecondPos(Player player, BlockPos firstPos, boolean skipRaytrace) {
+	protected BlockPos findSecondPos(PlayerEntity player, BlockPos firstPos, boolean skipRaytrace) {
 		return Floor.findFloor(player, firstPos, skipRaytrace);
 	}
 
 	@Override
-	protected BlockPos findThirdPos(Player player, BlockPos firstPos, BlockPos secondPos, boolean skipRaytrace) {
+	protected BlockPos findThirdPos(PlayerEntity player, BlockPos firstPos, BlockPos secondPos, boolean skipRaytrace) {
 		return findHeight(player, secondPos, skipRaytrace);
 	}
 
 	@Override
-	protected List<BlockPos> getIntermediateBlocks(Player player, int x1, int y1, int z1, int x2, int y2, int z2) {
+	protected List<BlockPos> getIntermediateBlocks(PlayerEntity player, int x1, int y1, int z1, int x2, int y2, int z2) {
 		return getFloorBlocksUsingCubeFill(player, x1, y1, z1, x2, y2, z2);
 	}
 
 	@Override
-	protected List<BlockPos> getFinalBlocks(Player player, int x1, int y1, int z1, int x2, int y2, int z2, int x3, int y3, int z3) {
+	protected List<BlockPos> getFinalBlocks(PlayerEntity player, int x1, int y1, int z1, int x2, int y2, int z2, int x3, int y3, int z3) {
 		return getCubeBlocks(player, x1, y1, z1, x3, y3, z3);
 	}
 }

src/main/java/nl/requios/effortlessbuilding/buildmode/buildmodes/Cylinder.java

@@ -1,7 +1,7 @@
 package nl.requios.effortlessbuilding.buildmode.buildmodes;
 
-import net.minecraft.world.entity.player.Player;
-import net.minecraft.core.BlockPos;
+import net.minecraft.entity.player.PlayerEntity;
+import net.minecraft.util.math.BlockPos;
 import nl.requios.effortlessbuilding.buildmode.ThreeClicksBuildMode;
 
 import java.util.ArrayList;
@@ -9,7 +9,7 @@ import java.util.List;
 
 public class Cylinder extends ThreeClicksBuildMode {
 
-	public static List<BlockPos> getCylinderBlocks(Player player, int x1, int y1, int z1, int x2, int y2, int z2, int x3, int y3, int z3) {
+	public static List<BlockPos> getCylinderBlocks(PlayerEntity player, int x1, int y1, int z1, int x2, int y2, int z2, int x3, int y3, int z3) {
 		List<BlockPos> list = new ArrayList<>();
 
 		//Get circle blocks (using CIRCLE_START and FILL options built-in)
@@ -29,22 +29,22 @@ public class Cylinder extends ThreeClicksBuildMode {
 	}
 
 	@Override
-	public BlockPos findSecondPos(Player player, BlockPos firstPos, boolean skipRaytrace) {
+	public BlockPos findSecondPos(PlayerEntity player, BlockPos firstPos, boolean skipRaytrace) {
 		return Floor.findFloor(player, firstPos, skipRaytrace);
 	}
 
 	@Override
-	public BlockPos findThirdPos(Player player, BlockPos firstPos, BlockPos secondPos, boolean skipRaytrace) {
+	public BlockPos findThirdPos(PlayerEntity player, BlockPos firstPos, BlockPos secondPos, boolean skipRaytrace) {
 		return findHeight(player, secondPos, skipRaytrace);
 	}
 
 	@Override
-	public List<BlockPos> getIntermediateBlocks(Player player, int x1, int y1, int z1, int x2, int y2, int z2) {
+	public List<BlockPos> getIntermediateBlocks(PlayerEntity player, int x1, int y1, int z1, int x2, int y2, int z2) {
 		return Circle.getCircleBlocks(player, x1, y1, z1, x2, y2, z2);
 	}
 
 	@Override
-	public List<BlockPos> getFinalBlocks(Player player, int x1, int y1, int z1, int x2, int y2, int z2, int x3, int y3, int z3) {
+	public List<BlockPos> getFinalBlocks(PlayerEntity player, int x1, int y1, int z1, int x2, int y2, int z2, int x3, int y3, int z3) {
 		return getCylinderBlocks(player, x1, y1, z1, x2, y2, z2, x3, y3, z3);
 	}
 }

src/main/java/nl/requios/effortlessbuilding/buildmode/buildmodes/DiagonalLine.java

@@ -1,8 +1,8 @@
 package nl.requios.effortlessbuilding.buildmode.buildmodes;
 
-import net.minecraft.world.entity.player.Player;
-import net.minecraft.core.BlockPos;
-import net.minecraft.world.phys.Vec3;
+import net.minecraft.entity.player.PlayerEntity;
+import net.minecraft.util.math.BlockPos;
+import net.minecraft.util.math.vector.Vector3d;
 import nl.requios.effortlessbuilding.buildmode.ThreeClicksBuildMode;
 
 import java.util.ArrayList;
@@ -11,15 +11,15 @@ import java.util.List;
 public class DiagonalLine extends ThreeClicksBuildMode {
 
 	//Add diagonal line from first to second
-	public static List<BlockPos> getDiagonalLineBlocks(Player player, int x1, int y1, int z1, int x2, int y2, int z2, float sampleMultiplier) {
+	public static List<BlockPos> getDiagonalLineBlocks(PlayerEntity player, int x1, int y1, int z1, int x2, int y2, int z2, float sampleMultiplier) {
 		List<BlockPos> list = new ArrayList<>();
 
-		Vec3 first = new Vec3(x1, y1, z1).add(0.5, 0.5, 0.5);
-		Vec3 second = new Vec3(x2, y2, z2).add(0.5, 0.5, 0.5);
+		Vector3d first = new Vector3d(x1, y1, z1).add(0.5, 0.5, 0.5);
+		Vector3d second = new Vector3d(x2, y2, z2).add(0.5, 0.5, 0.5);
 
 		int iterations = (int) Math.ceil(first.distanceTo(second) * sampleMultiplier);
 		for (double t = 0; t <= 1.0; t += 1.0 / iterations) {
-			Vec3 lerp = first.add(second.subtract(first).scale(t));
+			Vector3d lerp = first.add(second.subtract(first).scale(t));
 			BlockPos candidate = new BlockPos(lerp);
 			//Only add if not equal to the last in the list
 			if (list.isEmpty() || !list.get(list.size() - 1).equals(candidate))
@@ -30,23 +30,23 @@ public class DiagonalLine extends ThreeClicksBuildMode {
 	}
 
 	@Override
-	protected BlockPos findSecondPos(Player player, BlockPos firstPos, boolean skipRaytrace) {
+	protected BlockPos findSecondPos(PlayerEntity player, BlockPos firstPos, boolean skipRaytrace) {
 		return Floor.findFloor(player, firstPos, skipRaytrace);
 	}
 
 	@Override
-	protected BlockPos findThirdPos(Player player, BlockPos firstPos, BlockPos secondPos, boolean skipRaytrace) {
+	protected BlockPos findThirdPos(PlayerEntity player, BlockPos firstPos, BlockPos secondPos, boolean skipRaytrace) {
 		return findHeight(player, secondPos, skipRaytrace);
 	}
 
 	@Override
-	protected List<BlockPos> getIntermediateBlocks(Player player, int x1, int y1, int z1, int x2, int y2, int z2) {
+	protected List<BlockPos> getIntermediateBlocks(PlayerEntity player, int x1, int y1, int z1, int x2, int y2, int z2) {
 		//Add diagonal line from first to second
 		return getDiagonalLineBlocks(player, x1, y1, z1, x2, y2, z2, 10);
 	}
 
 	@Override
-	protected List<BlockPos> getFinalBlocks(Player player, int x1, int y1, int z1, int x2, int y2, int z2, int x3, int y3, int z3) {
+	protected List<BlockPos> getFinalBlocks(PlayerEntity player, int x1, int y1, int z1, int x2, int y2, int z2, int x3, int y3, int z3) {
 		//Add diagonal line from first to third
 		return getDiagonalLineBlocks(player, x1, y1, z1, x3, y3, z3, 10);
 	}

src/main/java/nl/requios/effortlessbuilding/buildmode/buildmodes/DiagonalWall.java

@@ -1,7 +1,7 @@
 package nl.requios.effortlessbuilding.buildmode.buildmodes;
 
-import net.minecraft.world.entity.player.Player;
-import net.minecraft.core.BlockPos;
+import net.minecraft.entity.player.PlayerEntity;
+import net.minecraft.util.math.BlockPos;
 import nl.requios.effortlessbuilding.buildmode.ThreeClicksBuildMode;
 
 import java.util.ArrayList;
@@ -10,7 +10,7 @@ import java.util.List;
 public class DiagonalWall extends ThreeClicksBuildMode {
 
 	//Add diagonal wall from first to second
-	public static List<BlockPos> getDiagonalWallBlocks(Player player, int x1, int y1, int z1, int x2, int y2, int z2, int x3, int y3, int z3) {
+	public static List<BlockPos> getDiagonalWallBlocks(PlayerEntity player, int x1, int y1, int z1, int x2, int y2, int z2, int x3, int y3, int z3) {
 		List<BlockPos> list = new ArrayList<>();
 
 		//Get diagonal line blocks
@@ -30,22 +30,22 @@ public class DiagonalWall extends ThreeClicksBuildMode {
 	}
 
 	@Override
-	protected BlockPos findSecondPos(Player player, BlockPos firstPos, boolean skipRaytrace) {
+	protected BlockPos findSecondPos(PlayerEntity player, BlockPos firstPos, boolean skipRaytrace) {
 		return Floor.findFloor(player, firstPos, skipRaytrace);
 	}
 
 	@Override
-	protected BlockPos findThirdPos(Player player, BlockPos firstPos, BlockPos secondPos, boolean skipRaytrace) {
+	protected BlockPos findThirdPos(PlayerEntity player, BlockPos firstPos, BlockPos secondPos, boolean skipRaytrace) {
 		return findHeight(player, secondPos, skipRaytrace);
 	}
 
 	@Override
-	protected List<BlockPos> getIntermediateBlocks(Player player, int x1, int y1, int z1, int x2, int y2, int z2) {
+	protected List<BlockPos> getIntermediateBlocks(PlayerEntity player, int x1, int y1, int z1, int x2, int y2, int z2) {
 		return DiagonalLine.getDiagonalLineBlocks(player, x1, y1, z1, x2, y2, z2, 1);
 	}
 
 	@Override
-	protected List<BlockPos> getFinalBlocks(Player player, int x1, int y1, int z1, int x2, int y2, int z2, int x3, int y3, int z3) {
+	protected List<BlockPos> getFinalBlocks(PlayerEntity player, int x1, int y1, int z1, int x2, int y2, int z2, int x3, int y3, int z3) {
 		return getDiagonalWallBlocks(player, x1, y1, z1, x2, y2, z2, x3, y3, z3);
 	}
 }

src/main/java/nl/requios/effortlessbuilding/buildmode/buildmodes/Disabled.java

@@ -1,41 +0,0 @@
-package nl.requios.effortlessbuilding.buildmode.buildmodes;
-
-import net.minecraft.world.entity.player.Player;
-import net.minecraft.core.Direction;
-import net.minecraft.core.BlockPos;
-import net.minecraft.world.phys.Vec3;
-import nl.requios.effortlessbuilding.buildmode.IBuildMode;
-
-import java.util.ArrayList;
-import java.util.List;
-
-public class Disabled implements IBuildMode {
-	@Override
-	public void initialize(Player player) {
-
-	}
-
-	@Override
-	public List<BlockPos> onRightClick(Player player, BlockPos blockPos, Direction sideHit, Vec3 hitVec, boolean skipRaytrace) {
-		List<BlockPos> list = new ArrayList<>();
-		if (blockPos != null) list.add(blockPos);
-		return list;
-	}
-
-	@Override
-	public List<BlockPos> findCoordinates(Player player, BlockPos blockPos, boolean skipRaytrace) {
-		List<BlockPos> list = new ArrayList<>();
-		if (blockPos != null) list.add(blockPos);
-		return list;
-	}
-
-	@Override
-	public Direction getSideHit(Player player) {
-		return null;
-	}
-
-	@Override
-	public Vec3 getHitVec(Player player) {
-		return null;
-	}
-}

src/main/java/nl/requios/effortlessbuilding/buildmode/buildmodes/Dome.java

@@ -1,31 +0,0 @@
-package nl.requios.effortlessbuilding.buildmode.buildmodes;
-
-import net.minecraft.core.BlockPos;
-import net.minecraft.world.entity.player.Player;
-import nl.requios.effortlessbuilding.buildmode.ThreeClicksBuildMode;
-
-import java.util.List;
-
-public class Dome extends ThreeClicksBuildMode {
-
-	@Override
-	protected BlockPos findSecondPos(Player player, BlockPos firstPos, boolean skipRaytrace) {
-		return Floor.findFloor(player, firstPos, skipRaytrace);
-	}
-
-	@Override
-	protected BlockPos findThirdPos(Player player, BlockPos firstPos, BlockPos secondPos, boolean skipRaytrace) {
-		return findHeight(player, secondPos, skipRaytrace);
-	}
-
-	@Override
-	protected List<BlockPos> getIntermediateBlocks(Player player, int x1, int y1, int z1, int x2, int y2, int z2) {
-		return Floor.getFloorBlocks(player, x1, y1, z1, x2, y2, z2);
-	}
-
-	@Override
-	protected List<BlockPos> getFinalBlocks(Player player, int x1, int y1, int z1, int x2, int y2, int z2, int x3, int y3, int z3) {
-		//TODO
-		return SlopeFloor.getSlopeFloorBlocks(player, x1, y1, z1, x2, y2, z2, x3, y3, z3);
-	}
-}

src/main/java/nl/requios/effortlessbuilding/buildmode/buildmodes/Floor.java

@@ -1,8 +1,8 @@
 package nl.requios.effortlessbuilding.buildmode.buildmodes;
 
-import net.minecraft.world.entity.player.Player;
-import net.minecraft.core.BlockPos;
-import net.minecraft.world.phys.Vec3;
+import net.minecraft.entity.player.PlayerEntity;
+import net.minecraft.util.math.BlockPos;
+import net.minecraft.util.math.vector.Vector3d;
 import nl.requios.effortlessbuilding.buildmode.BuildModes;
 import nl.requios.effortlessbuilding.buildmode.ModeOptions;
 import nl.requios.effortlessbuilding.buildmode.TwoClicksBuildMode;
@@ -13,14 +13,14 @@ import java.util.List;
 
 public class Floor extends TwoClicksBuildMode {
 
-	public static BlockPos findFloor(Player player, BlockPos firstPos, boolean skipRaytrace) {
-		Vec3 look = BuildModes.getPlayerLookVec(player);
-		Vec3 start = new Vec3(player.getX(), player.getY() + player.getEyeHeight(), player.getZ());
+	public static BlockPos findFloor(PlayerEntity player, BlockPos firstPos, boolean skipRaytrace) {
+		Vector3d look = BuildModes.getPlayerLookVec(player);
+		Vector3d start = new Vector3d(player.getX(), player.getY() + player.getEyeHeight(), player.getZ());
 
 		List<Criteria> criteriaList = new ArrayList<>(3);
 
 		//Y
-		Vec3 yBound = BuildModes.findYBound(firstPos.getY(), start, look);
+		Vector3d yBound = BuildModes.findYBound(firstPos.getY(), start, look);
 		criteriaList.add(new Criteria(yBound, start));
 
 		//Remove invalid criteria
@@ -36,7 +36,7 @@ public class Floor extends TwoClicksBuildMode {
 		return new BlockPos(selected.planeBound);
 	}
 
-	public static List<BlockPos> getFloorBlocks(Player player, int x1, int y1, int z1, int x2, int y2, int z2) {
+	public static List<BlockPos> getFloorBlocks(PlayerEntity player, int x1, int y1, int z1, int x2, int y2, int z2) {
 		List<BlockPos> list = new ArrayList<>();
 
 		if (ModeOptions.getFill() == ModeOptions.ActionEnum.FULL)
@@ -66,27 +66,27 @@ public class Floor extends TwoClicksBuildMode {
 	}
 
 	@Override
-	protected BlockPos findSecondPos(Player player, BlockPos firstPos, boolean skipRaytrace) {
+	protected BlockPos findSecondPos(PlayerEntity player, BlockPos firstPos, boolean skipRaytrace) {
 		return findFloor(player, firstPos, skipRaytrace);
 	}
 
 	@Override
-	protected List<BlockPos> getAllBlocks(Player player, int x1, int y1, int z1, int x2, int y2, int z2) {
+	protected List<BlockPos> getAllBlocks(PlayerEntity player, int x1, int y1, int z1, int x2, int y2, int z2) {
 		return getFloorBlocks(player, x1, y1, z1, x2, y2, z2);
 	}
 
 	static class Criteria {
-		Vec3 planeBound;
+		Vector3d planeBound;
 		double distToPlayerSq;
 
-		Criteria(Vec3 planeBound, Vec3 start) {
+		Criteria(Vector3d planeBound, Vector3d start) {
 			this.planeBound = planeBound;
 			this.distToPlayerSq = this.planeBound.subtract(start).lengthSqr();
 		}
 
 		//check if its not behind the player and its not too close and not too far
 		//also check if raytrace from player to block does not intersect blocks
-		public boolean isValid(Vec3 start, Vec3 look, int reach, Player player, boolean skipRaytrace) {
+		public boolean isValid(Vector3d start, Vector3d look, int reach, PlayerEntity player, boolean skipRaytrace) {
 
 			return BuildModes.isCriteriaValid(start, look, reach, player, skipRaytrace, planeBound, planeBound, distToPlayerSq);
 		}

src/main/java/nl/requios/effortlessbuilding/buildmode/buildmodes/Line.java

@@ -1,8 +1,8 @@
 package nl.requios.effortlessbuilding.buildmode.buildmodes;
 
-import net.minecraft.world.entity.player.Player;
-import net.minecraft.core.BlockPos;
-import net.minecraft.world.phys.Vec3;
+import net.minecraft.entity.player.PlayerEntity;
+import net.minecraft.util.math.BlockPos;
+import net.minecraft.util.math.vector.Vector3d;
 import nl.requios.effortlessbuilding.buildmode.BuildModes;
 import nl.requios.effortlessbuilding.buildmode.TwoClicksBuildMode;
 import nl.requios.effortlessbuilding.helper.ReachHelper;
@@ -12,22 +12,22 @@ import java.util.List;
 
 public class Line extends TwoClicksBuildMode {
 
-	public static BlockPos findLine(Player player, BlockPos firstPos, boolean skipRaytrace) {
-		Vec3 look = BuildModes.getPlayerLookVec(player);
-		Vec3 start = new Vec3(player.getX(), player.getY() + player.getEyeHeight(), player.getZ());
+	public static BlockPos findLine(PlayerEntity player, BlockPos firstPos, boolean skipRaytrace) {
+		Vector3d look = BuildModes.getPlayerLookVec(player);
+		Vector3d start = new Vector3d(player.getX(), player.getY() + player.getEyeHeight(), player.getZ());
 
 		List<Criteria> criteriaList = new ArrayList<>(3);
 
 		//X
-		Vec3 xBound = BuildModes.findXBound(firstPos.getX(), start, look);
+		Vector3d xBound = BuildModes.findXBound(firstPos.getX(), start, look);
 		criteriaList.add(new Criteria(xBound, firstPos, start));
 
 		//Y
-		Vec3 yBound = BuildModes.findYBound(firstPos.getY(), start, look);
+		Vector3d yBound = BuildModes.findYBound(firstPos.getY(), start, look);
 		criteriaList.add(new Criteria(yBound, firstPos, start));
 
 		//Z
-		Vec3 zBound = BuildModes.findZBound(firstPos.getZ(), start, look);
+		Vector3d zBound = BuildModes.findZBound(firstPos.getZ(), start, look);
 		criteriaList.add(new Criteria(zBound, firstPos, start));
 
 		//Remove invalid criteria
@@ -61,7 +61,7 @@ public class Line extends TwoClicksBuildMode {
 		return new BlockPos(selected.lineBound);
 	}
 
-	public static List<BlockPos> getLineBlocks(Player player, int x1, int y1, int z1, int x2, int y2, int z2) {
+	public static List<BlockPos> getLineBlocks(PlayerEntity player, int x1, int y1, int z1, int x2, int y2, int z2) {
 		List<BlockPos> list = new ArrayList<>();
 
 		if (x1 != x2) {
@@ -94,22 +94,22 @@ public class Line extends TwoClicksBuildMode {
 	}
 
 	@Override
-	protected BlockPos findSecondPos(Player player, BlockPos firstPos, boolean skipRaytrace) {
+	protected BlockPos findSecondPos(PlayerEntity player, BlockPos firstPos, boolean skipRaytrace) {
 		return findLine(player, firstPos, skipRaytrace);
 	}
 
 	@Override
-	protected List<BlockPos> getAllBlocks(Player player, int x1, int y1, int z1, int x2, int y2, int z2) {
+	protected List<BlockPos> getAllBlocks(PlayerEntity player, int x1, int y1, int z1, int x2, int y2, int z2) {
 		return getLineBlocks(player, x1, y1, z1, x2, y2, z2);
 	}
 
 	static class Criteria {
-		Vec3 planeBound;
-		Vec3 lineBound;
+		Vector3d planeBound;
+		Vector3d lineBound;
 		double distToLineSq;
 		double distToPlayerSq;
 
-		Criteria(Vec3 planeBound, BlockPos firstPos, Vec3 start) {
+		Criteria(Vector3d planeBound, BlockPos firstPos, Vector3d start) {
 			this.planeBound = planeBound;
 			this.lineBound = toLongestLine(this.planeBound, firstPos);
 			this.distToLineSq = this.lineBound.subtract(this.planeBound).lengthSqr();
@@ -118,27 +118,27 @@ public class Line extends TwoClicksBuildMode {
 
 		//Make it from a plane into a line
 		//Select the axis that is longest
-		private Vec3 toLongestLine(Vec3 boundVec, BlockPos firstPos) {
+		private Vector3d toLongestLine(Vector3d boundVec, BlockPos firstPos) {
 			BlockPos bound = new BlockPos(boundVec);
 
 			BlockPos firstToSecond = bound.subtract(firstPos);
 			firstToSecond = new BlockPos(Math.abs(firstToSecond.getX()), Math.abs(firstToSecond.getY()), Math.abs(firstToSecond.getZ()));
 			int longest = Math.max(firstToSecond.getX(), Math.max(firstToSecond.getY(), firstToSecond.getZ()));
 			if (longest == firstToSecond.getX()) {
-				return new Vec3(bound.getX(), firstPos.getY(), firstPos.getZ());
+				return new Vector3d(bound.getX(), firstPos.getY(), firstPos.getZ());
 			}
 			if (longest == firstToSecond.getY()) {
-				return new Vec3(firstPos.getX(), bound.getY(), firstPos.getZ());
+				return new Vector3d(firstPos.getX(), bound.getY(), firstPos.getZ());
 			}
 			if (longest == firstToSecond.getZ()) {
-				return new Vec3(firstPos.getX(), firstPos.getY(), bound.getZ());
+				return new Vector3d(firstPos.getX(), firstPos.getY(), bound.getZ());
 			}
 			return null;
 		}
 
 		//check if its not behind the player and its not too close and not too far
 		//also check if raytrace from player to block does not intersect blocks
-		public boolean isValid(Vec3 start, Vec3 look, int reach, Player player, boolean skipRaytrace) {
+		public boolean isValid(Vector3d start, Vector3d look, int reach, PlayerEntity player, boolean skipRaytrace) {
 
 			return BuildModes.isCriteriaValid(start, look, reach, player, skipRaytrace, lineBound, planeBound, distToPlayerSq);
 		}

src/main/java/nl/requios/effortlessbuilding/buildmode/buildmodes/Normal.java

@@ -0,0 +1,41 @@
+package nl.requios.effortlessbuilding.buildmode.buildmodes;
+
+import net.minecraft.entity.player.PlayerEntity;
+import net.minecraft.util.Direction;
+import net.minecraft.util.math.BlockPos;
+import net.minecraft.util.math.vector.Vector3d;
+import nl.requios.effortlessbuilding.buildmode.IBuildMode;
+
+import java.util.ArrayList;
+import java.util.List;
+
+public class Normal implements IBuildMode {
+	@Override
+	public void initialize(PlayerEntity player) {
+
+	}
+
+	@Override
+	public List<BlockPos> onRightClick(PlayerEntity player, BlockPos blockPos, Direction sideHit, Vector3d hitVec, boolean skipRaytrace) {
+		List<BlockPos> list = new ArrayList<>();
+		if (blockPos != null) list.add(blockPos);
+		return list;
+	}
+
+	@Override
+	public List<BlockPos> findCoordinates(PlayerEntity player, BlockPos blockPos, boolean skipRaytrace) {
+		List<BlockPos> list = new ArrayList<>();
+		if (blockPos != null) list.add(blockPos);
+		return list;
+	}
+
+	@Override
+	public Direction getSideHit(PlayerEntity player) {
+		return null;
+	}
+
+	@Override
+	public Vector3d getHitVec(PlayerEntity player) {
+		return null;
+	}
+}

src/main/java/nl/requios/effortlessbuilding/buildmode/buildmodes/NormalPlus.java

@@ -0,0 +1,41 @@
+package nl.requios.effortlessbuilding.buildmode.buildmodes;
+
+import net.minecraft.entity.player.PlayerEntity;
+import net.minecraft.util.Direction;
+import net.minecraft.util.math.BlockPos;
+import net.minecraft.util.math.vector.Vector3d;
+import nl.requios.effortlessbuilding.buildmode.IBuildMode;
+
+import java.util.ArrayList;
+import java.util.List;
+
+public class NormalPlus implements IBuildMode {
+	@Override
+	public void initialize(PlayerEntity player) {
+
+	}
+
+	@Override
+	public List<BlockPos> onRightClick(PlayerEntity player, BlockPos blockPos, Direction sideHit, Vector3d hitVec, boolean skipRaytrace) {
+		List<BlockPos> list = new ArrayList<>();
+		if (blockPos != null) list.add(blockPos);
+		return list;
+	}
+
+	@Override
+	public List<BlockPos> findCoordinates(PlayerEntity player, BlockPos blockPos, boolean skipRaytrace) {
+		List<BlockPos> list = new ArrayList<>();
+		if (blockPos != null) list.add(blockPos);
+		return list;
+	}
+
+	@Override
+	public Direction getSideHit(PlayerEntity player) {
+		return null;
+	}
+
+	@Override
+	public Vector3d getHitVec(PlayerEntity player) {
+		return null;
+	}
+}

src/main/java/nl/requios/effortlessbuilding/buildmode/buildmodes/Pyramid.java

@@ -1,34 +0,0 @@
-package nl.requios.effortlessbuilding.buildmode.buildmodes;
-
-import net.minecraft.core.BlockPos;
-import net.minecraft.world.entity.player.Player;
-import nl.requios.effortlessbuilding.buildmode.ModeOptions;
-import nl.requios.effortlessbuilding.buildmode.ThreeClicksBuildMode;
-import nl.requios.effortlessbuilding.helper.ReachHelper;
-
-import java.util.ArrayList;
-import java.util.List;
-
-public class Pyramid extends ThreeClicksBuildMode {
-
-	@Override
-	protected BlockPos findSecondPos(Player player, BlockPos firstPos, boolean skipRaytrace) {
-		return Floor.findFloor(player, firstPos, skipRaytrace);
-	}
-
-	@Override
-	protected BlockPos findThirdPos(Player player, BlockPos firstPos, BlockPos secondPos, boolean skipRaytrace) {
-		return findHeight(player, secondPos, skipRaytrace);
-	}
-
-	@Override
-	protected List<BlockPos> getIntermediateBlocks(Player player, int x1, int y1, int z1, int x2, int y2, int z2) {
-		return Floor.getFloorBlocks(player, x1, y1, z1, x2, y2, z2);
-	}
-
-	@Override
-	protected List<BlockPos> getFinalBlocks(Player player, int x1, int y1, int z1, int x2, int y2, int z2, int x3, int y3, int z3) {
-		//TODO
-		return SlopeFloor.getSlopeFloorBlocks(player, x1, y1, z1, x2, y2, z2, x3, y3, z3);
-	}
-}

src/main/java/nl/requios/effortlessbuilding/buildmode/buildmodes/Single.java

@@ -1,41 +0,0 @@
-package nl.requios.effortlessbuilding.buildmode.buildmodes;
-
-import net.minecraft.world.entity.player.Player;
-import net.minecraft.core.Direction;
-import net.minecraft.core.BlockPos;
-import net.minecraft.world.phys.Vec3;
-import nl.requios.effortlessbuilding.buildmode.IBuildMode;
-
-import java.util.ArrayList;
-import java.util.List;
-
-public class Single implements IBuildMode {
-	@Override
-	public void initialize(Player player) {
-
-	}
-
-	@Override
-	public List<BlockPos> onRightClick(Player player, BlockPos blockPos, Direction sideHit, Vec3 hitVec, boolean skipRaytrace) {
-		List<BlockPos> list = new ArrayList<>();
-		if (blockPos != null) list.add(blockPos);
-		return list;
-	}
-
-	@Override
-	public List<BlockPos> findCoordinates(Player player, BlockPos blockPos, boolean skipRaytrace) {
-		List<BlockPos> list = new ArrayList<>();
-		if (blockPos != null) list.add(blockPos);
-		return list;
-	}
-
-	@Override
-	public Direction getSideHit(Player player) {
-		return null;
-	}
-
-	@Override
-	public Vec3 getHitVec(Player player) {
-		return null;
-	}
-}

src/main/java/nl/requios/effortlessbuilding/buildmode/buildmodes/SlopeFloor.java

@@ -1,7 +1,7 @@
 package nl.requios.effortlessbuilding.buildmode.buildmodes;
 
-import net.minecraft.world.entity.player.Player;
-import net.minecraft.core.BlockPos;
+import net.minecraft.entity.player.PlayerEntity;
+import net.minecraft.util.math.BlockPos;
 import nl.requios.effortlessbuilding.buildmode.ModeOptions;
 import nl.requios.effortlessbuilding.buildmode.ThreeClicksBuildMode;
 import nl.requios.effortlessbuilding.helper.ReachHelper;
@@ -12,7 +12,7 @@ import java.util.List;
 public class SlopeFloor extends ThreeClicksBuildMode {
 
 	//Add slope floor from first to second
-	public static List<BlockPos> getSlopeFloorBlocks(Player player, int x1, int y1, int z1, int x2, int y2, int z2, int x3, int y3, int z3) {
+	public static List<BlockPos> getSlopeFloorBlocks(PlayerEntity player, int x1, int y1, int z1, int x2, int y2, int z2, int x3, int y3, int z3) {
 		List<BlockPos> list = new ArrayList<>();
 
 		int axisLimit = ReachHelper.getMaxBlocksPerAxis(player);
@@ -74,22 +74,22 @@ public class SlopeFloor extends ThreeClicksBuildMode {
 	}
 
 	@Override
-	protected BlockPos findSecondPos(Player player, BlockPos firstPos, boolean skipRaytrace) {
+	protected BlockPos findSecondPos(PlayerEntity player, BlockPos firstPos, boolean skipRaytrace) {
 		return Floor.findFloor(player, firstPos, skipRaytrace);
 	}
 
 	@Override
-	protected BlockPos findThirdPos(Player player, BlockPos firstPos, BlockPos secondPos, boolean skipRaytrace) {
+	protected BlockPos findThirdPos(PlayerEntity player, BlockPos firstPos, BlockPos secondPos, boolean skipRaytrace) {
 		return findHeight(player, secondPos, skipRaytrace);
 	}
 
 	@Override
-	protected List<BlockPos> getIntermediateBlocks(Player player, int x1, int y1, int z1, int x2, int y2, int z2) {
+	protected List<BlockPos> getIntermediateBlocks(PlayerEntity player, int x1, int y1, int z1, int x2, int y2, int z2) {
 		return Floor.getFloorBlocks(player, x1, y1, z1, x2, y2, z2);
 	}
 
 	@Override
-	protected List<BlockPos> getFinalBlocks(Player player, int x1, int y1, int z1, int x2, int y2, int z2, int x3, int y3, int z3) {
+	protected List<BlockPos> getFinalBlocks(PlayerEntity player, int x1, int y1, int z1, int x2, int y2, int z2, int x3, int y3, int z3) {
 		return getSlopeFloorBlocks(player, x1, y1, z1, x2, y2, z2, x3, y3, z3);
 	}
 }

src/main/java/nl/requios/effortlessbuilding/buildmode/buildmodes/Sphere.java

@@ -1,8 +1,8 @@
 package nl.requios.effortlessbuilding.buildmode.buildmodes;
 
-import net.minecraft.world.entity.player.Player;
-import net.minecraft.core.BlockPos;
-import net.minecraft.util.Mth;
+import net.minecraft.entity.player.PlayerEntity;
+import net.minecraft.util.math.BlockPos;
+import net.minecraft.util.math.MathHelper;
 import nl.requios.effortlessbuilding.buildmode.ModeOptions;
 import nl.requios.effortlessbuilding.buildmode.ThreeClicksBuildMode;
 
@@ -11,7 +11,7 @@ import java.util.List;
 
 public class Sphere extends ThreeClicksBuildMode {
 
-	public static List<BlockPos> getSphereBlocks(Player player, int x1, int y1, int z1, int x2, int y2, int z2, int x3, int y3, int z3) {
+	public static List<BlockPos> getSphereBlocks(PlayerEntity player, int x1, int y1, int z1, int x2, int y2, int z2, int x3, int y3, int z3) {
 		List<BlockPos> list = new ArrayList<>();
 
 		float centerX = x1;
@@ -29,9 +29,9 @@ public class Sphere extends ThreeClicksBuildMode {
 			z1 = (int) (centerZ - (z2 - centerZ));
 		}
 
-		float radiusX = Mth.abs(x2 - centerX);
-		float radiusY = Mth.abs(y3 - centerY);
-		float radiusZ = Mth.abs(z2 - centerZ);
+		float radiusX = MathHelper.abs(x2 - centerX);
+		float radiusY = MathHelper.abs(y3 - centerY);
+		float radiusZ = MathHelper.abs(z2 - centerZ);
 
 		if (ModeOptions.getFill() == ModeOptions.ActionEnum.FULL)
 			addSphereBlocks(list, x1, y1, z1, x3, y3, z3, centerX, centerY, centerZ, radiusX, radiusY, radiusZ);
@@ -76,7 +76,7 @@ public class Sphere extends ThreeClicksBuildMode {
 	}
 
 	private static float distance(float x1, float y1, float z1, float x2, float y2, float z2) {
-		return Mth.sqrt((x2 - x1) * (x2 - x1) + (y2 - y1) * (y2 - y1) + (z2 - z1) * (z2 - z1));
+		return MathHelper.sqrt((x2 - x1) * (x2 - x1) + (y2 - y1) * (y2 - y1) + (z2 - z1) * (z2 - z1));
 	}
 
 	public static float calculateSpheroidRadius(float centerX, float centerY, float centerZ, float radiusX, float radiusY, float radiusZ, int x, int y, int z) {
@@ -89,22 +89,22 @@ public class Sphere extends ThreeClicksBuildMode {
 	}
 
 	@Override
-	public BlockPos findSecondPos(Player player, BlockPos firstPos, boolean skipRaytrace) {
+	public BlockPos findSecondPos(PlayerEntity player, BlockPos firstPos, boolean skipRaytrace) {
 		return Floor.findFloor(player, firstPos, skipRaytrace);
 	}
 
 	@Override
-	public BlockPos findThirdPos(Player player, BlockPos firstPos, BlockPos secondPos, boolean skipRaytrace) {
+	public BlockPos findThirdPos(PlayerEntity player, BlockPos firstPos, BlockPos secondPos, boolean skipRaytrace) {
 		return findHeight(player, secondPos, skipRaytrace);
 	}
 
 	@Override
-	public List<BlockPos> getIntermediateBlocks(Player player, int x1, int y1, int z1, int x2, int y2, int z2) {
+	public List<BlockPos> getIntermediateBlocks(PlayerEntity player, int x1, int y1, int z1, int x2, int y2, int z2) {
 		return Circle.getCircleBlocks(player, x1, y1, z1, x2, y2, z2);
 	}
 
 	@Override
-	public List<BlockPos> getFinalBlocks(Player player, int x1, int y1, int z1, int x2, int y2, int z2, int x3, int y3, int z3) {
+	public List<BlockPos> getFinalBlocks(PlayerEntity player, int x1, int y1, int z1, int x2, int y2, int z2, int x3, int y3, int z3) {
 		return getSphereBlocks(player, x1, y1, z1, x2, y2, z2, x3, y3, z3);
 	}
 }

src/main/java/nl/requios/effortlessbuilding/buildmode/buildmodes/Wall.java

@@ -1,8 +1,8 @@
 package nl.requios.effortlessbuilding.buildmode.buildmodes;
 
-import net.minecraft.world.entity.player.Player;
-import net.minecraft.core.BlockPos;
-import net.minecraft.world.phys.Vec3;
+import net.minecraft.entity.player.PlayerEntity;
+import net.minecraft.util.math.BlockPos;
+import net.minecraft.util.math.vector.Vector3d;
 import nl.requios.effortlessbuilding.buildmode.BuildModes;
 import nl.requios.effortlessbuilding.buildmode.ModeOptions;
 import nl.requios.effortlessbuilding.buildmode.TwoClicksBuildMode;
@@ -13,18 +13,18 @@ import java.util.List;
 
 public class Wall extends TwoClicksBuildMode {
 
-	public static BlockPos findWall(Player player, BlockPos firstPos, boolean skipRaytrace) {
-		Vec3 look = BuildModes.getPlayerLookVec(player);
-		Vec3 start = new Vec3(player.getX(), player.getY() + player.getEyeHeight(), player.getZ());
+	public static BlockPos findWall(PlayerEntity player, BlockPos firstPos, boolean skipRaytrace) {
+		Vector3d look = BuildModes.getPlayerLookVec(player);
+		Vector3d start = new Vector3d(player.getX(), player.getY() + player.getEyeHeight(), player.getZ());
 
 		List<Criteria> criteriaList = new ArrayList<>(3);
 
 		//X
-		Vec3 xBound = BuildModes.findXBound(firstPos.getX(), start, look);
+		Vector3d xBound = BuildModes.findXBound(firstPos.getX(), start, look);
 		criteriaList.add(new Criteria(xBound, firstPos, start, look));
 
 		//Z
-		Vec3 zBound = BuildModes.findZBound(firstPos.getZ(), start, look);
+		Vector3d zBound = BuildModes.findZBound(firstPos.getZ(), start, look);
 		criteriaList.add(new Criteria(zBound, firstPos, start, look));
 
 		//Remove invalid criteria
@@ -51,7 +51,7 @@ public class Wall extends TwoClicksBuildMode {
 		return new BlockPos(selected.planeBound);
 	}
 
-	public static List<BlockPos> getWallBlocks(Player player, int x1, int y1, int z1, int x2, int y2, int z2) {
+	public static List<BlockPos> getWallBlocks(PlayerEntity player, int x1, int y1, int z1, int x2, int y2, int z2) {
 		List<BlockPos> list = new ArrayList<>();
 
 		if (x1 == x2) {
@@ -104,30 +104,30 @@ public class Wall extends TwoClicksBuildMode {
 	}
 
 	@Override
-	protected BlockPos findSecondPos(Player player, BlockPos firstPos, boolean skipRaytrace) {
+	protected BlockPos findSecondPos(PlayerEntity player, BlockPos firstPos, boolean skipRaytrace) {
 		return findWall(player, firstPos, skipRaytrace);
 	}
 
 	@Override
-	protected List<BlockPos> getAllBlocks(Player player, int x1, int y1, int z1, int x2, int y2, int z2) {
+	protected List<BlockPos> getAllBlocks(PlayerEntity player, int x1, int y1, int z1, int x2, int y2, int z2) {
 		return getWallBlocks(player, x1, y1, z1, x2, y2, z2);
 	}
 
 	static class Criteria {
-		Vec3 planeBound;
+		Vector3d planeBound;
 		double distToPlayerSq;
 		double angle;
 
-		Criteria(Vec3 planeBound, BlockPos firstPos, Vec3 start, Vec3 look) {
+		Criteria(Vector3d planeBound, BlockPos firstPos, Vector3d start, Vector3d look) {
 			this.planeBound = planeBound;
 			this.distToPlayerSq = this.planeBound.subtract(start).lengthSqr();
-			Vec3 wall = this.planeBound.subtract(Vec3.atLowerCornerOf(firstPos));
+			Vector3d wall = this.planeBound.subtract(Vector3d.atLowerCornerOf(firstPos));
 			this.angle = wall.x * look.x + wall.z * look.z; //dot product ignoring y (looking up/down should not affect this angle)
 		}
 
 		//check if its not behind the player and its not too close and not too far
 		//also check if raytrace from player to block does not intersect blocks
-		public boolean isValid(Vec3 start, Vec3 look, int reach, Player player, boolean skipRaytrace) {
+		public boolean isValid(Vector3d start, Vector3d look, int reach, PlayerEntity player, boolean skipRaytrace) {
 
 			return BuildModes.isCriteriaValid(start, look, reach, player, skipRaytrace, planeBound, planeBound, distToPlayerSq);
 		}

src/main/java/nl/requios/effortlessbuilding/buildmodifier/Array.java

@@ -1,13 +1,13 @@
 package nl.requios.effortlessbuilding.buildmodifier;
 
-import net.minecraft.world.level.block.state.BlockState;
-import net.minecraft.world.entity.player.Player;
-import net.minecraft.world.item.ItemStack;
-import net.minecraft.core.Direction;
-import net.minecraft.world.InteractionHand;
-import net.minecraft.core.BlockPos;
-import net.minecraft.world.phys.Vec3;
-import net.minecraft.core.Vec3i;
+import net.minecraft.block.BlockState;
+import net.minecraft.entity.player.PlayerEntity;
+import net.minecraft.item.ItemStack;
+import net.minecraft.util.Direction;
+import net.minecraft.util.Hand;
+import net.minecraft.util.math.BlockPos;
+import net.minecraft.util.math.vector.Vector3d;
+import net.minecraft.util.math.vector.Vector3i;
 import net.minecraftforge.items.IItemHandler;
 import nl.requios.effortlessbuilding.item.AbstractRandomizerBagItem;
 
@@ -16,7 +16,7 @@ import java.util.List;
 
 public class Array {
 
-	public static List<BlockPos> findCoordinates(Player player, BlockPos startPos) {
+	public static List<BlockPos> findCoordinates(PlayerEntity player, BlockPos startPos) {
 		List<BlockPos> coordinates = new ArrayList<>();
 
 		//find arraysettings for the player
@@ -24,7 +24,7 @@ public class Array {
 		if (!isEnabled(a)) return coordinates;
 
 		BlockPos pos = startPos;
-		Vec3i offset = new Vec3i(a.offset.getX(), a.offset.getY(), a.offset.getZ());
+		Vector3i offset = new Vector3i(a.offset.getX(), a.offset.getY(), a.offset.getZ());
 
 		for (int i = 0; i < a.count; i++) {
 			pos = pos.offset(offset);
@@ -34,7 +34,7 @@ public class Array {
 		return coordinates;
 	}
 
-	public static List<BlockState> findBlockStates(Player player, BlockPos startPos, BlockState blockState, ItemStack itemStack, List<ItemStack> itemStacks) {
+	public static List<BlockState> findBlockStates(PlayerEntity player, BlockPos startPos, BlockState blockState, ItemStack itemStack, List<ItemStack> itemStacks) {
 		List<BlockState> blockStates = new ArrayList<>();
 
 		//find arraysettings for the player that placed the block
@@ -42,13 +42,13 @@ public class Array {
 		if (!isEnabled(a)) return blockStates;
 
 		BlockPos pos = startPos;
-		Vec3i offset = new Vec3i(a.offset.getX(), a.offset.getY(), a.offset.getZ());
+		Vector3i offset = new Vector3i(a.offset.getX(), a.offset.getY(), a.offset.getZ());
 
 		//Randomizer bag synergy
 		AbstractRandomizerBagItem randomizerBagItem = null;
 		IItemHandler bagInventory = null;
 		if (!itemStack.isEmpty() && itemStack.getItem() instanceof AbstractRandomizerBagItem) {
-			randomizerBagItem = (AbstractRandomizerBagItem) itemStack.getItem() ;
+			randomizerBagItem = (AbstractRandomizerBagItem) itemStack.getItem();
 			bagInventory = randomizerBagItem.getBagInventory(itemStack);
 		}
 
@@ -59,7 +59,7 @@ public class Array {
 			if (randomizerBagItem != null) {
 				itemStack = randomizerBagItem.pickRandomStack(bagInventory);
 				blockState = BuildModifiers
-					.getBlockStateFromItem(itemStack, player, startPos, Direction.UP, new Vec3(0, 0, 0), InteractionHand.MAIN_HAND);
+					.getBlockStateFromItem(itemStack, player, startPos, Direction.UP, new Vector3d(0, 0, 0), Hand.MAIN_HAND);
 			}
 
 			//blockState = blockState.getBlock().getStateForPlacement(player.world, pos, )

src/main/java/nl/requios/effortlessbuilding/buildmodifier/BlockSet.java

@@ -1,8 +1,8 @@
 package nl.requios.effortlessbuilding.buildmodifier;
 
-import net.minecraft.world.level.block.state.BlockState;
-import net.minecraft.core.BlockPos;
-import net.minecraft.world.phys.Vec3;
+import net.minecraft.block.BlockState;
+import net.minecraft.util.math.BlockPos;
+import net.minecraft.util.math.vector.Vector3d;
 
 import java.util.List;
 
@@ -10,11 +10,11 @@ public class BlockSet {
 	private final List<BlockPos> coordinates;
 	private final List<BlockState> previousBlockStates;
 	private final List<BlockState> newBlockStates;
-	private final Vec3 hitVec;
+	private final Vector3d hitVec;
 	private final BlockPos firstPos;
 	private final BlockPos secondPos;
 
-	public BlockSet(List<BlockPos> coordinates, List<BlockState> previousBlockStates, List<BlockState> newBlockStates, Vec3 hitVec,
+	public BlockSet(List<BlockPos> coordinates, List<BlockState> previousBlockStates, List<BlockState> newBlockStates, Vector3d hitVec,
 					BlockPos firstPos, BlockPos secondPos) {
 		this.coordinates = coordinates;
 		this.previousBlockStates = previousBlockStates;
@@ -36,7 +36,7 @@ public class BlockSet {
 		return newBlockStates;
 	}
 
-	public Vec3 getHitVec() {
+	public Vector3d getHitVec() {
 		return hitVec;
 	}
 

src/main/java/nl/requios/effortlessbuilding/buildmodifier/BuildModifiers.java

@@ -1,26 +1,24 @@
 package nl.requios.effortlessbuilding.buildmodifier;
 
-import net.minecraft.world.level.block.Block;
-import net.minecraft.world.level.block.state.BlockState;
-import net.minecraft.world.level.block.Blocks;
-import net.minecraft.world.entity.player.Player;
-import net.minecraft.world.item.BlockItem;
-import net.minecraft.world.item.context.BlockPlaceContext;
-import net.minecraft.world.item.ItemStack;
-import net.minecraft.world.item.context.UseOnContext;
-import net.minecraft.core.Direction;
-import net.minecraft.world.InteractionHand;
-import net.minecraft.core.BlockPos;
-import net.minecraft.world.phys.BlockHitResult;
-import net.minecraft.world.phys.Vec3;
-import net.minecraft.world.level.Level;
-import nl.requios.effortlessbuilding.CommonConfig;
-import nl.requios.effortlessbuilding.EffortlessBuilding;
+import net.minecraft.block.Block;
+import net.minecraft.block.BlockState;
+import net.minecraft.block.Blocks;
+import net.minecraft.entity.player.PlayerEntity;
+import net.minecraft.item.BlockItem;
+import net.minecraft.item.BlockItemUseContext;
+import net.minecraft.item.ItemStack;
+import net.minecraft.item.ItemUseContext;
+import net.minecraft.util.Direction;
+import net.minecraft.util.Hand;
+import net.minecraft.util.math.BlockPos;
+import net.minecraft.util.math.BlockRayTraceResult;
+import net.minecraft.util.math.vector.Vector3d;
+import net.minecraft.world.World;
 import nl.requios.effortlessbuilding.compatibility.CompatHelper;
-import nl.requios.effortlessbuilding.helper.DelayedBlockPlacer;
+import nl.requios.effortlessbuilding.helper.InventoryHelper;
 import nl.requios.effortlessbuilding.helper.SurvivalHelper;
 import nl.requios.effortlessbuilding.item.AbstractRandomizerBagItem;
-import nl.requios.effortlessbuilding.render.BlockPreviews;
+import nl.requios.effortlessbuilding.render.BlockPreviewRenderer;
 
 import java.util.ArrayList;
 import java.util.Collections;
@@ -29,12 +27,12 @@ import java.util.List;
 public class BuildModifiers {
 
 	//Called from BuildModes
-	public static void onBlockPlaced(Player player, List<BlockPos> startCoordinates, Direction sideHit, Vec3 hitVec, boolean placeStartPos) {
-		Level world = player.level;
+	public static void onBlockPlaced(PlayerEntity player, List<BlockPos> startCoordinates, Direction sideHit, Vector3d hitVec, boolean placeStartPos) {
+		World world = player.level;
 		AbstractRandomizerBagItem.renewRandomness();
 
 		//Format hitvec to 0.x
-		hitVec = new Vec3(Math.abs(hitVec.x - ((int) hitVec.x)), Math.abs(hitVec.y - ((int) hitVec.y)), Math.abs(hitVec.z - ((int) hitVec.z)));
+		hitVec = new Vector3d(Math.abs(hitVec.x - ((int) hitVec.x)), Math.abs(hitVec.y - ((int) hitVec.y)), Math.abs(hitVec.z - ((int) hitVec.z)));
 
 		//find coordinates and blockstates
 		List<BlockPos> coordinates = findCoordinates(player, startCoordinates);
@@ -44,22 +42,60 @@ public class BuildModifiers {
 		//check if valid blockstates
 		if (blockStates.size() == 0 || coordinates.size() != blockStates.size()) return;
 
+		//remember previous blockstates for undo
+		List<BlockState> previousBlockStates = new ArrayList<>(coordinates.size());
+		List<BlockState> newBlockStates = new ArrayList<>(coordinates.size());
+		for (BlockPos coordinate : coordinates) {
+			previousBlockStates.add(world.getBlockState(coordinate));
+		}
+
 		if (world.isClientSide) {
 
-			BlockPreviews.onBlocksPlaced();
+			BlockPreviewRenderer.onBlocksPlaced();
+
+			newBlockStates = blockStates;
 
 		} else {
 
-			int delay = CommonConfig.visuals.appearAnimationLength.get() * 3 - 3; //DelayedBlockPlacer is called 3 times per tick?
+			//place blocks
+			for (int i = placeStartPos ? 0 : 1; i < coordinates.size(); i++) {
+				BlockPos blockPos = coordinates.get(i);
+				BlockState blockState = blockStates.get(i);
+				ItemStack itemStack = itemStacks.get(i);
 
-			//place blocks after delay
-			EffortlessBuilding.DELAYED_BLOCK_PLACER.placeBlocksDelayed(new DelayedBlockPlacer.Entry(world, player, coordinates,
-					blockStates, itemStacks, hitVec, placeStartPos, delay));
+				if (world.isLoaded(blockPos)) {
+					//check itemstack empty
+					if (itemStack.isEmpty()) {
+						//try to find new stack, otherwise continue
+						itemStack = InventoryHelper.findItemStackInInventory(player, blockState.getBlock());
+						if (itemStack.isEmpty()) continue;
+					}
+					SurvivalHelper.placeBlock(world, player, blockPos, blockState, itemStack, Direction.UP, hitVec, false, false, false);
 				}
 			}
 
-	public static void onBlockBroken(Player player, List<BlockPos> startCoordinates, boolean breakStartPos) {
-		Level world = player.level;
+			//find actual new blockstates for undo
+			for (BlockPos coordinate : coordinates) {
+				newBlockStates.add(world.getBlockState(coordinate));
+			}
+		}
+
+		//Set first previousBlockState to empty if in NORMAL mode, to make undo/redo work
+		//(Block is placed by the time it gets here, and unplaced after this)
+		if (!placeStartPos) previousBlockStates.set(0, Blocks.AIR.defaultBlockState());
+
+		//If all new blockstates are air then no use in adding it, no block was actually placed
+		//Can happen when e.g. placing one block in yourself
+		if (Collections.frequency(newBlockStates, Blocks.AIR.defaultBlockState()) != newBlockStates.size()) {
+			//add to undo stack
+			BlockPos firstPos = startCoordinates.get(0);
+			BlockPos secondPos = startCoordinates.get(startCoordinates.size() - 1);
+			UndoRedo.addUndo(player, new BlockSet(coordinates, previousBlockStates, newBlockStates, hitVec, firstPos, secondPos));
+		}
+	}
+
+	public static void onBlockBroken(PlayerEntity player, List<BlockPos> startCoordinates, boolean breakStartPos) {
+		World world = player.level;
 
 		List<BlockPos> coordinates = findCoordinates(player, startCoordinates);
 
@@ -73,7 +109,7 @@ public class BuildModifiers {
 		}
 
 		if (world.isClientSide) {
-			BlockPreviews.onBlocksBroken();
+			BlockPreviewRenderer.onBlocksBroken();
 
 			//list of air blockstates
 			for (int i = 0; i < coordinates.size(); i++) {
@@ -109,12 +145,12 @@ public class BuildModifiers {
 		//add to undo stack
 		BlockPos firstPos = startCoordinates.get(0);
 		BlockPos secondPos = startCoordinates.get(startCoordinates.size() - 1);
-		Vec3 hitVec = new Vec3(0.5, 0.5, 0.5);
+		Vector3d hitVec = new Vector3d(0.5, 0.5, 0.5);
 		UndoRedo.addUndo(player, new BlockSet(coordinates, previousBlockStates, newBlockStates, hitVec, firstPos, secondPos));
 
 	}
 
-	public static List<BlockPos> findCoordinates(Player player, List<BlockPos> posList) {
+	public static List<BlockPos> findCoordinates(PlayerEntity player, List<BlockPos> posList) {
 		List<BlockPos> coordinates = new ArrayList<>();
 		//Add current blocks being placed too
 		coordinates.addAll(posList);
@@ -135,18 +171,18 @@ public class BuildModifiers {
 		return coordinates;
 	}
 
-	public static List<BlockPos> findCoordinates(Player player, BlockPos blockPos) {
+	public static List<BlockPos> findCoordinates(PlayerEntity player, BlockPos blockPos) {
 		return findCoordinates(player, new ArrayList<>(Collections.singletonList(blockPos)));
 	}
 
-	public static List<BlockState> findBlockStates(Player player, List<BlockPos> posList, Vec3 hitVec, Direction facing, List<ItemStack> itemStacks) {
+	public static List<BlockState> findBlockStates(PlayerEntity player, List<BlockPos> posList, Vector3d hitVec, Direction facing, List<ItemStack> itemStacks) {
 		List<BlockState> blockStates = new ArrayList<>();
 		itemStacks.clear();
 
 		//Get itemstack
-		ItemStack itemStack = player.getItemInHand(InteractionHand.MAIN_HAND);
+		ItemStack itemStack = player.getItemInHand(Hand.MAIN_HAND);
 		if (itemStack.isEmpty() || !CompatHelper.isItemBlockProxy(itemStack)) {
-			itemStack = player.getItemInHand(InteractionHand.OFF_HAND);
+			itemStack = player.getItemInHand(Hand.OFF_HAND);
 		}
 		if (itemStack.isEmpty() || !CompatHelper.isItemBlockProxy(itemStack)) {
 			return blockStates;
@@ -161,16 +197,13 @@ public class BuildModifiers {
 		//Add blocks in posList first
 		for (BlockPos blockPos : posList) {
 			if (!(itemStack.getItem() instanceof BlockItem)) itemBlock = CompatHelper.getItemBlockFromStack(itemStack);
-			BlockState blockState = getBlockStateFromItem(itemBlock, player, blockPos, facing, hitVec, InteractionHand.MAIN_HAND);
-			if (blockState == null) continue;
-
+			BlockState blockState = getBlockStateFromItem(itemBlock, player, blockPos, facing, hitVec, Hand.MAIN_HAND);
 			blockStates.add(blockState);
 			itemStacks.add(itemBlock);
 		}
 
 		for (BlockPos blockPos : posList) {
-			BlockState blockState = getBlockStateFromItem(itemBlock, player, blockPos, facing, hitVec, InteractionHand.MAIN_HAND);
-			if (blockState == null) continue;
+			BlockState blockState = getBlockStateFromItem(itemBlock, player, blockPos, facing, hitVec, Hand.MAIN_HAND);
 
 			List<BlockState> arrayBlockStates = Array.findBlockStates(player, blockPos, blockState, itemStack, itemStacks);
 			blockStates.addAll(arrayBlockStates);
@@ -181,8 +214,6 @@ public class BuildModifiers {
 			for (int i = 0; i < arrayCoordinates.size(); i++) {
 				BlockPos coordinate = arrayCoordinates.get(i);
 				BlockState blockState1 = arrayBlockStates.get(i);
-				if (blockState1 == null) continue;
-
 				blockStates.addAll(Mirror.findBlockStates(player, coordinate, blockState1, itemStack, itemStacks));
 				blockStates.addAll(RadialMirror.findBlockStates(player, coordinate, blockState1, itemStack, itemStacks));
 			}
@@ -201,15 +232,14 @@ public class BuildModifiers {
 	}
 
 	public static boolean isEnabled(ModifierSettingsManager.ModifierSettings modifierSettings, BlockPos startPos) {
-		//startPos can be null
 		return Mirror.isEnabled(modifierSettings.getMirrorSettings(), startPos) ||
 			Array.isEnabled(modifierSettings.getArraySettings()) ||
 			RadialMirror.isEnabled(modifierSettings.getRadialMirrorSettings(), startPos) ||
 			modifierSettings.doQuickReplace();
 	}
 
-	public static BlockState getBlockStateFromItem(ItemStack itemStack, Player player, BlockPos blockPos, Direction facing, Vec3 hitVec, InteractionHand hand) {
-		return Block.byItem(itemStack.getItem()).getStateForPlacement(new BlockPlaceContext(new UseOnContext(player, hand, new BlockHitResult(hitVec, facing, blockPos, false))));
+	public static BlockState getBlockStateFromItem(ItemStack itemStack, PlayerEntity player, BlockPos blockPos, Direction facing, Vector3d hitVec, Hand hand) {
+		return Block.byItem(itemStack.getItem()).getStateForPlacement(new BlockItemUseContext(new ItemUseContext(player, hand, new BlockRayTraceResult(hitVec, facing, blockPos, false))));
 	}
 
 	//Returns true if equal (or both null)

src/main/java/nl/requios/effortlessbuilding/buildmodifier/Mirror.java

@@ -1,28 +1,23 @@
 package nl.requios.effortlessbuilding.buildmodifier;
 
-import net.minecraft.world.entity.player.Player;
-import net.minecraft.world.item.ItemStack;
-import net.minecraft.world.level.block.state.properties.Half;
-import net.minecraft.world.level.block.state.properties.SlabType;
-import net.minecraft.core.Direction;
-import net.minecraft.world.InteractionHand;
-import net.minecraft.core.BlockPos;
-import net.minecraft.world.phys.Vec3;
+import net.minecraft.block.*;
+import net.minecraft.entity.player.PlayerEntity;
+import net.minecraft.item.ItemStack;
+import net.minecraft.state.properties.Half;
+import net.minecraft.state.properties.SlabType;
+import net.minecraft.util.Direction;
+import net.minecraft.util.Hand;
+import net.minecraft.util.math.BlockPos;
+import net.minecraft.util.math.vector.Vector3d;
 import net.minecraftforge.items.IItemHandler;
 import nl.requios.effortlessbuilding.item.AbstractRandomizerBagItem;
 
 import java.util.ArrayList;
 import java.util.List;
 
-import net.minecraft.world.level.block.DirectionalBlock;
-import net.minecraft.world.level.block.DispenserBlock;
-import net.minecraft.world.level.block.SlabBlock;
-import net.minecraft.world.level.block.StairBlock;
-import net.minecraft.world.level.block.state.BlockState;
-
 public class Mirror {
 
-	public static List<BlockPos> findCoordinates(Player player, BlockPos startPos) {
+	public static List<BlockPos> findCoordinates(PlayerEntity player, BlockPos startPos) {
 		List<BlockPos> coordinates = new ArrayList<>();
 
 		//find mirrorsettings for the player
@@ -62,7 +57,7 @@ public class Mirror {
 		coordinates.add(newBlockPos);
 	}
 
-	public static List<BlockState> findBlockStates(Player player, BlockPos startPos, BlockState blockState, ItemStack itemStack, List<ItemStack> itemStacks) {
+	public static List<BlockState> findBlockStates(PlayerEntity player, BlockPos startPos, BlockState blockState, ItemStack itemStack, List<ItemStack> itemStacks) {
 		List<BlockState> blockStates = new ArrayList<>();
 
 		//find mirrorsettings for the player
@@ -73,22 +68,22 @@ public class Mirror {
 		AbstractRandomizerBagItem randomizerBagItem = null;
 		IItemHandler bagInventory = null;
 		if (!itemStack.isEmpty() && itemStack.getItem() instanceof AbstractRandomizerBagItem) {
-			randomizerBagItem = (AbstractRandomizerBagItem) itemStack.getItem() ;
+			randomizerBagItem = (AbstractRandomizerBagItem) itemStack.getItem();
 			bagInventory = randomizerBagItem.getBagInventory(itemStack);
 		}
 
 		if (m.mirrorX)
-			blockStateMirrorX(player, m, startPos, blockState, bagInventory, itemStack, InteractionHand.MAIN_HAND, blockStates, itemStacks);
+			blockStateMirrorX(player, m, startPos, blockState, bagInventory, itemStack, Hand.MAIN_HAND, blockStates, itemStacks);
 		if (m.mirrorY)
-			blockStateMirrorY(player, m, startPos, blockState, bagInventory, itemStack, InteractionHand.MAIN_HAND, blockStates, itemStacks);
+			blockStateMirrorY(player, m, startPos, blockState, bagInventory, itemStack, Hand.MAIN_HAND, blockStates, itemStacks);
 		if (m.mirrorZ)
-			blockStateMirrorZ(player, m, startPos, blockState, bagInventory, itemStack, InteractionHand.MAIN_HAND, blockStates, itemStacks);
+			blockStateMirrorZ(player, m, startPos, blockState, bagInventory, itemStack, Hand.MAIN_HAND, blockStates, itemStacks);
 
 		return blockStates;
 	}
 
-	private static void blockStateMirrorX(Player player, MirrorSettings m, BlockPos oldBlockPos, BlockState oldBlockState,
-										  IItemHandler bagInventory, ItemStack itemStack, InteractionHand hand, List<BlockState> blockStates, List<ItemStack> itemStacks) {
+	private static void blockStateMirrorX(PlayerEntity player, MirrorSettings m, BlockPos oldBlockPos, BlockState oldBlockState,
+										  IItemHandler bagInventory, ItemStack itemStack, Hand hand, List<BlockState> blockStates, List<ItemStack> itemStacks) {
 		//find mirror position
 		double x = m.position.x + (m.position.x - oldBlockPos.getX() - 0.5);
 		BlockPos newBlockPos = new BlockPos(x, oldBlockPos.getY(), oldBlockPos.getZ());
@@ -96,11 +91,11 @@ public class Mirror {
 		//Randomizer bag synergy
 		if (bagInventory != null) {
 			itemStack = ((AbstractRandomizerBagItem)itemStack.getItem()).pickRandomStack(bagInventory);
-			oldBlockState = BuildModifiers.getBlockStateFromItem(itemStack, player, oldBlockPos, Direction.UP, new Vec3(0, 0, 0), hand);
+			oldBlockState = BuildModifiers.getBlockStateFromItem(itemStack, player, oldBlockPos, Direction.UP, new Vector3d(0, 0, 0), hand);
 		}
 
 		//Find blockstate
-		BlockState newBlockState = oldBlockState == null ? null : oldBlockState.mirror(net.minecraft.world.level.block.Mirror.FRONT_BACK);
+		BlockState newBlockState = oldBlockState == null ? null : oldBlockState.mirror(net.minecraft.util.Mirror.FRONT_BACK);
 
 		//Store blockstate and itemstack
 		blockStates.add(newBlockState);
@@ -112,8 +107,8 @@ public class Mirror {
 			blockStateMirrorZ(player, m, newBlockPos, newBlockState, bagInventory, itemStack, hand, blockStates, itemStacks);
 	}
 
-	private static void blockStateMirrorY(Player player, MirrorSettings m, BlockPos oldBlockPos, BlockState oldBlockState,
-										  IItemHandler bagInventory, ItemStack itemStack, InteractionHand hand, List<BlockState> blockStates, List<ItemStack> itemStacks) {
+	private static void blockStateMirrorY(PlayerEntity player, MirrorSettings m, BlockPos oldBlockPos, BlockState oldBlockState,
+										  IItemHandler bagInventory, ItemStack itemStack, Hand hand, List<BlockState> blockStates, List<ItemStack> itemStacks) {
 		//find mirror position
 		double y = m.position.y + (m.position.y - oldBlockPos.getY() - 0.5);
 		BlockPos newBlockPos = new BlockPos(oldBlockPos.getX(), y, oldBlockPos.getZ());
@@ -121,7 +116,7 @@ public class Mirror {
 		//Randomizer bag synergy
 		if (bagInventory != null) {
 			itemStack = ((AbstractRandomizerBagItem)itemStack.getItem()).pickRandomStack(bagInventory);
-			oldBlockState = BuildModifiers.getBlockStateFromItem(itemStack, player, oldBlockPos, Direction.UP, new Vec3(0, 0, 0), hand);
+			oldBlockState = BuildModifiers.getBlockStateFromItem(itemStack, player, oldBlockPos, Direction.UP, new Vector3d(0, 0, 0), hand);
 		}
 
 		//Find blockstate
@@ -135,8 +130,8 @@ public class Mirror {
 			blockStateMirrorZ(player, m, newBlockPos, newBlockState, bagInventory, itemStack, hand, blockStates, itemStacks);
 	}
 
-	private static void blockStateMirrorZ(Player player, MirrorSettings m, BlockPos oldBlockPos, BlockState oldBlockState,
-										  IItemHandler bagInventory, ItemStack itemStack, InteractionHand hand, List<BlockState> blockStates, List<ItemStack> itemStacks) {
+	private static void blockStateMirrorZ(PlayerEntity player, MirrorSettings m, BlockPos oldBlockPos, BlockState oldBlockState,
+										  IItemHandler bagInventory, ItemStack itemStack, Hand hand, List<BlockState> blockStates, List<ItemStack> itemStacks) {
 		//find mirror position
 		double z = m.position.z + (m.position.z - oldBlockPos.getZ() - 0.5);
 		BlockPos newBlockPos = new BlockPos(oldBlockPos.getX(), oldBlockPos.getY(), z);
@@ -144,11 +139,11 @@ public class Mirror {
 		//Randomizer bag synergy
 		if (bagInventory != null) {
 			itemStack = ((AbstractRandomizerBagItem)itemStack.getItem()).pickRandomStack(bagInventory);
-			oldBlockState = BuildModifiers.getBlockStateFromItem(itemStack, player, oldBlockPos, Direction.UP, new Vec3(0, 0, 0), hand);
+			oldBlockState = BuildModifiers.getBlockStateFromItem(itemStack, player, oldBlockPos, Direction.UP, new Vector3d(0, 0, 0), hand);
 		}
 
 		//Find blockstate
-		BlockState newBlockState = oldBlockState == null ? null : oldBlockState.mirror(net.minecraft.world.level.block.Mirror.LEFT_RIGHT);
+		BlockState newBlockState = oldBlockState == null ? null : oldBlockState.mirror(net.minecraft.util.Mirror.LEFT_RIGHT);
 
 		//Store blockstate and itemstack
 		blockStates.add(newBlockState);
@@ -166,11 +161,11 @@ public class Mirror {
 
 	private static BlockState getVerticalMirror(BlockState blockState) {
 		//Stairs
-		if (blockState.getBlock() instanceof StairBlock) {
-			if (blockState.getValue(StairBlock.HALF) == Half.BOTTOM) {
-				return blockState.setValue(StairBlock.HALF, Half.TOP);
+		if (blockState.getBlock() instanceof StairsBlock) {
+			if (blockState.getValue(StairsBlock.HALF) == Half.BOTTOM) {
+				return blockState.setValue(StairsBlock.HALF, Half.TOP);
 			} else {
-				return blockState.setValue(StairBlock.HALF, Half.BOTTOM);
+				return blockState.setValue(StairsBlock.HALF, Half.BOTTOM);
 			}
 		}
 
@@ -208,7 +203,7 @@ public class Mirror {
 
 	public static class MirrorSettings {
 		public boolean enabled = false;
-		public Vec3 position = new Vec3(0.5, 64.5, 0.5);
+		public Vector3d position = new Vector3d(0.5, 64.5, 0.5);
 		public boolean mirrorX = true, mirrorY = false, mirrorZ = false;
 		public int radius = 10;
 		public boolean drawLines = true, drawPlanes = true;
@@ -216,7 +211,7 @@ public class Mirror {
 		public MirrorSettings() {
 		}
 
-		public MirrorSettings(boolean mirrorEnabled, Vec3 position, boolean mirrorX, boolean mirrorY, boolean mirrorZ, int radius, boolean drawLines, boolean drawPlanes) {
+		public MirrorSettings(boolean mirrorEnabled, Vector3d position, boolean mirrorX, boolean mirrorY, boolean mirrorZ, int radius, boolean drawLines, boolean drawPlanes) {
 			this.enabled = mirrorEnabled;
 			this.position = position;
 			this.mirrorX = mirrorX;

src/main/java/nl/requios/effortlessbuilding/buildmodifier/ModifierSettingsManager.java

@@ -1,11 +1,11 @@
 package nl.requios.effortlessbuilding.buildmodifier;
 
-import net.minecraft.world.entity.player.Player;
-import net.minecraft.server.level.ServerPlayer;
+import net.minecraft.entity.player.PlayerEntity;
+import net.minecraft.entity.player.ServerPlayerEntity;
 import net.minecraftforge.common.util.LazyOptional;
 import net.minecraftforge.fml.common.Mod;
-import net.minecraftforge.network.PacketDistributor;
-import nl.requios.effortlessbuilding.CommonConfig;
+import net.minecraftforge.fml.network.PacketDistributor;
+import nl.requios.effortlessbuilding.BuildConfig;
 import nl.requios.effortlessbuilding.EffortlessBuilding;
 import nl.requios.effortlessbuilding.capability.ModifierCapabilityManager;
 import nl.requios.effortlessbuilding.helper.ReachHelper;
@@ -20,32 +20,32 @@ public class ModifierSettingsManager {
 	//Retrieves the buildsettings of a player through the modifierCapability capability
 	//Never returns null
 	@Nonnull
-	public static ModifierSettings getModifierSettings(Player player) {
-
+	public static ModifierSettings getModifierSettings(PlayerEntity player) {
 		LazyOptional<ModifierCapabilityManager.IModifierCapability> modifierCapability =
-			player.getCapability(ModifierCapabilityManager.MODIFIER_CAPABILITY, null);
+			player.getCapability(ModifierCapabilityManager.modifierCapability, null);
 
 		if (modifierCapability.isPresent()) {
 			ModifierCapabilityManager.IModifierCapability capability = modifierCapability.orElse(null);
-			if (capability.getModifierData() == null){
+			if (capability.getModifierData() == null) {
 				capability.setModifierData(new ModifierSettings());
 			}
 			return capability.getModifierData();
 		}
 
-		EffortlessBuilding.logger.warn("Player does not have modifierCapability: " + player);
+		//Player does not have modifierCapability capability
 		//Return dummy settings
 		return new ModifierSettings();
+//        throw new IllegalArgumentException("Player does not have modifierCapability capability");
 	}
 
-	public static void setModifierSettings(Player player, ModifierSettings modifierSettings) {
+	public static void setModifierSettings(PlayerEntity player, ModifierSettings modifierSettings) {
 		if (player == null) {
 			EffortlessBuilding.log("Cannot set buildsettings, player is null");
 			return;
 		}
 
 		LazyOptional<ModifierCapabilityManager.IModifierCapability> modifierCapability =
-			player.getCapability(ModifierCapabilityManager.MODIFIER_CAPABILITY, null);
+			player.getCapability(ModifierCapabilityManager.modifierCapability, null);
 
 		modifierCapability.ifPresent((capability) -> {
 			capability.setModifierData(modifierSettings);
@@ -56,7 +56,7 @@ public class ModifierSettingsManager {
 		}
 	}
 
-	public static String sanitize(ModifierSettings modifierSettings, Player player) {
+	public static String sanitize(ModifierSettings modifierSettings, PlayerEntity player) {
 		int maxReach = ReachHelper.getMaxReach(player);
 		String error = "";
 
@@ -110,7 +110,7 @@ public class ModifierSettingsManager {
 		return error;
 	}
 
-	public static void handleNewPlayer(Player player) {
+	public static void handleNewPlayer(PlayerEntity player) {
 		//Makes sure player has modifier settings (if it doesnt it will create it)
 		getModifierSettings(player);
 
@@ -118,7 +118,7 @@ public class ModifierSettingsManager {
 		if (!player.level.isClientSide) {
 			//Send to client
 			ModifierSettingsMessage msg = new ModifierSettingsMessage(getModifierSettings(player));
-			PacketHandler.INSTANCE.send(PacketDistributor.PLAYER.with(() -> (ServerPlayer) player), msg);
+			PacketHandler.INSTANCE.send(PacketDistributor.PLAYER.with(() -> (ServerPlayerEntity) player), msg);
 		}
 	}
 
@@ -192,16 +192,16 @@ public class ModifierSettingsManager {
 			int reach = 10;
 			switch (reachUpgrade) {
 				case 0:
-					reach = CommonConfig.reach.maxReachLevel0.get();
+					reach = BuildConfig.reach.maxReachLevel0.get();
 					break;
 				case 1:
-					reach = CommonConfig.reach.maxReachLevel1.get();
+					reach = BuildConfig.reach.maxReachLevel1.get();
 					break;
 				case 2:
-					reach = CommonConfig.reach.maxReachLevel2.get();
+					reach = BuildConfig.reach.maxReachLevel2.get();
 					break;
 				case 3:
-					reach = CommonConfig.reach.maxReachLevel3.get();
+					reach = BuildConfig.reach.maxReachLevel3.get();
 					break;
 			}
 

src/main/java/nl/requios/effortlessbuilding/buildmodifier/RadialMirror.java

@@ -1,15 +1,15 @@
 package nl.requios.effortlessbuilding.buildmodifier;
 
-import net.minecraft.world.level.block.state.BlockState;
-import net.minecraft.world.entity.player.Player;
-import net.minecraft.world.item.ItemStack;
-import net.minecraft.core.Direction;
-import net.minecraft.world.InteractionHand;
-import net.minecraft.world.level.block.Mirror;
-import net.minecraft.world.level.block.Rotation;
-import net.minecraft.core.BlockPos;
-import net.minecraft.util.Mth;
-import net.minecraft.world.phys.Vec3;
+import net.minecraft.block.BlockState;
+import net.minecraft.entity.player.PlayerEntity;
+import net.minecraft.item.ItemStack;
+import net.minecraft.util.Direction;
+import net.minecraft.util.Hand;
+import net.minecraft.util.Mirror;
+import net.minecraft.util.Rotation;
+import net.minecraft.util.math.BlockPos;
+import net.minecraft.util.math.MathHelper;
+import net.minecraft.util.math.vector.Vector3d;
 import net.minecraftforge.items.IItemHandler;
 import nl.requios.effortlessbuilding.item.AbstractRandomizerBagItem;
 
@@ -18,7 +18,7 @@ import java.util.List;
 
 public class RadialMirror {
 
-	public static List<BlockPos> findCoordinates(Player player, BlockPos startPos) {
+	public static List<BlockPos> findCoordinates(PlayerEntity player, BlockPos startPos) {
 		List<BlockPos> coordinates = new ArrayList<>();
 
 		//find radial mirror settings for the player
@@ -28,10 +28,10 @@ public class RadialMirror {
 		//get angle between slices
 		double sliceAngle = 2 * Math.PI / r.slices;
 
-		Vec3 startVec = new Vec3(startPos.getX() + 0.5f, startPos.getY() + 0.5f, startPos.getZ() + 0.5f);
-		Vec3 relStartVec = startVec.subtract(r.position);
+		Vector3d startVec = new Vector3d(startPos.getX() + 0.5f, startPos.getY() + 0.5f, startPos.getZ() + 0.5f);
+		Vector3d relStartVec = startVec.subtract(r.position);
 
-		double startAngleToCenter = Mth.atan2(relStartVec.x, relStartVec.z);
+		double startAngleToCenter = MathHelper.atan2(relStartVec.x, relStartVec.z);
 		if (startAngleToCenter < 0) startAngleToCenter += Math.PI;
 		double startAngleInSlice = startAngleToCenter % sliceAngle;
 
@@ -43,7 +43,7 @@ public class RadialMirror {
 				curAngle = curAngle - startAngleInSlice + (sliceAngle - startAngleInSlice);
 			}
 
-			Vec3 relNewVec = relStartVec.yRot((float) curAngle);
+			Vector3d relNewVec = relStartVec.yRot((float) curAngle);
 			BlockPos newBlockPos = new BlockPos(r.position.add(relNewVec));
 			if (!coordinates.contains(newBlockPos) && !newBlockPos.equals(startPos)) coordinates.add(newBlockPos);
 		}
@@ -51,7 +51,7 @@ public class RadialMirror {
 		return coordinates;
 	}
 
-	public static List<BlockState> findBlockStates(Player player, BlockPos startPos, BlockState blockState, ItemStack itemStack, List<ItemStack> itemStacks) {
+	public static List<BlockState> findBlockStates(PlayerEntity player, BlockPos startPos, BlockState blockState, ItemStack itemStack, List<ItemStack> itemStacks) {
 		List<BlockState> blockStates = new ArrayList<>();
 		List<BlockPos> coordinates = new ArrayList<>(); //to keep track of duplicates
 
@@ -63,21 +63,21 @@ public class RadialMirror {
 		//get angle between slices
 		double sliceAngle = 2 * Math.PI / r.slices;
 
-		Vec3 startVec = new Vec3(startPos.getX() + 0.5f, startPos.getY() + 0.5f, startPos.getZ() + 0.5f);
-		Vec3 relStartVec = startVec.subtract(r.position);
+		Vector3d startVec = new Vector3d(startPos.getX() + 0.5f, startPos.getY() + 0.5f, startPos.getZ() + 0.5f);
+		Vector3d relStartVec = startVec.subtract(r.position);
 
-		double startAngleToCenter = Mth.atan2(relStartVec.x, relStartVec.z);
+		double startAngleToCenter = MathHelper.atan2(relStartVec.x, relStartVec.z);
 		double startAngleToCenterMod = startAngleToCenter < 0 ? startAngleToCenter + Math.PI : startAngleToCenter;
 		double startAngleInSlice = startAngleToCenterMod % sliceAngle;
 
 		//Rotate the original blockstate
-		blockState = rotateOriginalBlockState(player, startPos, startAngleToCenter, blockState);
+		blockState = rotateOriginalBlockState(startAngleToCenter, blockState);
 
 		//Randomizer bag synergy
 		AbstractRandomizerBagItem randomizerBagItem = null;
 		IItemHandler bagInventory = null;
 		if (!itemStack.isEmpty() && itemStack.getItem() instanceof AbstractRandomizerBagItem) {
-			randomizerBagItem = (AbstractRandomizerBagItem) itemStack.getItem() ;
+			randomizerBagItem = (AbstractRandomizerBagItem) itemStack.getItem();
 			bagInventory = randomizerBagItem.getBagInventory(itemStack);
 		}
 
@@ -91,22 +91,22 @@ public class RadialMirror {
 				curAngle = curAngle - startAngleInSlice + (sliceAngle - startAngleInSlice);
 			}
 
-			Vec3 relNewVec = relStartVec.yRot((float) curAngle);
+			Vector3d relNewVec = relStartVec.yRot((float) curAngle);
 			BlockPos newBlockPos = new BlockPos(r.position.add(relNewVec));
 			if (coordinates.contains(newBlockPos) || newBlockPos.equals(startPos)) continue; //filter out duplicates
 			coordinates.add(newBlockPos);
 
 			//Randomizer bag synergy
-			if (randomizerBagItem != null) {
+			if (bagInventory != null) {
 				itemStack = randomizerBagItem.pickRandomStack(bagInventory);
 				newBlockState = BuildModifiers
-					.getBlockStateFromItem(itemStack, player, startPos, Direction.UP, new Vec3(0, 0, 0), InteractionHand.MAIN_HAND);
+					.getBlockStateFromItem(itemStack, player, startPos, Direction.UP, new Vector3d(0, 0, 0), Hand.MAIN_HAND);
 
-				newBlockState = rotateOriginalBlockState(player, startPos, startAngleToCenter, newBlockState);
+				newBlockState = rotateOriginalBlockState(startAngleToCenter, newBlockState);
 			}
 
 			//rotate
-			newBlockState = rotateBlockState(player, startPos, relNewVec, newBlockState, r.alternate && i % 2 == 1);
+			newBlockState = rotateBlockState(relNewVec, newBlockState, r.alternate && i % 2 == 1);
 
 			blockStates.add(newBlockState);
 			itemStacks.add(itemStack);
@@ -115,36 +115,36 @@ public class RadialMirror {
 		return blockStates;
 	}
 
-	private static BlockState rotateOriginalBlockState(Player player, BlockPos startPos, double startAngleToCenter, BlockState blockState) {
+	private static BlockState rotateOriginalBlockState(double startAngleToCenter, BlockState blockState) {
 		BlockState newBlockState = blockState;
 
 		if (startAngleToCenter < -0.751 * Math.PI || startAngleToCenter > 0.749 * Math.PI) {
-			newBlockState = blockState.rotate(player.level, startPos, Rotation.CLOCKWISE_180);
+			newBlockState = blockState.rotate(Rotation.CLOCKWISE_180);
 		} else if (startAngleToCenter < -0.251 * Math.PI) {
-			newBlockState = blockState.rotate(player.level, startPos, Rotation.COUNTERCLOCKWISE_90);
+			newBlockState = blockState.rotate(Rotation.COUNTERCLOCKWISE_90);
 		} else if (startAngleToCenter > 0.249 * Math.PI) {
-			newBlockState = blockState.rotate(player.level, startPos, Rotation.CLOCKWISE_90);
+			newBlockState = blockState.rotate(Rotation.CLOCKWISE_90);
 		}
 
 		return newBlockState;
 	}
 
-	private static BlockState rotateBlockState(Player player, BlockPos startPos, Vec3 relVec, BlockState blockState, boolean alternate) {
+	private static BlockState rotateBlockState(Vector3d relVec, BlockState blockState, boolean alternate) {
 		BlockState newBlockState;
-		double angleToCenter = Mth.atan2(relVec.x, relVec.z); //between -PI and PI
+		double angleToCenter = MathHelper.atan2(relVec.x, relVec.z); //between -PI and PI
 
 		if (angleToCenter < -0.751 * Math.PI || angleToCenter > 0.749 * Math.PI) {
-			newBlockState = blockState.rotate(player.level, startPos, Rotation.CLOCKWISE_180);
+			newBlockState = blockState.rotate(Rotation.CLOCKWISE_180);
 			if (alternate) {
 				newBlockState = newBlockState.mirror(Mirror.FRONT_BACK);
 			}
 		} else if (angleToCenter < -0.251 * Math.PI) {
-			newBlockState = blockState.rotate(player.level, startPos, Rotation.CLOCKWISE_90);
+			newBlockState = blockState.rotate(Rotation.CLOCKWISE_90);
 			if (alternate) {
 				newBlockState = newBlockState.mirror(Mirror.LEFT_RIGHT);
 			}
 		} else if (angleToCenter > 0.249 * Math.PI) {
-			newBlockState = blockState.rotate(player.level, startPos, Rotation.COUNTERCLOCKWISE_90);
+			newBlockState = blockState.rotate(Rotation.COUNTERCLOCKWISE_90);
 			if (alternate) {
 				newBlockState = newBlockState.mirror(Mirror.LEFT_RIGHT);
 			}
@@ -161,13 +161,13 @@ public class RadialMirror {
 	public static boolean isEnabled(RadialMirrorSettings r, BlockPos startPos) {
 		if (r == null || !r.enabled) return false;
 
-		return !(new Vec3(startPos.getX() + 0.5, startPos.getY() + 0.5, startPos.getZ() + 0.5).subtract(r.position).lengthSqr() >
+		return !(new Vector3d(startPos.getX() + 0.5, startPos.getY() + 0.5, startPos.getZ() + 0.5).subtract(r.position).lengthSqr() >
 			r.radius * r.radius);
 	}
 
 	public static class RadialMirrorSettings {
 		public boolean enabled = false;
-		public Vec3 position = new Vec3(0.5, 64.5, 0.5);
+		public Vector3d position = new Vector3d(0.5, 64.5, 0.5);
 		public int slices = 4;
 		public boolean alternate = false;
 		public int radius = 20;
@@ -176,7 +176,7 @@ public class RadialMirror {
 		public RadialMirrorSettings() {
 		}
 
-		public RadialMirrorSettings(boolean enabled, Vec3 position, int slices, boolean alternate, int radius, boolean drawLines, boolean drawPlanes) {
+		public RadialMirrorSettings(boolean enabled, Vector3d position, int slices, boolean alternate, int radius, boolean drawLines, boolean drawPlanes) {
 			this.enabled = enabled;
 			this.position = position;
 			this.slices = slices;

src/main/java/nl/requios/effortlessbuilding/buildmodifier/UndoRedo.java

@@ -1,21 +1,21 @@
 package nl.requios.effortlessbuilding.buildmodifier;
 
-import net.minecraft.world.level.block.Block;
-import net.minecraft.world.level.block.state.BlockState;
-import net.minecraft.world.level.block.Blocks;
-import net.minecraft.world.entity.player.Player;
-import net.minecraft.world.item.BlockItem;
-import net.minecraft.world.item.ItemStack;
-import net.minecraft.core.Direction;
-import net.minecraft.core.BlockPos;
-import net.minecraft.world.phys.Vec3;
-import net.minecraft.server.level.ServerLevel;
-import nl.requios.effortlessbuilding.CommonConfig;
+import net.minecraft.block.Block;
+import net.minecraft.block.BlockState;
+import net.minecraft.block.Blocks;
+import net.minecraft.entity.player.PlayerEntity;
+import net.minecraft.item.BlockItem;
+import net.minecraft.item.ItemStack;
+import net.minecraft.util.Direction;
+import net.minecraft.util.math.BlockPos;
+import net.minecraft.util.math.vector.Vector3d;
+import net.minecraft.world.server.ServerWorld;
+import nl.requios.effortlessbuilding.BuildConfig;
 import nl.requios.effortlessbuilding.EffortlessBuilding;
 import nl.requios.effortlessbuilding.helper.FixedStack;
 import nl.requios.effortlessbuilding.helper.InventoryHelper;
 import nl.requios.effortlessbuilding.helper.SurvivalHelper;
-import nl.requios.effortlessbuilding.render.BlockPreviews;
+import nl.requios.effortlessbuilding.render.BlockPreviewRenderer;
 
 import java.util.*;
 
@@ -29,7 +29,7 @@ public class UndoRedo {
 	private static final Map<UUID, FixedStack<BlockSet>> redoStacksServer = new HashMap<>();
 
 	//add to undo stack
-	public static void addUndo(Player player, BlockSet blockSet) {
+	public static void addUndo(PlayerEntity player, BlockSet blockSet) {
 		Map<UUID, FixedStack<BlockSet>> undoStacks = player.level.isClientSide ? undoStacksClient : undoStacksServer;
 
 		//Assert coordinates is as long as previous and new blockstate lists
@@ -50,26 +50,26 @@ public class UndoRedo {
 
 		//If no stack exists, make one
 		if (!undoStacks.containsKey(player.getUUID())) {
-			undoStacks.put(player.getUUID(), new FixedStack<>(new BlockSet[CommonConfig.survivalBalancers.undoStackSize.get()]));
+			undoStacks.put(player.getUUID(), new FixedStack<>(new BlockSet[BuildConfig.survivalBalancers.undoStackSize.get()]));
 		}
 
 		undoStacks.get(player.getUUID()).push(blockSet);
 	}
 
-	private static void addRedo(Player player, BlockSet blockSet) {
+	private static void addRedo(PlayerEntity player, BlockSet blockSet) {
 		Map<UUID, FixedStack<BlockSet>> redoStacks = player.level.isClientSide ? redoStacksClient : redoStacksServer;
 
 		//(No asserts necessary, it's private)
 
 		//If no stack exists, make one
 		if (!redoStacks.containsKey(player.getUUID())) {
-			redoStacks.put(player.getUUID(), new FixedStack<>(new BlockSet[CommonConfig.survivalBalancers.undoStackSize.get()]));
+			redoStacks.put(player.getUUID(), new FixedStack<>(new BlockSet[BuildConfig.survivalBalancers.undoStackSize.get()]));
 		}
 
 		redoStacks.get(player.getUUID()).push(blockSet);
 	}
 
-	public static boolean undo(Player player) {
+	public static boolean undo(PlayerEntity player) {
 		Map<UUID, FixedStack<BlockSet>> undoStacks = player.level.isClientSide ? undoStacksClient : undoStacksServer;
 
 		if (!undoStacks.containsKey(player.getUUID())) return false;
@@ -82,13 +82,13 @@ public class UndoRedo {
 		List<BlockPos> coordinates = blockSet.getCoordinates();
 		List<BlockState> previousBlockStates = blockSet.getPreviousBlockStates();
 		List<BlockState> newBlockStates = blockSet.getNewBlockStates();
-		Vec3 hitVec = blockSet.getHitVec();
+		Vector3d hitVec = blockSet.getHitVec();
 
 		//Find up to date itemstacks in player inventory
 		List<ItemStack> itemStacks = findItemStacksInInventory(player, previousBlockStates);
 
 		if (player.level.isClientSide) {
-			BlockPreviews.onBlocksBroken(coordinates, itemStacks, newBlockStates, blockSet.getSecondPos(), blockSet.getFirstPos());
+			BlockPreviewRenderer.onBlocksBroken(coordinates, itemStacks, newBlockStates, blockSet.getSecondPos(), blockSet.getFirstPos());
 		} else {
 			//break all those blocks, reset to what they were
 			for (int i = 0; i < coordinates.size(); i++) {
@@ -98,14 +98,14 @@ public class UndoRedo {
 				if (previousBlockStates.get(i).equals(newBlockStates.get(i))) continue;
 
 				//get blockstate from itemstack
-				BlockState previousBlockState = previousBlockStates.get(i);
+				BlockState previousBlockState = Blocks.AIR.defaultBlockState();
 				if (itemStack.getItem() instanceof BlockItem) {
 					previousBlockState = ((BlockItem) itemStack.getItem()).getBlock().defaultBlockState();
 				}
 
 				if (player.level.isLoaded(coordinate)) {
 					//check itemstack empty
-					if (itemStack.isEmpty() && !player.isCreative()) {
+					if (itemStack.isEmpty()) {
 						itemStack = findItemStackInInventory(player, previousBlockStates.get(i));
 						//get blockstate from new itemstack
 						if (!itemStack.isEmpty() && itemStack.getItem() instanceof BlockItem) {
@@ -129,7 +129,7 @@ public class UndoRedo {
 		return true;
 	}
 
-	public static boolean redo(Player player) {
+	public static boolean redo(PlayerEntity player) {
 		Map<UUID, FixedStack<BlockSet>> redoStacks = player.level.isClientSide ? redoStacksClient : redoStacksServer;
 
 		if (!redoStacks.containsKey(player.getUUID())) return false;
@@ -142,13 +142,13 @@ public class UndoRedo {
 		List<BlockPos> coordinates = blockSet.getCoordinates();
 		List<BlockState> previousBlockStates = blockSet.getPreviousBlockStates();
 		List<BlockState> newBlockStates = blockSet.getNewBlockStates();
-		Vec3 hitVec = blockSet.getHitVec();
+		Vector3d hitVec = blockSet.getHitVec();
 
 		//Find up to date itemstacks in player inventory
 		List<ItemStack> itemStacks = findItemStacksInInventory(player, newBlockStates);
 
 		if (player.level.isClientSide) {
-			BlockPreviews.onBlocksPlaced(coordinates, itemStacks, newBlockStates, blockSet.getFirstPos(), blockSet.getSecondPos());
+			BlockPreviewRenderer.onBlocksPlaced(coordinates, itemStacks, newBlockStates, blockSet.getFirstPos(), blockSet.getSecondPos());
 		} else {
 			//place blocks
 			for (int i = 0; i < coordinates.size(); i++) {
@@ -158,14 +158,14 @@ public class UndoRedo {
 				if (previousBlockStates.get(i).equals(newBlockStates.get(i))) continue;
 
 				//get blockstate from itemstack
-				BlockState newBlockState = newBlockStates.get(i);
+				BlockState newBlockState = Blocks.AIR.defaultBlockState();
 				if (itemStack.getItem() instanceof BlockItem) {
 					newBlockState = ((BlockItem) itemStack.getItem()).getBlock().defaultBlockState();
 				}
 
 				if (player.level.isLoaded(coordinate)) {
 					//check itemstack empty
-					if (itemStack.isEmpty() && !player.isCreative()) {
+					if (itemStack.isEmpty()) {
 						itemStack = findItemStackInInventory(player, newBlockStates.get(i));
 						//get blockstate from new itemstack
 						if (!itemStack.isEmpty() && itemStack.getItem() instanceof BlockItem) {
@@ -188,7 +188,7 @@ public class UndoRedo {
 		return true;
 	}
 
-	public static void clear(Player player) {
+	public static void clear(PlayerEntity player) {
 		Map<UUID, FixedStack<BlockSet>> undoStacks = player.level.isClientSide ? undoStacksClient : undoStacksServer;
 		Map<UUID, FixedStack<BlockSet>> redoStacks = player.level.isClientSide ? redoStacksClient : redoStacksServer;
 		if (undoStacks.containsKey(player.getUUID())) {
@@ -199,7 +199,7 @@ public class UndoRedo {
 		}
 	}
 
-	private static List<ItemStack> findItemStacksInInventory(Player player, List<BlockState> blockStates) {
+	private static List<ItemStack> findItemStacksInInventory(PlayerEntity player, List<BlockState> blockStates) {
 		List<ItemStack> itemStacks = new ArrayList<>(blockStates.size());
 		for (BlockState blockState : blockStates) {
 			itemStacks.add(findItemStackInInventory(player, blockState));
@@ -207,7 +207,7 @@ public class UndoRedo {
 		return itemStacks;
 	}
 
-	private static ItemStack findItemStackInInventory(Player player, BlockState blockState) {
+	private static ItemStack findItemStackInInventory(PlayerEntity player, BlockState blockState) {
 		ItemStack itemStack = ItemStack.EMPTY;
 		if (blockState == null) return itemStack;
 
@@ -221,7 +221,7 @@ public class UndoRedo {
 		if (itemStack.isEmpty()) {
 			//Cannot check drops on clientside because loot tables are server only
 			if (!player.level.isClientSide) {
-				List<ItemStack> itemsDropped = Block.getDrops(blockState, (ServerLevel) player.level, BlockPos.ZERO, null);
+				List<ItemStack> itemsDropped = Block.getDrops(blockState, (ServerWorld) player.level, BlockPos.ZERO, null);
 				for (ItemStack itemStackDropped : itemsDropped) {
 					if (itemStackDropped.getItem() instanceof BlockItem) {
 						Block block = ((BlockItem) itemStackDropped.getItem()).getBlock();

src/main/java/nl/requios/effortlessbuilding/capability/ItemHandlerCapabilityProvider.java

@@ -1,18 +1,19 @@
 package nl.requios.effortlessbuilding.capability;
 
-import net.minecraft.nbt.CompoundTag;
-import net.minecraft.core.Direction;
+import net.minecraft.nbt.CompoundNBT;
+import net.minecraft.util.Direction;
 import net.minecraftforge.common.capabilities.Capability;
 import net.minecraftforge.common.capabilities.ICapabilitySerializable;
 import net.minecraftforge.common.util.LazyOptional;
 import net.minecraftforge.items.CapabilityItemHandler;
 import net.minecraftforge.items.IItemHandler;
 import net.minecraftforge.items.ItemStackHandler;
+import nl.requios.effortlessbuilding.item.RandomizerBagItem;
 
 import javax.annotation.Nonnull;
 import javax.annotation.Nullable;
 
-public class ItemHandlerCapabilityProvider implements ICapabilitySerializable<CompoundTag> {
+public class ItemHandlerCapabilityProvider implements ICapabilitySerializable<CompoundNBT> {
 	IItemHandler itemHandler;
 
 	public ItemHandlerCapabilityProvider(int size) {
@@ -26,12 +27,12 @@ public class ItemHandlerCapabilityProvider implements ICapabilitySerializable<Co
 	}
 
 	@Override
-	public CompoundTag serializeNBT() {
+	public CompoundNBT serializeNBT() {
 		return ((ItemStackHandler) itemHandler).serializeNBT();
 	}
 
 	@Override
-	public void deserializeNBT(CompoundTag nbt) {
+	public void deserializeNBT(CompoundNBT nbt) {
 		((ItemStackHandler) itemHandler).deserializeNBT(nbt);
 	}
 }

src/main/java/nl/requios/effortlessbuilding/capability/ModeCapabilityManager.java

@@ -1,9 +1,11 @@
 package nl.requios.effortlessbuilding.capability;
 
-import net.minecraft.nbt.CompoundTag;
-import net.minecraft.nbt.Tag;
-import net.minecraft.core.Direction;
-import net.minecraftforge.common.capabilities.*;
+import net.minecraft.nbt.CompoundNBT;
+import net.minecraft.nbt.INBT;
+import net.minecraft.util.Direction;
+import net.minecraftforge.common.capabilities.Capability;
+import net.minecraftforge.common.capabilities.CapabilityInject;
+import net.minecraftforge.common.capabilities.ICapabilitySerializable;
 import net.minecraftforge.common.util.LazyOptional;
 import net.minecraftforge.event.entity.player.PlayerEvent;
 import net.minecraftforge.eventbus.api.SubscribeEvent;
@@ -13,18 +15,21 @@ import nl.requios.effortlessbuilding.buildmode.BuildModes;
 import javax.annotation.Nonnull;
 import javax.annotation.Nullable;
 
+import static nl.requios.effortlessbuilding.buildmode.ModeSettingsManager.ModeSettings;
+
 import nl.requios.effortlessbuilding.buildmode.ModeSettingsManager.ModeSettings;
 
 @Mod.EventBusSubscriber
 public class ModeCapabilityManager {
 
-	public static Capability<IModeCapability> MODE_CAPABILITY = CapabilityManager.get(new CapabilityToken<>(){});
+	@CapabilityInject(IModeCapability.class)
+	public final static Capability<IModeCapability> modeCapability = null;
 
 	// Allows for the capability to persist after death.
 	@SubscribeEvent
 	public static void clonePlayer(PlayerEvent.Clone event) {
-		LazyOptional<IModeCapability> original = event.getOriginal().getCapability(MODE_CAPABILITY, null);
-		LazyOptional<IModeCapability> clone = event.getEntity().getCapability(MODE_CAPABILITY, null);
+		LazyOptional<IModeCapability> original = event.getOriginal().getCapability(modeCapability, null);
+		LazyOptional<IModeCapability> clone = event.getEntity().getCapability(modeCapability, null);
 		clone.ifPresent(cloneModeCapability ->
 			original.ifPresent(originalModeCapability ->
 				cloneModeCapability.setModeData(originalModeCapability.getModeData())));
@@ -50,38 +55,10 @@ public class ModeCapabilityManager {
 		}
 	}
 
-	public static class Provider extends CapabilityProvider<Provider> implements ICapabilitySerializable<Tag> {
-
-		private IModeCapability instance = new ModeCapability();
-		private LazyOptional<IModeCapability> modeCapabilityOptional = LazyOptional.of(() -> instance);
-
-		public Provider() {
-			super(Provider.class);
-			gatherCapabilities();
-		}
-
-		@Nonnull
+	public static class Storage implements Capability.IStorage<IModeCapability> {
 		@Override
-		public <T> LazyOptional<T> getCapability(@Nonnull Capability<T> cap, @Nullable Direction side) {
-			if (cap == MODE_CAPABILITY) return modeCapabilityOptional.cast();
-			return LazyOptional.empty();
-		}
-
-		@Override
-		public void invalidateCaps() {
-			super.invalidateCaps();
-			modeCapabilityOptional.invalidate();
-		}
-
-		@Override
-		public void reviveCaps() {
-			super.reviveCaps();
-			modeCapabilityOptional = LazyOptional.of(() -> instance);
-		}
-
-		@Override
-		public Tag serializeNBT() {
-			CompoundTag compound = new CompoundTag();
+		public INBT writeNBT(Capability<IModeCapability> capability, IModeCapability instance, Direction side) {
+			CompoundNBT compound = new CompoundNBT();
 			ModeSettings modeSettings = instance.getModeData();
 			if (modeSettings == null) modeSettings = new ModeSettings();
 
@@ -93,16 +70,36 @@ public class ModeCapabilityManager {
 		}
 
 		@Override
-		public void deserializeNBT(Tag nbt) {
-			CompoundTag compound = (CompoundTag) nbt;
+		public void readNBT(Capability<IModeCapability> capability, IModeCapability instance, Direction side, INBT nbt) {
+			CompoundNBT compound = (CompoundNBT) nbt;
 
 			//BuildModes.BuildModeEnum buildMode = BuildModes.BuildModeEnum.values()[compound.getInteger("buildMode")];
 
 			//TODO add mode settings
 
-			ModeSettings modeSettings = new ModeSettings(BuildModes.BuildModeEnum.DISABLED);
+			ModeSettings modeSettings = new ModeSettings(BuildModes.BuildModeEnum.NORMAL);
 			instance.setModeData(modeSettings);
 		}
+	}
+
+	public static class Provider implements ICapabilitySerializable<INBT> {
+		IModeCapability inst = modeCapability.getDefaultInstance();
+
+		@Nonnull
+		@Override
+		public <T> LazyOptional<T> getCapability(@Nonnull Capability<T> cap, @Nullable Direction side) {
+			return modeCapability.orEmpty(cap, LazyOptional.of(() -> inst));
+		}
+
+		@Override
+		public INBT serializeNBT() {
+			return modeCapability.getStorage().writeNBT(modeCapability, inst, null);
+		}
+
+		@Override
+		public void deserializeNBT(INBT nbt) {
+			modeCapability.getStorage().readNBT(modeCapability, inst, null, nbt);
+		}
 
 	}
 }

src/main/java/nl/requios/effortlessbuilding/capability/ModifierCapabilityManager.java

@@ -1,12 +1,13 @@
 package nl.requios.effortlessbuilding.capability;
 
-import net.minecraft.nbt.CompoundTag;
-import net.minecraft.nbt.Tag;
-import net.minecraft.core.Direction;
-import net.minecraft.core.BlockPos;
-import net.minecraft.world.phys.Vec3;
-import net.minecraftforge.common.capabilities.*;
-import net.minecraftforge.common.util.INBTSerializable;
+import net.minecraft.nbt.CompoundNBT;
+import net.minecraft.nbt.INBT;
+import net.minecraft.util.Direction;
+import net.minecraft.util.math.BlockPos;
+import net.minecraft.util.math.vector.Vector3d;
+import net.minecraftforge.common.capabilities.Capability;
+import net.minecraftforge.common.capabilities.CapabilityInject;
+import net.minecraftforge.common.capabilities.ICapabilitySerializable;
 import net.minecraftforge.common.util.LazyOptional;
 import net.minecraftforge.event.entity.player.PlayerEvent;
 import net.minecraftforge.eventbus.api.SubscribeEvent;
@@ -18,18 +19,21 @@ import nl.requios.effortlessbuilding.buildmodifier.RadialMirror;
 import javax.annotation.Nonnull;
 import javax.annotation.Nullable;
 
+import static nl.requios.effortlessbuilding.buildmodifier.ModifierSettingsManager.ModifierSettings;
+
 import nl.requios.effortlessbuilding.buildmodifier.ModifierSettingsManager.ModifierSettings;
 
 @Mod.EventBusSubscriber
 public class ModifierCapabilityManager {
 
-	public final static Capability<IModifierCapability> MODIFIER_CAPABILITY = CapabilityManager.get(new CapabilityToken<>(){});
+	@CapabilityInject(IModifierCapability.class)
+	public final static Capability<IModifierCapability> modifierCapability = null;
 
 	// Allows for the capability to persist after death.
 	@SubscribeEvent
 	public static void clonePlayer(PlayerEvent.Clone event) {
-		LazyOptional<IModifierCapability> original = event.getOriginal().getCapability(MODIFIER_CAPABILITY, null);
-		LazyOptional<IModifierCapability> clone = event.getEntity().getCapability(MODIFIER_CAPABILITY, null);
+		LazyOptional<IModifierCapability> original = event.getOriginal().getCapability(modifierCapability, null);
+		LazyOptional<IModifierCapability> clone = event.getEntity().getCapability(modifierCapability, null);
 		clone.ifPresent(cloneModifierCapability ->
 			original.ifPresent(originalModifierCapability ->
 				cloneModifierCapability.setModifierData(originalModifierCapability.getModifierData())));
@@ -55,38 +59,10 @@ public class ModifierCapabilityManager {
 		}
 	}
 
-	public static class Provider extends CapabilityProvider<Provider> implements INBTSerializable<Tag> {
-
-		private final IModifierCapability instance = new ModifierCapability();
-		private LazyOptional<IModifierCapability> modifierCapabilityOptional = LazyOptional.of(() -> instance);
-
-		public Provider() {
-			super(Provider.class);
-			gatherCapabilities();
-		}
-
-		@Nonnull
+	public static class Storage implements Capability.IStorage<IModifierCapability> {
 		@Override
-		public <T> LazyOptional<T> getCapability(@Nonnull Capability<T> cap, @Nullable Direction side) {
-			if (cap == MODIFIER_CAPABILITY) return modifierCapabilityOptional.cast();
-			return LazyOptional.empty();
-		}
-
-		@Override
-		public void invalidateCaps() {
-			super.invalidateCaps();
-			modifierCapabilityOptional.invalidate();
-		}
-
-		@Override
-		public void reviveCaps() {
-			super.reviveCaps();
-			modifierCapabilityOptional = LazyOptional.of(() -> instance);
-		}
-
-		@Override
-		public Tag serializeNBT() {
-			CompoundTag compound = new CompoundTag();
+		public INBT writeNBT(Capability<IModifierCapability> capability, IModifierCapability instance, Direction side) {
+			CompoundNBT compound = new CompoundNBT();
 			ModifierSettings modifierSettings = instance.getModifierData();
 			if (modifierSettings == null) modifierSettings = new ModifierSettings();
 
@@ -134,12 +110,12 @@ public class ModifierCapabilityManager {
 		}
 
 		@Override
-		public void deserializeNBT(Tag nbt) {
-			CompoundTag compound = (CompoundTag) nbt;
+		public void readNBT(Capability<IModifierCapability> capability, IModifierCapability instance, Direction side, INBT nbt) {
+			CompoundNBT compound = (CompoundNBT) nbt;
 
 			//MIRROR
 			boolean mirrorEnabled = compound.getBoolean("mirrorEnabled");
-			Vec3 mirrorPosition = new Vec3(
+			Vector3d mirrorPosition = new Vector3d(
 				compound.getDouble("mirrorPosX"),
 				compound.getDouble("mirrorPosY"),
 				compound.getDouble("mirrorPosZ"));
@@ -166,7 +142,7 @@ public class ModifierCapabilityManager {
 
 			//RADIAL MIRROR
 			boolean radialMirrorEnabled = compound.getBoolean("radialMirrorEnabled");
-			Vec3 radialMirrorPosition = new Vec3(
+			Vector3d radialMirrorPosition = new Vector3d(
 				compound.getDouble("radialMirrorPosX"),
 				compound.getDouble("radialMirrorPosY"),
 				compound.getDouble("radialMirrorPosZ"));
@@ -181,6 +157,27 @@ public class ModifierCapabilityManager {
 			ModifierSettings modifierSettings = new ModifierSettings(mirrorSettings, arraySettings, radialMirrorSettings, false, reachUpgrade);
 			instance.setModifierData(modifierSettings);
 		}
+	}
+
+	public static class Provider implements ICapabilitySerializable<INBT> {
+
+		IModifierCapability inst = modifierCapability.getDefaultInstance();
+
+		@Nonnull
+		@Override
+		public <T> LazyOptional<T> getCapability(@Nonnull Capability<T> cap, @Nullable Direction side) {
+			return modifierCapability.orEmpty(cap, LazyOptional.of(() -> inst));
+		}
+
+		@Override
+		public INBT serializeNBT() {
+			return modifierCapability.getStorage().writeNBT(modifierCapability, inst, null);
+		}
+
+		@Override
+		public void deserializeNBT(INBT nbt) {
+			modifierCapability.getStorage().readNBT(modifierCapability, inst, null, nbt);
+		}
 
 	}
 }

src/main/java/nl/requios/effortlessbuilding/command/CommandReach.java

@@ -0,0 +1,43 @@
+package nl.requios.effortlessbuilding.command;
+
+import com.mojang.brigadier.CommandDispatcher;
+import com.mojang.brigadier.arguments.IntegerArgumentType;
+import net.minecraft.command.CommandSource;
+import net.minecraft.command.Commands;
+import net.minecraft.entity.player.ServerPlayerEntity;
+import net.minecraft.util.text.StringTextComponent;
+import net.minecraftforge.fml.network.PacketDistributor;
+import nl.requios.effortlessbuilding.EffortlessBuilding;
+import nl.requios.effortlessbuilding.buildmodifier.ModifierSettingsManager;
+import nl.requios.effortlessbuilding.network.ModifierSettingsMessage;
+import nl.requios.effortlessbuilding.network.PacketHandler;
+
+public class CommandReach {
+
+	public static void register(CommandDispatcher<CommandSource> dispatcher) {
+		dispatcher.register(Commands.literal("reach").then(Commands.literal("set").then(Commands.argument("level", IntegerArgumentType.integer(0, 3)).executes((context) -> {
+			return setReachLevel(context.getSource().getPlayerOrException(), IntegerArgumentType.getInteger(context, "level"));
+		}))).then(Commands.literal("get").executes((context -> {
+			return getReachLevel(context.getSource().getPlayerOrException());
+		}))));
+	}
+
+	private static int setReachLevel(ServerPlayerEntity player, int level) {
+		ModifierSettingsManager.ModifierSettings modifierSettings = ModifierSettingsManager.getModifierSettings(player);
+		modifierSettings.setReachUpgrade(level);
+		ModifierSettingsManager.setModifierSettings(player, modifierSettings);
+		//Send to client
+		PacketHandler.INSTANCE.send(PacketDistributor.PLAYER.with(() -> player), new ModifierSettingsMessage(modifierSettings));
+
+		player.sendMessage(new StringTextComponent("Reach level of " + player.getName().getString() + " set to " + modifierSettings.getReachUpgrade()), player.getUUID());
+
+		return 1;
+	}
+
+	private static int getReachLevel(ServerPlayerEntity player) {
+		int reachUpgrade = ModifierSettingsManager.getModifierSettings(player).getReachUpgrade();
+		EffortlessBuilding.log(player, "Current reach: level " + reachUpgrade);
+
+		return 1;
+	}
+}

src/main/java/nl/requios/effortlessbuilding/compatibility/CompatHelper.java

@@ -1,9 +1,9 @@
 package nl.requios.effortlessbuilding.compatibility;
 
-import net.minecraft.world.level.block.state.BlockState;
-import net.minecraft.world.item.BlockItem;
-import net.minecraft.world.item.Item;
-import net.minecraft.world.item.ItemStack;
+import net.minecraft.block.BlockState;
+import net.minecraft.item.BlockItem;
+import net.minecraft.item.Item;
+import net.minecraft.item.ItemStack;
 import net.minecraftforge.items.IItemHandler;
 import nl.requios.effortlessbuilding.item.AbstractRandomizerBagItem;
 
@@ -59,5 +59,4 @@ public class CompatHelper {
 
 		return ItemStack.EMPTY;
 	}
-
 }

src/main/java/nl/requios/effortlessbuilding/create/AllSpecialTextures.java

@@ -1,33 +0,0 @@
-package nl.requios.effortlessbuilding.create;
-
-import com.mojang.blaze3d.systems.RenderSystem;
-import net.minecraft.resources.ResourceLocation;
-
-public enum AllSpecialTextures {
-
-	BLANK("blank.png"),
-	CHECKERED("checkerboard.png"),
-	THIN_CHECKERED("thin_checkerboard.png"),
-	CUTOUT_CHECKERED("cutout_checkerboard.png"),
-	HIGHLIGHT_CHECKERED("highlighted_checkerboard.png"),
-	SELECTION("selection.png"),
-	GLUE("glue.png"),
-
-	;
-
-	public static final String ASSET_PATH = "textures/special/";
-	private ResourceLocation location;
-
-	private AllSpecialTextures(String filename) {
-		location = Create.asResource(ASSET_PATH + filename);
-	}
-
-	public void bind() {
-		RenderSystem.setShaderTexture(0, location);
-	}
-
-	public ResourceLocation getLocation() {
-		return location;
-	}
-
-}

src/main/java/nl/requios/effortlessbuilding/create/Create.java

@@ -1,16 +0,0 @@
-package nl.requios.effortlessbuilding.create;
-
-import com.mojang.logging.LogUtils;
-import net.minecraft.resources.ResourceLocation;
-import nl.requios.effortlessbuilding.EffortlessBuilding;
-import org.slf4j.Logger;
-
-public class Create {
-    public static final String ID = EffortlessBuilding.MODID;
-
-    public static final Logger LOGGER = LogUtils.getLogger();
-
-    public static ResourceLocation asResource(String path) {
-        return new ResourceLocation(EffortlessBuilding.MODID, path);
-    }
-}

src/main/java/nl/requios/effortlessbuilding/create/CreateClient.java

@@ -1,15 +0,0 @@
-package nl.requios.effortlessbuilding.create;
-
-import nl.requios.effortlessbuilding.create.foundation.render.SuperByteBufferCache;
-import nl.requios.effortlessbuilding.create.foundation.utility.ghost.GhostBlocks;
-import nl.requios.effortlessbuilding.create.foundation.utility.outliner.Outliner;
-
-public class CreateClient {
-    public static final SuperByteBufferCache BUFFER_CACHE = new SuperByteBufferCache();
-    public static final Outliner OUTLINER = new Outliner();
-    public static final GhostBlocks GHOST_BLOCKS = new GhostBlocks();
-
-    public static void invalidateRenderers() {
-        CreateClient.BUFFER_CACHE.invalidate();
-    }
-}

src/main/java/nl/requios/effortlessbuilding/create/CreateClientTest.java

@@ -1,31 +0,0 @@
-package nl.requios.effortlessbuilding.create;
-
-import net.minecraft.world.level.block.Blocks;
-import net.minecraft.world.phys.AABB;
-import net.minecraftforge.api.distmarker.Dist;
-import net.minecraftforge.event.TickEvent;
-import net.minecraftforge.eventbus.api.SubscribeEvent;
-import net.minecraftforge.fml.common.Mod;
-import nl.requios.effortlessbuilding.create.foundation.utility.Color;
-
-@Mod.EventBusSubscriber(Dist.CLIENT)
-public class CreateClientTest {
-
-//    @SubscribeEvent
-//    public static void onTick(TickEvent.ClientTickEvent event) {
-//        CreateClient.GHOST_BLOCKS.showGhostState(1, Blocks.SPRUCE_LOG.defaultBlockState())
-//                .at(0, 120, 0)
-//                .breathingAlpha();
-//        CreateClient.GHOST_BLOCKS.showGhostState(2, Blocks.SPRUCE_LOG.defaultBlockState())
-//                .at(1, 120, 0)
-//                .breathingAlpha();
-//
-//        CreateClient.OUTLINER.showAABB(1, new AABB(0, 0, 0, 10, 2, 6)
-//                        .move(10, 120, 0))
-//                .withFaceTexture(AllSpecialTextures.CHECKERED)
-//                .colored(new Color(0.11f, 0.49f, 0.7f, 1f))
-////                .colored(0xbfbfbf)
-//                .disableNormals()
-//                .lineWidth(1 / 32f);
-//    }
-}

src/main/java/nl/requios/effortlessbuilding/create/events/ClientEvents.java

@@ -1,96 +0,0 @@
-package nl.requios.effortlessbuilding.create.events;
-
-import com.mojang.blaze3d.systems.RenderSystem;
-import com.mojang.blaze3d.vertex.PoseStack;
-import net.minecraft.client.Minecraft;
-import net.minecraft.client.multiplayer.ClientLevel;
-import net.minecraft.world.level.Level;
-import net.minecraft.world.level.LevelAccessor;
-import net.minecraft.world.phys.Vec3;
-import net.minecraftforge.api.distmarker.Dist;
-import net.minecraftforge.client.event.RenderLevelLastEvent;
-import net.minecraftforge.client.event.ViewportEvent;
-import net.minecraftforge.event.TickEvent.ClientTickEvent;
-import net.minecraftforge.event.level.LevelEvent;
-import net.minecraftforge.eventbus.api.SubscribeEvent;
-import net.minecraftforge.fml.common.Mod.EventBusSubscriber;
-import nl.requios.effortlessbuilding.create.Create;
-import nl.requios.effortlessbuilding.create.CreateClient;
-import nl.requios.effortlessbuilding.create.foundation.render.SuperRenderTypeBuffer;
-import nl.requios.effortlessbuilding.create.foundation.utility.AnimationTickHolder;
-import nl.requios.effortlessbuilding.create.foundation.utility.CameraAngleAnimationService;
-import nl.requios.effortlessbuilding.create.foundation.utility.worldWrappers.WrappedClientWorld;
-
-@EventBusSubscriber(Dist.CLIENT)
-public class ClientEvents {
-
-	private static final String ITEM_PREFIX = "item." + Create.ID;
-	private static final String BLOCK_PREFIX = "block." + Create.ID;
-
-	@SubscribeEvent
-	public static void onTick(ClientTickEvent event) {
-		if (!isGameActive())
-			return;
-
-		Level world = Minecraft.getInstance().level;
-		AnimationTickHolder.tick();
-
-		CreateClient.GHOST_BLOCKS.tickGhosts();
-		CreateClient.OUTLINER.tickOutlines();
-		CameraAngleAnimationService.tick();
-	}
-
-	@SubscribeEvent
-	public static void onLoadWorld(LevelEvent.Load event) {
-		LevelAccessor world = event.getLevel();
-		if (world.isClientSide() && world instanceof ClientLevel && !(world instanceof WrappedClientWorld)) {
-			CreateClient.invalidateRenderers();
-			AnimationTickHolder.reset();
-		}
-	}
-
-	@SubscribeEvent
-	public static void onUnloadWorld(LevelEvent.Unload event) {
-		if (!event.getLevel()
-			.isClientSide())
-			return;
-		CreateClient.invalidateRenderers();
-		AnimationTickHolder.reset();
-	}
-
-	@SubscribeEvent
-	public static void onRenderWorld(RenderLevelLastEvent event) {
-		Vec3 cameraPos = Minecraft.getInstance().gameRenderer.getMainCamera()
-			.getPosition();
-		float pt = AnimationTickHolder.getPartialTicks();
-
-		PoseStack ms = event.getPoseStack();
-		ms.pushPose();
-		ms.translate(-cameraPos.x(), -cameraPos.y(), -cameraPos.z());
-		SuperRenderTypeBuffer buffer = SuperRenderTypeBuffer.getInstance();
-
-		CreateClient.GHOST_BLOCKS.renderAll(ms, buffer);
-
-		CreateClient.OUTLINER.renderOutlines(ms, buffer, pt);
-		buffer.draw();
-		RenderSystem.enableCull();
-
-		ms.popPose();
-	}
-
-	@SubscribeEvent
-	public static void onCameraSetup(ViewportEvent.ComputeCameraAngles event) {
-		float partialTicks = AnimationTickHolder.getPartialTicks();
-
-		if (CameraAngleAnimationService.isYawAnimating())
-			event.setYaw(CameraAngleAnimationService.getYaw(partialTicks));
-
-		if (CameraAngleAnimationService.isPitchAnimating())
-			event.setPitch(CameraAngleAnimationService.getPitch(partialTicks));
-	}
-
-	public static boolean isGameActive() {
-		return !(Minecraft.getInstance().level == null || Minecraft.getInstance().player == null);
-	}
-
-}

src/main/java/nl/requios/effortlessbuilding/create/events/CommonEvents.java

@@ -1,39 +0,0 @@
-package nl.requios.effortlessbuilding.create.events;
-
-import net.minecraft.world.level.LevelAccessor;
-import net.minecraftforge.event.level.LevelEvent;
-import net.minecraftforge.eventbus.api.SubscribeEvent;
-import net.minecraftforge.fml.common.Mod.EventBusSubscriber;
-import nl.requios.effortlessbuilding.create.foundation.utility.WorldAttached;
-
-@EventBusSubscriber
-public class CommonEvents {
-
-	@SubscribeEvent
-	public static void onUnloadWorld(LevelEvent.Unload event) {
-		LevelAccessor world = event.getLevel();
-		WorldAttached.invalidateWorld(world);
-	}
-
-
-	@EventBusSubscriber(bus = EventBusSubscriber.Bus.MOD)
-	public static class ModBusEvents {
-
-//		@SubscribeEvent
-//		public static void addPackFinders(AddPackFindersEvent event) {
-//			if (event.getPackType() == PackType.CLIENT_RESOURCES) {
-//				IModFileInfo modFileInfo = ModList.get().getModFileById(Create.ID);
-//				if (modFileInfo == null) {
-//					Create.LOGGER.error("Could not find Create mod file info; built-in resource packs will be missing!");
-//					return;
-//				}
-//				IModFile modFile = modFileInfo.getFile();
-//				event.addRepositorySource((consumer, constructor) -> {
-//					consumer.accept(Pack.create(Create.asResource("legacy_copper").toString(), false, () -> new ModFilePackResources("Create Legacy Copper", modFile, "resourcepacks/legacy_copper"), constructor, Pack.Position.TOP, PackSource.DEFAULT));
-//				});
-//			}
-//		}
-
-	}
-
-}

src/main/java/nl/requios/effortlessbuilding/create/foundation/ClientResourceReloadListener.java

@@ -1,16 +0,0 @@
-package nl.requios.effortlessbuilding.create.foundation;
-
-import nl.requios.effortlessbuilding.create.foundation.utility.LangNumberFormat;
-import net.minecraft.server.packs.resources.ResourceManager;
-import net.minecraft.server.packs.resources.ResourceManagerReloadListener;
-
-public class ClientResourceReloadListener implements ResourceManagerReloadListener {
-
-	@Override
-	public void onResourceManagerReload(ResourceManager resourceManager) {
-//		CreateClient.invalidateRenderers();
-//		SoundScapes.invalidateAll();
-		LangNumberFormat.numberFormat.update();
-	}
-
-}

src/main/java/nl/requios/effortlessbuilding/create/foundation/ModFilePackResources.java

@@ -1,25 +0,0 @@
-package nl.requios.effortlessbuilding.create.foundation;
-
-import net.minecraftforge.forgespi.locating.IModFile;
-import net.minecraftforge.resource.PathPackResources;
-
-import java.nio.file.Path;
-
-public class ModFilePackResources extends PathPackResources {
-	protected final IModFile modFile;
-	protected final String sourcePath;
-
-	public ModFilePackResources(String name, IModFile modFile, String sourcePath) {
-		super(name, modFile.findResource(sourcePath));
-		this.modFile = modFile;
-		this.sourcePath = sourcePath;
-	}
-
-	@Override
-	protected Path resolve(String... paths) {
-		String[] allPaths = new String[paths.length + 1];
-		allPaths[0] = sourcePath;
-		System.arraycopy(paths, 0, allPaths, 1, paths.length);
-		return modFile.findResource(allPaths);
-	}
-}

src/main/java/nl/requios/effortlessbuilding/create/foundation/block/render/SpriteShiftEntry.java

@@ -1,49 +0,0 @@
-package nl.requios.effortlessbuilding.create.foundation.block.render;
-
-import com.jozufozu.flywheel.core.StitchedSprite;
-import net.minecraft.client.renderer.texture.TextureAtlasSprite;
-import net.minecraft.resources.ResourceLocation;
-
-public class SpriteShiftEntry {
-	protected StitchedSprite original;
-	protected StitchedSprite target;
-
-	public void set(ResourceLocation originalTextureLocation, ResourceLocation targetTextureLocation) {
-		original = new StitchedSprite(originalTextureLocation);
-		target = new StitchedSprite(targetTextureLocation);
-	}
-
-	public ResourceLocation getOriginalResourceLocation() {
-		return original.getLocation();
-	}
-
-	public ResourceLocation getTargetResourceLocation() {
-		return target.getLocation();
-	}
-
-	public TextureAtlasSprite getOriginal() {
-		return original.get();
-	}
-
-	public TextureAtlasSprite getTarget() {
-		return target.get();
-	}
-
-	public float getTargetU(float localU) {
-		return getTarget().getU(getUnInterpolatedU(getOriginal(), localU));
-	}
-
-	public float getTargetV(float localV) {
-		return getTarget().getV(getUnInterpolatedV(getOriginal(), localV));
-	}
-
-	public static float getUnInterpolatedU(TextureAtlasSprite sprite, float u) {
-		float f = sprite.getU1() - sprite.getU0();
-		return (u - sprite.getU0()) / f * 16.0F;
-	}
-
-	public static float getUnInterpolatedV(TextureAtlasSprite sprite, float v) {
-		float f = sprite.getV1() - sprite.getV0();
-		return (v - sprite.getV0()) / f * 16.0F;
-	}
-}

src/main/java/nl/requios/effortlessbuilding/create/foundation/render/BakedModelRenderHelper.java

@@ -1,29 +0,0 @@
-package nl.requios.effortlessbuilding.create.foundation.render;
-
-import com.jozufozu.flywheel.core.model.ModelUtil;
-import com.jozufozu.flywheel.util.Pair;
-import com.mojang.blaze3d.vertex.BufferBuilder.RenderedBuffer;
-import com.mojang.blaze3d.vertex.PoseStack;
-import net.minecraft.client.Minecraft;
-import net.minecraft.client.renderer.block.BlockRenderDispatcher;
-import net.minecraft.client.resources.model.BakedModel;
-import net.minecraft.world.level.block.state.BlockState;
-
-public class BakedModelRenderHelper {
-
-	public static SuperByteBuffer standardBlockRender(BlockState renderedState) {
-		BlockRenderDispatcher dispatcher = Minecraft.getInstance()
-			.getBlockRenderer();
-		return standardModelRender(dispatcher.getBlockModel(renderedState), renderedState);
-	}
-
-	public static SuperByteBuffer standardModelRender(BakedModel model, BlockState referenceState) {
-		return standardModelRender(model, referenceState, new PoseStack());
-	}
-
-	public static SuperByteBuffer standardModelRender(BakedModel model, BlockState referenceState, PoseStack ms) {
-		Pair<RenderedBuffer, Integer> pair = ModelUtil.getBufferBuilder(model, referenceState, ms);
-		return new SuperByteBuffer(pair.first(), pair.second());
-	}
-
-}

src/main/java/nl/requios/effortlessbuilding/create/foundation/render/CachedBufferer.java

@@ -1,88 +0,0 @@
-package nl.requios.effortlessbuilding.create.foundation.render;
-
-import com.jozufozu.flywheel.core.PartialModel;
-import com.jozufozu.flywheel.util.transform.TransformStack;
-import com.mojang.blaze3d.vertex.PoseStack;
-import nl.requios.effortlessbuilding.EffortlessBuildingClient;
-import nl.requios.effortlessbuilding.create.CreateClient;
-import nl.requios.effortlessbuilding.create.foundation.render.SuperByteBufferCache.Compartment;
-import nl.requios.effortlessbuilding.create.foundation.utility.AngleHelper;
-import net.minecraft.core.Direction;
-import net.minecraft.world.level.block.state.BlockState;
-import org.apache.commons.lang3.tuple.Pair;
-
-import java.util.function.Supplier;
-
-import static net.minecraft.world.level.block.state.properties.BlockStateProperties.FACING;
-
-public class CachedBufferer {
-
-	public static final Compartment<BlockState> GENERIC_TILE = new Compartment<>();
-	public static final Compartment<PartialModel> PARTIAL = new Compartment<>();
-	public static final Compartment<Pair<Direction, PartialModel>> DIRECTIONAL_PARTIAL = new Compartment<>();
-
-	public static SuperByteBuffer block(BlockState toRender) {
-		return block(GENERIC_TILE, toRender);
-	}
-
-	public static SuperByteBuffer block(Compartment<BlockState> compartment, BlockState toRender) {
-		return CreateClient.BUFFER_CACHE.get(compartment, toRender, () -> BakedModelRenderHelper.standardBlockRender(toRender));
-	}
-
-	public static SuperByteBuffer partial(PartialModel partial, BlockState referenceState) {
-		return CreateClient.BUFFER_CACHE.get(PARTIAL, partial,
-				() -> BakedModelRenderHelper.standardModelRender(partial.get(), referenceState));
-	}
-
-	public static SuperByteBuffer partial(PartialModel partial, BlockState referenceState,
-			Supplier<PoseStack> modelTransform) {
-		return CreateClient.BUFFER_CACHE.get(PARTIAL, partial,
-				() -> BakedModelRenderHelper.standardModelRender(partial.get(), referenceState, modelTransform.get()));
-	}
-
-	public static SuperByteBuffer partialFacing(PartialModel partial, BlockState referenceState) {
-		Direction facing = referenceState.getValue(FACING);
-		return partialFacing(partial, referenceState, facing);
-	}
-
-	public static SuperByteBuffer partialFacing(PartialModel partial, BlockState referenceState, Direction facing) {
-		return partialDirectional(partial, referenceState, facing,
-			rotateToFace(facing));
-	}
-
-	public static SuperByteBuffer partialFacingVertical(PartialModel partial, BlockState referenceState, Direction facing) {
-		return partialDirectional(partial, referenceState, facing,
-			rotateToFaceVertical(facing));
-	}
-
-	public static SuperByteBuffer partialDirectional(PartialModel partial, BlockState referenceState, Direction dir,
-			Supplier<PoseStack> modelTransform) {
-		return CreateClient.BUFFER_CACHE.get(DIRECTIONAL_PARTIAL, Pair.of(dir, partial),
-			() -> BakedModelRenderHelper.standardModelRender(partial.get(), referenceState, modelTransform.get()));
-	}
-
-	public static Supplier<PoseStack> rotateToFace(Direction facing) {
-		return () -> {
-			PoseStack stack = new PoseStack();
-			TransformStack.cast(stack)
-				.centre()
-				.rotateY(AngleHelper.horizontalAngle(facing))
-				.rotateX(AngleHelper.verticalAngle(facing))
-				.unCentre();
-			return stack;
-		};
-	}
-
-	public static Supplier<PoseStack> rotateToFaceVertical(Direction facing) {
-		return () -> {
-			PoseStack stack = new PoseStack();
-			TransformStack.cast(stack)
-				.centre()
-				.rotateY(AngleHelper.horizontalAngle(facing))
-				.rotateX(AngleHelper.verticalAngle(facing) + 90)
-				.unCentre();
-			return stack;
-		};
-	}
-
-}

src/main/java/nl/requios/effortlessbuilding/create/foundation/render/ForcedDiffuseState.java

@@ -1,30 +0,0 @@
-package nl.requios.effortlessbuilding.create.foundation.render;
-
-import com.jozufozu.flywheel.util.DiffuseLightCalculator;
-import it.unimi.dsi.fastutil.objects.ObjectArrayList;
-
-import javax.annotation.Nullable;
-
-public final class ForcedDiffuseState {
-	private static final ThreadLocal<ObjectArrayList<DiffuseLightCalculator>> FORCED_DIFFUSE = ThreadLocal.withInitial(ObjectArrayList::new);
-
-	private ForcedDiffuseState() {
-	}
-
-	public static void pushCalculator(DiffuseLightCalculator calculator) {
-		FORCED_DIFFUSE.get().push(calculator);
-	}
-
-	public static void popCalculator() {
-		FORCED_DIFFUSE.get().pop();
-	}
-
-	@Nullable
-	public static DiffuseLightCalculator getForcedCalculator() {
-		ObjectArrayList<DiffuseLightCalculator> stack = FORCED_DIFFUSE.get();
-		if (stack.isEmpty()) {
-			return null;
-		}
-		return stack.top();
-	}
-}

src/main/java/nl/requios/effortlessbuilding/create/foundation/render/RenderTypes.java

@@ -1,160 +0,0 @@
-package nl.requios.effortlessbuilding.create.foundation.render;
-
-import com.mojang.blaze3d.vertex.DefaultVertexFormat;
-import com.mojang.blaze3d.vertex.VertexFormat;
-import nl.requios.effortlessbuilding.create.AllSpecialTextures;
-import nl.requios.effortlessbuilding.create.Create;
-import net.minecraft.client.renderer.RenderStateShard;
-import net.minecraft.client.renderer.RenderType;
-import net.minecraft.client.renderer.ShaderInstance;
-import net.minecraft.resources.ResourceLocation;
-import net.minecraft.server.packs.resources.ResourceManager;
-import net.minecraft.world.inventory.InventoryMenu;
-import net.minecraftforge.api.distmarker.Dist;
-import net.minecraftforge.client.event.RegisterShadersEvent;
-import net.minecraftforge.eventbus.api.SubscribeEvent;
-import net.minecraftforge.fml.common.Mod.EventBusSubscriber;
-
-import java.io.IOException;
-
-// TODO 1.17: use custom shaders instead of vanilla ones
-public class RenderTypes extends RenderStateShard {
-
-	public static final ShaderStateShard GLOWING_SHADER = new ShaderStateShard(() -> Shaders.glowingShader);
-
-	private static final RenderType OUTLINE_SOLID =
-		RenderType.create(createLayerName("outline_solid"), DefaultVertexFormat.NEW_ENTITY, VertexFormat.Mode.QUADS, 256, false,
-			false, RenderType.CompositeState.builder()
-				.setShaderState(RENDERTYPE_ENTITY_SOLID_SHADER)
-				.setTextureState(new TextureStateShard(AllSpecialTextures.BLANK.getLocation(), false, false))
-				.setCullState(CULL)
-				.setLightmapState(LIGHTMAP)
-				.setOverlayState(OVERLAY)
-				.createCompositeState(false));
-
-	public static RenderType getOutlineSolid() {
-		return OUTLINE_SOLID;
-	}
-
-	public static RenderType getOutlineTranslucent(ResourceLocation texture, boolean cull) {
-		return RenderType.create(createLayerName("outline_translucent" + (cull ? "_cull" : "")),
-			DefaultVertexFormat.NEW_ENTITY, VertexFormat.Mode.QUADS, 256, false, true, RenderType.CompositeState.builder()
-				.setShaderState(cull ? RENDERTYPE_ENTITY_TRANSLUCENT_CULL_SHADER : RENDERTYPE_ENTITY_TRANSLUCENT_SHADER)
-				.setTextureState(new TextureStateShard(texture, false, false))
-				.setTransparencyState(TRANSLUCENT_TRANSPARENCY)
-				.setCullState(cull ? CULL : NO_CULL)
-				.setLightmapState(LIGHTMAP)
-				.setOverlayState(OVERLAY)
-				.setWriteMaskState(COLOR_WRITE)
-				.createCompositeState(false));
-	}
-
-	public static RenderType getGlowingSolid(ResourceLocation texture) {
-		return RenderType.create(createLayerName("glowing_solid"), DefaultVertexFormat.NEW_ENTITY, VertexFormat.Mode.QUADS, 256,
-			true, false, RenderType.CompositeState.builder()
-				.setShaderState(GLOWING_SHADER)
-				.setTextureState(new TextureStateShard(texture, false, false))
-				.setCullState(CULL)
-				.setLightmapState(LIGHTMAP)
-				.setOverlayState(OVERLAY)
-				.createCompositeState(true));
-	}
-
-	private static final RenderType GLOWING_SOLID_DEFAULT = getGlowingSolid(InventoryMenu.BLOCK_ATLAS);
-
-	public static RenderType getGlowingSolid() {
-		return GLOWING_SOLID_DEFAULT;
-	}
-
-	public static RenderType getGlowingTranslucent(ResourceLocation texture) {
-		return RenderType.create(createLayerName("glowing_translucent"), DefaultVertexFormat.NEW_ENTITY, VertexFormat.Mode.QUADS,
-			256, true, true, RenderType.CompositeState.builder()
-				.setShaderState(GLOWING_SHADER)
-				.setTextureState(new TextureStateShard(texture, false, false))
-				.setTransparencyState(TRANSLUCENT_TRANSPARENCY)
-				.setLightmapState(LIGHTMAP)
-				.setOverlayState(OVERLAY)
-				.createCompositeState(true));
-	}
-
-	private static final RenderType ADDITIVE = RenderType.create(createLayerName("additive"), DefaultVertexFormat.BLOCK,
-		VertexFormat.Mode.QUADS, 256, true, true, RenderType.CompositeState.builder()
-			.setShaderState(BLOCK_SHADER)
-			.setTextureState(new TextureStateShard(InventoryMenu.BLOCK_ATLAS, false, false))
-			.setTransparencyState(ADDITIVE_TRANSPARENCY)
-			.setCullState(NO_CULL)
-			.setLightmapState(LIGHTMAP)
-			.setOverlayState(OVERLAY)
-			.createCompositeState(true));
-
-	public static RenderType getAdditive() {
-		return ADDITIVE;
-	}
-
-	private static final RenderType GLOWING_TRANSLUCENT_DEFAULT = getGlowingTranslucent(InventoryMenu.BLOCK_ATLAS);
-
-	public static RenderType getGlowingTranslucent() {
-		return GLOWING_TRANSLUCENT_DEFAULT;
-	}
-
-	private static final RenderType ITEM_PARTIAL_SOLID =
-		RenderType.create(createLayerName("item_partial_solid"), DefaultVertexFormat.NEW_ENTITY, VertexFormat.Mode.QUADS, 256, true,
-			false, RenderType.CompositeState.builder()
-				.setShaderState(RENDERTYPE_ENTITY_SOLID_SHADER)
-				.setTextureState(BLOCK_SHEET)
-				.setCullState(CULL)
-				.setLightmapState(LIGHTMAP)
-				.setOverlayState(OVERLAY)
-				.createCompositeState(true));
-
-	public static RenderType getItemPartialSolid() {
-		return ITEM_PARTIAL_SOLID;
-	}
-
-	private static final RenderType ITEM_PARTIAL_TRANSLUCENT = RenderType.create(createLayerName("item_partial_translucent"),
-		DefaultVertexFormat.NEW_ENTITY, VertexFormat.Mode.QUADS, 256, true, true, RenderType.CompositeState.builder()
-			.setShaderState(RENDERTYPE_ENTITY_TRANSLUCENT_CULL_SHADER)
-			.setTextureState(BLOCK_SHEET)
-			.setTransparencyState(TRANSLUCENT_TRANSPARENCY)
-			.setLightmapState(LIGHTMAP)
-			.setOverlayState(OVERLAY)
-			.createCompositeState(true));
-
-	public static RenderType getItemPartialTranslucent() {
-		return ITEM_PARTIAL_TRANSLUCENT;
-	}
-
-	private static final RenderType FLUID = RenderType.create(createLayerName("fluid"),
-		DefaultVertexFormat.NEW_ENTITY, VertexFormat.Mode.QUADS, 256, false, true, RenderType.CompositeState.builder()
-			.setShaderState(RENDERTYPE_ENTITY_TRANSLUCENT_CULL_SHADER)
-			.setTextureState(BLOCK_SHEET_MIPPED)
-			.setTransparencyState(TRANSLUCENT_TRANSPARENCY)
-			.setLightmapState(LIGHTMAP)
-			.setOverlayState(OVERLAY)
-			.createCompositeState(true));
-
-	public static RenderType getFluid() {
-		return FLUID;
-	}
-
-	private static String createLayerName(String name) {
-		return Create.ID + ":" + name;
-	}
-
-	// Mmm gimme those protected fields
-	private RenderTypes() {
-		super(null, null, null);
-	}
-
-	@EventBusSubscriber(value = Dist.CLIENT, bus = EventBusSubscriber.Bus.MOD)
-	private static class Shaders {
-		private static ShaderInstance glowingShader;
-
-		@SubscribeEvent
-		public static void onRegisterShaders(RegisterShadersEvent event) throws IOException {
-			ResourceManager resourceManager = event.getResourceManager();
-			event.registerShader(new ShaderInstance(resourceManager, Create.asResource("glowing_shader"), DefaultVertexFormat.NEW_ENTITY), shader -> glowingShader = shader);
-		}
-	}
-
-}

src/main/java/nl/requios/effortlessbuilding/create/foundation/render/ShadowRenderHelper.java

@@ -1,112 +0,0 @@
-package nl.requios.effortlessbuilding.create.foundation.render;
-
-import com.mojang.blaze3d.vertex.PoseStack;
-import com.mojang.blaze3d.vertex.VertexConsumer;
-import net.minecraft.client.renderer.LightTexture;
-import net.minecraft.client.renderer.MultiBufferSource;
-import net.minecraft.client.renderer.RenderType;
-import net.minecraft.client.renderer.texture.OverlayTexture;
-import net.minecraft.core.BlockPos;
-import net.minecraft.resources.ResourceLocation;
-import net.minecraft.util.Mth;
-import net.minecraft.world.level.LevelReader;
-import net.minecraft.world.level.block.RenderShape;
-import net.minecraft.world.level.block.state.BlockState;
-import net.minecraft.world.phys.AABB;
-import net.minecraft.world.phys.Vec3;
-import net.minecraft.world.phys.shapes.VoxelShape;
-
-/**
- * Taken from EntityRendererManager
- */
-public class ShadowRenderHelper {
-
-	private static final RenderType SHADOW_LAYER =
-		RenderType.entityNoOutline(new ResourceLocation("textures/misc/shadow.png"));
-
-	public static void renderShadow(PoseStack matrixStack, MultiBufferSource buffer, float opacity, float radius) {
-		PoseStack.Pose entry = matrixStack.last();
-		VertexConsumer builder = buffer.getBuffer(SHADOW_LAYER);
-
-		opacity /= 2;
-		shadowVertex(entry, builder, opacity, -1 * radius, 0, -1 * radius, 0, 0);
-		shadowVertex(entry, builder, opacity, -1 * radius, 0, 1 * radius, 0, 1);
-		shadowVertex(entry, builder, opacity, 1 * radius, 0, 1 * radius, 1, 1);
-		shadowVertex(entry, builder, opacity, 1 * radius, 0, -1 * radius, 1, 0);
-	}
-
-	public static void renderShadow(PoseStack matrixStack, MultiBufferSource buffer, LevelReader world,
-		Vec3 pos, float opacity, float radius) {
-		float f = radius;
-
-		double d2 = pos.x();
-		double d0 = pos.y();
-		double d1 = pos.z();
-		int i = Mth.floor(d2 - (double) f);
-		int j = Mth.floor(d2 + (double) f);
-		int k = Mth.floor(d0 - (double) f);
-		int l = Mth.floor(d0);
-		int i1 = Mth.floor(d1 - (double) f);
-		int j1 = Mth.floor(d1 + (double) f);
-		PoseStack.Pose entry = matrixStack.last();
-		VertexConsumer builder = buffer.getBuffer(SHADOW_LAYER);
-
-		for (BlockPos blockpos : BlockPos.betweenClosed(new BlockPos(i, k, i1), new BlockPos(j, l, j1))) {
-			renderBlockShadow(entry, builder, world, blockpos, d2, d0, d1, f,
-				opacity);
-		}
-	}
-
-	private static void renderBlockShadow(PoseStack.Pose entry, VertexConsumer builder,
-		LevelReader world, BlockPos pos, double x, double y, double z,
-		float radius, float opacity) {
-		BlockPos blockpos = pos.below();
-		BlockState blockstate = world.getBlockState(blockpos);
-		if (blockstate.getRenderShape() != RenderShape.INVISIBLE && world.getMaxLocalRawBrightness(pos) > 3) {
-			if (blockstate.isCollisionShapeFullBlock(world, blockpos)) {
-				VoxelShape voxelshape = blockstate.getShape(world, pos.below());
-				if (!voxelshape.isEmpty()) {
-					float brightness = LightTexture.getBrightness(world.dimensionType(), world.getMaxLocalRawBrightness(pos));
-					float f = (float) ((opacity - (y - pos.getY()) / 2.0D) * 0.5D * brightness);
-					if (f >= 0.0F) {
-						if (f > 1.0F) {
-							f = 1.0F;
-						}
-
-						AABB AABB = voxelshape.bounds();
-						double d0 = (double) pos.getX() + AABB.minX;
-						double d1 = (double) pos.getX() + AABB.maxX;
-						double d2 = (double) pos.getY() + AABB.minY;
-						double d3 = (double) pos.getZ() + AABB.minZ;
-						double d4 = (double) pos.getZ() + AABB.maxZ;
-						float f1 = (float) (d0 - x);
-						float f2 = (float) (d1 - x);
-						float f3 = (float) (d2 - y + 0.015625D);
-						float f4 = (float) (d3 - z);
-						float f5 = (float) (d4 - z);
-						float f6 = -f1 / 2.0F / radius + 0.5F;
-						float f7 = -f2 / 2.0F / radius + 0.5F;
-						float f8 = -f4 / 2.0F / radius + 0.5F;
-						float f9 = -f5 / 2.0F / radius + 0.5F;
-						shadowVertex(entry, builder, f, f1, f3, f4, f6, f8);
-						shadowVertex(entry, builder, f, f1, f3, f5, f6, f9);
-						shadowVertex(entry, builder, f, f2, f3, f5, f7, f9);
-						shadowVertex(entry, builder, f, f2, f3, f4, f7, f8);
-					}
-				}
-			}
-		}
-	}
-
-	private static void shadowVertex(PoseStack.Pose entry, VertexConsumer builder, float alpha,
-		float x, float y, float z, float u, float v) {
-		builder.vertex(entry.pose(), x, y, z)
-			.color(1.0F, 1.0F, 1.0F, alpha)
-			.uv(u, v)
-			.overlayCoords(OverlayTexture.NO_OVERLAY)
-			.uv2(LightTexture.FULL_BRIGHT)
-			.normal(entry.normal(), 0.0F, 1.0F, 0.0F)
-			.endVertex();
-	}
-
-}

src/main/java/nl/requios/effortlessbuilding/create/foundation/render/SuperByteBuffer.java

@@ -1,464 +0,0 @@
-package nl.requios.effortlessbuilding.create.foundation.render;
-
-import com.jozufozu.flywheel.api.vertex.ShadedVertexList;
-import com.jozufozu.flywheel.backend.ShadersModHandler;
-import com.jozufozu.flywheel.core.vertex.BlockVertexList;
-import com.jozufozu.flywheel.util.DiffuseLightCalculator;
-import com.jozufozu.flywheel.util.transform.TStack;
-import com.jozufozu.flywheel.util.transform.Transform;
-import com.mojang.blaze3d.vertex.BufferBuilder.DrawState;
-import com.mojang.blaze3d.vertex.BufferBuilder.RenderedBuffer;
-import com.mojang.blaze3d.vertex.PoseStack;
-import com.mojang.blaze3d.vertex.VertexConsumer;
-import com.mojang.math.*;
-import nl.requios.effortlessbuilding.create.foundation.block.render.SpriteShiftEntry;
-import nl.requios.effortlessbuilding.create.foundation.utility.Color;
-import it.unimi.dsi.fastutil.longs.Long2IntMap;
-import it.unimi.dsi.fastutil.longs.Long2IntOpenHashMap;
-import net.minecraft.client.Minecraft;
-import net.minecraft.client.renderer.LevelRenderer;
-import net.minecraft.client.renderer.LightTexture;
-import net.minecraft.client.renderer.texture.OverlayTexture;
-import net.minecraft.core.BlockPos;
-import net.minecraft.core.Direction;
-import net.minecraft.util.Mth;
-import net.minecraft.world.level.Level;
-
-public class SuperByteBuffer implements Transform<SuperByteBuffer>, TStack<SuperByteBuffer> {
-
-	private final ShadedVertexList template;
-
-	// Vertex Position
-	private final PoseStack transforms;
-
-	// Vertex Coloring
-	private boolean shouldColor;
-	private int r, g, b, a;
-	private boolean disableDiffuseMult;
-	private DiffuseLightCalculator diffuseCalculator;
-
-	// Vertex Texture Coords
-	private SpriteShiftFunc spriteShiftFunc;
-
-	// Vertex Overlay Color
-	private boolean hasOverlay;
-	private int overlay = OverlayTexture.NO_OVERLAY;
-
-	// Vertex Lighting
-	private boolean useWorldLight;
-	private Matrix4f lightTransform;
-	private boolean hasCustomLight;
-	private int packedLightCoords;
-	private boolean hybridLight;
-
-	// Vertex Normals
-	private boolean fullNormalTransform;
-
-	// Temporary
-	private static final Long2IntMap WORLD_LIGHT_CACHE = new Long2IntOpenHashMap();
-
-	public SuperByteBuffer(RenderedBuffer buf, int unshadedStartVertex) {
-		DrawState drawState = buf.drawState();
-		template = new BlockVertexList.Shaded(buf.vertexBuffer(), drawState.vertexCount(), drawState.format().getVertexSize(), unshadedStartVertex);
-
-		transforms = new PoseStack();
-		transforms.pushPose();
-	}
-
-	public void renderInto(PoseStack input, VertexConsumer builder) {
-		if (isEmpty())
-			return;
-
-		Matrix4f modelMat = input.last()
-			.pose()
-			.copy();
-		Matrix4f localTransforms = transforms.last()
-			.pose();
-		modelMat.multiply(localTransforms);
-
-		Matrix3f normalMat;
-		if (fullNormalTransform) {
-			normalMat = input.last()
-				.normal()
-				.copy();
-			Matrix3f localNormalTransforms = transforms.last()
-				.normal();
-			normalMat.mul(localNormalTransforms);
-		} else {
-			normalMat = transforms.last()
-				.normal()
-				.copy();
-		}
-
-		if (useWorldLight) {
-			WORLD_LIGHT_CACHE.clear();
-		}
-
-		final Vector4f pos = new Vector4f();
-		final Vector3f normal = new Vector3f();
-		final Vector4f lightPos = new Vector4f();
-
-		DiffuseLightCalculator diffuseCalculator = ForcedDiffuseState.getForcedCalculator();
-		final boolean disableDiffuseMult =
-			this.disableDiffuseMult || (ShadersModHandler.isShaderPackInUse() && diffuseCalculator == null);
-		if (diffuseCalculator == null) {
-			diffuseCalculator = this.diffuseCalculator;
-			if (diffuseCalculator == null) {
-				diffuseCalculator = DiffuseLightCalculator.forCurrentLevel();
-			}
-		}
-
-		final int vertexCount = template.getVertexCount();
-		for (int i = 0; i < vertexCount; i++) {
-			float x = template.getX(i);
-			float y = template.getY(i);
-			float z = template.getZ(i);
-
-			pos.set(x, y, z, 1F);
-			pos.transform(modelMat);
-			builder.vertex(pos.x(), pos.y(), pos.z());
-
-			float normalX = template.getNX(i);
-			float normalY = template.getNY(i);
-			float normalZ = template.getNZ(i);
-
-			normal.set(normalX, normalY, normalZ);
-			normal.transform(normalMat);
-			float nx = normal.x();
-			float ny = normal.y();
-			float nz = normal.z();
-
-			byte r, g, b, a;
-			if (shouldColor) {
-				r = (byte) this.r;
-				g = (byte) this.g;
-				b = (byte) this.b;
-				a = (byte) this.a;
-			} else {
-				r = template.getR(i);
-				g = template.getG(i);
-				b = template.getB(i);
-				a = template.getA(i);
-			}
-			if (disableDiffuseMult) {
-				builder.color(r, g, b, a);
-			} else {
-				float instanceDiffuse = diffuseCalculator.getDiffuse(nx, ny, nz, template.isShaded(i));
-				int colorR = transformColor(r, instanceDiffuse);
-				int colorG = transformColor(g, instanceDiffuse);
-				int colorB = transformColor(b, instanceDiffuse);
-				builder.color(colorR, colorG, colorB, a);
-			}
-
-			float u = template.getU(i);
-			float v = template.getV(i);
-			if (spriteShiftFunc != null) {
-				spriteShiftFunc.shift(builder, u, v);
-			} else {
-				builder.uv(u, v);
-			}
-
-			if (hasOverlay) {
-				builder.overlayCoords(overlay);
-			}
-
-			int light;
-			if (useWorldLight) {
-				lightPos.set(((x - .5f) * 15 / 16f) + .5f, (y - .5f) * 15 / 16f + .5f, (z - .5f) * 15 / 16f + .5f, 1f);
-				lightPos.transform(localTransforms);
-				if (lightTransform != null) {
-					lightPos.transform(lightTransform);
-				}
-
-				light = getLight(Minecraft.getInstance().level, lightPos);
-				if (hasCustomLight) {
-					light = maxLight(light, packedLightCoords);
-				}
-			} else if (hasCustomLight) {
-				light = packedLightCoords;
-			} else {
-				light = template.getLight(i);
-			}
-
-			if (hybridLight) {
-				builder.uv2(maxLight(light, template.getLight(i)));
-			} else {
-				builder.uv2(light);
-			}
-
-			builder.normal(nx, ny, nz);
-
-			builder.endVertex();
-		}
-
-		reset();
-	}
-
-	public SuperByteBuffer reset() {
-		while (!transforms.clear())
-			transforms.popPose();
-		transforms.pushPose();
-
-		shouldColor = false;
-		r = 0;
-		g = 0;
-		b = 0;
-		a = 0;
-		disableDiffuseMult = false;
-		diffuseCalculator = null;
-		spriteShiftFunc = null;
-		hasOverlay = false;
-		overlay = OverlayTexture.NO_OVERLAY;
-		useWorldLight = false;
-		lightTransform = null;
-		hasCustomLight = false;
-		packedLightCoords = 0;
-		hybridLight = false;
-		fullNormalTransform = false;
-		return this;
-	}
-
-	public boolean isEmpty() {
-		return template.isEmpty();
-	}
-
-	public PoseStack getTransforms() {
-		return transforms;
-	}
-
-	@Override
-	public SuperByteBuffer translate(double x, double y, double z) {
-		transforms.translate(x, y, z);
-		return this;
-	}
-
-	@Override
-	public SuperByteBuffer multiply(Quaternion quaternion) {
-		transforms.mulPose(quaternion);
-		return this;
-	}
-
-	@Override
-	public SuperByteBuffer scale(float factorX, float factorY, float factorZ) {
-		transforms.scale(factorX, factorY, factorZ);
-		return this;
-	}
-
-	@Override
-	public SuperByteBuffer pushPose() {
-		transforms.pushPose();
-		return this;
-	}
-
-	@Override
-	public SuperByteBuffer popPose() {
-		transforms.popPose();
-		return this;
-	}
-
-	@Override
-	public SuperByteBuffer mulPose(Matrix4f pose) {
-		transforms.last()
-			.pose()
-			.multiply(pose);
-		return this;
-	}
-
-	@Override
-	public SuperByteBuffer mulNormal(Matrix3f normal) {
-		transforms.last()
-			.normal()
-			.mul(normal);
-		return this;
-	}
-
-	public SuperByteBuffer transform(PoseStack stack) {
-		transforms.last()
-			.pose()
-			.multiply(stack.last()
-				.pose());
-		transforms.last()
-			.normal()
-			.mul(stack.last()
-				.normal());
-		return this;
-	}
-
-	public SuperByteBuffer rotateCentered(Direction axis, float radians) {
-		translate(.5f, .5f, .5f).rotate(axis, radians)
-			.translate(-.5f, -.5f, -.5f);
-		return this;
-	}
-
-	public SuperByteBuffer rotateCentered(Quaternion q) {
-		translate(.5f, .5f, .5f).multiply(q)
-			.translate(-.5f, -.5f, -.5f);
-		return this;
-	}
-
-	public SuperByteBuffer color(int r, int g, int b, int a) {
-		shouldColor = true;
-		this.r = r;
-		this.g = g;
-		this.b = b;
-		this.a = a;
-		return this;
-	}
-
-	public SuperByteBuffer color(int color) {
-		shouldColor = true;
-		r = ((color >> 16) & 0xFF);
-		g = ((color >> 8) & 0xFF);
-		b = (color & 0xFF);
-		a = 255;
-		return this;
-	}
-
-	public SuperByteBuffer color(Color c) {
-		return color(c.getRGB());
-	}
-
-	/**
-	 * Prevents vertex colors from being multiplied by the diffuse value calculated
-	 * from the final transformed normal vector. Useful for entity rendering, when
-	 * diffuse is applied automatically later.
-	 */
-	public SuperByteBuffer disableDiffuse() {
-		disableDiffuseMult = true;
-		return this;
-	}
-
-	public SuperByteBuffer diffuseCalculator(DiffuseLightCalculator diffuseCalculator) {
-		this.diffuseCalculator = diffuseCalculator;
-		return this;
-	}
-
-	public SuperByteBuffer shiftUV(SpriteShiftEntry entry) {
-		this.spriteShiftFunc = (builder, u, v) -> {
-			builder.uv(entry.getTargetU(u), entry.getTargetV(v));
-		};
-		return this;
-	}
-
-	public SuperByteBuffer shiftUVScrolling(SpriteShiftEntry entry, float scrollV) {
-		return this.shiftUVScrolling(entry, 0, scrollV);
-	}
-
-	public SuperByteBuffer shiftUVScrolling(SpriteShiftEntry entry, float scrollU, float scrollV) {
-		this.spriteShiftFunc = (builder, u, v) -> {
-			float targetU = u - entry.getOriginal()
-				.getU0() + entry.getTarget()
-					.getU0()
-				+ scrollU;
-			float targetV = v - entry.getOriginal()
-				.getV0() + entry.getTarget()
-					.getV0()
-				+ scrollV;
-			builder.uv(targetU, targetV);
-		};
-		return this;
-	}
-
-	public SuperByteBuffer shiftUVtoSheet(SpriteShiftEntry entry, float uTarget, float vTarget, int sheetSize) {
-		this.spriteShiftFunc = (builder, u, v) -> {
-			float targetU = entry.getTarget()
-				.getU((SpriteShiftEntry.getUnInterpolatedU(entry.getOriginal(), u) / sheetSize) + uTarget * 16);
-			float targetV = entry.getTarget()
-				.getV((SpriteShiftEntry.getUnInterpolatedV(entry.getOriginal(), v) / sheetSize) + vTarget * 16);
-			builder.uv(targetU, targetV);
-		};
-		return this;
-	}
-
-	public SuperByteBuffer overlay() {
-		hasOverlay = true;
-		return this;
-	}
-
-	public SuperByteBuffer overlay(int overlay) {
-		hasOverlay = true;
-		this.overlay = overlay;
-		return this;
-	}
-
-	public SuperByteBuffer light() {
-		useWorldLight = true;
-		return this;
-	}
-
-	public SuperByteBuffer light(Matrix4f lightTransform) {
-		useWorldLight = true;
-		this.lightTransform = lightTransform;
-		return this;
-	}
-
-	public SuperByteBuffer light(int packedLightCoords) {
-		hasCustomLight = true;
-		this.packedLightCoords = packedLightCoords;
-		return this;
-	}
-
-	public SuperByteBuffer light(Matrix4f lightTransform, int packedLightCoords) {
-		light(lightTransform);
-		light(packedLightCoords);
-		return this;
-	}
-
-	/**
-	 * Uses max light from calculated light (world light or custom light) and vertex
-	 * light for the final light value. Ineffective if any other light method was
-	 * not called.
-	 */
-	public SuperByteBuffer hybridLight() {
-		hybridLight = true;
-		return this;
-	}
-
-	/**
-	 * Transforms normals not only by the local matrix stack, but also by the passed
-	 * matrix stack.
-	 */
-	public SuperByteBuffer fullNormalTransform() {
-		fullNormalTransform = true;
-		return this;
-	}
-
-	public SuperByteBuffer forEntityRender() {
-		disableDiffuse();
-		overlay();
-		fullNormalTransform();
-		return this;
-	}
-
-	public static int transformColor(byte component, float scale) {
-		return Mth.clamp((int) (Byte.toUnsignedInt(component) * scale), 0, 255);
-	}
-
-	public static int transformColor(int component, float scale) {
-		return Mth.clamp((int) (component * scale), 0, 255);
-	}
-
-	public static int maxLight(int packedLight1, int packedLight2) {
-		int blockLight1 = LightTexture.block(packedLight1);
-		int skyLight1 = LightTexture.sky(packedLight1);
-		int blockLight2 = LightTexture.block(packedLight2);
-		int skyLight2 = LightTexture.sky(packedLight2);
-		return LightTexture.pack(Math.max(blockLight1, blockLight2), Math.max(skyLight1, skyLight2));
-	}
-
-	private static int getLight(Level world, Vector4f lightPos) {
-		BlockPos pos = new BlockPos(lightPos.x(), lightPos.y(), lightPos.z());
-		return WORLD_LIGHT_CACHE.computeIfAbsent(pos.asLong(), $ -> LevelRenderer.getLightColor(world, pos));
-	}
-
-	@FunctionalInterface
-	public interface SpriteShiftFunc {
-		void shift(VertexConsumer builder, float u, float v);
-	}
-
-	@FunctionalInterface
-	public interface VertexLighter {
-		int getPackedLight(float x, float y, float z);
-	}
-
-}

src/main/java/nl/requios/effortlessbuilding/create/foundation/render/SuperByteBufferCache.java

@@ -1,54 +0,0 @@
-package nl.requios.effortlessbuilding.create.foundation.render;
-
-import com.google.common.cache.Cache;
-import com.google.common.cache.CacheBuilder;
-
-import java.util.HashMap;
-import java.util.Map;
-import java.util.concurrent.Callable;
-import java.util.concurrent.ExecutionException;
-import java.util.concurrent.TimeUnit;
-
-public class SuperByteBufferCache {
-
-	protected final Map<Compartment<?>, Cache<Object, SuperByteBuffer>> caches = new HashMap<>();
-
-	public synchronized void registerCompartment(Compartment<?> compartment) {
-		caches.put(compartment, CacheBuilder.newBuilder()
-			.build());
-	}
-
-	public synchronized void registerCompartment(Compartment<?> compartment, long ticksUntilExpired) {
-		caches.put(compartment, CacheBuilder.newBuilder()
-			.expireAfterAccess(ticksUntilExpired * 50, TimeUnit.MILLISECONDS)
-			.build());
-	}
-
-	public <T> SuperByteBuffer get(Compartment<T> compartment, T key, Callable<SuperByteBuffer> callable) {
-		Cache<Object, SuperByteBuffer> cache = caches.get(compartment);
-		if (cache != null) {
-			try {
-				return cache.get(key, callable);
-			} catch (ExecutionException e) {
-				e.printStackTrace();
-			}
-		}
-		return null;
-	}
-
-	public <T> void invalidate(Compartment<T> compartment, T key) {
-		caches.get(compartment).invalidate(key);
-	}
-
-	public <T> void invalidate(Compartment<?> compartment) {
-		caches.get(compartment).invalidateAll();
-	}
-
-	public void invalidate() {
-		caches.forEach((compartment, cache) -> cache.invalidateAll());
-	}
-
-	public static class Compartment<T> {
-	}
-
-}

src/main/java/nl/requios/effortlessbuilding/create/foundation/render/SuperRenderTypeBuffer.java

@@ -1,94 +0,0 @@
-package nl.requios.effortlessbuilding.create.foundation.render;
-
-import com.mojang.blaze3d.vertex.BufferBuilder;
-import com.mojang.blaze3d.vertex.VertexConsumer;
-import it.unimi.dsi.fastutil.objects.Object2ObjectLinkedOpenHashMap;
-import net.minecraft.Util;
-import net.minecraft.client.renderer.ChunkBufferBuilderPack;
-import net.minecraft.client.renderer.MultiBufferSource;
-import net.minecraft.client.renderer.RenderType;
-import net.minecraft.client.renderer.Sheets;
-import net.minecraft.client.resources.model.ModelBakery;
-
-import java.util.SortedMap;
-
-public class SuperRenderTypeBuffer implements MultiBufferSource {
-
-	private static final SuperRenderTypeBuffer INSTANCE = new SuperRenderTypeBuffer();
-
-	public static SuperRenderTypeBuffer getInstance() {
-		return INSTANCE;
-	}
-
-	private SuperRenderTypeBufferPhase earlyBuffer;
-	private SuperRenderTypeBufferPhase defaultBuffer;
-	private SuperRenderTypeBufferPhase lateBuffer;
-
-	public SuperRenderTypeBuffer() {
-		earlyBuffer = new SuperRenderTypeBufferPhase();
-		defaultBuffer = new SuperRenderTypeBufferPhase();
-		lateBuffer = new SuperRenderTypeBufferPhase();
-	}
-
-	public VertexConsumer getEarlyBuffer(RenderType type) {
-		return earlyBuffer.bufferSource.getBuffer(type);
-	}
-
-	@Override
-	public VertexConsumer getBuffer(RenderType type) {
-		return defaultBuffer.bufferSource.getBuffer(type);
-	}
-
-	public VertexConsumer getLateBuffer(RenderType type) {
-		return lateBuffer.bufferSource.getBuffer(type);
-	}
-
-	public void draw() {
-		earlyBuffer.bufferSource.endBatch();
-		defaultBuffer.bufferSource.endBatch();
-		lateBuffer.bufferSource.endBatch();
-	}
-
-	public void draw(RenderType type) {
-		earlyBuffer.bufferSource.endBatch(type);
-		defaultBuffer.bufferSource.endBatch(type);
-		lateBuffer.bufferSource.endBatch(type);
-	}
-
-	private static class SuperRenderTypeBufferPhase {
-
-		// Visible clones from RenderBuffers
-		private final ChunkBufferBuilderPack fixedBufferPack = new ChunkBufferBuilderPack();
-		private final SortedMap<RenderType, BufferBuilder> fixedBuffers = Util.make(new Object2ObjectLinkedOpenHashMap<>(), map -> {
-				map.put(Sheets.solidBlockSheet(), fixedBufferPack.builder(RenderType.solid()));
-				map.put(Sheets.cutoutBlockSheet(), fixedBufferPack.builder(RenderType.cutout()));
-				map.put(Sheets.bannerSheet(), fixedBufferPack.builder(RenderType.cutoutMipped()));
-				map.put(Sheets.translucentCullBlockSheet(), fixedBufferPack.builder(RenderType.translucent()));
-				put(map, Sheets.shieldSheet());
-				put(map, Sheets.bedSheet());
-				put(map, Sheets.shulkerBoxSheet());
-				put(map, Sheets.signSheet());
-				put(map, Sheets.chestSheet());
-				put(map, RenderType.translucentNoCrumbling());
-				put(map, RenderType.armorGlint());
-				put(map, RenderType.armorEntityGlint());
-				put(map, RenderType.glint());
-				put(map, RenderType.glintDirect());
-				put(map, RenderType.glintTranslucent());
-				put(map, RenderType.entityGlint());
-				put(map, RenderType.entityGlintDirect());
-				put(map, RenderType.waterMask());
-				put(map, RenderTypes.getOutlineSolid());
-				ModelBakery.DESTROY_TYPES.forEach((p_173062_) -> {
-					put(map, p_173062_);
-				});
-			});
-		private final BufferSource bufferSource = MultiBufferSource.immediateWithBuffers(fixedBuffers, new BufferBuilder(256));
-
-		private static void put(Object2ObjectLinkedOpenHashMap<RenderType, BufferBuilder> map, RenderType type) {
-			map.put(type, new BufferBuilder(type.bufferSize()));
-		}
-
-	}
-
-}

src/main/java/nl/requios/effortlessbuilding/create/foundation/render/TileEntityRenderHelper.java

@@ -1,113 +0,0 @@
-package nl.requios.effortlessbuilding.create.foundation.render;
-
-import com.jozufozu.flywheel.backend.Backend;
-import com.jozufozu.flywheel.backend.instancing.InstancedRenderRegistry;
-import com.jozufozu.flywheel.config.BackendType;
-import com.jozufozu.flywheel.core.virtual.VirtualRenderWorld;
-import com.jozufozu.flywheel.util.transform.TransformStack;
-import com.mojang.blaze3d.vertex.PoseStack;
-import com.mojang.math.Matrix4f;
-import com.mojang.math.Vector4f;
-import nl.requios.effortlessbuilding.create.Create;
-import nl.requios.effortlessbuilding.create.foundation.utility.AnimationTickHolder;
-import nl.requios.effortlessbuilding.create.foundation.utility.RegisteredObjects;
-import net.minecraft.client.Minecraft;
-import net.minecraft.client.renderer.LevelRenderer;
-import net.minecraft.client.renderer.MultiBufferSource;
-import net.minecraft.client.renderer.blockentity.BlockEntityRenderer;
-import net.minecraft.client.renderer.texture.OverlayTexture;
-import net.minecraft.core.BlockPos;
-import net.minecraft.world.level.Level;
-import net.minecraft.world.level.block.entity.BlockEntity;
-
-import javax.annotation.Nullable;
-import java.util.Iterator;
-
-public class TileEntityRenderHelper {
-
-	public static void renderTileEntities(Level world, Iterable<BlockEntity> customRenderTEs, PoseStack ms,
-			MultiBufferSource buffer) {
-		renderTileEntities(world, null, customRenderTEs, ms, null, buffer);
-	}
-
-	public static void renderTileEntities(Level world, Iterable<BlockEntity> customRenderTEs, PoseStack ms,
-			MultiBufferSource buffer, float pt) {
-		renderTileEntities(world, null, customRenderTEs, ms, null, buffer, pt);
-	}
-
-	public static void renderTileEntities(Level world, @Nullable VirtualRenderWorld renderWorld,
-			Iterable<BlockEntity> customRenderTEs, PoseStack ms, @Nullable Matrix4f lightTransform, MultiBufferSource buffer) {
-		renderTileEntities(world, renderWorld, customRenderTEs, ms, lightTransform, buffer,
-			AnimationTickHolder.getPartialTicks());
-	}
-
-	public static void renderTileEntities(Level world, @Nullable VirtualRenderWorld renderWorld,
-			Iterable<BlockEntity> customRenderTEs, PoseStack ms, @Nullable Matrix4f lightTransform, MultiBufferSource buffer,
-			float pt) {
-		Iterator<BlockEntity> iterator = customRenderTEs.iterator();
-		while (iterator.hasNext()) {
-			BlockEntity tileEntity = iterator.next();
-			if (Backend.getBackendType() == BackendType.INSTANCING && Backend.isFlywheelWorld(renderWorld) && InstancedRenderRegistry.shouldSkipRender(tileEntity))
-				continue;
-
-			BlockEntityRenderer<BlockEntity> renderer = Minecraft.getInstance().getBlockEntityRenderDispatcher().getRenderer(tileEntity);
-			if (renderer == null) {
-				iterator.remove();
-				continue;
-			}
-
-			BlockPos pos = tileEntity.getBlockPos();
-			ms.pushPose();
-			TransformStack.cast(ms)
-				.translate(pos);
-
-			try {
-				int worldLight = getCombinedLight(world, getLightPos(lightTransform, pos), renderWorld, pos);
-
-				if (renderWorld != null) {
-					// Swap the real world for the render world so that the renderer gets contraption-local information
-					tileEntity.setLevel(renderWorld);
-					renderer.render(tileEntity, pt, ms, buffer, worldLight, OverlayTexture.NO_OVERLAY);
-					tileEntity.setLevel(world);
-				} else {
-					renderer.render(tileEntity, pt, ms, buffer, worldLight, OverlayTexture.NO_OVERLAY);
-				}
-
-			} catch (Exception e) {
-				iterator.remove();
-
-				String message = "BlockEntity " + RegisteredObjects.getKeyOrThrow(tileEntity.getType())
-					.toString() + " could not be rendered virtually.";
-//				if (AllConfigs.CLIENT.explainRenderErrors.get())
-					Create.LOGGER.error(message, e);
-//				else
-//					Create.LOGGER.error(message);
-			}
-
-			ms.popPose();
-		}
-	}
-
-	private static BlockPos getLightPos(@Nullable Matrix4f lightTransform, BlockPos contraptionPos) {
-		if (lightTransform != null) {
-			Vector4f lightVec = new Vector4f(contraptionPos.getX() + .5f, contraptionPos.getY() + .5f, contraptionPos.getZ() + .5f, 1);
-			lightVec.transform(lightTransform);
-			return new BlockPos(lightVec.x(), lightVec.y(), lightVec.z());
-		} else {
-			return contraptionPos;
-		}
-	}
-
-	public static int getCombinedLight(Level world, BlockPos worldPos, @Nullable VirtualRenderWorld renderWorld,
-			BlockPos renderWorldPos) {
-		int worldLight = LevelRenderer.getLightColor(world, worldPos);
-
-		if (renderWorld != null) {
-			int renderWorldLight = LevelRenderer.getLightColor(renderWorld, renderWorldPos);
-			return SuperByteBuffer.maxLight(worldLight, renderWorldLight);
-		}
-
-		return worldLight;
-	}
-
-}

src/main/java/nl/requios/effortlessbuilding/create/foundation/utility/AbstractBlockBreakQueue.java

@@ -1,36 +0,0 @@
-package nl.requios.effortlessbuilding.create.foundation.utility;
-
-import net.minecraft.core.BlockPos;
-import net.minecraft.world.InteractionHand;
-import net.minecraft.world.entity.LivingEntity;
-import net.minecraft.world.entity.player.Player;
-import net.minecraft.world.item.ItemStack;
-import net.minecraft.world.level.Level;
-import net.minecraftforge.event.ForgeEventFactory;
-
-import javax.annotation.Nullable;
-import java.util.function.BiConsumer;
-import java.util.function.Consumer;
-
-public abstract class AbstractBlockBreakQueue {
-	protected Consumer<BlockPos> makeCallbackFor(Level world, float effectChance, ItemStack toDamage,
-		@Nullable Player playerEntity, BiConsumer<BlockPos, ItemStack> drop) {
-		return pos -> {
-			ItemStack usedTool = toDamage.copy();
-			BlockHelper.destroyBlockAs(world, pos, playerEntity, toDamage, effectChance,
-				stack -> drop.accept(pos, stack));
-			if (toDamage.isEmpty() && !usedTool.isEmpty())
-				ForgeEventFactory.onPlayerDestroyItem(playerEntity, usedTool, InteractionHand.MAIN_HAND);
-		};
-	}
-
-	public void destroyBlocks(Level world, @Nullable LivingEntity entity, BiConsumer<BlockPos, ItemStack> drop) {
-		Player playerEntity = entity instanceof Player ? ((Player) entity) : null;
-		ItemStack toDamage =
-			playerEntity != null && !playerEntity.isCreative() ? playerEntity.getMainHandItem() : ItemStack.EMPTY;
-		destroyBlocks(world, toDamage, playerEntity, drop);
-	}
-
-	public abstract void destroyBlocks(Level world, ItemStack toDamage, @Nullable Player playerEntity,
-		BiConsumer<BlockPos, ItemStack> drop);
-}

src/main/java/nl/requios/effortlessbuilding/create/foundation/utility/AngleHelper.java

@@ -1,52 +0,0 @@
-package nl.requios.effortlessbuilding.create.foundation.utility;
-
-import net.minecraft.core.Direction;
-import net.minecraft.core.Direction.Axis;
-import net.minecraft.util.Mth;
-
-public class AngleHelper {
-
-	public static float horizontalAngle(Direction facing) {
-		if (facing.getAxis().isVertical())
-			return 0;
-		float angle = facing.toYRot();
-		if (facing.getAxis() == Axis.X)
-			angle = -angle;
-		return angle;
-	}
-
-	public static float verticalAngle(Direction facing) {
-		return facing == Direction.UP ? -90 : facing == Direction.DOWN ? 90 : 0;
-	}
-
-	public static float rad(double angle) {
-		if (angle == 0)
-			return 0;
-		return (float) (angle / 180 * Math.PI);
-	}
-
-	public static float deg(double angle) {
-		if (angle == 0)
-			return 0;
-		return (float) (angle * 180 / Math.PI);
-	}
-
-	public static float angleLerp(double pct, double current, double target) {
-		return (float) (current + getShortestAngleDiff(current, target) * pct);
-	}
-
-	public static float getShortestAngleDiff(double current, double target) {
-		current = current % 360;
-		target = target % 360;
-		return (float) (((((target - current) % 360) + 540) % 360) - 180);
-	}
-
-	public static float getShortestAngleDiff(double current, double target, float hint) {
-		float diff = getShortestAngleDiff(current, target);
-		if (Mth.equal(Math.abs(diff), 180) && Math.signum(diff) != Math.signum(hint)) {
-			return diff + 360*Math.signum(hint);
-		}
-		return diff;
-	}
-
-}

src/main/java/nl/requios/effortlessbuilding/create/foundation/utility/AnimationTickHolder.java

@@ -1,56 +0,0 @@
-package nl.requios.effortlessbuilding.create.foundation.utility;
-
-import nl.requios.effortlessbuilding.create.foundation.utility.worldWrappers.WrappedClientWorld;
-import net.minecraft.client.Minecraft;
-import net.minecraft.world.level.LevelAccessor;
-
-public class AnimationTickHolder {
-
-	private static int ticks;
-	private static int pausedTicks;
-
-	public static void reset() {
-		ticks = 0;
-		pausedTicks = 0;
-	}
-
-	public static void tick() {
-		if (!Minecraft.getInstance()
-			.isPaused()) {
-			ticks = (ticks + 1) % 1_728_000; // wrap around every 24 hours so we maintain enough floating point precision
-		} else {
-			pausedTicks = (pausedTicks + 1) % 1_728_000;
-		}
-	}
-
-	public static int getTicks() {
-		return getTicks(false);
-	}
-
-	public static int getTicks(boolean includePaused) {
-		return includePaused ? ticks + pausedTicks : ticks;
-	}
-
-	public static float getRenderTime() {
-		return getTicks() + getPartialTicks();
-	}
-
-	public static float getPartialTicks() {
-		Minecraft mc = Minecraft.getInstance();
-		return (mc.isPaused() ? mc.pausePartialTick : mc.getFrameTime());
-	}
-
-	public static int getTicks(LevelAccessor world) {
-		if (world instanceof WrappedClientWorld)
-			return getTicks(((WrappedClientWorld) world).getWrappedWorld());
-		return getTicks();
-	}
-
-	public static float getRenderTime(LevelAccessor world) {
-		return getTicks(world) + getPartialTicks(world);
-	}
-
-	public static float getPartialTicks(LevelAccessor world) {
-		return getPartialTicks();
-	}
-}

src/main/java/nl/requios/effortlessbuilding/create/foundation/utility/BBHelper.java

@@ -1,20 +0,0 @@
-package nl.requios.effortlessbuilding.create.foundation.utility;
-
-import net.minecraft.core.BlockPos;
-import net.minecraft.world.level.levelgen.structure.BoundingBox;
-
-public class BBHelper {
-
-	public static BoundingBox encapsulate(BoundingBox bb, BlockPos pos) {
-		return new BoundingBox(Math.min(bb.minX(), pos.getX()), Math.min(bb.minY(), pos.getY()),
-			Math.min(bb.minZ(), pos.getZ()), Math.max(bb.maxX(), pos.getX()), Math.max(bb.maxY(), pos.getY()),
-			Math.max(bb.maxZ(), pos.getZ()));
-	}
-
-	public static BoundingBox encapsulate(BoundingBox bb, BoundingBox bb2) {
-		return new BoundingBox(Math.min(bb.minX(), bb2.minX()), Math.min(bb.minY(), bb2.minY()),
-			Math.min(bb.minZ(), bb2.minZ()), Math.max(bb.maxX(), bb2.maxX()), Math.max(bb.maxY(), bb2.maxY()),
-			Math.max(bb.maxZ(), bb2.maxZ()));
-	}
-
-}

src/main/java/nl/requios/effortlessbuilding/create/foundation/utility/BlockFace.java

@@ -1,52 +0,0 @@
-package nl.requios.effortlessbuilding.create.foundation.utility;
-
-import net.minecraft.core.BlockPos;
-import net.minecraft.core.Direction;
-import net.minecraft.nbt.CompoundTag;
-import net.minecraft.nbt.NbtUtils;
-
-public class BlockFace extends Pair<BlockPos, Direction> {
-
-	public BlockFace(BlockPos first, Direction second) {
-		super(first, second);
-	}
-
-	public boolean isEquivalent(BlockFace other) {
-		if (equals(other))
-			return true;
-		return getConnectedPos().equals(other.getPos()) && getPos().equals(other.getConnectedPos());
-	}
-
-	public BlockPos getPos() {
-		return getFirst();
-	}
-
-	public Direction getFace() {
-		return getSecond();
-	}
-
-	public Direction getOppositeFace() {
-		return getSecond().getOpposite();
-	}
-
-	public BlockFace getOpposite() {
-		return new BlockFace(getConnectedPos(), getOppositeFace());
-	}
-
-	public BlockPos getConnectedPos() {
-		return getPos().relative(getFace());
-	}
-
-	public CompoundTag serializeNBT() {
-		CompoundTag compoundNBT = new CompoundTag();
-		compoundNBT.put("Pos", NbtUtils.writeBlockPos(getPos()));
-		NBTHelper.writeEnum(compoundNBT, "Face", getFace());
-		return compoundNBT;
-	}
-
-	public static BlockFace fromNBT(CompoundTag compound) {
-		return new BlockFace(NbtUtils.readBlockPos(compound.getCompound("Pos")),
-			NBTHelper.readEnum(compound, "Face", Direction.class));
-	}
-
-}

src/main/java/nl/requios/effortlessbuilding/create/foundation/utility/BlockHelper.java

@@ -1,337 +0,0 @@
-package nl.requios.effortlessbuilding.create.foundation.utility;
-
-import net.minecraft.core.BlockPos;
-import net.minecraft.core.Direction;
-import net.minecraft.core.Registry;
-import net.minecraft.core.SectionPos;
-import net.minecraft.core.particles.ParticleTypes;
-import net.minecraft.nbt.CompoundTag;
-import net.minecraft.server.level.ServerLevel;
-import net.minecraft.sounds.SoundEvents;
-import net.minecraft.sounds.SoundSource;
-import net.minecraft.stats.Stats;
-import net.minecraft.tags.BlockTags;
-import net.minecraft.tags.FluidTags;
-import net.minecraft.world.entity.player.Player;
-import net.minecraft.world.item.Item;
-import net.minecraft.world.item.ItemStack;
-import net.minecraft.world.item.Items;
-import net.minecraft.world.item.enchantment.Enchantments;
-import net.minecraft.world.level.BlockGetter;
-import net.minecraft.world.level.GameRules;
-import net.minecraft.world.level.Level;
-import net.minecraft.world.level.block.*;
-import net.minecraft.world.level.block.entity.BlockEntity;
-import net.minecraft.world.level.block.state.BlockState;
-import net.minecraft.world.level.block.state.properties.BlockStateProperties;
-import net.minecraft.world.level.block.state.properties.Property;
-import net.minecraft.world.level.block.state.properties.SlabType;
-import net.minecraft.world.level.chunk.LevelChunk;
-import net.minecraft.world.level.chunk.LevelChunkSection;
-import net.minecraft.world.level.material.FluidState;
-import net.minecraft.world.level.material.Material;
-import net.minecraftforge.common.IPlantable;
-import net.minecraftforge.common.MinecraftForge;
-import net.minecraftforge.event.level.BlockEvent;
-
-import javax.annotation.Nullable;
-import java.util.function.Consumer;
-
-public class BlockHelper {
-
-	public static BlockState setZeroAge(BlockState blockState) {
-		if (blockState.hasProperty(BlockStateProperties.AGE_1))
-			return blockState.setValue(BlockStateProperties.AGE_1, 0);
-		if (blockState.hasProperty(BlockStateProperties.AGE_2))
-			return blockState.setValue(BlockStateProperties.AGE_2, 0);
-		if (blockState.hasProperty(BlockStateProperties.AGE_3))
-			return blockState.setValue(BlockStateProperties.AGE_3, 0);
-		if (blockState.hasProperty(BlockStateProperties.AGE_5))
-			return blockState.setValue(BlockStateProperties.AGE_5, 0);
-		if (blockState.hasProperty(BlockStateProperties.AGE_7))
-			return blockState.setValue(BlockStateProperties.AGE_7, 0);
-		if (blockState.hasProperty(BlockStateProperties.AGE_15))
-			return blockState.setValue(BlockStateProperties.AGE_15, 0);
-		if (blockState.hasProperty(BlockStateProperties.AGE_25))
-			return blockState.setValue(BlockStateProperties.AGE_25, 0);
-		if (blockState.hasProperty(BlockStateProperties.LEVEL_HONEY))
-			return blockState.setValue(BlockStateProperties.LEVEL_HONEY, 0);
-		if (blockState.hasProperty(BlockStateProperties.HATCH))
-			return blockState.setValue(BlockStateProperties.HATCH, 0);
-		if (blockState.hasProperty(BlockStateProperties.STAGE))
-			return blockState.setValue(BlockStateProperties.STAGE, 0);
-		if (blockState.is(BlockTags.CAULDRONS))
-			return Blocks.CAULDRON.defaultBlockState();
-		if (blockState.hasProperty(BlockStateProperties.LEVEL_COMPOSTER))
-			return blockState.setValue(BlockStateProperties.LEVEL_COMPOSTER, 0);
-		if (blockState.hasProperty(BlockStateProperties.EXTENDED))
-			return blockState.setValue(BlockStateProperties.EXTENDED, false);
-		return blockState;
-	}
-
-	public static int findAndRemoveInInventory(BlockState block, Player player, int amount) {
-		int amountFound = 0;
-		Item required = getRequiredItem(block).getItem();
-
-		boolean needsTwo = block.hasProperty(BlockStateProperties.SLAB_TYPE)
-			&& block.getValue(BlockStateProperties.SLAB_TYPE) == SlabType.DOUBLE;
-
-		if (needsTwo)
-			amount *= 2;
-
-		if (block.hasProperty(BlockStateProperties.EGGS))
-			amount *= block.getValue(BlockStateProperties.EGGS);
-
-		if (block.hasProperty(BlockStateProperties.PICKLES))
-			amount *= block.getValue(BlockStateProperties.PICKLES);
-
-		{
-			// Try held Item first
-			int preferredSlot = player.getInventory().selected;
-			ItemStack itemstack = player.getInventory()
-				.getItem(preferredSlot);
-			int count = itemstack.getCount();
-			if (itemstack.getItem() == required && count > 0) {
-				int taken = Math.min(count, amount - amountFound);
-				player.getInventory()
-					.setItem(preferredSlot, new ItemStack(itemstack.getItem(), count - taken));
-				amountFound += taken;
-			}
-		}
-
-		// Search inventory
-		for (int i = 0; i < player.getInventory()
-			.getContainerSize(); ++i) {
-			if (amountFound == amount)
-				break;
-
-			ItemStack itemstack = player.getInventory()
-				.getItem(i);
-			int count = itemstack.getCount();
-			if (itemstack.getItem() == required && count > 0) {
-				int taken = Math.min(count, amount - amountFound);
-				player.getInventory()
-					.setItem(i, new ItemStack(itemstack.getItem(), count - taken));
-				amountFound += taken;
-			}
-		}
-
-		if (needsTwo) {
-			// Give back 1 if uneven amount was removed
-			if (amountFound % 2 != 0)
-				player.getInventory()
-					.add(new ItemStack(required));
-			amountFound /= 2;
-		}
-
-		return amountFound;
-	}
-
-	public static ItemStack getRequiredItem(BlockState state) {
-		ItemStack itemStack = new ItemStack(state.getBlock());
-		Item item = itemStack.getItem();
-		if (item == Items.FARMLAND || item == Items.DIRT_PATH)
-			itemStack = new ItemStack(Items.DIRT);
-		return itemStack;
-	}
-
-	public static void destroyBlock(Level world, BlockPos pos, float effectChance) {
-		destroyBlock(world, pos, effectChance, stack -> Block.popResource(world, pos, stack));
-	}
-
-	public static void destroyBlock(Level world, BlockPos pos, float effectChance,
-		Consumer<ItemStack> droppedItemCallback) {
-		destroyBlockAs(world, pos, null, ItemStack.EMPTY, effectChance, droppedItemCallback);
-	}
-
-	public static void destroyBlockAs(Level world, BlockPos pos, @Nullable Player player, ItemStack usedTool,
-		float effectChance, Consumer<ItemStack> droppedItemCallback) {
-		FluidState fluidState = world.getFluidState(pos);
-		BlockState state = world.getBlockState(pos);
-		
-		if (world.random.nextFloat() < effectChance)
-			world.levelEvent(2001, pos, Block.getId(state));
-		BlockEntity tileentity = state.hasBlockEntity() ? world.getBlockEntity(pos) : null;
-		
-		if (player != null) {
-			BlockEvent.BreakEvent event = new BlockEvent.BreakEvent(world, pos, state, player);
-			MinecraftForge.EVENT_BUS.post(event);
-			if (event.isCanceled())
-				return;
-
-			if (event.getExpToDrop() > 0 && world instanceof ServerLevel)
-				state.getBlock()
-					.popExperience((ServerLevel) world, pos, event.getExpToDrop());
-
-			usedTool.mineBlock(world, state, pos, player);
-			player.awardStat(Stats.BLOCK_MINED.get(state.getBlock()));
-		}
-
-		if (world instanceof ServerLevel && world.getGameRules()
-			.getBoolean(GameRules.RULE_DOBLOCKDROPS) && !world.restoringBlockSnapshots
-			&& (player == null || !player.isCreative())) {
-			for (ItemStack itemStack : Block.getDrops(state, (ServerLevel) world, pos, tileentity, player, usedTool))
-				droppedItemCallback.accept(itemStack);
-
-			// Simulating IceBlock#playerDestroy. Not calling method directly as it would drop item
-			// entities as a side-effect
-			if (state.getBlock() instanceof IceBlock && usedTool.getEnchantmentLevel(Enchantments.SILK_TOUCH) == 0) {
-				if (world.dimensionType()
-					.ultraWarm())
-					return;
-
-				Material material = world.getBlockState(pos.below())
-					.getMaterial();
-				if (material.blocksMotion() || material.isLiquid())
-					world.setBlockAndUpdate(pos, Blocks.WATER.defaultBlockState());
-				return;
-			}
-
-			state.spawnAfterBreak((ServerLevel) world, pos, ItemStack.EMPTY, true);
-		}
-		
-		world.setBlockAndUpdate(pos, fluidState.createLegacyBlock());
-	}
-
-	public static boolean isSolidWall(BlockGetter reader, BlockPos fromPos, Direction toDirection) {
-		return hasBlockSolidSide(reader.getBlockState(fromPos.relative(toDirection)), reader,
-			fromPos.relative(toDirection), toDirection.getOpposite());
-	}
-
-	public static boolean noCollisionInSpace(BlockGetter reader, BlockPos pos) {
-		return reader.getBlockState(pos)
-			.getCollisionShape(reader, pos)
-			.isEmpty();
-	}
-
-	private static void placeRailWithoutUpdate(Level world, BlockState state, BlockPos target) {
-		LevelChunk chunk = world.getChunkAt(target);
-		int idx = chunk.getSectionIndex(target.getY());
-		LevelChunkSection chunksection = chunk.getSection(idx);
-		if (chunksection == null) {
-			chunksection = new LevelChunkSection(chunk.getSectionYFromSectionIndex(idx), world.registryAccess()
-				.registryOrThrow(Registry.BIOME_REGISTRY));
-			chunk.getSections()[idx] = chunksection;
-		}
-		BlockState old = chunksection.setBlockState(SectionPos.sectionRelative(target.getX()),
-			SectionPos.sectionRelative(target.getY()), SectionPos.sectionRelative(target.getZ()), state);
-		chunk.setUnsaved(true);
-		world.markAndNotifyBlock(target, chunk, old, state, 82, 512);
-
-		world.setBlock(target, state, 82);
-		world.neighborChanged(target, world.getBlockState(target.below())
-			.getBlock(), target.below());
-	}
-
-	public static void placeSchematicBlock(Level world, BlockState state, BlockPos target, ItemStack stack,
-		@Nullable CompoundTag data) {
-		BlockEntity existingTile = world.getBlockEntity(target);
-
-		// Piston
-		if (state.hasProperty(BlockStateProperties.EXTENDED))
-			state = state.setValue(BlockStateProperties.EXTENDED, Boolean.FALSE);
-		if (state.hasProperty(BlockStateProperties.WATERLOGGED))
-			state = state.setValue(BlockStateProperties.WATERLOGGED, Boolean.FALSE);
-
-//		if (AllBlocks.BELT.has(state)) {
-//			world.setBlock(target, state, 2);
-//			return;
-//		} else if (state.getBlock() == Blocks.COMPOSTER)
-//			state = Blocks.COMPOSTER.defaultBlockState();
-//		else if (state.getBlock() != Blocks.SEA_PICKLE && state.getBlock() instanceof IPlantable)
-//			state = ((IPlantable) state.getBlock()).getPlant(world, target);
-//		else if (state.is(BlockTags.CAULDRONS))
-//			state = Blocks.CAULDRON.defaultBlockState();
-
-		if (world.dimensionType()
-			.ultraWarm() && state.getFluidState().is(FluidTags.WATER)) {
-			int i = target.getX();
-			int j = target.getY();
-			int k = target.getZ();
-			world.playSound(null, target, SoundEvents.FIRE_EXTINGUISH, SoundSource.BLOCKS, 0.5F,
-				2.6F + (world.random.nextFloat() - world.random.nextFloat()) * 0.8F);
-
-			for (int l = 0; l < 8; ++l) {
-				world.addParticle(ParticleTypes.LARGE_SMOKE, i + Math.random(), j + Math.random(), k + Math.random(),
-					0.0D, 0.0D, 0.0D);
-			}
-			Block.dropResources(state, world, target);
-			return;
-		}
-
-		if (state.getBlock() instanceof BaseRailBlock) {
-			placeRailWithoutUpdate(world, state, target);
-		} else {
-			world.setBlock(target, state, 18);
-		}
-
-		if (data != null) {
-//			if (existingTile instanceof IMergeableTE mergeable) {
-//				BlockEntity loaded = BlockEntity.loadStatic(target, state, data);
-//				if (existingTile.getType()
-//					.equals(loaded.getType())) {
-//					mergeable.accept(loaded);
-//					return;
-//				}
-//			}
-			BlockEntity tile = world.getBlockEntity(target);
-			if (tile != null) {
-				data.putInt("x", target.getX());
-				data.putInt("y", target.getY());
-				data.putInt("z", target.getZ());
-//				if (tile instanceof KineticTileEntity)
-//					((KineticTileEntity) tile).warnOfMovement();
-				tile.load(data);
-			}
-		}
-
-		try {
-			state.getBlock()
-				.setPlacedBy(world, target, state, null, stack);
-		} catch (Exception e) {
-		}
-	}
-
-	public static double getBounceMultiplier(Block block) {
-		if (block instanceof SlimeBlock)
-			return 0.8D;
-		if (block instanceof BedBlock)
-			return 0.66 * 0.8D;
-		return 0;
-	}
-
-	public static boolean hasBlockSolidSide(BlockState p_220056_0_, BlockGetter p_220056_1_, BlockPos p_220056_2_,
-		Direction p_220056_3_) {
-		return !p_220056_0_.is(BlockTags.LEAVES)
-			&& Block.isFaceFull(p_220056_0_.getCollisionShape(p_220056_1_, p_220056_2_), p_220056_3_);
-	}
-
-	public static boolean extinguishFire(Level world, @Nullable Player p_175719_1_, BlockPos p_175719_2_,
-		Direction p_175719_3_) {
-		p_175719_2_ = p_175719_2_.relative(p_175719_3_);
-		if (world.getBlockState(p_175719_2_)
-			.getBlock() == Blocks.FIRE) {
-			world.levelEvent(p_175719_1_, 1009, p_175719_2_, 0);
-			world.removeBlock(p_175719_2_, false);
-			return true;
-		} else {
-			return false;
-		}
-	}
-
-	public static BlockState copyProperties(BlockState fromState, BlockState toState) {
-		for (Property<?> property : fromState.getProperties()) {
-			toState = copyProperty(property, fromState, toState);
-		}
-		return toState;
-	}
-
-	public static <T extends Comparable<T>> BlockState copyProperty(Property<T> property, BlockState fromState,
-		BlockState toState) {
-		if (fromState.hasProperty(property) && toState.hasProperty(property)) {
-			return toState.setValue(property, fromState.getValue(property));
-		}
-		return toState;
-	}
-
-}

src/main/java/nl/requios/effortlessbuilding/create/foundation/utility/CameraAngleAnimationService.java

@@ -1,90 +0,0 @@
-package nl.requios.effortlessbuilding.create.foundation.utility;
-
-import nl.requios.effortlessbuilding.create.foundation.utility.animation.LerpedFloat;
-import net.minecraft.client.Minecraft;
-import net.minecraft.util.Mth;
-
-public class CameraAngleAnimationService {
-
-	private static final LerpedFloat yRotation = LerpedFloat.angular().startWithValue(0);
-	private static final LerpedFloat xRotation = LerpedFloat.angular().startWithValue(0);
-
-	private static Mode animationMode = Mode.LINEAR;
-	private static float animationSpeed = -1;
-
-	public static void tick() {
-
-		yRotation.tickChaser();
-		xRotation.tickChaser();
-
-		if (Minecraft.getInstance().player != null) {
-			if (!yRotation.settled())
-				Minecraft.getInstance().player.setYRot(yRotation.getValue(1));
-
-			if (!xRotation.settled())
-				Minecraft.getInstance().player.setXRot(xRotation.getValue(1));
-		}
-	}
-
-	public static boolean isYawAnimating() {
-		return !yRotation.settled();
-	}
-
-	public static boolean isPitchAnimating() {
-		return !xRotation.settled();
-	}
-
-	public static float getYaw(float partialTicks) {
-		return yRotation.getValue(partialTicks);
-	}
-
-	public static float getPitch(float partialTicks) {
-		return xRotation.getValue(partialTicks);
-	}
-
-	public static void setAnimationMode(Mode mode) {
-		animationMode = mode;
-	}
-
-	public static void setAnimationSpeed(float speed) {
-		animationSpeed = speed;
-	}
-
-	public static void setYawTarget(float yaw) {
-		float currentYaw = getCurrentYaw();
-		yRotation.startWithValue(currentYaw);
-		setupChaser(yRotation, currentYaw + AngleHelper.getShortestAngleDiff(currentYaw, Mth.wrapDegrees(yaw)));
-	}
-
-	public static void setPitchTarget(float pitch) {
-		float currentPitch = getCurrentPitch();
-		xRotation.startWithValue(currentPitch);
-		setupChaser(xRotation, currentPitch + AngleHelper.getShortestAngleDiff(currentPitch, Mth.wrapDegrees(pitch)));
-	}
-
-	private static float getCurrentYaw() {
-		if (Minecraft.getInstance().player == null)
-			return 0;
-		return Mth.wrapDegrees(Minecraft.getInstance().player.getYRot());
-	}
-
-	private static float getCurrentPitch() {
-		if (Minecraft.getInstance().player == null)
-			return 0;
-
-		return Mth.wrapDegrees(Minecraft.getInstance().player.getXRot());
-	}
-
-	private static void setupChaser(LerpedFloat rotation, float target) {
-		if (animationMode == Mode.LINEAR) {
-			rotation.chase(target, animationSpeed > 0 ? animationSpeed : 2, LerpedFloat.Chaser.LINEAR);
-		} else if (animationMode == Mode.EXPONENTIAL) {
-			rotation.chase(target, animationSpeed > 0 ? animationSpeed : 0.25, LerpedFloat.Chaser.EXP);
-		}
-	}
-
-	public enum Mode {
-		LINEAR,
-		EXPONENTIAL
-	}
-}

src/main/java/nl/requios/effortlessbuilding/create/foundation/utility/Color.java

@@ -1,310 +0,0 @@
-package nl.requios.effortlessbuilding.create.foundation.utility;
-
-import com.google.common.hash.Hashing;
-import com.mojang.math.Vector3f;
-import net.minecraft.util.Mth;
-import net.minecraft.world.phys.Vec3;
-
-import javax.annotation.Nonnull;
-import java.util.function.UnaryOperator;
-
-public class Color {
-	public final static Color TRANSPARENT_BLACK = new Color(0, 0, 0, 0).setImmutable();
-	public final static Color BLACK = new Color(0, 0, 0).setImmutable();
-	public final static Color WHITE = new Color(255, 255, 255).setImmutable();
-	public final static Color RED = new Color(255, 0, 0).setImmutable();
-	public final static Color GREEN = new Color(0, 255, 0).setImmutable();
-	public final static Color SPRING_GREEN = new Color(0, 255, 187).setImmutable();
-
-	protected boolean mutable = true;
-	protected int value;
-
-	public Color(int r, int g, int b) {
-		this(r, g, b, 0xff);
-	}
-
-	public Color(int r, int g, int b, int a) {
-		value = ((a & 0xff) << 24) |
-				((r & 0xff) << 16) |
-				((g & 0xff) << 8)  |
-				((b & 0xff) << 0);
-	}
-
-	public Color(float r, float g, float b, float a) {
-		this(
-				(int) (0.5 + 0xff * Mth.clamp(r, 0, 1)),
-				(int) (0.5 + 0xff * Mth.clamp(g, 0, 1)),
-				(int) (0.5 + 0xff * Mth.clamp(b, 0, 1)),
-				(int) (0.5 + 0xff * Mth.clamp(a, 0, 1))
-		);
-	}
-
-	public Color(int rgba) {
-		value = rgba;
-	}
-
-	public Color(int rgb, boolean hasAlpha) {
-		if (hasAlpha) {
-			value = rgb;
-		} else {
-			value = rgb | 0xff_000000;
-		}
-	}
-
-	public Color copy() {
-		return copy(true);
-	}
-
-	public Color copy(boolean mutable) {
-		if (mutable)
-			return new Color(value);
-		else
-			return new Color(value).setImmutable();
-	}
-
-	/**
-	 * Mark this color as immutable. Attempting to mutate this color in the future
-	 * will instead cause a copy to be created that can me modified.
-	 */
-	public Color setImmutable() {
-		this.mutable = false;
-		return this;
-	}
-
-	/**
-	 * @return the red component in the range 0-255.
-	 * @see #getRGB
-	 */
-	public int getRed() {
-		return (getRGB() >> 16) & 0xff;
-	}
-
-	/**
-	 * @return the green component in the range 0-255.
-	 * @see #getRGB
-	 */
-	public int getGreen() {
-		return (getRGB() >> 8) & 0xff;
-	}
-
-	/**
-	 * @return the blue component in the range 0-255.
-	 * @see #getRGB
-	 */
-	public int getBlue() {
-		return (getRGB() >> 0) & 0xff;
-	}
-
-	/**
-	 * @return the alpha component in the range 0-255.
-	 * @see #getRGB
-	 */
-	public int getAlpha() {
-		return (getRGB() >> 24) & 0xff;
-	}
-
-	/**
-	 * @return the red component in the range 0-1f.
-	 */
-	public float getRedAsFloat() {
-		return getRed() / 255f;
-	}
-
-	/**
-	 * @return the green component in the range 0-1f.
-	 */
-	public float getGreenAsFloat() {
-		return getGreen() / 255f;
-	}
-
-	/**
-	 * @return the blue component in the range 0-1f.
-	 */
-	public float getBlueAsFloat() {
-		return getBlue() / 255f;
-	}
-
-	/**
-	 * @return the alpha component in the range 0-1f.
-	 */
-	public float getAlphaAsFloat() {
-		return getAlpha() / 255f;
-	}
-
-	/**
-	 * Returns the RGB value representing this color
-	 * (Bits 24-31 are alpha, 16-23 are red, 8-15 are green, 0-7 are blue).
-	 * @return the RGB value of the color
-	 */
-	public int getRGB() {
-		return value;
-	}
-
-	public Vec3 asVector() {
-		return new Vec3(getRedAsFloat(), getGreenAsFloat(), getBlueAsFloat());
-	}
-
-	public Vector3f asVectorF() {
-		return new Vector3f(getRedAsFloat(), getGreenAsFloat(), getBlueAsFloat());
-	}
-
-	public Color setRed(int r) {
-		return ensureMutable().setRedUnchecked(r);
-	}
-
-	public Color setGreen(int g) {
-		return ensureMutable().setGreenUnchecked(g);
-	}
-
-	public Color setBlue(int b) {
-		return ensureMutable().setBlueUnchecked(b);
-	}
-
-	public Color setAlpha(int a) {
-		return ensureMutable().setAlphaUnchecked(a);
-	}
-
-	public Color setRed(float r) {
-		return ensureMutable().setRedUnchecked((int) (0xff * Mth.clamp(r, 0, 1)));
-	}
-
-	public Color setGreen(float g) {
-		return ensureMutable().setGreenUnchecked((int) (0xff * Mth.clamp(g, 0, 1)));
-	}
-
-	public Color setBlue(float b) {
-		return ensureMutable().setBlueUnchecked((int) (0xff * Mth.clamp(b, 0, 1)));
-	}
-
-	public Color setAlpha(float a) {
-		return ensureMutable().setAlphaUnchecked((int) (0xff * Mth.clamp(a, 0, 1)));
-	}
-
-	public Color scaleAlpha(float factor) {
-		return ensureMutable().setAlphaUnchecked((int) (getAlpha() * Mth.clamp(factor, 0, 1)));
-	}
-
-	public Color mixWith(Color other, float weight) {
-		return ensureMutable()
-				.setRedUnchecked((int) (getRed() + (other.getRed() - getRed()) * weight))
-				.setGreenUnchecked((int) (getGreen() + (other.getGreen() - getGreen()) * weight))
-				.setBlueUnchecked((int) (getBlue() + (other.getBlue() - getBlue()) * weight))
-				.setAlphaUnchecked((int) (getAlpha() + (other.getAlpha() - getAlpha()) * weight));
-	}
-
-	public Color darker() {
-		int a = getAlpha();
-		return ensureMutable().mixWith(BLACK, .25f).setAlphaUnchecked(a);
-	}
-
-	public Color brighter() {
-		int a = getAlpha();
-		return ensureMutable().mixWith(WHITE, .25f).setAlphaUnchecked(a);
-	}
-
-	public Color setValue(int value) {
-		return ensureMutable().setValueUnchecked(value);
-	}
-
-	public Color modifyValue(UnaryOperator<Integer> function) {
-		int newValue = function.apply(value);
-		if (newValue == value)
-			return this;
-
-		return ensureMutable().setValueUnchecked(newValue);
-	}
-
-	// ********* //
-
-	protected Color ensureMutable() {
-		if (this.mutable)
-			return this;
-
-		return new Color(this.value);
-	}
-
-	protected Color setRedUnchecked(int r) {
-		this.value = (this.value & 0xff_00ffff) | ((r & 0xff) << 16);
-		return this;
-	}
-
-	protected Color setGreenUnchecked(int g) {
-		this.value = (this.value & 0xff_ff00ff) | ((g & 0xff) << 8);
-		return this;
-	}
-
-	protected Color setBlueUnchecked(int b) {
-		this.value = (this.value & 0xff_ffff00) | ((b & 0xff) << 0);
-		return this;
-	}
-
-	protected Color setAlphaUnchecked(int a) {
-		this.value = (this.value & 0x00_ffffff) | ((a & 0xff) << 24);
-		return this;
-	}
-
-	protected Color setValueUnchecked(int value) {
-		this.value = value;
-		return this;
-	}
-
-	// ********* //
-
-	public static Color mixColors(@Nonnull Color c1, @Nonnull Color c2, float w) {
-		return new Color(
-				(int) (c1.getRed() + (c2.getRed() - c1.getRed()) * w),
-				(int) (c1.getGreen() + (c2.getGreen() - c1.getGreen()) * w),
-				(int) (c1.getBlue() + (c2.getBlue() - c1.getBlue()) * w),
-				(int) (c1.getAlpha() + (c2.getAlpha() - c1.getAlpha()) * w)
-		);
-	}
-
-	public static Color mixColors(@Nonnull Couple<Color> colors, float w) {
-		return mixColors(colors.getFirst(), colors.getSecond(), w);
-	}
-
-	public static int mixColors(int color1, int color2, float w) {
-		int a1 = (color1 >> 24);
-		int r1 = (color1 >> 16) & 0xFF;
-		int g1 = (color1 >> 8) & 0xFF;
-		int b1 = color1 & 0xFF;
-		int a2 = (color2 >> 24);
-		int r2 = (color2 >> 16) & 0xFF;
-		int g2 = (color2 >> 8) & 0xFF;
-		int b2 = color2 & 0xFF;
-
-		return
-				((int) (a1 + (a2 - a1) * w) << 24) +
-				((int) (r1 + (r2 - r1) * w) << 16) +
-				((int) (g1 + (g2 - g1) * w) << 8) +
-				((int) (b1 + (b2 - b1) * w) << 0);
-	}
-
-	public static Color rainbowColor(int timeStep) {
-		int localTimeStep = Math.abs(timeStep) % 1536;
-		int timeStepInPhase = localTimeStep % 256;
-		int phaseBlue = localTimeStep / 256;
-		int red = colorInPhase(phaseBlue + 4, timeStepInPhase);
-		int green = colorInPhase(phaseBlue + 2, timeStepInPhase);
-		int blue = colorInPhase(phaseBlue, timeStepInPhase);
-		return new Color(red, green, blue);
-	}
-
-	private static int colorInPhase(int phase, int progress) {
-		phase = phase % 6;
-		if (phase <= 1)
-			return 0;
-		if (phase == 2)
-			return progress;
-		if (phase <= 4)
-			return 255;
-		else
-			return 255 - progress;
-	}
-
-	public static Color generateFromLong(long l) {
-		return rainbowColor(Hashing.crc32().hashLong(l).asInt())
-				.mixWith(WHITE, 0.5f);
-	}
-
-}

src/main/java/nl/requios/effortlessbuilding/create/foundation/utility/ColorHandlers.java

@@ -1,26 +0,0 @@
-package nl.requios.effortlessbuilding.create.foundation.utility;
-
-import net.minecraft.client.color.block.BlockColor;
-import net.minecraft.client.color.item.ItemColor;
-import net.minecraft.client.renderer.BiomeColors;
-import net.minecraft.world.level.GrassColor;
-import net.minecraft.world.level.block.RedStoneWireBlock;
-import net.minecraft.world.level.block.state.properties.BlockStateProperties;
-
-public class ColorHandlers {
-
-	public static BlockColor getGrassyBlock() {
-		return (state, world, pos, layer) -> pos != null && world != null ? BiomeColors.getAverageGrassColor(world, pos)
-				: GrassColor.get(0.5D, 1.0D);
-	}
-
-	public static ItemColor getGrassyItem() {
-		return (stack, layer) -> GrassColor.get(0.5D, 1.0D);
-	}
-
-	public static BlockColor getRedstonePower() {
-		return (state, world, pos, layer) -> RedStoneWireBlock
-				.getColorForPower(pos != null && world != null ? state.getValue(BlockStateProperties.POWER) : 0);
-	}
-
-}

src/main/java/nl/requios/effortlessbuilding/create/foundation/utility/Components.java

@@ -1,33 +0,0 @@
-package nl.requios.effortlessbuilding.create.foundation.utility;
-
-import net.minecraft.network.chat.Component;
-import net.minecraft.network.chat.MutableComponent;
-
-public final class Components {
-	private static final Component IMMUTABLE_EMPTY = Component.empty();
-
-	public static Component immutableEmpty() {
-		return IMMUTABLE_EMPTY;
-	}
-
-	/** Use {@link #immutableEmpty()} when possible to prevent creating an extra object. */
-	public static MutableComponent empty() {
-		return Component.empty();
-	}
-
-	public static MutableComponent literal(String str) {
-		return Component.literal(str);
-	}
-
-	public static MutableComponent translatable(String key) {
-		return Component.translatable(key);
-	}
-
-	public static MutableComponent translatable(String key, Object... args) {
-		return Component.translatable(key, args);
-	}
-
-	public static MutableComponent keybind(String name) {
-		return Component.keybind(name);
-	}
-}

src/main/java/nl/requios/effortlessbuilding/create/foundation/utility/Couple.java

@@ -1,151 +0,0 @@
-package nl.requios.effortlessbuilding.create.foundation.utility;
-
-import com.google.common.collect.ImmutableList;
-import net.minecraft.nbt.CompoundTag;
-import net.minecraft.nbt.ListTag;
-
-import java.util.Iterator;
-import java.util.List;
-import java.util.function.*;
-import java.util.stream.Stream;
-
-public class Couple<T> extends Pair<T, T> implements Iterable<T> {
-
-	private static final Couple<Boolean> TRUE_AND_FALSE = Couple.create(true, false);
-
-	protected Couple(T first, T second) {
-		super(first, second);
-	}
-
-	public static <T> Couple<T> create(T first, T second) {
-		return new Couple<>(first, second);
-	}
-
-	public static <T> Couple<T> create(Supplier<T> factory) {
-		return new Couple<>(factory.get(), factory.get());
-	}
-
-	public static <T> Couple<T> createWithContext(Function<Boolean, T> factory) {
-		return new Couple<>(factory.apply(true), factory.apply(false));
-	}
-
-	public T get(boolean first) {
-		return first ? getFirst() : getSecond();
-	}
-
-	public void set(boolean first, T value) {
-		if (first)
-			setFirst(value);
-		else
-			setSecond(value);
-	}
-
-	@Override
-	public Couple<T> copy() {
-		return create(first, second);
-	}
-
-	public <S> Couple<S> map(Function<T, S> function) {
-		return Couple.create(function.apply(first), function.apply(second));
-	}
-
-	public <S> Couple<S> mapWithContext(BiFunction<T, Boolean, S> function) {
-		return Couple.create(function.apply(first, true), function.apply(second, false));
-	}
-
-	public <S, R> Couple<S> mapWithParams(BiFunction<T, R, S> function, Couple<R> values) {
-		return Couple.create(function.apply(first, values.first), function.apply(second, values.second));
-	}
-
-	public <S, R> Couple<S> mapNotNullWithParam(BiFunction<T, R, S> function, R value) {
-		return Couple.create(first != null ? function.apply(first, value) : null,
-				second != null ? function.apply(second, value) : null);
-	}
-
-	public boolean both(Predicate<T> test) {
-		return test.test(getFirst()) && test.test(getSecond());
-	}
-
-	public boolean either(Predicate<T> test) {
-		return test.test(getFirst()) || test.test(getSecond());
-	}
-
-	public void replace(Function<T, T> function) {
-		setFirst(function.apply(getFirst()));
-		setSecond(function.apply(getSecond()));
-	}
-
-	public void replaceWithContext(BiFunction<T, Boolean, T> function) {
-		replaceWithParams(function, TRUE_AND_FALSE);
-	}
-
-	public <S> void replaceWithParams(BiFunction<T, S, T> function, Couple<S> values) {
-		setFirst(function.apply(getFirst(), values.getFirst()));
-		setSecond(function.apply(getSecond(), values.getSecond()));
-	}
-
-	@Override
-	public void forEach(Consumer<? super T> consumer) {
-		consumer.accept(getFirst());
-		consumer.accept(getSecond());
-	}
-
-	public void forEachWithContext(BiConsumer<T, Boolean> consumer) {
-		forEachWithParams(consumer, TRUE_AND_FALSE);
-	}
-
-	public <S> void forEachWithParams(BiConsumer<T, S> function, Couple<S> values) {
-		function.accept(getFirst(), values.getFirst());
-		function.accept(getSecond(), values.getSecond());
-	}
-
-	public Couple<T> swap() {
-		return Couple.create(second, first);
-	}
-
-	public ListTag serializeEach(Function<T, CompoundTag> serializer) {
-		return NBTHelper.writeCompoundList(ImmutableList.of(first, second), serializer);
-	}
-
-	public static <S> Couple<S> deserializeEach(ListTag list, Function<CompoundTag, S> deserializer) {
-		List<S> readCompoundList = NBTHelper.readCompoundList(list, deserializer);
-		return new Couple<>(readCompoundList.get(0), readCompoundList.get(1));
-	}
-
-	@Override
-	public Iterator<T> iterator() {
-		return new Couplerator<>(this);
-	}
-
-	public Stream<T> stream() {
-		return Stream.of(first, second);
-	}
-
-	private static class Couplerator<T> implements Iterator<T> {
-
-		int state;
-		private final Couple<T> couple;
-
-		public Couplerator(Couple<T> couple) {
-			this.couple = couple;
-			state = 0;
-		}
-
-		@Override
-		public boolean hasNext() {
-			return state != 2;
-		}
-
-		@Override
-		public T next() {
-			state++;
-			if (state == 1)
-				return couple.first;
-			if (state == 2)
-				return couple.second;
-			return null;
-		}
-
-	}
-
-}

src/main/java/nl/requios/effortlessbuilding/create/foundation/utility/CreateRegistry.java

@@ -1,102 +0,0 @@
-package nl.requios.effortlessbuilding.create.foundation.utility;
-
-import net.minecraft.resources.ResourceLocation;
-import net.minecraftforge.registries.IForgeRegistry;
-import nl.requios.effortlessbuilding.EffortlessBuilding;
-import nl.requios.effortlessbuilding.create.Create;
-import org.jetbrains.annotations.Nullable;
-
-import java.util.*;
-
-public class CreateRegistry<K, V> {
-	private static final List<CreateRegistry<?, ?>> ALL = new ArrayList<>();
-
-	protected final IForgeRegistry<K> objectRegistry;
-	protected final Map<ResourceLocation, V> locationMap = new HashMap<>();
-	protected final Map<K, V> objectMap = new IdentityHashMap<>();
-	protected boolean unwrapped = false;
-
-	public CreateRegistry(IForgeRegistry<K> objectRegistry) {
-		this.objectRegistry = objectRegistry;
-		ALL.add(this);
-	}
-
-	public void register(ResourceLocation location, V value) {
-		if (!unwrapped) {
-			locationMap.put(location, value);
-		} else {
-			K object = objectRegistry.getValue(location);
-			if (object != null) {
-				objectMap.put(object, value);
-			} else {
-				Create.LOGGER.warn("Could not get object for location '" + location + "' in CreateRegistry after unwrapping!");
-			}
-		}
-	}
-
-	public void register(K object, V value) {
-		if (unwrapped) {
-			objectMap.put(object, value);
-		} else {
-			ResourceLocation location = objectRegistry.getKey(object);
-			if (location != null) {
-				locationMap.put(location, value);
-			} else {
-				Create.LOGGER.warn("Could not get location of object '" + object + "' in CreateRegistry before unwrapping!");
-			}
-		}
-	}
-
-	@Nullable
-	public V get(ResourceLocation location) {
-		if (!unwrapped) {
-			return locationMap.get(location);
-		} else {
-			K object = objectRegistry.getValue(location);
-			if (object != null) {
-				return objectMap.get(object);
-			} else {
-				Create.LOGGER.warn("Could not get object for location '" + location + "' in CreateRegistry after unwrapping!");
-				return null;
-			}
-		}
-	}
-
-	@Nullable
-	public V get(K object) {
-		if (unwrapped) {
-			return objectMap.get(object);
-		} else {
-			ResourceLocation location = objectRegistry.getKey(object);
-			if (location != null) {
-				return locationMap.get(location);
-			} else {
-				Create.LOGGER.warn("Could not get location of object '" + object + "' in CreateRegistry before unwrapping!");
-				return null;
-			}
-		}
-	}
-
-	public boolean isUnwrapped() {
-		return unwrapped;
-	}
-
-	protected void unwrap() {
-		for (Map.Entry<ResourceLocation, V> entry : locationMap.entrySet()) {
-			ResourceLocation location = entry.getKey();
-			K object = objectRegistry.getValue(location);
-			if (object != null) {
-				objectMap.put(object, entry.getValue());
-			} else {
-				Create.LOGGER.warn("Could not get object for location '" + location + "' in CreateRegistry during unwrapping!");
-			}
-		}
-		unwrapped = true;
-	}
-
-	public static void unwrapAll() {
-		for (CreateRegistry<?, ?> registry : ALL) {
-			registry.unwrap();
-		}
-	}
-}

src/main/java/nl/requios/effortlessbuilding/create/foundation/utility/Debug.java

@@ -1,67 +0,0 @@
-package nl.requios.effortlessbuilding.create.foundation.utility;
-
-import nl.requios.effortlessbuilding.create.Create;
-import net.minecraft.ChatFormatting;
-import net.minecraft.client.Minecraft;
-import net.minecraft.network.chat.Component;
-import net.minecraft.network.chat.MutableComponent;
-import net.minecraftforge.api.distmarker.Dist;
-import net.minecraftforge.api.distmarker.OnlyIn;
-import net.minecraftforge.fml.util.thread.EffectiveSide;
-
-/** Deprecated so simi doensn't forget to remove debug calls **/
-@OnlyIn(value = Dist.CLIENT)
-public class Debug {
-
-	@Deprecated
-	public static void debugChat(String message) {
-		if (Minecraft.getInstance().player != null)
-			Minecraft.getInstance().player.displayClientMessage(Components.literal(message), false);
-	}
-
-	@Deprecated
-	public static void debugChatAndShowStack(String message, int depth) {
-		if (Minecraft.getInstance().player != null)
-			Minecraft.getInstance().player.displayClientMessage(Components.literal(message).append("@")
-				.append(debugStack(depth)), false);
-	}
-
-	@Deprecated
-	public static void debugMessage(String message) {
-		if (Minecraft.getInstance().player != null)
-			Minecraft.getInstance().player.displayClientMessage(Components.literal(message), true);
-	}
-	
-	@Deprecated
-	public static void log(String message) {
-		Create.LOGGER.info(message);
-	}
-
-	@Deprecated
-	public static String getLogicalSide() {
-		return EffectiveSide.get()
-			.isClient() ? "CL" : "SV";
-	}
-
-	@Deprecated
-	public static Component debugStack(int depth) {
-		StackTraceElement[] stackTraceElements = Thread.currentThread()
-			.getStackTrace();
-		MutableComponent text = Components.literal("[")
-			.append(Components.literal(getLogicalSide()).withStyle(ChatFormatting.GOLD))
-			.append("] ");
-		for (int i = 1; i < depth + 2 && i < stackTraceElements.length; i++) {
-			StackTraceElement e = stackTraceElements[i];
-			if (e.getClassName()
-				.equals(Debug.class.getName()))
-				continue;
-			text.append(Components.literal(e.getMethodName()).withStyle(ChatFormatting.YELLOW))
-				.append(", ");
-		}
-		return text.append(Components.literal(" ...").withStyle(ChatFormatting.GRAY));
-	}
-
-	@Deprecated
-	public static void markTemporary() {}
-
-}

src/main/java/nl/requios/effortlessbuilding/create/foundation/utility/DyeHelper.java

@@ -1,75 +0,0 @@
-package nl.requios.effortlessbuilding.create.foundation.utility;
-
-import com.google.common.collect.ImmutableMap;
-import net.minecraft.world.item.DyeColor;
-import net.minecraft.world.level.ItemLike;
-import net.minecraft.world.level.block.Blocks;
-
-import java.util.Map;
-
-public class DyeHelper {
-
-	public static ItemLike getWoolOfDye(DyeColor color) {
-		switch (color) {
-		case BLACK:
-			return Blocks.BLACK_WOOL;
-		case BLUE:
-			return Blocks.BLUE_WOOL;
-		case BROWN:
-			return Blocks.BROWN_WOOL;
-		case CYAN:
-			return Blocks.CYAN_WOOL;
-		case GRAY:
-			return Blocks.GRAY_WOOL;
-		case GREEN:
-			return Blocks.GREEN_WOOL;
-		case LIGHT_BLUE:
-			return Blocks.LIGHT_BLUE_WOOL;
-		case LIGHT_GRAY:
-			return Blocks.LIGHT_GRAY_WOOL;
-		case LIME:
-			return Blocks.LIME_WOOL;
-		case MAGENTA:
-			return Blocks.MAGENTA_WOOL;
-		case ORANGE:
-			return Blocks.ORANGE_WOOL;
-		case PINK:
-			return Blocks.PINK_WOOL;
-		case PURPLE:
-			return Blocks.PURPLE_WOOL;
-		case RED:
-			return Blocks.RED_WOOL;
-		case YELLOW:
-			return Blocks.YELLOW_WOOL;
-		case WHITE:
-		default:
-			return Blocks.WHITE_WOOL;
-		}
-	}
-
-	public static final Map<DyeColor, Couple<Integer>> DYE_TABLE = new ImmutableMap.Builder<DyeColor, Couple<Integer>>()
-	
-	// DyeColor, ( Front RGB, Back RGB )
-	.put(DyeColor.BLACK, Couple.create(0x45403B, 0x21201F))
-	.put(DyeColor.RED, Couple.create(0xB13937, 0x632737))
-	.put(DyeColor.GREEN, Couple.create(0x208A46, 0x1D6045))
-	.put(DyeColor.BROWN, Couple.create(0xAC855C, 0x68533E))
-	
-	.put(DyeColor.BLUE, Couple.create(0x5391E1, 0x504B90))
-	.put(DyeColor.GRAY, Couple.create(0x5D666F, 0x313538))
-	.put(DyeColor.LIGHT_GRAY, Couple.create(0x95969B, 0x707070))
-	.put(DyeColor.PURPLE, Couple.create(0x9F54AE, 0x63366C))
-	
-	.put(DyeColor.CYAN, Couple.create(0x3EABB4, 0x3C7872))
-	.put(DyeColor.PINK, Couple.create(0xD5A8CB, 0xB86B95))
-	.put(DyeColor.LIME, Couple.create(0xA3DF55, 0x4FB16F))
-	.put(DyeColor.YELLOW, Couple.create(0xE6D756, 0xE9AC29))
-	
-	.put(DyeColor.LIGHT_BLUE, Couple.create(0x69CED2, 0x508AA5))
-	.put(DyeColor.ORANGE, Couple.create(0xEE9246, 0xD94927))
-	.put(DyeColor.MAGENTA, Couple.create(0xF062B0, 0xC04488))
-	.put(DyeColor.WHITE, Couple.create(0xEDEAE5, 0xBBB6B0))
-	
-	.build();
-
-}

src/main/java/nl/requios/effortlessbuilding/create/foundation/utility/DynamicComponent.java

@@ -1,94 +0,0 @@
-package nl.requios.effortlessbuilding.create.foundation.utility;
-
-import com.google.gson.JsonElement;
-import com.google.gson.JsonParseException;
-import com.google.gson.JsonParser;
-import com.mojang.brigadier.exceptions.CommandSyntaxException;
-import nl.requios.effortlessbuilding.create.Create;
-import net.minecraft.commands.CommandSource;
-import net.minecraft.commands.CommandSourceStack;
-import net.minecraft.core.BlockPos;
-import net.minecraft.nbt.CompoundTag;
-import net.minecraft.network.chat.Component;
-import net.minecraft.network.chat.ComponentUtils;
-import net.minecraft.network.chat.MutableComponent;
-import net.minecraft.server.level.ServerLevel;
-import net.minecraft.world.level.Level;
-import net.minecraft.world.phys.Vec2;
-import net.minecraft.world.phys.Vec3;
-
-public class DynamicComponent {
-
-	private JsonElement rawCustomText;
-	private Component parsedCustomText;
-
-	public DynamicComponent() {}
-
-	public void displayCustomText(Level level, BlockPos pos, String tagElement) {
-		if (tagElement == null)
-			return;
-
-		rawCustomText = getJsonFromString(tagElement);
-		parsedCustomText = parseCustomText(level, pos, rawCustomText);
-	}
-
-	public boolean sameAs(String tagElement) {
-		return isValid() && rawCustomText.equals(getJsonFromString(tagElement));
-	}
-
-	public boolean isValid() {
-		return parsedCustomText != null && rawCustomText != null;
-	}
-
-	public String resolve() {
-		return parsedCustomText.getString();
-	}
-
-	public MutableComponent get() {
-		return parsedCustomText == null ? Components.empty() : parsedCustomText.copy();
-	}
-
-	public void read(Level level, BlockPos pos, CompoundTag nbt) {
-		rawCustomText = getJsonFromString(nbt.getString("RawCustomText"));
-		try {
-			parsedCustomText = Component.Serializer.fromJson(nbt.getString("CustomText"));
-		} catch (JsonParseException e) {
-			parsedCustomText = null;
-		}
-	}
-
-	public void write(CompoundTag nbt) {
-		if (!isValid())
-			return;
-
-		nbt.putString("RawCustomText", rawCustomText.toString());
-		nbt.putString("CustomText", Component.Serializer.toJson(parsedCustomText));
-	}
-
-	public static JsonElement getJsonFromString(String string) {
-		try {
-			return JsonParser.parseString(string);
-		} catch (JsonParseException e) {
-			return null;
-		}
-	}
-
-	public static Component parseCustomText(Level level, BlockPos pos, JsonElement customText) {
-		if (!(level instanceof ServerLevel serverLevel))
-			return null;
-		try {
-			return ComponentUtils.updateForEntity(getCommandSource(serverLevel, pos),
-				Component.Serializer.fromJson(customText), null, 0);
-		} catch (JsonParseException e) {
-			return null;
-		} catch (CommandSyntaxException e) {
-			return null;
-		}
-	}
-
-	public static CommandSourceStack getCommandSource(ServerLevel level, BlockPos pos) {
-		return new CommandSourceStack(CommandSource.NULL, Vec3.atCenterOf(pos), Vec2.ZERO, level, 2, Create.ID,
-			Components.literal(Create.ID), level.getServer(), null);
-	}
-
-}

src/main/java/nl/requios/effortlessbuilding/create/foundation/utility/FilesHelper.java

@@ -1,101 +0,0 @@
-package nl.requios.effortlessbuilding.create.foundation.utility;
-
-import com.google.gson.JsonElement;
-import com.google.gson.JsonParser;
-import com.google.gson.internal.Streams;
-import com.google.gson.stream.JsonReader;
-import com.google.gson.stream.JsonWriter;
-import nl.requios.effortlessbuilding.create.Create;
-import net.minecraft.nbt.CompoundTag;
-
-import java.io.BufferedReader;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.InputStreamReader;
-import java.nio.file.Files;
-import java.nio.file.Paths;
-import java.nio.file.StandardOpenOption;
-
-public class FilesHelper {
-
-	public static void createFolderIfMissing(String name) {
-		try {
-			Files.createDirectories(Paths.get(name));
-		} catch (IOException e) {
-			Create.LOGGER.warn("Could not create Folder: {}", name);
-		}
-	}
-
-	public static String findFirstValidFilename(String name, String folderPath, String extension) {
-		int index = 0;
-		String filename;
-		String filepath;
-		do {
-			filename = slug(name) + ((index == 0) ? "" : "_" + index) + "." + extension;
-			index++;
-			filepath = folderPath + "/" + filename;
-		} while (Files.exists(Paths.get(filepath)));
-		return filename;
-	}
-
-	public static String slug(String name) {
-		return Lang.asId(name)
-			.replaceAll("\\W+", "_");
-	}
-
-	public static boolean saveTagCompoundAsJson(CompoundTag compound, String path) {
-		try {
-			Files.deleteIfExists(Paths.get(path));
-			JsonWriter writer = new JsonWriter(Files.newBufferedWriter(Paths.get(path), StandardOpenOption.CREATE));
-			writer.setIndent("  ");
-			Streams.write(JsonParser.parseString(compound.toString()), writer);
-			writer.close();
-			return true;
-		} catch (IOException e) {
-			e.printStackTrace();
-		}
-		return false;
-	}
-
-	public static boolean saveTagCompoundAsJsonCompact(CompoundTag compound, String path) {
-		try {
-			Files.deleteIfExists(Paths.get(path));
-			JsonWriter writer = new JsonWriter(Files.newBufferedWriter(Paths.get(path), StandardOpenOption.CREATE));
-			Streams.write(JsonParser.parseString(compound.toString()), writer);
-			writer.close();
-			return true;
-		} catch (IOException e) {
-			e.printStackTrace();
-		}
-		return false;
-
-	}
-
-	private static JsonElement loadJson(InputStream inputStream) {
-		try {
-			JsonReader reader = new JsonReader(new BufferedReader(new InputStreamReader(inputStream)));
-			reader.setLenient(true);
-			JsonElement element = Streams.parse(reader);
-			reader.close();
-			inputStream.close();
-			return element;
-		} catch (IOException e) {
-			e.printStackTrace();
-		}
-		return null;
-	}
-
-	public static JsonElement loadJsonResource(String filepath) {
-		return loadJson(ClassLoader.getSystemResourceAsStream(filepath));
-	}
-
-	public static JsonElement loadJson(String filepath) {
-		try {
-			return loadJson(Files.newInputStream(Paths.get(filepath), StandardOpenOption.READ));
-		} catch (IOException e) {
-			e.printStackTrace();
-		}
-		return null;
-	}
-
-}

src/main/java/nl/requios/effortlessbuilding/create/foundation/utility/FluidFormatter.java

@@ -1,26 +0,0 @@
-package nl.requios.effortlessbuilding.create.foundation.utility;
-
-import net.minecraft.network.chat.MutableComponent;
-
-public class FluidFormatter {
-
-	public static String asString(long amount, boolean shorten) {
-		Couple<MutableComponent> couple = asComponents(amount, shorten);
-		return couple.getFirst().getString() + " " + couple.getSecond().getString();
-	}
-
-	public static Couple<MutableComponent> asComponents(long amount, boolean shorten) {
-		if (shorten && amount >= 1000) {
-			return Couple.create(
-					Components.literal(String.format("%.1f" , amount / 1000d)),
-					Lang.translateDirect("generic.unit.buckets")
-			);
-		}
-
-		return Couple.create(
-				Components.literal(String.valueOf(amount)),
-				Lang.translateDirect("generic.unit.millibuckets")
-		);
-	}
-
-}

src/main/java/nl/requios/effortlessbuilding/create/foundation/utility/FontHelper.java

@@ -1,87 +0,0 @@
-package nl.requios.effortlessbuilding.create.foundation.utility;
-
-import com.mojang.blaze3d.vertex.PoseStack;
-import com.mojang.blaze3d.vertex.Tesselator;
-import com.mojang.math.Matrix4f;
-import net.minecraft.client.Minecraft;
-import net.minecraft.client.gui.Font;
-import net.minecraft.client.renderer.LightTexture;
-import net.minecraft.client.renderer.MultiBufferSource;
-
-import java.text.BreakIterator;
-import java.util.LinkedList;
-import java.util.List;
-
-public final class FontHelper {
-
-	private FontHelper() {}
-
-	public static List<String> cutString(Font font, String text, int maxWidthPerLine) {
-		// Split words
-		List<String> words = new LinkedList<>();
-		BreakIterator iterator = BreakIterator.getLineInstance(Minecraft.getInstance().getLocale());
-		iterator.setText(text);
-		int start = iterator.first();
-		for (int end = iterator.next(); end != BreakIterator.DONE; start = end, end = iterator.next()) {
-			String word = text.substring(start, end);
-			words.add(word);
-		}
-		// Apply hard wrap
-		List<String> lines = new LinkedList<>();
-		StringBuilder currentLine = new StringBuilder();
-		int width = 0;
-		for (String word : words) {
-			int newWidth = font.width(word);
-			if (width + newWidth > maxWidthPerLine) {
-				if (width > 0) {
-					String line = currentLine.toString();
-					lines.add(line);
-					currentLine = new StringBuilder();
-					width = 0;
-				} else {
-					lines.add(word);
-					continue;
-				}
-			}
-			currentLine.append(word);
-			width += newWidth;
-		}
-		if (width > 0) {
-			lines.add(currentLine.toString());
-		}
-		return lines;
-	}
-
-	public static void drawSplitString(PoseStack ms, Font font, String text, int x, int y, int width,
-		int color) {
-		List<String> list = cutString(font, text, width);
-		Matrix4f matrix4f = ms.last()
-			.pose();
-
-		for (String s : list) {
-			float f = (float) x;
-			if (font.isBidirectional()) {
-				int i = font.width(font.bidirectionalShaping(s));
-				f += (float) (width - i);
-			}
-
-			draw(font, s, f, (float) y, color, matrix4f, false);
-			y += 9;
-		}
-	}
-
-	private static int draw(Font font, String p_228078_1_, float p_228078_2_, float p_228078_3_,
-		int p_228078_4_, Matrix4f p_228078_5_, boolean p_228078_6_) {
-		if (p_228078_1_ == null) {
-			return 0;
-		} else {
-			MultiBufferSource.BufferSource irendertypebuffer$impl = MultiBufferSource.immediate(Tesselator.getInstance()
-				.getBuilder());
-			int i = font.drawInBatch(p_228078_1_, p_228078_2_, p_228078_3_, p_228078_4_, p_228078_6_, p_228078_5_,
-				irendertypebuffer$impl, false, 0, LightTexture.FULL_BRIGHT);
-			irendertypebuffer$impl.endBatch();
-			return i;
-		}
-	}
-
-}

src/main/java/nl/requios/effortlessbuilding/create/foundation/utility/ICoordinate.java

@@ -1,8 +0,0 @@
-package nl.requios.effortlessbuilding.create.foundation.utility;
-
-import net.minecraft.core.BlockPos;
-
-@FunctionalInterface
-public interface ICoordinate {
-	float get(BlockPos from);
-}

src/main/java/nl/requios/effortlessbuilding/create/foundation/utility/IInteractionChecker.java

@@ -1,7 +0,0 @@
-package nl.requios.effortlessbuilding.create.foundation.utility;
-
-import net.minecraft.world.entity.player.Player;
-
-public interface IInteractionChecker {
-	boolean canPlayerUse(Player player);
-}

src/main/java/nl/requios/effortlessbuilding/create/foundation/utility/IPartialSafeNBT.java

@@ -1,8 +0,0 @@
-package nl.requios.effortlessbuilding.create.foundation.utility;
-
-import net.minecraft.nbt.CompoundTag;
-
-public interface IPartialSafeNBT {
-	/** This method always runs on the logical server. */
-	public void writeSafe(CompoundTag compound);
-}

src/main/java/nl/requios/effortlessbuilding/create/foundation/utility/IntAttached.java

@@ -1,61 +0,0 @@
-package nl.requios.effortlessbuilding.create.foundation.utility;
-
-import net.minecraft.nbt.CompoundTag;
-
-import java.util.Comparator;
-import java.util.function.Function;
-
-public class IntAttached<V> extends Pair<Integer, V> {
-
-	protected IntAttached(Integer first, V second) {
-		super(first, second);
-	}
-
-	public static <V> IntAttached<V> with(int number, V value) {
-		return new IntAttached<>(number, value);
-	}
-
-	public static <V> IntAttached<V> withZero(V value) {
-		return new IntAttached<>(0, value);
-	}
-
-	public boolean isZero() {
-		return first.intValue() == 0;
-	}
-
-	public boolean exceeds(int value) {
-		return first.intValue() > value;
-	}
-
-	public boolean isOrBelowZero() {
-		return first.intValue() <= 0;
-	}
-
-	public void increment() {
-		first++;
-	}
-
-	public void decrement() {
-		first--;
-	}
-
-	public V getValue() {
-		return getSecond();
-	}
-
-	public CompoundTag serializeNBT(Function<V, CompoundTag> serializer) {
-		CompoundTag nbt = new CompoundTag();
-		nbt.put("Item", serializer.apply(getValue()));
-		nbt.putInt("Location", getFirst());
-		return nbt;
-	}
-
-	public static Comparator<? super IntAttached<?>> comparator() {
-		return (i1, i2) -> Integer.compare(i2.getFirst(), i1.getFirst());
-	}
-
-	public static <T> IntAttached<T> read(CompoundTag nbt, Function<CompoundTag, T> deserializer) {
-		return IntAttached.with(nbt.getInt("Location"), deserializer.apply(nbt.getCompound("Item")));
-	}
-
-}

src/main/java/nl/requios/effortlessbuilding/create/foundation/utility/Iterate.java

@@ -1,48 +0,0 @@
-package nl.requios.effortlessbuilding.create.foundation.utility;
-
-import net.minecraft.core.BlockPos;
-import net.minecraft.core.Direction;
-import net.minecraft.core.Direction.Axis;
-
-import java.util.Arrays;
-import java.util.EnumSet;
-import java.util.List;
-
-public class Iterate {
-
-	public static final boolean[] trueAndFalse = { true, false };
-	public static final boolean[] falseAndTrue = { false, true };
-	public static final int[] zeroAndOne = { 0, 1 };
-	public static final int[] positiveAndNegative = { 1, -1 };
-	public static final Direction[] directions = Direction.values();
-	public static final Direction[] horizontalDirections = getHorizontals();
-	public static final Axis[] axes = Axis.values();
-	public static final EnumSet<Axis> axisSet = EnumSet.allOf(Axis.class);
-
-	private static Direction[] getHorizontals() {
-		Direction[] directions = new Direction[4];
-		for (int i = 0; i < 4; i++)
-			directions[i] = Direction.from2DDataValue(i);
-		return directions;
-	}
-
-	public static Direction[] directionsInAxis(Axis axis) {
-		switch (axis) {
-		case X:
-			return new Direction[] { Direction.EAST, Direction.WEST };
-		case Y:
-			return new Direction[] { Direction.UP, Direction.DOWN };
-		default:
-		case Z:
-			return new Direction[] { Direction.SOUTH, Direction.NORTH };
-		}
-	}
-
-	public static List<BlockPos> hereAndBelow(BlockPos pos) {
-		return Arrays.asList(pos, pos.below());
-	}
-
-	public static List<BlockPos> hereBelowAndAbove(BlockPos pos) {
-		return Arrays.asList(pos, pos.below(), pos.above());
-	}
-}

src/main/java/nl/requios/effortlessbuilding/create/foundation/utility/Lang.java

@@ -1,91 +0,0 @@
-package nl.requios.effortlessbuilding.create.foundation.utility;
-
-import nl.requios.effortlessbuilding.create.Create;
-import net.minecraft.network.chat.Component;
-import net.minecraft.network.chat.MutableComponent;
-import net.minecraft.world.item.ItemStack;
-import net.minecraft.world.level.block.state.BlockState;
-import net.minecraftforge.fluids.FluidStack;
-
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Locale;
-
-public class Lang {
-
-	/**
-	 * legacy-ish. Use Lang.translate and other builder methods where possible
-	 * 
-	 * @param key
-	 * @param args
-	 * @return
-	 */
-	public static MutableComponent translateDirect(String key, Object... args) {
-		return Components.translatable(Create.ID + "." + key, resolveBuilders(args));
-	}
-
-	public static String asId(String name) {
-		return name.toLowerCase(Locale.ROOT);
-	}
-
-	public static String nonPluralId(String name) {
-		String asId = asId(name);
-		return asId.endsWith("s") ? asId.substring(0, asId.length() - 1) : asId;
-	}
-
-	public static List<Component> translatedOptions(String prefix, String... keys) {
-		List<Component> result = new ArrayList<>(keys.length);
-		for (String key : keys)
-			result.add(translate((prefix != null ? prefix + "." : "") + key).component());
-		return result;
-	}
-
-	//
-
-	public static LangBuilder builder() {
-		return new LangBuilder(Create.ID);
-	}
-
-	public static LangBuilder builder(String namespace) {
-		return new LangBuilder(namespace);
-	}
-
-	//
-
-	public static LangBuilder blockName(BlockState state) {
-		return builder().add(state.getBlock()
-			.getName());
-	}
-
-	public static LangBuilder itemName(ItemStack stack) {
-		return builder().add(stack.getHoverName()
-			.copy());
-	}
-
-	public static LangBuilder fluidName(FluidStack stack) {
-		return builder().add(stack.getDisplayName()
-			.copy());
-	}
-
-	public static LangBuilder number(double d) {
-		return builder().text(LangNumberFormat.format(d));
-	}
-
-	public static LangBuilder translate(String langKey, Object... args) {
-		return builder().translate(langKey, args);
-	}
-
-	public static LangBuilder text(String text) {
-		return builder().text(text);
-	}
-
-	//
-
-	public static Object[] resolveBuilders(Object[] args) {
-		for (int i = 0; i < args.length; i++)
-			if (args[i]instanceof LangBuilder cb)
-				args[i] = cb.component();
-		return args;
-	}
-
-}

src/main/java/nl/requios/effortlessbuilding/create/foundation/utility/LangBuilder.java

@@ -1,165 +0,0 @@
-package nl.requios.effortlessbuilding.create.foundation.utility;
-
-import joptsimple.internal.Strings;
-import net.minecraft.ChatFormatting;
-import net.minecraft.network.chat.Component;
-import net.minecraft.network.chat.MutableComponent;
-import net.minecraft.world.entity.player.Player;
-
-import java.util.List;
-
-public class LangBuilder {
-
-	String namespace;
-	MutableComponent component;
-
-	public LangBuilder(String namespace) {
-		this.namespace = namespace;
-	}
-
-	public LangBuilder space() {
-		return text(" ");
-	}
-
-	public LangBuilder newLine() {
-		return text("\n");
-	}
-
-	/**
-	 * Appends a localised component<br>
-	 * To add an independently formatted localised component, use add() and a nested
-	 * builder
-	 * 
-	 * @param langKey
-	 * @param args
-	 * @return
-	 */
-	public LangBuilder translate(String langKey, Object... args) {
-		return add(Components.translatable(namespace + "." + langKey, Lang.resolveBuilders(args)));
-	}
-
-	/**
-	 * Appends a text component
-	 * 
-	 * @param literalText
-	 * @return
-	 */
-	public LangBuilder text(String literalText) {
-		return add(Components.literal(literalText));
-	}
-
-	/**
-	 * Appends a colored text component
-	 * 
-	 * @param format
-	 * @param literalText
-	 * @return
-	 */
-	public LangBuilder text(ChatFormatting format, String literalText) {
-		return add(Components.literal(literalText).withStyle(format));
-	}
-
-	/**
-	 * Appends a colored text component
-	 * 
-	 * @param color
-	 * @param literalText
-	 * @return
-	 */
-	public LangBuilder text(int color, String literalText) {
-		return add(Components.literal(literalText).withStyle(s -> s.withColor(color)));
-	}
-
-	/**
-	 * Appends the contents of another builder
-	 * 
-	 * @param otherBuilder
-	 * @return
-	 */
-	public LangBuilder add(LangBuilder otherBuilder) {
-		return add(otherBuilder.component());
-	}
-
-	/**
-	 * Appends a component
-	 * 
-	 * @param customComponent
-	 * @return
-	 */
-	public LangBuilder add(MutableComponent customComponent) {
-		component = component == null ? customComponent : component.append(customComponent);
-		return this;
-	}
-
-	//
-
-	/**
-	 * Applies the format to all added components
-	 * 
-	 * @param format
-	 * @return
-	 */
-	public LangBuilder style(ChatFormatting format) {
-		assertComponent();
-		component = component.withStyle(format);
-		return this;
-	}
-
-	/**
-	 * Applies the color to all added components
-	 * 
-	 * @param color
-	 * @return
-	 */
-	public LangBuilder color(int color) {
-		assertComponent();
-		component = component.withStyle(s -> s.withColor(color));
-		return this;
-	}
-
-	//
-
-	public MutableComponent component() {
-		assertComponent();
-		return component;
-	}
-
-	public String string() {
-		return component().getString();
-	}
-
-	public String json() {
-		return Component.Serializer.toJson(component());
-	}
-
-	public void sendStatus(Player player) {
-		player.displayClientMessage(component(), true);
-	}
-
-	public void sendChat(Player player) {
-		player.displayClientMessage(component(), false);
-	}
-
-	public void addTo(List<? super MutableComponent> tooltip) {
-		tooltip.add(component());
-	}
-
-	public void forGoggles(List<? super MutableComponent> tooltip) {
-		forGoggles(tooltip, 0);
-	}
-
-	public void forGoggles(List<? super MutableComponent> tooltip, int indents) {
-		tooltip.add(Lang.builder()
-			.text(Strings.repeat(' ', 4 + indents))
-			.add(this)
-			.component());
-	}
-
-	//
-
-	private void assertComponent() {
-		if (component == null)
-			throw new IllegalStateException("No components were added to builder");
-	}
-
-}

src/main/java/nl/requios/effortlessbuilding/create/foundation/utility/LangNumberFormat.java

@@ -1,33 +0,0 @@
-package nl.requios.effortlessbuilding.create.foundation.utility;
-
-import net.minecraft.client.Minecraft;
-
-import java.text.NumberFormat;
-import java.util.Locale;
-
-public class LangNumberFormat {
-
-	private NumberFormat format = NumberFormat.getNumberInstance(Locale.ROOT);
-	public static LangNumberFormat numberFormat = new LangNumberFormat();
-
-	public NumberFormat get() {
-		return format;
-	}
-
-	public void update() {
-		format = NumberFormat.getInstance(Minecraft.getInstance()
-			.getLanguageManager()
-			.getSelected()
-			.getJavaLocale());
-		format.setMaximumFractionDigits(2);
-		format.setMinimumFractionDigits(0);
-		format.setGroupingUsed(true);
-	}
-
-	public static String format(double d) {
-		return numberFormat.get()
-			.format(d)
-			.replace("\u00A0", " ");
-	}
-
-}

src/main/java/nl/requios/effortlessbuilding/create/foundation/utility/NBTHelper.java

@@ -1,106 +0,0 @@
-package nl.requios.effortlessbuilding.create.foundation.utility;
-
-import net.minecraft.core.Vec3i;
-import net.minecraft.nbt.*;
-import net.minecraft.world.item.ItemStack;
-import net.minecraft.world.phys.AABB;
-
-import javax.annotation.Nonnull;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.function.Consumer;
-import java.util.function.Function;
-
-public class NBTHelper {
-
-	public static void putMarker(CompoundTag nbt, String marker) {
-		nbt.putBoolean(marker, true);
-	}
-
-	public static <T extends Enum<?>> T readEnum(CompoundTag nbt, String key, Class<T> enumClass) {
-		T[] enumConstants = enumClass.getEnumConstants();
-		if (enumConstants == null)
-			throw new IllegalArgumentException("Non-Enum class passed to readEnum: " + enumClass.getName());
-		if (nbt.contains(key, Tag.TAG_STRING)) {
-			String name = nbt.getString(key);
-			for (T t : enumConstants) {
-				if (t.name()
-					.equals(name))
-					return t;
-			}
-		}
-		return enumConstants[0];
-	}
-
-	public static <T extends Enum<?>> void writeEnum(CompoundTag nbt, String key, T enumConstant) {
-		nbt.putString(key, enumConstant.name());
-	}
-
-	public static <T> ListTag writeCompoundList(Iterable<T> list, Function<T, CompoundTag> serializer) {
-		ListTag listNBT = new ListTag();
-		list.forEach(t -> {
-			CompoundTag apply = serializer.apply(t);
-			if (apply == null)
-				return;
-			listNBT.add(apply);
-		});
-		return listNBT;
-	}
-
-	public static <T> List<T> readCompoundList(ListTag listNBT, Function<CompoundTag, T> deserializer) {
-		List<T> list = new ArrayList<>(listNBT.size());
-		listNBT.forEach(inbt -> list.add(deserializer.apply((CompoundTag) inbt)));
-		return list;
-	}
-
-	public static <T> void iterateCompoundList(ListTag listNBT, Consumer<CompoundTag> consumer) {
-		listNBT.forEach(inbt -> consumer.accept((CompoundTag) inbt));
-	}
-
-	public static ListTag writeItemList(Iterable<ItemStack> stacks) {
-		return writeCompoundList(stacks, ItemStack::serializeNBT);
-	}
-
-	public static List<ItemStack> readItemList(ListTag stacks) {
-		return readCompoundList(stacks, ItemStack::of);
-	}
-
-	public static ListTag writeAABB(AABB bb) {
-		ListTag bbtag = new ListTag();
-		bbtag.add(FloatTag.valueOf((float) bb.minX));
-		bbtag.add(FloatTag.valueOf((float) bb.minY));
-		bbtag.add(FloatTag.valueOf((float) bb.minZ));
-		bbtag.add(FloatTag.valueOf((float) bb.maxX));
-		bbtag.add(FloatTag.valueOf((float) bb.maxY));
-		bbtag.add(FloatTag.valueOf((float) bb.maxZ));
-		return bbtag;
-	}
-
-	public static AABB readAABB(ListTag bbtag) {
-		if (bbtag == null || bbtag.isEmpty())
-			return null;
-		return new AABB(bbtag.getFloat(0), bbtag.getFloat(1), bbtag.getFloat(2), bbtag.getFloat(3),
-			bbtag.getFloat(4), bbtag.getFloat(5));
-	}
-
-	public static ListTag writeVec3i(Vec3i vec) {
-		ListTag tag = new ListTag();
-		tag.add(IntTag.valueOf(vec.getX()));
-		tag.add(IntTag.valueOf(vec.getY()));
-		tag.add(IntTag.valueOf(vec.getZ()));
-		return tag;
-	}
-
-	public static Vec3i readVec3i(ListTag tag) {
-		return new Vec3i(tag.getInt(0), tag.getInt(1), tag.getInt(2));
-	}
-
-	@Nonnull
-	public static Tag getINBT(CompoundTag nbt, String id) {
-		Tag inbt = nbt.get(id);
-		if (inbt != null)
-			return inbt;
-		return new CompoundTag();
-	}
-
-}

src/main/java/nl/requios/effortlessbuilding/create/foundation/utility/NBTProcessors.java

@@ -1,84 +0,0 @@
-package nl.requios.effortlessbuilding.create.foundation.utility;
-
-import net.minecraft.nbt.CompoundTag;
-import net.minecraft.nbt.ListTag;
-import net.minecraft.nbt.Tag;
-import net.minecraft.network.chat.Component;
-import net.minecraft.world.level.block.entity.BlockEntity;
-import net.minecraft.world.level.block.entity.BlockEntityType;
-import net.minecraft.world.level.block.entity.SpawnerBlockEntity;
-
-import javax.annotation.Nullable;
-import java.util.HashMap;
-import java.util.Map;
-import java.util.function.UnaryOperator;
-
-public final class NBTProcessors {
-
-	private static final Map<BlockEntityType<?>, UnaryOperator<CompoundTag>> processors = new HashMap<>();
-	private static final Map<BlockEntityType<?>, UnaryOperator<CompoundTag>> survivalProcessors = new HashMap<>();
-
-	public static synchronized void addProcessor(BlockEntityType<?> type, UnaryOperator<CompoundTag> processor) {
-		processors.put(type, processor);
-	}
-
-	public static synchronized void addSurvivalProcessor(BlockEntityType<?> type, UnaryOperator<CompoundTag> processor) {
-		survivalProcessors.put(type, processor);
-	}
-
-	static {
-		addProcessor(BlockEntityType.SIGN, data -> {
-			for (int i = 0; i < 4; ++i) {
-				if (textComponentHasClickEvent(data.getString("Text" + (i + 1))))
-					return null;
-			}
-			return data;
-		});
-		addProcessor(BlockEntityType.LECTERN, data -> {
-			if (!data.contains("Book", Tag.TAG_COMPOUND))
-				return data;
-			CompoundTag book = data.getCompound("Book");
-
-			if (!book.contains("tag", Tag.TAG_COMPOUND))
-				return data;
-			CompoundTag tag = book.getCompound("tag");
-
-			if (!tag.contains("pages", Tag.TAG_LIST))
-				return data;
-			ListTag pages = tag.getList("pages", Tag.TAG_STRING);
-
-			for (Tag inbt : pages) {
-				if (textComponentHasClickEvent(inbt.getAsString()))
-					return null;
-			}
-			return data;
-		});
-	}
-
-	public static boolean textComponentHasClickEvent(String json) {
-		Component component = Component.Serializer.fromJson(json.isEmpty() ? "\"\"" : json);
-		return component != null && component.getStyle() != null && component.getStyle().getClickEvent() != null;
-	}
-
-	private NBTProcessors() {
-	}
-
-	@Nullable
-	public static CompoundTag process(BlockEntity tileEntity, CompoundTag compound, boolean survival) {
-		if (compound == null)
-			return null;
-		BlockEntityType<?> type = tileEntity.getType();
-		if (survival && survivalProcessors.containsKey(type))
-			compound = survivalProcessors.get(type)
-				.apply(compound);
-		if (compound != null && processors.containsKey(type))
-			return processors.get(type)
-				.apply(compound);
-		if (tileEntity instanceof SpawnerBlockEntity)
-			return compound;
-		if (tileEntity.onlyOpCanSetNbt())
-			return null;
-		return compound;
-	}
-
-}

src/main/java/nl/requios/effortlessbuilding/create/foundation/utility/Pair.java

@@ -1,68 +0,0 @@
-package nl.requios.effortlessbuilding.create.foundation.utility;
-
-import java.util.Objects;
-
-public class Pair<F, S> {
-
-	F first;
-	S second;
-
-	protected Pair(F first, S second) {
-		this.first = first;
-		this.second = second;
-	}
-
-	public static <F, S> Pair<F, S> of(F first, S second) {
-		return new Pair<>(first, second);
-	}
-
-	public F getFirst() {
-		return first;
-	}
-
-	public S getSecond() {
-		return second;
-	}
-
-	public void setFirst(F first) {
-		this.first = first;
-	}
-
-	public void setSecond(S second) {
-		this.second = second;
-	}
-
-	public Pair<F, S> copy() {
-		return Pair.of(first, second);
-	}
-
-	@Override
-	public boolean equals(final Object obj) {
-		if (obj == this)
-			return true;
-		if (obj instanceof Pair) {
-			final Pair<?, ?> other = (Pair<?, ?>) obj;
-			return Objects.equals(first, other.first) && Objects.equals(second, other.second);
-		}
-		return false;
-	}
-
-	@Override
-	public int hashCode() {
-		return (nullHash(first) * 31) ^ nullHash(second);
-	}
-
-	int nullHash(Object o) {
-		return o == null ? 0 : o.hashCode();
-	}
-
-	@Override
-	public String toString() {
-		return "(" + first + ", " + second + ")";
-	}
-
-	public Pair<S, F> swap() {
-		return Pair.of(second, first);
-	}
-
-}

src/main/java/nl/requios/effortlessbuilding/create/foundation/utility/Pointing.java

@@ -1,35 +0,0 @@
-package nl.requios.effortlessbuilding.create.foundation.utility;
-
-import net.minecraft.core.Direction;
-import net.minecraft.core.Direction.Axis;
-import net.minecraft.core.Direction.AxisDirection;
-import net.minecraft.util.StringRepresentable;
-
-public enum Pointing implements StringRepresentable {
-	UP(0), LEFT(270), DOWN(180), RIGHT(90);
-
-	private int xRotation;
-
-	private Pointing(int xRotation) {
-		this.xRotation = xRotation;
-	}
-
-	@Override
-	public String getSerializedName() {
-		return Lang.asId(name());
-	}
-
-	public int getXRotation() {
-		return xRotation;
-	}
-
-	public Direction getCombinedDirection(Direction direction) {
-		Axis axis = direction.getAxis();
-		Direction top = axis == Axis.Y ? Direction.SOUTH : Direction.UP;
-		int rotations = direction.getAxisDirection() == AxisDirection.NEGATIVE ? 4 - ordinal() : ordinal();
-		for (int i = 0; i < rotations; i++)
-			top = top.getClockWise(axis);
-		return top;
-	}
-
-}

src/main/java/nl/requios/effortlessbuilding/create/foundation/utility/RaycastHelper.java

@@ -1,197 +0,0 @@
-package nl.requios.effortlessbuilding.create.foundation.utility;
-
-import net.minecraft.core.BlockPos;
-import net.minecraft.core.BlockPos.MutableBlockPos;
-import net.minecraft.core.Direction;
-import net.minecraft.util.Mth;
-import net.minecraft.world.entity.player.Player;
-import net.minecraft.world.level.ClipContext;
-import net.minecraft.world.level.ClipContext.Block;
-import net.minecraft.world.level.ClipContext.Fluid;
-import net.minecraft.world.level.Level;
-import net.minecraft.world.phys.BlockHitResult;
-import net.minecraft.world.phys.Vec3;
-
-import java.util.function.Predicate;
-
-public class RaycastHelper {
-
-	public static BlockHitResult rayTraceRange(Level worldIn, Player playerIn, double range) {
-		Vec3 origin = getTraceOrigin(playerIn);
-		Vec3 target = getTraceTarget(playerIn, range, origin);
-		ClipContext context = new ClipContext(origin, target, Block.COLLIDER, Fluid.NONE, playerIn);
-		return worldIn.clip(context);
-	}
-
-	public static PredicateTraceResult rayTraceUntil(Player playerIn, double range,
-		Predicate<BlockPos> predicate) {
-		Vec3 origin = getTraceOrigin(playerIn);
-		Vec3 target = getTraceTarget(playerIn, range, origin);
-		return rayTraceUntil(origin, target, predicate);
-	}
-
-	public static Vec3 getTraceTarget(Player playerIn, double range, Vec3 origin) {
-		float f = playerIn.getXRot();
-		float f1 = playerIn.getYRot();
-		float f2 = Mth.cos(-f1 * 0.017453292F - (float) Math.PI);
-		float f3 = Mth.sin(-f1 * 0.017453292F - (float) Math.PI);
-		float f4 = -Mth.cos(-f * 0.017453292F);
-		float f5 = Mth.sin(-f * 0.017453292F);
-		float f6 = f3 * f4;
-		float f7 = f2 * f4;
-		double d3 = range;
-		Vec3 Vector3d1 = origin.add((double) f6 * d3, (double) f5 * d3, (double) f7 * d3);
-		return Vector3d1;
-	}
-
-	public static Vec3 getTraceOrigin(Player playerIn) {
-		double d0 = playerIn.getX();
-		double d1 = playerIn.getY() + (double) playerIn.getEyeHeight();
-		double d2 = playerIn.getZ();
-		Vec3 Vector3d = new Vec3(d0, d1, d2);
-		return Vector3d;
-	}
-
-	public static PredicateTraceResult rayTraceUntil(Vec3 start, Vec3 end, Predicate<BlockPos> predicate) {
-		if (Double.isNaN(start.x) || Double.isNaN(start.y) || Double.isNaN(start.z))
-			return null;
-		if (Double.isNaN(end.x) || Double.isNaN(end.y) || Double.isNaN(end.z))
-			return null;
-
-		int dx = Mth.floor(end.x);
-		int dy = Mth.floor(end.y);
-		int dz = Mth.floor(end.z);
-		int x = Mth.floor(start.x);
-		int y = Mth.floor(start.y);
-		int z = Mth.floor(start.z);
-
-		MutableBlockPos currentPos = new BlockPos(x, y, z).mutable();
-
-		if (predicate.test(currentPos))
-			return new PredicateTraceResult(currentPos.immutable(), Direction.getNearest(dx - x, dy - y, dz - z));
-
-		int remainingDistance = 200;
-
-		while (remainingDistance-- >= 0) {
-			if (Double.isNaN(start.x) || Double.isNaN(start.y) || Double.isNaN(start.z)) {
-				return null;
-			}
-
-			if (x == dx && y == dy && z == dz) {
-				return new PredicateTraceResult();
-			}
-
-			boolean flag2 = true;
-			boolean flag = true;
-			boolean flag1 = true;
-			double d0 = 999.0D;
-			double d1 = 999.0D;
-			double d2 = 999.0D;
-
-			if (dx > x) {
-				d0 = (double) x + 1.0D;
-			} else if (dx < x) {
-				d0 = (double) x + 0.0D;
-			} else {
-				flag2 = false;
-			}
-
-			if (dy > y) {
-				d1 = (double) y + 1.0D;
-			} else if (dy < y) {
-				d1 = (double) y + 0.0D;
-			} else {
-				flag = false;
-			}
-
-			if (dz > z) {
-				d2 = (double) z + 1.0D;
-			} else if (dz < z) {
-				d2 = (double) z + 0.0D;
-			} else {
-				flag1 = false;
-			}
-
-			double d3 = 999.0D;
-			double d4 = 999.0D;
-			double d5 = 999.0D;
-			double d6 = end.x - start.x;
-			double d7 = end.y - start.y;
-			double d8 = end.z - start.z;
-
-			if (flag2) {
-				d3 = (d0 - start.x) / d6;
-			}
-
-			if (flag) {
-				d4 = (d1 - start.y) / d7;
-			}
-
-			if (flag1) {
-				d5 = (d2 - start.z) / d8;
-			}
-
-			if (d3 == -0.0D) {
-				d3 = -1.0E-4D;
-			}
-
-			if (d4 == -0.0D) {
-				d4 = -1.0E-4D;
-			}
-
-			if (d5 == -0.0D) {
-				d5 = -1.0E-4D;
-			}
-
-			Direction enumfacing;
-
-			if (d3 < d4 && d3 < d5) {
-				enumfacing = dx > x ? Direction.WEST : Direction.EAST;
-				start = new Vec3(d0, start.y + d7 * d3, start.z + d8 * d3);
-			} else if (d4 < d5) {
-				enumfacing = dy > y ? Direction.DOWN : Direction.UP;
-				start = new Vec3(start.x + d6 * d4, d1, start.z + d8 * d4);
-			} else {
-				enumfacing = dz > z ? Direction.NORTH : Direction.SOUTH;
-				start = new Vec3(start.x + d6 * d5, start.y + d7 * d5, d2);
-			}
-
-			x = Mth.floor(start.x) - (enumfacing == Direction.EAST ? 1 : 0);
-			y = Mth.floor(start.y) - (enumfacing == Direction.UP ? 1 : 0);
-			z = Mth.floor(start.z) - (enumfacing == Direction.SOUTH ? 1 : 0);
-			currentPos.set(x, y, z);
-
-			if (predicate.test(currentPos))
-				return new PredicateTraceResult(currentPos.immutable(), enumfacing);
-		}
-
-		return new PredicateTraceResult();
-	}
-
-	public static class PredicateTraceResult {
-		private BlockPos pos;
-		private Direction facing;
-
-		public PredicateTraceResult(BlockPos pos, Direction facing) {
-			this.pos = pos;
-			this.facing = facing;
-		}
-
-		public PredicateTraceResult() {
-			// missed, no result
-		}
-
-		public Direction getFacing() {
-			return facing;
-		}
-
-		public BlockPos getPos() {
-			return pos;
-		}
-
-		public boolean missed() {
-			return this.pos == null;
-		}
-	}
-
-}

src/main/java/nl/requios/effortlessbuilding/create/foundation/utility/RegisteredObjects.java

@@ -1,66 +0,0 @@
-package nl.requios.effortlessbuilding.create.foundation.utility;
-
-import net.minecraft.core.particles.ParticleType;
-import net.minecraft.resources.ResourceLocation;
-import net.minecraft.world.entity.EntityType;
-import net.minecraft.world.item.Item;
-import net.minecraft.world.item.alchemy.Potion;
-import net.minecraft.world.item.crafting.RecipeSerializer;
-import net.minecraft.world.level.block.Block;
-import net.minecraft.world.level.block.entity.BlockEntityType;
-import net.minecraft.world.level.material.Fluid;
-import net.minecraftforge.registries.ForgeRegistries;
-import net.minecraftforge.registries.IForgeRegistry;
-import org.jetbrains.annotations.NotNull;
-
-public final class RegisteredObjects {
-	// registry argument for easier porting to 1.19
-	@NotNull
-	public static <V> ResourceLocation getKeyOrThrow(IForgeRegistry<V> registry, V value) {
-		ResourceLocation key = registry.getKey(value);
-		if (key == null) {
-			throw new IllegalArgumentException("Could not get key for value " + value + "!");
-		}
-		return key;
-	}
-
-	@NotNull
-	public static ResourceLocation getKeyOrThrow(Block value) {
-		return getKeyOrThrow(ForgeRegistries.BLOCKS, value);
-	}
-
-	@NotNull
-	public static ResourceLocation getKeyOrThrow(Item value) {
-		return getKeyOrThrow(ForgeRegistries.ITEMS, value);
-	}
-
-	@NotNull
-	public static ResourceLocation getKeyOrThrow(Fluid value) {
-		return getKeyOrThrow(ForgeRegistries.FLUIDS, value);
-	}
-
-	@NotNull
-	public static ResourceLocation getKeyOrThrow(EntityType<?> value) {
-		return getKeyOrThrow(ForgeRegistries.ENTITY_TYPES, value);
-	}
-
-	@NotNull
-	public static ResourceLocation getKeyOrThrow(BlockEntityType<?> value) {
-		return getKeyOrThrow(ForgeRegistries.BLOCK_ENTITY_TYPES, value);
-	}
-
-	@NotNull
-	public static ResourceLocation getKeyOrThrow(Potion value) {
-		return getKeyOrThrow(ForgeRegistries.POTIONS, value);
-	}
-
-	@NotNull
-	public static ResourceLocation getKeyOrThrow(ParticleType<?> value) {
-		return getKeyOrThrow(ForgeRegistries.PARTICLE_TYPES, value);
-	}
-
-	@NotNull
-	public static ResourceLocation getKeyOrThrow(RecipeSerializer<?> value) {
-		return getKeyOrThrow(ForgeRegistries.RECIPE_SERIALIZERS, value);
-	}
-}

src/main/java/nl/requios/effortlessbuilding/create/foundation/utility/ResetableLazy.java

@@ -1,32 +0,0 @@
-package nl.requios.effortlessbuilding.create.foundation.utility;
-
-import net.minecraftforge.common.util.NonNullSupplier;
-
-import java.util.function.Supplier;
-
-public class ResetableLazy<T> implements Supplier<T> {
-
-	private final NonNullSupplier<T> supplier;
-	private T value;
-
-	public ResetableLazy(NonNullSupplier<T> supplier) {
-		this.supplier = supplier;
-	}
-
-	@Override
-	public T get() {
-		if (value == null) {
-			value = supplier.get();
-		}
-		return value;
-	}
-
-	public void reset() {
-		value = null;
-	}
-
-	public static <T> ResetableLazy<T> of(NonNullSupplier<T> supplier) {
-		return new ResetableLazy<>(supplier);
-	}
-
-}

src/main/java/nl/requios/effortlessbuilding/create/foundation/utility/UniqueLinkedList.java

@@ -1,102 +0,0 @@
-package nl.requios.effortlessbuilding.create.foundation.utility;
-
-import java.util.Collection;
-import java.util.HashSet;
-import java.util.LinkedList;
-import java.util.List;
-import java.util.stream.Collectors;
-
-public class UniqueLinkedList<E> extends LinkedList<E> {
-	/**
-	 * 
-	 */
-	private static final long serialVersionUID = 1L;
-	private final HashSet<E> contained = new HashSet<>();
-
-	@Override
-	public boolean contains(Object o) {
-		return contained.contains(o);
-	}
-
-	@Override
-	public E poll() {
-		E e = super.poll();
-		contained.remove(e);
-		return e;
-	}
-
-	@Override
-	public boolean add(E e) {
-		if (contained.add(e))
-			return super.add(e);
-		else
-			return false;
-	}
-
-	@Override
-	public void add(int index, E element) {
-		if (contained.add(element))
-			super.add(index, element);
-	}
-
-	@Override
-	public void addFirst(E e) {
-		if (contained.add(e))
-			super.addFirst(e);
-	}
-
-	@Override
-	public void addLast(E e) {
-		if (contained.add(e))
-			super.addLast(e);
-	}
-
-	@Override
-	public boolean addAll(Collection<? extends E> c) {
-		List<? extends E> filtered = c.stream()
-			.filter(it -> !contained.contains(it))
-			.collect(Collectors.toList());
-		return super.addAll(filtered);
-	}
-
-	@Override
-	public boolean addAll(int index, Collection<? extends E> c) {
-		List<? extends E> filtered = c.stream()
-			.filter(it -> !contained.contains(it))
-			.collect(Collectors.toList());
-		return super.addAll(index, filtered);
-	}
-
-	@Override
-	public boolean remove(Object o) {
-		contained.remove(o);
-		return super.remove(o);
-	}
-
-	@Override
-	public E remove(int index) {
-		E e = super.remove(index);
-		contained.remove(e);
-		return e;
-	}
-
-	@Override
-	public E removeFirst() {
-		E e = super.removeFirst();
-		contained.remove(e);
-		return e;
-	}
-
-	@Override
-	public E removeLast() {
-		E e = super.removeLast();
-		contained.remove(e);
-		return e;
-	}
-
-	@Override
-	public void clear() {
-		super.clear();
-		contained.clear();
-	}
-}