Removed logging in network messages.

.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

.gitignore

@@ -20,7 +20,6 @@ build
 # other
 eclipse
 run
-logs/*
 
 # Files from Forge MDK
 forge*changelog.txt

LICENSE.txt

@@ -1,520 +0,0 @@
-Unless noted below, Minecraft Forge, Forge Mod Loader, and all 
-parts herein are licensed under the terms of the LGPL 2.1 found
-here http://www.gnu.org/licenses/old-licenses/lgpl-2.1.txt and 
-copied below.
-
-Homepage: http://minecraftforge.net/
-          https://github.com/MinecraftForge/MinecraftForge
-          
-
-A note on authorship:
-All source artifacts are property of their original author, with
-the exclusion of the contents of the patches directory and others
-copied from it from time to time. Authorship of the contents of
-the patches directory is retained by the Minecraft Forge project.
-This is because the patches are partially machine generated
-artifacts, and are changed heavily due to the way forge works.
-Individual attribution within them is impossible.
-
-Consent:
-All contributions to Forge must consent to the release of any
-patch content to the Forge project.
-
-A note on infectivity:
-The LGPL is chosen specifically so that projects may depend on Forge
-features without being infected with its license. That is the 
-purpose of the LGPL. Mods and others using this code via ordinary
-Java mechanics for referencing libraries are specifically not bound
-by Forge's license for the Mod code.
-
-
-=== MCP Data ===
-This software includes data from the Minecraft Coder Pack (MCP), with kind permission
-from them. The license to MCP data is not transitive - distribution of this data by
-third parties requires independent licensing from the MCP team. This data is not
-redistributable without permission from the MCP team.
-
-=== Sharing ===
-I grant permission for some parts of FML to be redistributed outside the terms of the LGPL, for the benefit of
-the minecraft modding community. All contributions to these parts should be licensed under the same additional grant.
-
--- Runtime patcher --
-License is granted to redistribute the runtime patcher code (src/main/java/net/minecraftforge/fml/common/patcher
-and subdirectories) under any alternative open source license as classified by the OSI (http://opensource.org/licenses)
-
--- ASM transformers --
-License is granted to redistribute the ASM transformer code (src/main/java/net/minecraftforge/common/asm/ and subdirectories)
-under any alternative open source license as classified by the OSI (http://opensource.org/licenses)
-
-=========================================================================
-This software includes portions from the Apache Maven project at
-http://maven.apache.org/ specifically the ComparableVersion.java code. It is
-included based on guidelines at
-http://www.softwarefreedom.org/resources/2007/gpl-non-gpl-collaboration.html
-with notices intact. The only change is a non-functional change of package name.
-
-This software contains a partial repackaging of javaxdelta, a BSD licensed program for generating
-binary differences and applying them, sourced from the subversion at http://sourceforge.net/projects/javaxdelta/
-authored by genman, heikok, pivot.
-The only changes are to replace some Trove collection types with standard Java collections, and repackaged.
-=========================================================================
-
-
-                  GNU LESSER GENERAL PUBLIC LICENSE
-                       Version 2.1, February 1999
-
- Copyright (C) 1991, 1999 Free Software Foundation, Inc.
- 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
- Everyone is permitted to copy and distribute verbatim copies
- of this license document, but changing it is not allowed.
-
-[This is the first released version of the Lesser GPL.  It also counts
- as the successor of the GNU Library Public License, version 2, hence
- the version number 2.1.]
-
-                            Preamble
-
-  The licenses for most software are designed to take away your
-freedom to share and change it.  By contrast, the GNU General Public
-Licenses are intended to guarantee your freedom to share and change
-free software--to make sure the software is free for all its users.
-
-  This license, the Lesser General Public License, applies to some
-specially designated software packages--typically libraries--of the
-Free Software Foundation and other authors who decide to use it.  You
-can use it too, but we suggest you first think carefully about whether
-this license or the ordinary General Public License is the better
-strategy to use in any particular case, based on the explanations below.
-
-  When we speak of free software, we are referring to freedom of use,
-not price.  Our General Public Licenses are designed to make sure that
-you have the freedom to distribute copies of free software (and charge
-for this service if you wish); that you receive source code or can get
-it if you want it; that you can change the software and use pieces of
-it in new free programs; and that you are informed that you can do
-these things.
-
-  To protect your rights, we need to make restrictions that forbid
-distributors to deny you these rights or to ask you to surrender these
-rights.  These restrictions translate to certain responsibilities for
-you if you distribute copies of the library or if you modify it.
-
-  For example, if you distribute copies of the library, whether gratis
-or for a fee, you must give the recipients all the rights that we gave
-you.  You must make sure that they, too, receive or can get the source
-code.  If you link other code with the library, you must provide
-complete object files to the recipients, so that they can relink them
-with the library after making changes to the library and recompiling
-it.  And you must show them these terms so they know their rights.
-
-  We protect your rights with a two-step method: (1) we copyright the
-library, and (2) we offer you this license, which gives you legal
-permission to copy, distribute and/or modify the library.
-
-  To protect each distributor, we want to make it very clear that
-there is no warranty for the free library.  Also, if the library is
-modified by someone else and passed on, the recipients should know
-that what they have is not the original version, so that the original
-author's reputation will not be affected by problems that might be
-introduced by others.
-
-  Finally, software patents pose a constant threat to the existence of
-any free program.  We wish to make sure that a company cannot
-effectively restrict the users of a free program by obtaining a
-restrictive license from a patent holder.  Therefore, we insist that
-any patent license obtained for a version of the library must be
-consistent with the full freedom of use specified in this license.
-
-  Most GNU software, including some libraries, is covered by the
-ordinary GNU General Public License.  This license, the GNU Lesser
-General Public License, applies to certain designated libraries, and
-is quite different from the ordinary General Public License.  We use
-this license for certain libraries in order to permit linking those
-libraries into non-free programs.
-
-  When a program is linked with a library, whether statically or using
-a shared library, the combination of the two is legally speaking a
-combined work, a derivative of the original library.  The ordinary
-General Public License therefore permits such linking only if the
-entire combination fits its criteria of freedom.  The Lesser General
-Public License permits more lax criteria for linking other code with
-the library.
-
-  We call this license the "Lesser" General Public License because it
-does Less to protect the user's freedom than the ordinary General
-Public License.  It also provides other free software developers Less
-of an advantage over competing non-free programs.  These disadvantages
-are the reason we use the ordinary General Public License for many
-libraries.  However, the Lesser license provides advantages in certain
-special circumstances.
-
-  For example, on rare occasions, there may be a special need to
-encourage the widest possible use of a certain library, so that it becomes
-a de-facto standard.  To achieve this, non-free programs must be
-allowed to use the library.  A more frequent case is that a free
-library does the same job as widely used non-free libraries.  In this
-case, there is little to gain by limiting the free library to free
-software only, so we use the Lesser General Public License.
-
-  In other cases, permission to use a particular library in non-free
-programs enables a greater number of people to use a large body of
-free software.  For example, permission to use the GNU C Library in
-non-free programs enables many more people to use the whole GNU
-operating system, as well as its variant, the GNU/Linux operating
-system.
-
-  Although the Lesser General Public License is Less protective of the
-users' freedom, it does ensure that the user of a program that is
-linked with the Library has the freedom and the wherewithal to run
-that program using a modified version of the Library.
-
-  The precise terms and conditions for copying, distribution and
-modification follow.  Pay close attention to the difference between a
-"work based on the library" and a "work that uses the library".  The
-former contains code derived from the library, whereas the latter must
-be combined with the library in order to run.
-
-                  GNU LESSER GENERAL PUBLIC LICENSE
-   TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
-
-  0. This License Agreement applies to any software library or other
-program which contains a notice placed by the copyright holder or
-other authorized party saying it may be distributed under the terms of
-this Lesser General Public License (also called "this License").
-Each licensee is addressed as "you".
-
-  A "library" means a collection of software functions and/or data
-prepared so as to be conveniently linked with application programs
-(which use some of those functions and data) to form executables.
-
-  The "Library", below, refers to any such software library or work
-which has been distributed under these terms.  A "work based on the
-Library" means either the Library or any derivative work under
-copyright law: that is to say, a work containing the Library or a
-portion of it, either verbatim or with modifications and/or translated
-straightforwardly into another language.  (Hereinafter, translation is
-included without limitation in the term "modification".)
-
-  "Source code" for a work means the preferred form of the work for
-making modifications to it.  For a library, complete source code means
-all the source code for all modules it contains, plus any associated
-interface definition files, plus the scripts used to control compilation
-and installation of the library.
-
-  Activities other than copying, distribution and modification are not
-covered by this License; they are outside its scope.  The act of
-running a program using the Library is not restricted, and output from
-such a program is covered only if its contents constitute a work based
-on the Library (independent of the use of the Library in a tool for
-writing it).  Whether that is true depends on what the Library does
-and what the program that uses the Library does.
-
-  1. You may copy and distribute verbatim copies of the Library's
-complete source code as you receive it, in any medium, provided that
-you conspicuously and appropriately publish on each copy an
-appropriate copyright notice and disclaimer of warranty; keep intact
-all the notices that refer to this License and to the absence of any
-warranty; and distribute a copy of this License along with the
-Library.
-
-  You may charge a fee for the physical act of transferring a copy,
-and you may at your option offer warranty protection in exchange for a
-fee.
-
-  2. You may modify your copy or copies of the Library or any portion
-of it, thus forming a work based on the Library, and copy and
-distribute such modifications or work under the terms of Section 1
-above, provided that you also meet all of these conditions:
-
-    a) The modified work must itself be a software library.
-
-    b) You must cause the files modified to carry prominent notices
-    stating that you changed the files and the date of any change.
-
-    c) You must cause the whole of the work to be licensed at no
-    charge to all third parties under the terms of this License.
-
-    d) If a facility in the modified Library refers to a function or a
-    table of data to be supplied by an application program that uses
-    the facility, other than as an argument passed when the facility
-    is invoked, then you must make a good faith effort to ensure that,
-    in the event an application does not supply such function or
-    table, the facility still operates, and performs whatever part of
-    its purpose remains meaningful.
-
-    (For example, a function in a library to compute square roots has
-    a purpose that is entirely well-defined independent of the
-    application.  Therefore, Subsection 2d requires that any
-    application-supplied function or table used by this function must
-    be optional: if the application does not supply it, the square
-    root function must still compute square roots.)
-
-These requirements apply to the modified work as a whole.  If
-identifiable sections of that work are not derived from the Library,
-and can be reasonably considered independent and separate works in
-themselves, then this License, and its terms, do not apply to those
-sections when you distribute them as separate works.  But when you
-distribute the same sections as part of a whole which is a work based
-on the Library, the distribution of the whole must be on the terms of
-this License, whose permissions for other licensees extend to the
-entire whole, and thus to each and every part regardless of who wrote
-it.
-
-Thus, it is not the intent of this section to claim rights or contest
-your rights to work written entirely by you; rather, the intent is to
-exercise the right to control the distribution of derivative or
-collective works based on the Library.
-
-In addition, mere aggregation of another work not based on the Library
-with the Library (or with a work based on the Library) on a volume of
-a storage or distribution medium does not bring the other work under
-the scope of this License.
-
-  3. You may opt to apply the terms of the ordinary GNU General Public
-License instead of this License to a given copy of the Library.  To do
-this, you must alter all the notices that refer to this License, so
-that they refer to the ordinary GNU General Public License, version 2,
-instead of to this License.  (If a newer version than version 2 of the
-ordinary GNU General Public License has appeared, then you can specify
-that version instead if you wish.)  Do not make any other change in
-these notices.
-
-  Once this change is made in a given copy, it is irreversible for
-that copy, so the ordinary GNU General Public License applies to all
-subsequent copies and derivative works made from that copy.
-
-  This option is useful when you wish to copy part of the code of
-the Library into a program that is not a library.
-
-  4. You may copy and distribute the Library (or a portion or
-derivative of it, under Section 2) in object code or executable form
-under the terms of Sections 1 and 2 above provided that you accompany
-it with the complete corresponding machine-readable source code, which
-must be distributed under the terms of Sections 1 and 2 above on a
-medium customarily used for software interchange.
-
-  If distribution of object code is made by offering access to copy
-from a designated place, then offering equivalent access to copy the
-source code from the same place satisfies the requirement to
-distribute the source code, even though third parties are not
-compelled to copy the source along with the object code.
-
-  5. A program that contains no derivative of any portion of the
-Library, but is designed to work with the Library by being compiled or
-linked with it, is called a "work that uses the Library".  Such a
-work, in isolation, is not a derivative work of the Library, and
-therefore falls outside the scope of this License.
-
-  However, linking a "work that uses the Library" with the Library
-creates an executable that is a derivative of the Library (because it
-contains portions of the Library), rather than a "work that uses the
-library".  The executable is therefore covered by this License.
-Section 6 states terms for distribution of such executables.
-
-  When a "work that uses the Library" uses material from a header file
-that is part of the Library, the object code for the work may be a
-derivative work of the Library even though the source code is not.
-Whether this is true is especially significant if the work can be
-linked without the Library, or if the work is itself a library.  The
-threshold for this to be true is not precisely defined by law.
-
-  If such an object file uses only numerical parameters, data
-structure layouts and accessors, and small macros and small inline
-functions (ten lines or less in length), then the use of the object
-file is unrestricted, regardless of whether it is legally a derivative
-work.  (Executables containing this object code plus portions of the
-Library will still fall under Section 6.)
-
-  Otherwise, if the work is a derivative of the Library, you may
-distribute the object code for the work under the terms of Section 6.
-Any executables containing that work also fall under Section 6,
-whether or not they are linked directly with the Library itself.
-
-  6. As an exception to the Sections above, you may also combine or
-link a "work that uses the Library" with the Library to produce a
-work containing portions of the Library, and distribute that work
-under terms of your choice, provided that the terms permit
-modification of the work for the customer's own use and reverse
-engineering for debugging such modifications.
-
-  You must give prominent notice with each copy of the work that the
-Library is used in it and that the Library and its use are covered by
-this License.  You must supply a copy of this License.  If the work
-during execution displays copyright notices, you must include the
-copyright notice for the Library among them, as well as a reference
-directing the user to the copy of this License.  Also, you must do one
-of these things:
-
-    a) Accompany the work with the complete corresponding
-    machine-readable source code for the Library including whatever
-    changes were used in the work (which must be distributed under
-    Sections 1 and 2 above); and, if the work is an executable linked
-    with the Library, with the complete machine-readable "work that
-    uses the Library", as object code and/or source code, so that the
-    user can modify the Library and then relink to produce a modified
-    executable containing the modified Library.  (It is understood
-    that the user who changes the contents of definitions files in the
-    Library will not necessarily be able to recompile the application
-    to use the modified definitions.)
-
-    b) Use a suitable shared library mechanism for linking with the
-    Library.  A suitable mechanism is one that (1) uses at run time a
-    copy of the library already present on the user's computer system,
-    rather than copying library functions into the executable, and (2)
-    will operate properly with a modified version of the library, if
-    the user installs one, as long as the modified version is
-    interface-compatible with the version that the work was made with.
-
-    c) Accompany the work with a written offer, valid for at
-    least three years, to give the same user the materials
-    specified in Subsection 6a, above, for a charge no more
-    than the cost of performing this distribution.
-
-    d) If distribution of the work is made by offering access to copy
-    from a designated place, offer equivalent access to copy the above
-    specified materials from the same place.
-
-    e) Verify that the user has already received a copy of these
-    materials or that you have already sent this user a copy.
-
-  For an executable, the required form of the "work that uses the
-Library" must include any data and utility programs needed for
-reproducing the executable from it.  However, as a special exception,
-the materials to be distributed need not include anything that is
-normally distributed (in either source or binary form) with the major
-components (compiler, kernel, and so on) of the operating system on
-which the executable runs, unless that component itself accompanies
-the executable.
-
-  It may happen that this requirement contradicts the license
-restrictions of other proprietary libraries that do not normally
-accompany the operating system.  Such a contradiction means you cannot
-use both them and the Library together in an executable that you
-distribute.
-
-  7. You may place library facilities that are a work based on the
-Library side-by-side in a single library together with other library
-facilities not covered by this License, and distribute such a combined
-library, provided that the separate distribution of the work based on
-the Library and of the other library facilities is otherwise
-permitted, and provided that you do these two things:
-
-    a) Accompany the combined library with a copy of the same work
-    based on the Library, uncombined with any other library
-    facilities.  This must be distributed under the terms of the
-    Sections above.
-
-    b) Give prominent notice with the combined library of the fact
-    that part of it is a work based on the Library, and explaining
-    where to find the accompanying uncombined form of the same work.
-
-  8. You may not copy, modify, sublicense, link with, or distribute
-the Library except as expressly provided under this License.  Any
-attempt otherwise to copy, modify, sublicense, link with, or
-distribute the Library is void, and will automatically terminate your
-rights under this License.  However, parties who have received copies,
-or rights, from you under this License will not have their licenses
-terminated so long as such parties remain in full compliance.
-
-  9. You are not required to accept this License, since you have not
-signed it.  However, nothing else grants you permission to modify or
-distribute the Library or its derivative works.  These actions are
-prohibited by law if you do not accept this License.  Therefore, by
-modifying or distributing the Library (or any work based on the
-Library), you indicate your acceptance of this License to do so, and
-all its terms and conditions for copying, distributing or modifying
-the Library or works based on it.
-
-  10. Each time you redistribute the Library (or any work based on the
-Library), the recipient automatically receives a license from the
-original licensor to copy, distribute, link with or modify the Library
-subject to these terms and conditions.  You may not impose any further
-restrictions on the recipients' exercise of the rights granted herein.
-You are not responsible for enforcing compliance by third parties with
-this License.
-
-  11. If, as a consequence of a court judgment or allegation of patent
-infringement or for any other reason (not limited to patent issues),
-conditions are imposed on you (whether by court order, agreement or
-otherwise) that contradict the conditions of this License, they do not
-excuse you from the conditions of this License.  If you cannot
-distribute so as to satisfy simultaneously your obligations under this
-License and any other pertinent obligations, then as a consequence you
-may not distribute the Library at all.  For example, if a patent
-license would not permit royalty-free redistribution of the Library by
-all those who receive copies directly or indirectly through you, then
-the only way you could satisfy both it and this License would be to
-refrain entirely from distribution of the Library.
-
-If any portion of this section is held invalid or unenforceable under any
-particular circumstance, the balance of the section is intended to apply,
-and the section as a whole is intended to apply in other circumstances.
-
-It is not the purpose of this section to induce you to infringe any
-patents or other property right claims or to contest validity of any
-such claims; this section has the sole purpose of protecting the
-integrity of the free software distribution system which is
-implemented by public license practices.  Many people have made
-generous contributions to the wide range of software distributed
-through that system in reliance on consistent application of that
-system; it is up to the author/donor to decide if he or she is willing
-to distribute software through any other system and a licensee cannot
-impose that choice.
-
-This section is intended to make thoroughly clear what is believed to
-be a consequence of the rest of this License.
-
-  12. If the distribution and/or use of the Library is restricted in
-certain countries either by patents or by copyrighted interfaces, the
-original copyright holder who places the Library under this License may add
-an explicit geographical distribution limitation excluding those countries,
-so that distribution is permitted only in or among countries not thus
-excluded.  In such case, this License incorporates the limitation as if
-written in the body of this License.
-
-  13. The Free Software Foundation may publish revised and/or new
-versions of the Lesser General Public License from time to time.
-Such new versions will be similar in spirit to the present version,
-but may differ in detail to address new problems or concerns.
-
-Each version is given a distinguishing version number.  If the Library
-specifies a version number of this License which applies to it and
-"any later version", you have the option of following the terms and
-conditions either of that version or of any later version published by
-the Free Software Foundation.  If the Library does not specify a
-license version number, you may choose any version ever published by
-the Free Software Foundation.
-
-  14. If you wish to incorporate parts of the Library into other free
-programs whose distribution conditions are incompatible with these,
-write to the author to ask for permission.  For software which is
-copyrighted by the Free Software Foundation, write to the Free
-Software Foundation; we sometimes make exceptions for this.  Our
-decision will be guided by the two goals of preserving the free status
-of all derivatives of our free software and of promoting the sharing
-and reuse of software generally.
-
-                            NO WARRANTY
-
-  15. BECAUSE THE LIBRARY IS LICENSED FREE OF CHARGE, THERE IS NO
-WARRANTY FOR THE LIBRARY, TO THE EXTENT PERMITTED BY APPLICABLE LAW.
-EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR
-OTHER PARTIES PROVIDE THE LIBRARY "AS IS" WITHOUT WARRANTY OF ANY
-KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE
-IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
-PURPOSE.  THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE
-LIBRARY IS WITH YOU.  SHOULD THE LIBRARY PROVE DEFECTIVE, YOU ASSUME
-THE COST OF ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
-
-  16. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN
-WRITING WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY
-AND/OR REDISTRIBUTE THE LIBRARY AS PERMITTED ABOVE, BE LIABLE TO YOU
-FOR DAMAGES, INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR
-CONSEQUENTIAL DAMAGES ARISING OUT OF THE USE OR INABILITY TO USE THE
-LIBRARY (INCLUDING BUT NOT LIMITED TO LOSS OF DATA OR DATA BEING
-RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD PARTIES OR A
-FAILURE OF THE LIBRARY TO OPERATE WITH ANY OTHER SOFTWARE), EVEN IF
-SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH
-DAMAGES.
-
-                     END OF TERMS AND CONDITIONS

README.md

@@ -0,0 +1 @@
+The 1.12 repository can be found here: https://bitbucket.org/Requios/effortless-building/src/master/

build.gradle

@@ -1,27 +1,35 @@
-plugins {
+buildscript {
-    id 'eclipse'
+    repositories {
-    id 'maven-publish'
+        maven { url = 'https://files.minecraftforge.net/maven' }
-    id 'net.minecraftforge.gradle' version '5.1.+'
+        jcenter()
+        mavenCentral()
+    }
+    dependencies {
+        classpath group: 'net.minecraftforge.gradle', name: 'ForgeGradle', version: '3.+', 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'
+version = '1.13.2-2.16'
-group = 'nl.requios.effortlessbuilding'
+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.
+sourceCompatibility = targetCompatibility = compileJava.sourceCompatibility = compileJava.targetCompatibility = '1.8' // Need this here so eclipse task generates correctly.
-java.toolchain.languageVersion = JavaLanguageVersion.of(17)
 
-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: 'snapshot', version: '20180921-1.13'
-    accessTransformer = file('src/main/resources/META-INF/accesstransformer.cfg')
     // makeObfSourceJar = false // an Srg named sources jar is made by default. uncomment this to disable.
     
+    // accessTransformer = file('build/resources/main/META-INF/accesstransformer.cfg')
+
     // Default run configurations.
     // These can be tweaked, removed, or duplicated as needed.
     runs {
@@ -34,9 +42,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'
-			
             mods {
                 effortlessbuilding {
                     source sourceSets.main
@@ -47,48 +52,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'
-
-            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
-                }
-            }
-        }
-
-        data {
-			workingDirectory project.file('run')
-
-            property 'forge.logging.markers', 'REGISTRIES'
-
-            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.
-            args '--mod', 'effortlessbuilding', '--all', '--output', file('src/generated/resources/'), '--existing', file('src/main/resources/')
-
             mods {
                 effortlessbuilding {
                     source sourceSets.main
@@ -98,36 +67,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'
-    // }
-}
-
 dependencies {
-    // Specify the version of Minecraft to use. If this is any group other than 'net.minecraft', it is assumed
+    // 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 its patches will be applied.
+    // 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.13.2-25.0.219'
 
-    // Real mod deobf dependency examples - these get remapped to your current mappings
+    // You may put jars on which you depend on in ./libs or you may define them like so..
-    // compileOnly fg.deobf("mezz.jei:jei-${mc_version}:${jei_version}:api") // Adds JEI API as a compile dependency
+    // compile "some.group:artifact:version:classifier"
-    // runtimeOnly fg.deobf("mezz.jei:jei-${mc_version}:${jei_version}") // Adds the full JEI mod as a runtime dependency
+    // compile "some.group:artifact:version"
-    // implementation fg.deobf("com.tterrag.registrate:Registrate:MC${mc_version}-${registrate_version}") // Adds registrate as a dependency
 
-    // Examples using mod jars from ./libs
+    // Real examples
-    // implementation fg.deobf("blank:coolmod-${mc_version}:${coolmod_version}")
+    // 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
+
 }
 
 // Example for how to get properties into the manifest for reading by the runtime..
@@ -138,32 +101,31 @@ 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
+// we define a custom artifact that is sourced from the reobfJar output task
-jar.finalizedBy('reobfJar')
+// and then declare that to be published
-// 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
+// Note you'll need to add a repository here
-// publish.dependsOn('reobfJar')
+def reobfFile = file("$buildDir/reobfJar/output.jar")
-
+def reobfArtifact = artifacts.add('default', reobfFile) {
+    type 'jar'
+    builtBy 'reobfJar'
+}
 publishing {
     publications {
         mavenJava(MavenPublication) {
-            artifact jar
+            artifact reobfArtifact
         }
     }
     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
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
+distributionUrl=https\://services.gradle.org/distributions/gradle-4.9-bin.zip

gradlew

@@ -1,129 +1,78 @@
-#!/bin/sh
+#!/usr/bin/env sh
-
-#
-# Copyright <20> 2015-2021 the original authors.
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#      https://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
 
 ##############################################################################
-#
+##
-#   Gradle start up script for POSIX generated by Gradle.
+##  Gradle start up script for UN*X
-#
+##
-#   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/.
-#
 ##############################################################################
 
 # Attempt to set APP_HOME
-
 # Resolve links: $0 may be a link
-app_path=$0
+PRG="$0"
-
+# Need this for relative symlinks.
-# Need this for daisy-chained symlinks.
+while [ -h "$PRG" ] ; do
-while
+    ls=`ls -ld "$PRG"`
-    APP_HOME=${app_path%"${app_path##*/}"}  # leaves a trailing /; empty if no leading path
+    link=`expr "$ls" : '.*-> \(.*\)$'`
-    [ -h "$app_path" ]
+    if expr "$link" : '/.*' > /dev/null; then
-do
+        PRG="$link"
-    ls=$( ls -ld "$app_path" )
+    else
-    link=${ls#*' -> '}
+        PRG=`dirname "$PRG"`"/$link"
-    case $link in             #(
+    fi
-      /*)   app_path=$link ;; #(
-      *)    app_path=$APP_HOME$link ;;
-    esac
 done
-
+SAVED="`pwd`"
-APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit
+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"'
+DEFAULT_JVM_OPTS=""
 
 # Use the maximum available, or set MAX_FD != -1 to use that value.
-MAX_FD=maximum
+MAX_FD="maximum"
 
 warn () {
     echo "$*"
-} >&2
+}
 
 die () {
     echo
     echo "$*"
     echo
     exit 1
-} >&2
+}
 
 # OS specific support (must be 'true' or 'false').
 cygwin=false
 msys=false
 darwin=false
 nonstop=false
-case "$( uname )" in                #(
+case "`uname`" in
-  CYGWIN* )         cygwin=true  ;; #(
+  CYGWIN* )
-  Darwin* )         darwin=true  ;; #(
+    cygwin=true
-  MSYS* | MINGW* )  msys=true    ;; #(
+    ;;
-  NONSTOP* )        nonstop=true ;;
+  Darwin* )
+    darwin=true
+    ;;
+  MINGW* )
+    msys=true
+    ;;
+  NONSTOP* )
+    nonstop=true
+    ;;
 esac
 
 CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar
 
-
 # Determine the Java command to use to start the JVM.
 if [ -n "$JAVA_HOME" ] ; then
     if [ -x "$JAVA_HOME/jre/sh/java" ] ; then
         # IBM's JDK on AIX uses strange locations for the executables
-        JAVACMD=$JAVA_HOME/jre/sh/java
+        JAVACMD="$JAVA_HOME/jre/sh/java"
     else
-        JAVACMD=$JAVA_HOME/bin/java
+        JAVACMD="$JAVA_HOME/bin/java"
     fi
     if [ ! -x "$JAVACMD" ] ; then
         die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME
@@ -132,7 +81,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 +89,84 @@ location of your Java installation."
 fi
 
 # Increase the maximum file descriptors if we can.
-if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then
+if [ "$cygwin" = "false" -a "$darwin" = "false" -a "$nonstop" = "false" ] ; then
-    case $MAX_FD in #(
+    MAX_FD_LIMIT=`ulimit -H -n`
-      max*)
+    if [ $? -eq 0 ] ; then
-        MAX_FD=$( ulimit -H -n ) ||
+        if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ] ; then
-            warn "Could not query maximum file descriptor limit"
+            MAX_FD="$MAX_FD_LIMIT"
-    esac
-    case $MAX_FD in  #(
-      '' | soft) :;; #(
-      *)
-        ulimit -n "$MAX_FD" ||
-            warn "Could not set maximum file descriptor limit to $MAX_FD"
-    esac
-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 Cygwin or MSYS, switch paths to Windows format before running java
-if "$cygwin" || "$msys" ; then
-    APP_HOME=$( cygpath --path --mixed "$APP_HOME" )
-    CLASSPATH=$( cygpath --path --mixed "$CLASSPATH" )
-
-    JAVACMD=$( cygpath --unix "$JAVACMD" )
-
-    # Now convert the arguments - kludge to limit ourselves to /bin/sh
-    for arg do
-        if
-            case $arg in                                #(
-              -*)   false ;;                            # don't mess with options #(
-              /?*)  t=${arg#/} t=/${t%%/*}              # looks like a POSIX filepath
-                    [ -e "$t" ] ;;                      #(
-              *)    false ;;
-            esac
-        then
-            arg=$( cygpath --path --ignore --mixed "$arg" )
         fi
-        # Roll the args list around exactly as many times as the number of
+        ulimit -n $MAX_FD
-        # args, so each arg winds up back in the position where it started, but
+        if [ $? -ne 0 ] ; then
-        # possibly modified.
+            warn "Could not set maximum file descriptor limit: $MAX_FD"
-        #
+        fi
-        # NB: a `for` loop captures its iteration list before it begins, so
+    else
-        # changing the positional parameters here affects neither the number of
+        warn "Could not query maximum file descriptor limit: $MAX_FD_LIMIT"
-        # iterations, nor the values presented in `arg`.
+    fi
-        shift                   # remove old arg
-        set -- "$@" "$arg"      # push replacement arg
-    done
 fi
 
-# Collect all arguments for the java command;
+# For Darwin, add options to specify how the application appears in the dock
-#   * $DEFAULT_JVM_OPTS, $JAVA_OPTS, and $GRADLE_OPTS can contain fragments of
+if $darwin; then
-#     shell script including quotes and variable substitutions, so put them in
+    GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\""
-#     double quotes to make sure that they get re-expanded; and
+fi
-#   * put everything else in single quotes, so that it's not re-expanded.
 
-set -- \
+# For Cygwin, switch paths to Windows format before running java
-        "-Dorg.gradle.appname=$APP_BASE_NAME" \
+if $cygwin ; then
-        -classpath "$CLASSPATH" \
+    APP_HOME=`cygpath --path --mixed "$APP_HOME"`
-        org.gradle.wrapper.GradleWrapperMain \
+    CLASSPATH=`cygpath --path --mixed "$CLASSPATH"`
-        "$@"
+    JAVACMD=`cygpath --unix "$JAVACMD"`
 
-# Use "xargs" to parse quoted args.
+    # We build the pattern for arguments to be converted via cygpath
-#
+    ROOTDIRSRAW=`find -L / -maxdepth 1 -mindepth 1 -type d 2>/dev/null`
-# With -n1 it outputs one arg per line, with the quotes and backslashes removed.
+    SEP=""
-#
+    for dir in $ROOTDIRSRAW ; do
-# In Bash we could simply go:
+        ROOTDIRS="$ROOTDIRS$SEP$dir"
-#
+        SEP="|"
-#   readarray ARGS < <( xargs -n1 <<<"$var" ) &&
+    done
-#   set -- "${ARGS[@]}" "$@"
+    OURCYGPATTERN="(^($ROOTDIRS))"
-#
+    # Add a user-defined pattern to the cygpath arguments
-# but POSIX shell has neither arrays nor command substitution, so instead we
+    if [ "$GRADLE_CYGPATTERN" != "" ] ; then
-# post-process each arg (as a line of input to sed) to backslash-escape any
+        OURCYGPATTERN="$OURCYGPATTERN|($GRADLE_CYGPATTERN)"
-# character that might be a shell metacharacter, then use eval to reverse
+    fi
-# that process (while maintaining the separation between arguments), and wrap
+    # Now convert the arguments - kludge to limit ourselves to /bin/sh
-# the whole thing up as a single "set" statement.
+    i=0
-#
+    for arg in "$@" ; do
-# This will of course break if any of these variables contains a newline or
+        CHECK=`echo "$arg"|egrep -c "$OURCYGPATTERN" -`
-# an unmatched quote.
+        CHECK2=`echo "$arg"|egrep -c "^-"`                                 ### Determine if an option
-#
 
-eval "set -- $(
+        if [ $CHECK -ne 0 ] && [ $CHECK2 -eq 0 ] ; then                    ### Added a condition
-        printf '%s\n' "$DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS" |
+            eval `echo args$i`=`cygpath --path --ignore --mixed "$arg"`
-        xargs -n1 |
+        else
-        sed ' s~[^-[:alnum:]+,./:=@_]~\\&~g; ' |
+            eval `echo args$i`="\"$arg\""
-        tr '\n' ' '
+        fi
-    )" '"$@"'
+        i=$((i+1))
+    done
+    case $i in
+        (0) set -- ;;
+        (1) set -- "$args0" ;;
+        (2) set -- "$args0" "$args1" ;;
+        (3) set -- "$args0" "$args1" "$args2" ;;
+        (4) set -- "$args0" "$args1" "$args2" "$args3" ;;
+        (5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;;
+        (6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;;
+        (7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;;
+        (8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;;
+        (9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;;
+    esac
+fi
+
+# Escape application args
+save () {
+    for i do printf %s\\n "$i" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/" ; done
+    echo " "
+}
+APP_ARGS=$(save "$@")
+
+# Collect all arguments for the java command, following the shell quoting and substitution rules
+eval set -- $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS "\"-Dorg.gradle.appname=$APP_BASE_NAME\"" -classpath "\"$CLASSPATH\"" org.gradle.wrapper.GradleWrapperMain "$APP_ARGS"
+
+# by default we should be in the correct project dir, but when run from Finder on Mac, the cwd is wrong
+if [ "$(uname)" = "Darwin" ] && [ "$HOME" = "$PWD" ]; then
+  cd "$(dirname "$0")"
+fi
 
 exec "$JAVACMD" "$@"

gradlew.bat

@@ -1,19 +1,3 @@
-@rem
-@rem Copyright 2015 the original author or authors.
-@rem
-@rem Licensed under the Apache License, Version 2.0 (the "License");
-@rem you may not use this file except in compliance with the License.
-@rem You may obtain a copy of the License at
-@rem
-@rem      https://www.apache.org/licenses/LICENSE-2.0
-@rem
-@rem Unless required by applicable law or agreed to in writing, software
-@rem distributed under the License is distributed on an "AS IS" BASIS,
-@rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-@rem See the License for the specific language governing permissions and
-@rem limitations under the License.
-@rem
-
 @if "%DEBUG%" == "" @echo off
 @rem ##########################################################################
 @rem
@@ -29,18 +13,15 @@ if "%DIRNAME%" == "" set DIRNAME=.
 set APP_BASE_NAME=%~n0
 set APP_HOME=%DIRNAME%
 
-@rem Resolve any "." and ".." in APP_HOME to make it shorter.
-for %%i in ("%APP_HOME%") do set APP_HOME=%%~fi
-
 @rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
-set DEFAULT_JVM_OPTS="-Xmx64m" "-Xms64m"
+set DEFAULT_JVM_OPTS=
 
 @rem Find java.exe
 if defined JAVA_HOME goto findJavaFromJavaHome
 
 set JAVA_EXE=java.exe
 %JAVA_EXE% -version >NUL 2>&1
-if "%ERRORLEVEL%" == "0" goto execute
+if "%ERRORLEVEL%" == "0" goto init
 
 echo.
 echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
@@ -54,7 +35,7 @@ goto fail
 set JAVA_HOME=%JAVA_HOME:"=%
 set JAVA_EXE=%JAVA_HOME%/bin/java.exe
 
-if exist "%JAVA_EXE%" goto execute
+if exist "%JAVA_EXE%" goto init
 
 echo.
 echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME%
@@ -64,14 +45,28 @@ echo location of your Java installation.
 
 goto fail
 
+:init
+@rem Get command-line arguments, handling Windows variants
+
+if not "%OS%" == "Windows_NT" goto win9xME_args
+
+:win9xME_args
+@rem Slurp the command line arguments.
+set CMD_LINE_ARGS=
+set _SKIP=2
+
+:win9xME_args_slurp
+if "x%~1" == "x" goto execute
+
+set CMD_LINE_ARGS=%*
+
 :execute
 @rem Setup the command line
 
 set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
 
-
 @rem Execute Gradle
-"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %*
+"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %CMD_LINE_ARGS%
 
 :end
 @rem End local scope for the variables with windows NT shell

settings.gradle

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

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

@@ -4,111 +4,131 @@ import net.minecraftforge.common.ForgeConfigSpec;
 
 public class BuildConfig {
 
-	private static final ForgeConfigSpec.Builder builder = new ForgeConfigSpec.Builder();
+    private static final ForgeConfigSpec.Builder builder = new ForgeConfigSpec.Builder();
-	public static final Reach reach = new Reach(builder);
+    public static final Reach reach = new Reach(builder);
-	public static final SurvivalBalancers survivalBalancers = new SurvivalBalancers(builder);
+    public static final SurvivalBalancers survivalBalancers = new SurvivalBalancers(builder);
-	public static final Visuals visuals = new Visuals(builder);
+    public static final Visuals visuals = new Visuals(builder);
-	public static final ForgeConfigSpec spec = builder.build();
+    public static final ForgeConfigSpec spec = builder.build();
 
-	public static class Reach {
+    public static class Reach {
-		public final ForgeConfigSpec.ConfigValue<Boolean> enableReachUpgrades;
+        public final ForgeConfigSpec.ConfigValue<Boolean> enableReachUpgrades;
-		public final ForgeConfigSpec.ConfigValue<Integer> maxReachCreative;
+        public final ForgeConfigSpec.ConfigValue<Integer> maxReachCreative;
-		public final ForgeConfigSpec.ConfigValue<Integer> maxReachLevel0;
+        public final ForgeConfigSpec.ConfigValue<Integer> maxReachLevel0;
-		public final ForgeConfigSpec.ConfigValue<Integer> maxReachLevel1;
+        public final ForgeConfigSpec.ConfigValue<Integer> maxReachLevel1;
-		public final ForgeConfigSpec.ConfigValue<Integer> maxReachLevel2;
+        public final ForgeConfigSpec.ConfigValue<Integer> maxReachLevel2;
-		public final ForgeConfigSpec.ConfigValue<Integer> maxReachLevel3;
+        public final ForgeConfigSpec.ConfigValue<Integer> maxReachLevel3;
 
-		public Reach(ForgeConfigSpec.Builder builder) {
+        public Reach(ForgeConfigSpec.Builder builder) {
-			builder.push("Reach");
+            builder.push("Reach");
-			enableReachUpgrades = builder
+            enableReachUpgrades = builder
-				.comment("Reach: how far away the player can place blocks using mirror/array etc.",
+                    .comment("Reach: how far away the player can place blocks using mirror/array etc.",
-					"Enable the crafting of reach upgrades to increase reach.",
+                            "Enable the crafting of reach upgrades to increase reach.",
-					"If disabled, reach is set to level 3 for survival players.")
+                            "If disabled, reach is set to level 3 for survival players.")
-				.define("enableReachUpgrades", true);
+                    .define("enableReachUpgrades", true);
 
-			maxReachCreative = builder
+            maxReachCreative = builder
-				.comment("Maximum reach in creative",
+                    .comment("Maximum reach in creative",
-					"Keep in mind that chunks need to be loaded to be able to place blocks inside.")
+                            "Keep in mind that chunks need to be loaded to be able to place blocks inside.")
-				.define("maxReachCreative", 200);
+                    .define("maxReachCreative", 200);
 
-			maxReachLevel0 = builder
+            maxReachLevel0 = builder
-				.comment("Maximum reach in survival without upgrades",
+                    .comment("Maximum reach in survival without upgrades",
-					"Reach upgrades are craftable consumables that permanently increase reach.",
+                            "Reach upgrades are craftable consumables that permanently increase reach.",
-					"Set to 0 to disable Effortless Building until the player has consumed a reach upgrade.")
+                            "Set to 0 to disable Effortless Building until the player has consumed a reach upgrade.")
-				.define("maxReachLevel0", 20);
+                    .define("maxReachLevel0", 20);
 
-			maxReachLevel1 = builder
+            maxReachLevel1 = builder
-				.comment("Maximum reach in survival with one upgrade")
+                    .comment("Maximum reach in survival with one upgrade")
-				.define("maxReachLevel1", 50);
+                    .define("maxReachLevel1", 50);
 
-			maxReachLevel2 = builder
+            maxReachLevel2 = builder
-				.comment("Maximum reach in survival with two upgrades")
+                    .comment("Maximum reach in survival with two upgrades")
-				.define("maxReachLevel2", 100);
+                    .define("maxReachLevel2", 100);
 
-			maxReachLevel3 = builder
+            maxReachLevel3 = builder
-				.comment("Maximum reach in survival with three upgrades")
+                    .comment("Maximum reach in survival with three upgrades")
-				.define("maxReachLevel3", 200);
+                    .define("maxReachLevel3", 200);
 
-			builder.pop();
+            builder.pop();
-		}
+        }
-	}
+    }
 
-	public static class SurvivalBalancers {
+    public static class SurvivalBalancers {
-		public final ForgeConfigSpec.ConfigValue<Integer> quickReplaceMiningLevel;
+        public final ForgeConfigSpec.ConfigValue<Boolean> breakFar;
-		public final ForgeConfigSpec.ConfigValue<Integer> undoStackSize;
+        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) {
+        public SurvivalBalancers(ForgeConfigSpec.Builder builder) {
-			builder.push("SurvivalBalancers");
+            builder.push("SurvivalBalancers");
 
-			quickReplaceMiningLevel = builder
+            breakFar = builder
-				.comment("Determines what blocks can be replaced in survival.",
+                    .comment("Allows a survival player to break blocks that are far away, in addition to placing blocks.",
-					"-1: only blocks that can be harvested by hand (default)",
+                            "Note: this allows insta-breaking of blocks in survival.")
-					"0: blocks that can be harvested with wooden or gold tools",
+                    .define("breakFar", false);
-					"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")
-				.defineInRange("quickReplaceMiningLevel", -1, -1, 3);
 
-			undoStackSize = builder
+            increasedMiningTime = builder
-				.comment("How many placements are remembered for the undo functionality.")
+                    .comment("Increases the time to mine a block when breaking multiple at once.",
-				.worldRestart()
+                            "Mining time depends on how many blocks, what type of blocks, and the percentage below.",
-				.define("undoStackSize", 10);
+                            "Example: breaking 1 dirt + 1 obsidian takes the time of breaking 1 dirt + 1 obsidian.")
+                    .define("increasedMiningTime", true);
 
-			builder.pop();
+            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);
 
-	public static class Visuals {
+            quickReplaceMiningLevel = builder
-		public final ForgeConfigSpec.ConfigValue<Boolean> alwaysShowBlockPreview;
+                    .comment("Determines what blocks can be replaced in survival.",
-		public final ForgeConfigSpec.ConfigValue<Double> dissolveTimeMultiplier;
+                            "-1: only blocks that can be harvested by hand (default)",
-		public final ForgeConfigSpec.ConfigValue<Integer> shaderThreshold;
+                            "0: blocks that can be harvested with wooden or gold tools",
-		public final ForgeConfigSpec.ConfigValue<Boolean> useShaders;
+                            "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")
+                    .defineInRange("quickReplaceMiningLevel", -1, -1, 3);
 
-		public Visuals(ForgeConfigSpec.Builder builder) {
+            undoStackSize = builder
-			builder.push("Visuals");
+                    .comment("How many placements are remembered for the undo functionality.")
+                    .worldRestart()
+                    .define("undoStackSize", 10);
 
-			alwaysShowBlockPreview = builder
+            builder.pop();
-				.comment("Show a block preview if you have a block in hand even in the 'Normal' build mode")
+        }
-				.define("alwaysShowBlockPreview", false);
+    }
 
-			dissolveTimeMultiplier = builder
+    public static class Visuals {
-				.comment("How long the dissolve effect takes when placing blocks.",
+        public final ForgeConfigSpec.ConfigValue<Boolean> alwaysShowBlockPreview;
-					"Default between 30 and 60 ticks, you can multiply that here.",
+        public final ForgeConfigSpec.ConfigValue<Double> dissolveTimeMultiplier;
-					"Recommended values:",
+        public final ForgeConfigSpec.ConfigValue<Integer> shaderTreshold;
-					"Snappy: 0.7",
+        public final ForgeConfigSpec.ConfigValue<Boolean> useShaders;
-					"Relaxing: 1.5")
-				.define("dissolveTimeMultiplier", 1.0);
 
-			shaderThreshold = builder
+        public Visuals(ForgeConfigSpec.Builder builder) {
-				.comment("Switch to using the simple performance shader when placing more than this many blocks.")
+            builder.push("Visuals");
-				.define("shaderTreshold", 1500);
 
-			useShaders = builder
+            alwaysShowBlockPreview = builder
-				.comment("Use fancy shaders while placing blocks")
+                    .comment("Show a block preview if you have a block in hand even in the 'Normal' build mode")
-				.define("useShaders", true);
+                    .define("alwaysShowBlockPreview", false);
 
-			builder.pop();
+            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/EffortlessBuilding.java

@@ -1,113 +1,153 @@
 package nl.requios.effortlessbuilding;
 
-import net.minecraft.network.chat.Component;
+import net.minecraft.block.Block;
-import net.minecraft.world.entity.player.Player;
+import net.minecraft.entity.player.EntityPlayer;
-import net.minecraft.world.inventory.AbstractContainerMenu;
+import net.minecraft.item.Item;
-import net.minecraft.world.inventory.MenuType;
+import net.minecraft.util.ResourceLocation;
-import net.minecraft.world.item.Item;
+import net.minecraft.util.text.TextComponentString;
-import net.minecraftforge.common.capabilities.RegisterCapabilitiesEvent;
+import net.minecraftforge.common.MinecraftForge;
+import net.minecraftforge.common.capabilities.CapabilityManager;
+import net.minecraftforge.common.crafting.CraftingHelper;
 import net.minecraftforge.eventbus.api.SubscribeEvent;
 import net.minecraftforge.fml.DistExecutor;
+import net.minecraftforge.fml.ExtensionPoint;
 import net.minecraftforge.fml.ModLoadingContext;
 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.event.lifecycle.InterModEnqueueEvent;
+import net.minecraftforge.fml.event.lifecycle.InterModProcessEvent;
+import net.minecraftforge.fml.event.server.FMLServerStartingEvent;
 import net.minecraftforge.fml.javafmlmod.FMLJavaModLoadingContext;
-import net.minecraftforge.network.IContainerFactory;
+import net.minecraftforge.fml.network.NetworkRegistry;
-import net.minecraftforge.registries.RegistryObject;
-import net.minecraftforge.registries.DeferredRegister;
-import net.minecraftforge.registries.ForgeRegistries;
 import nl.requios.effortlessbuilding.capability.ModeCapabilityManager;
 import nl.requios.effortlessbuilding.capability.ModifierCapabilityManager;
+import nl.requios.effortlessbuilding.command.CommandReach;
 import nl.requios.effortlessbuilding.compatibility.CompatHelper;
-import nl.requios.effortlessbuilding.gui.DiamondRandomizerBagContainer;
+import nl.requios.effortlessbuilding.gui.RandomizerBagGuiHandler;
-import nl.requios.effortlessbuilding.gui.GoldenRandomizerBagContainer;
+import nl.requios.effortlessbuilding.helper.ReachConditionFactory;
-import nl.requios.effortlessbuilding.gui.RandomizerBagContainer;
+import nl.requios.effortlessbuilding.item.ItemRandomizerBag;
-import nl.requios.effortlessbuilding.item.*;
+import nl.requios.effortlessbuilding.item.ItemReachUpgrade1;
+import nl.requios.effortlessbuilding.item.ItemReachUpgrade2;
+import nl.requios.effortlessbuilding.item.ItemReachUpgrade3;
 import nl.requios.effortlessbuilding.network.PacketHandler;
 import nl.requios.effortlessbuilding.proxy.ClientProxy;
 import nl.requios.effortlessbuilding.proxy.IProxy;
 import nl.requios.effortlessbuilding.proxy.ServerProxy;
+import nl.requios.effortlessbuilding.render.ShaderHandler;
 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)
-public class EffortlessBuilding {
+@Mod.EventBusSubscriber(bus=Mod.EventBusSubscriber.Bus.MOD)
+public class EffortlessBuilding
+{
+    public static final String MODID = "effortlessbuilding";
+    public static final String NAME = "Effortless Building";
+    public static final String VERSION = "1.13.2-2.16";
 
-	public static final String MODID = "effortlessbuilding";
+    public static EffortlessBuilding instance;
-	public static final Logger logger = LogManager.getLogger();
 
-	public static EffortlessBuilding instance;
+    public static final Logger logger = LogManager.getLogger();
-	public static IProxy proxy = DistExecutor.runForDist(() -> ClientProxy::new, () -> ServerProxy::new);
 
-	//Registration
+    public static IProxy proxy = DistExecutor.runForDist(() -> ClientProxy::new, () -> ServerProxy::new);
-	private static final DeferredRegister<Item> ITEMS = DeferredRegister.create(ForgeRegistries.ITEMS, MODID);
-	private static final DeferredRegister<MenuType<?>> CONTAINERS = DeferredRegister.create(ForgeRegistries.MENU_TYPES, EffortlessBuilding.MODID);
 
-	public static final RegistryObject<Item> RANDOMIZER_BAG_ITEM = ITEMS.register("randomizer_bag", RandomizerBagItem::new);
+    public static final ItemRandomizerBag ITEM_RANDOMIZER_BAG = new ItemRandomizerBag();
-	public static final RegistryObject<Item> GOLDEN_RANDOMIZER_BAG_ITEM = ITEMS.register("golden_randomizer_bag", GoldenRandomizerBagItem::new);
+    public static final ItemReachUpgrade1 ITEM_REACH_UPGRADE_1 = new ItemReachUpgrade1();
-	public static final RegistryObject<Item> DIAMOND_RANDOMIZER_BAG_ITEM = ITEMS.register("diamond_randomizer_bag", DiamondRandomizerBagItem::new);
+    public static final ItemReachUpgrade2 ITEM_REACH_UPGRADE_2 = new ItemReachUpgrade2();
-	public static final RegistryObject<Item> REACH_UPGRADE_1_ITEM = ITEMS.register("reach_upgrade1", ReachUpgrade1Item::new);
+    public static final ItemReachUpgrade3 ITEM_REACH_UPGRADE_3 = new ItemReachUpgrade3();
-	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 Block[] BLOCKS = {
-	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 EffortlessBuilding() {
+    public static final Item[] ITEMS = {
-		instance = this;
+            ITEM_RANDOMIZER_BAG,
+            ITEM_REACH_UPGRADE_1,
+            ITEM_REACH_UPGRADE_2,
+            ITEM_REACH_UPGRADE_3
+    };
 
-		// Register ourselves for server and other game events we are interested in
+    public static final ResourceLocation RANDOMIZER_BAG_GUI = new ResourceLocation(EffortlessBuilding.MODID, "randomizer_bag");
-		FMLJavaModLoadingContext.get().getModEventBus().register(this);
 
-		ITEMS.register(FMLJavaModLoadingContext.get().getModEventBus());
+    public EffortlessBuilding() {
-		CONTAINERS.register(FMLJavaModLoadingContext.get().getModEventBus());
+        instance = this;
 
-		//Register config
+        // Register the setup method for modloading
-		ModLoadingContext.get().registerConfig(ModConfig.Type.COMMON, BuildConfig.spec);
+        FMLJavaModLoadingContext.get().getModEventBus().addListener(this::setup);
-	}
+        // Register the enqueueIMC method for modloading
+        FMLJavaModLoadingContext.get().getModEventBus().addListener(this::enqueueIMC);
+        // Register the processIMC method for modloading
+        FMLJavaModLoadingContext.get().getModEventBus().addListener(this::processIMC);
+        // Register the clientSetup method for modloading
+        FMLJavaModLoadingContext.get().getModEventBus().addListener(this::clientSetup);
 
-	public static <T extends AbstractContainerMenu> MenuType<T> registerContainer(IContainerFactory<T> fact){
+        //Register config
-		MenuType<T> type = new MenuType<T>(fact);
+        ModLoadingContext.get().registerConfig(ModConfig.Type.COMMON, BuildConfig.spec);
-		return type;
-	}
 
-	@SubscribeEvent
+        // Register ourselves for server and other game events we are interested in
-	public void setup(final FMLCommonSetupEvent event) {
+        MinecraftForge.EVENT_BUS.register(this);
-		PacketHandler.register();
+    }
 
-		proxy.setup(event);
+    @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);
 
-		CompatHelper.setup();
+        PacketHandler.register();
-	}
 
-	@SubscribeEvent
+        //Register recipe condition
-	public void clientSetup(final FMLClientSetupEvent event) {
+        CraftingHelper.register(new ResourceLocation(MODID, "enable_reach_upgrades"), new ReachConditionFactory());
-		proxy.clientSetup(event);
-	}
 
-	@SubscribeEvent
+        //TODO 1.13 config
-	public void registerCapabilities(RegisterCapabilitiesEvent event){
+//        ConfigManager.sync(MODID, Config.Type.INSTANCE);
-		event.register(ModifierCapabilityManager.IModifierCapability.class);
-		event.register(ModeCapabilityManager.IModeCapability.class);
-	}
 
-	public static void log(String msg) {
+        ModLoadingContext.get().registerExtensionPoint(ExtensionPoint.GUIFACTORY, () -> RandomizerBagGuiHandler::openGui);
-		logger.info(msg);
-	}
 
-	public static void log(Player player, String msg) {
+        proxy.setup(event);
-		log(player, msg, false);
-	}
 
-	public static void log(Player player, String msg, boolean actionBar) {
+        CompatHelper.setup();
-		player.displayClientMessage(Component.literal(msg), actionBar);
+    }
-	}
 
-	//Log with translation supported, call either on client or server (which then sends a message)
+    @SubscribeEvent
-	public static void logTranslate(Player player, String prefix, String translationKey, String suffix, boolean actionBar) {
+    public void clientSetup(final FMLClientSetupEvent event) {
-		proxy.logTranslate(player, prefix, translationKey, suffix, actionBar);
+
-	}
+        proxy.clientSetup(event);
+    }
+
+    @SubscribeEvent
+    public void enqueueIMC(final InterModEnqueueEvent event) {
+
+        // some example code to dispatch IMC to another mod
+//        InterModComms.sendTo("examplemod", "helloworld", () -> { logger.info("Hello world from the MDK"); return "Hello world";});
+    }
+
+    @SubscribeEvent
+    public void processIMC(final InterModProcessEvent event) {
+
+        // some example code to receive and process InterModComms from other mods
+//        logger.info("Got IMC {}", event.getIMCStream().
+//                map(m->m.getMessageSupplier().get()).
+//                collect(Collectors.toList()));
+    }
+
+    @SubscribeEvent
+    public void onServerStarting(FMLServerStartingEvent event) {
+        CommandReach.register(event.getCommandDispatcher());
+    }
+
+
+    public static void log(String msg){
+        logger.info(msg);
+    }
+
+    public static void log(EntityPlayer player, String msg){
+        log(player, msg, false);
+    }
+
+    public static void log(EntityPlayer player, String msg, boolean actionBar){
+        player.sendStatusMessage(new TextComponentString(msg), actionBar);
+    }
 }

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

@@ -1,175 +1,213 @@
 package nl.requios.effortlessbuilding;
 
-import net.minecraft.world.InteractionHand;
+import net.minecraft.block.state.IBlockState;
-import net.minecraft.world.item.BlockItem;
+import net.minecraft.entity.Entity;
-import net.minecraft.world.item.ItemStack;
+import net.minecraft.entity.player.EntityPlayer;
-import net.minecraft.world.level.block.Blocks;
+import net.minecraft.entity.player.EntityPlayerMP;
-import net.minecraft.world.entity.Entity;
+import net.minecraft.init.Blocks;
-import net.minecraft.world.entity.player.Player;
+import net.minecraft.stats.Stat;
-import net.minecraft.server.level.ServerPlayer;
+import net.minecraft.stats.StatList;
-import net.minecraft.resources.ResourceLocation;
+import net.minecraft.util.ResourceLocation;
-import net.minecraftforge.common.util.FakePlayer;
+import net.minecraft.util.math.BlockPos;
+import net.minecraft.world.World;
+import net.minecraftforge.common.util.LazyOptional;
 import net.minecraftforge.event.AttachCapabilitiesEvent;
-import net.minecraftforge.event.RegisterCommandsEvent;
 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;
-import net.minecraftforge.network.PacketDistributor;
+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;
 
-@Mod.EventBusSubscriber(modid = EffortlessBuilding.MODID, bus = Mod.EventBusSubscriber.Bus.FORGE)
+import java.util.List;
-public class EventHandler {
 
-	@SubscribeEvent
+import static net.minecraftforge.fml.common.gameevent.PlayerEvent.*;
-	public static void attachCapabilities(AttachCapabilitiesEvent<Entity> event) {
-		if (event.getObject() instanceof FakePlayer) return;
-		if (event.getObject() instanceof Player) {
-			event.addCapability(new ResourceLocation(EffortlessBuilding.MODID, "build_modifier"), new ModifierCapabilityManager.Provider());
-			event.addCapability(new ResourceLocation(EffortlessBuilding.MODID, "build_mode"), new ModeCapabilityManager.Provider());
-		}
-	}
 
-	@SubscribeEvent
+@Mod.EventBusSubscriber
-	public static void onBlockPlaced(BlockEvent.EntityPlaceEvent event) {
+public class EventHandler
-		if (event.getLevel().isClientSide()) return;
+{
 
-		if (!(event.getEntity() instanceof Player)) return;
+    @SubscribeEvent
+    public static void attachCapabilities(AttachCapabilitiesEvent<Entity> event) {
+        if (event.getObject() instanceof EntityPlayer) {
+            event.addCapability(new ResourceLocation(EffortlessBuilding.MODID, "build_modifier"), new ModifierCapabilityManager.Provider());
+            event.addCapability(new ResourceLocation(EffortlessBuilding.MODID, "build_mode"), new ModeCapabilityManager.Provider());
+        }
+    }
 
-		if (event.getEntity() instanceof FakePlayer) return;
+    //TODO 1.13 config
+//    @SubscribeEvent
+//    public static void onConfigChangedEvent(ConfigChangedEvent.OnConfigChangedEvent event)
+//    {
+//        if (event.getModID().equals(EffortlessBuilding.MODID))
+//        {
+//            ConfigManager.sync(EffortlessBuilding.MODID, Config.Type.INSTANCE);
+//        }
+//    }
 
-		//Cancel event if necessary
+//    @SubscribeEvent
-		ServerPlayer player = ((ServerPlayer) event.getEntity());
+//    public static void onServerTick(TickEvent.ServerTickEvent event) {
-		BuildModes.BuildModeEnum buildMode = ModeSettingsManager.getModeSettings(player).getBuildMode();
+//
-		ModifierSettingsManager.ModifierSettings modifierSettings = ModifierSettingsManager.getModifierSettings(player);
+//    }
 
-		if (buildMode != BuildModes.BuildModeEnum.NORMAL) {
+    @SubscribeEvent
+    //Only called serverside (except with lilypads...)
+    public static void onBlockPlaced(BlockEvent.EntityPlaceEvent event) {
+        if (event.getWorld().isRemote()) return;
 
-			//Only cancel if itemblock in hand
+        if (!(event.getEntity() instanceof EntityPlayer)) return;
-			//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())) {
-				event.setCanceled(true);
-			}
 
-		} else if (modifierSettings.doQuickReplace()) {
+        //Cancel event if necessary
-			//Cancel event and send message if QuickReplace
+        EntityPlayerMP player = ((EntityPlayerMP) event.getEntity());
-			event.setCanceled(true);
+        BuildModes.BuildModeEnum buildMode = ModeSettingsManager.getModeSettings(player).getBuildMode();
-			PacketHandler.INSTANCE.send(PacketDistributor.PLAYER.with(() -> player), new RequestLookAtMessage(true));
+        ModifierSettingsManager.ModifierSettings modifierSettings = ModifierSettingsManager.getModifierSettings(player);
-			PacketHandler.INSTANCE.send(PacketDistributor.PLAYER.with(() -> player), new AddUndoMessage(event.getPos(), event.getBlockSnapshot().getReplacedBlock(), event.getState()));
-		} else {
-			//NORMAL mode, let vanilla handle block placing
-			//But modifiers should still work
 
-			//Send message to client, which sends message back with raytrace info
+        if (buildMode != BuildModes.BuildModeEnum.NORMAL) {
-			PacketHandler.INSTANCE.send(PacketDistributor.PLAYER.with(() -> player), new RequestLookAtMessage(false));
+            event.setCanceled(true);
-			PacketHandler.INSTANCE.send(PacketDistributor.PLAYER.with(() -> player), new AddUndoMessage(event.getPos(), event.getBlockSnapshot().getReplacedBlock(), event.getState()));
+        } else if (modifierSettings.doQuickReplace()) {
-		}
+            //Cancel event and send message if QuickReplace
+            event.setCanceled(true);
+            PacketHandler.INSTANCE.send(PacketDistributor.PLAYER.with(() -> player), new RequestLookAtMessage(true));
+            PacketHandler.INSTANCE.send(PacketDistributor.PLAYER.with(() -> player), new AddUndoMessage(event.getPos(), event.getBlockSnapshot().getReplacedBlock(), event.getState()));
+        } else {
+            //NORMAL mode, let vanilla handle block placing
+            //But modifiers should still work
+
+            //Send message to client, which sends message back with raytrace info
+            PacketHandler.INSTANCE.send(PacketDistributor.PLAYER.with(() -> player), new RequestLookAtMessage(false));
+            PacketHandler.INSTANCE.send(PacketDistributor.PLAYER.with(() -> player), new AddUndoMessage(event.getPos(), event.getBlockSnapshot().getReplacedBlock(), event.getState()));
+        }
 
 //        Stat<ResourceLocation> blocksPlacedStat = StatList.CUSTOM.get(new ResourceLocation(EffortlessBuilding.MODID, "blocks_placed"));
 //        player.getStats().increment(player, blocksPlacedStat, 1);
 //
 //        System.out.println(player.getStats().getValue(blocksPlacedStat));
-	}
+    }
 
-	@SubscribeEvent
+    @SubscribeEvent
-	public static void onBlockBroken(BlockEvent.BreakEvent event) {
+    public static void onBlockBroken(BlockEvent.BreakEvent event) {
-		if (event.getLevel().isClientSide()) return;
+        if (event.getWorld().isRemote()) 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.NORMAL && ReachHelper.canBreakFar(event.getPlayer())) {
+            event.setCanceled(true);
+        } else {
+            //NORMAL mode, let vanilla handle block breaking
+            //But modifiers and QuickReplace should still work
+            //Dont break the original block yourself, otherwise Tinkers Hammer and Veinminer won't work
+            BuildModes.onBlockBroken(event.getPlayer(), event.getPos(), false);
 
-		//Cancel event if necessary
+            //Add to undo stack in client
-		//If cant break far then dont cancel event ever
+            PacketHandler.INSTANCE.send(PacketDistributor.PLAYER.with(() -> (EntityPlayerMP) event.getPlayer()), new AddUndoMessage(event.getPos(), event.getState(), Blocks.AIR.getDefaultState()));
-		BuildModes.BuildModeEnum buildMode = ModeSettingsManager.getModeSettings(event.getPlayer()).getBuildMode();
+        }
-		if (buildMode != BuildModes.BuildModeEnum.NORMAL && ReachHelper.canBreakFar(event.getPlayer())) {
+    }
-			event.setCanceled(true);
-		} else {
-			//NORMAL mode, let vanilla handle block breaking
-			//But modifiers and QuickReplace should still work
-			//Dont break the original block yourself, otherwise Tinkers Hammer and Veinminer won't work
-			BuildModes.onBlockBroken(event.getPlayer(), event.getPos(), false);
 
-			//Add to undo stack in client
+    @SubscribeEvent
-			if (event.getPlayer() instanceof ServerPlayer && event.getState() != null && event.getPos() != null) {
+    public static void breakSpeed(PlayerEvent.BreakSpeed event) {
-				PacketDistributor.PacketTarget packetTarget = PacketDistributor.PLAYER.with(() -> (ServerPlayer) event.getPlayer());
+        //Disable if config says so
-				if (packetTarget != null)
+        if (!BuildConfig.survivalBalancers.increasedMiningTime.get()) return;
-					PacketHandler.INSTANCE.send(packetTarget, new AddUndoMessage(event.getPos(), event.getState(), Blocks.AIR.defaultBlockState()));
-			}
-		}
-	}
 
-	@SubscribeEvent
+        EntityPlayer player = event.getEntityPlayer();
-	public static void onPlayerLoggedIn(PlayerEvent.PlayerLoggedInEvent event) {
+        World world = player.world;
-		if (event.getEntity() instanceof FakePlayer) return;
+        BlockPos pos = event.getPos();
-		Player player = event.getEntity();
-		ModifierSettingsManager.handleNewPlayer(player);
-		ModeSettingsManager.handleNewPlayer(player);
-	}
 
-	@SubscribeEvent
+        //EffortlessBuilding.log(player, String.valueOf(event.getNewSpeed()));
-	public static void onPlayerLoggedOut(PlayerEvent.PlayerLoggedOutEvent event) {
-		if (event.getEntity() instanceof FakePlayer) return;
-		Player player = event.getEntity();
-		if (player.getCommandSenderWorld().isClientSide) return;
 
-		UndoRedo.clear(player);
+        float originalBlockHardness = event.getState().getBlockHardness(world, pos);
-		PacketHandler.INSTANCE.send(PacketDistributor.PLAYER.with(() -> (ServerPlayer) player), new ClearUndoMessage());
+        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
+            IBlockState blockState = world.getBlockState(coordinate);
+            //add hardness for each blockstate, if can break
+            if (SurvivalHelper.canBreak(world, player, coordinate))
+                totalBlockHardness += blockState.getBlockHardness(world, coordinate);
+        }
 
-	@SubscribeEvent
+        //Grabbing percentage from config
-	public static void onPlayerRespawn(PlayerEvent.PlayerRespawnEvent event) {
+        float percentage = (float) BuildConfig.survivalBalancers.miningTimePercentage.get() / 100;
-		if (event.getEntity() instanceof FakePlayer) return;
+        totalBlockHardness *= percentage;
-		Player player = event.getEntity();
+        totalBlockHardness += originalBlockHardness;
-		ModifierSettingsManager.handleNewPlayer(player);
-		ModeSettingsManager.handleNewPlayer(player);
-	}
 
-	@SubscribeEvent
+        float newSpeed = event.getOriginalSpeed() / totalBlockHardness * originalBlockHardness;
-	public static void onPlayerChangedDimension(PlayerEvent.PlayerChangedDimensionEvent event) {
+        if (Float.isNaN(newSpeed) || newSpeed == 0f) newSpeed = 1f;
-		if (event.getEntity() instanceof FakePlayer) return;
+        event.setNewSpeed(newSpeed);
-		Player player = event.getEntity();
-		if (player.getCommandSenderWorld().isClientSide) return;
 
-		//Set build mode to normal
+        //EffortlessBuilding.log(player, String.valueOf(event.getNewSpeed()));
-		ModeSettingsManager.ModeSettings modeSettings = ModeSettingsManager.getModeSettings(player);
+    }
-		modeSettings.setBuildMode(BuildModes.BuildModeEnum.NORMAL);
-		ModeSettingsManager.setModeSettings(player, modeSettings);
 
-		//Disable modifiers
+    @SubscribeEvent
-		ModifierSettingsManager.ModifierSettings modifierSettings = ModifierSettingsManager.getModifierSettings(player);
+    public static void onPlayerLoggedIn(PlayerLoggedInEvent event) {
-		modifierSettings.getMirrorSettings().enabled = false;
+        EntityPlayer player = event.getPlayer();
-		modifierSettings.getRadialMirrorSettings().enabled = false;
+        ModifierSettingsManager.handleNewPlayer(player);
-		modifierSettings.getArraySettings().enabled = false;
+        ModeSettingsManager.handleNewPlayer(player);
-		ModifierSettingsManager.setModifierSettings(player, modifierSettings);
+    }
 
-		ModifierSettingsManager.handleNewPlayer(player);
+    @SubscribeEvent
-		ModeSettingsManager.handleNewPlayer(player);
+    public static void onPlayerLoggedOut(PlayerLoggedOutEvent event) {
+        EntityPlayer player = event.getPlayer();
+        if (player.getEntityWorld().isRemote) return;
 
-		UndoRedo.clear(player);
+        UndoRedo.clear(player);
-		PacketHandler.INSTANCE.send(PacketDistributor.PLAYER.with(() -> (ServerPlayer) player), new ClearUndoMessage());
+        PacketHandler.INSTANCE.send(PacketDistributor.PLAYER.with(() -> (EntityPlayerMP) player), new ClearUndoMessage());
-	}
+    }
 
-	@SubscribeEvent
+    @SubscribeEvent
-	public static void onPlayerClone(PlayerEvent.Clone event) {
+    public static void onPlayerRespawn(PlayerRespawnEvent event) {
-		if (event.getEntity() instanceof FakePlayer) return;
+        EntityPlayer player = event.getPlayer();
-		//Attach capabilities on death, otherwise crash
+        ModifierSettingsManager.handleNewPlayer(player);
-		Player oldPlayer = event.getOriginal();
+        ModeSettingsManager.handleNewPlayer(player);
-		oldPlayer.revive();
+    }
 
-		Player newPlayer = event.getEntity();
+    @SubscribeEvent
-		ModifierSettingsManager.setModifierSettings(newPlayer, ModifierSettingsManager.getModifierSettings(oldPlayer));
+    public static void onPlayerChangedDimension(PlayerChangedDimensionEvent event) {
-		ModeSettingsManager.setModeSettings(newPlayer, ModeSettingsManager.getModeSettings(oldPlayer));
+        EntityPlayer player = event.getPlayer();
-	}
+        if (player.getEntityWorld().isRemote) return;
+
+        //Set build mode to normal
+        ModeSettingsManager.ModeSettings modeSettings = ModeSettingsManager.getModeSettings(player);
+        modeSettings.setBuildMode(BuildModes.BuildModeEnum.NORMAL);
+        ModeSettingsManager.setModeSettings(player, modeSettings);
+
+        //Disable modifiers
+        ModifierSettingsManager.ModifierSettings modifierSettings = ModifierSettingsManager.getModifierSettings(player);
+        modifierSettings.getMirrorSettings().enabled = false;
+        modifierSettings.getRadialMirrorSettings().enabled = false;
+        modifierSettings.getArraySettings().enabled = false;
+        ModifierSettingsManager.setModifierSettings(player, modifierSettings);
+
+        ModifierSettingsManager.handleNewPlayer(player);
+        ModeSettingsManager.handleNewPlayer(player);
+
+        UndoRedo.clear(player);
+        PacketHandler.INSTANCE.send(PacketDistributor.PLAYER.with(() -> (EntityPlayerMP) player), new ClearUndoMessage());
+    }
+
+    @SubscribeEvent
+    public static void onPlayerClone(PlayerEvent.Clone event) {
+        //Attach capabilities on death, otherwise crash
+        EntityPlayer oldPlayer = event.getOriginal();
+        oldPlayer.revive();
+
+        EntityPlayer newPlayer = event.getEntityPlayer();
+        ModifierSettingsManager.setModifierSettings(newPlayer, ModifierSettingsManager.getModifierSettings(oldPlayer));
+        ModeSettingsManager.setModeSettings(newPlayer, ModeSettingsManager.getModeSettings(oldPlayer));
+    }
 }

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

@@ -1,51 +0,0 @@
-package nl.requios.effortlessbuilding;
-
-import com.mojang.blaze3d.platform.InputConstants;
-import com.mojang.blaze3d.vertex.DefaultVertexFormat;
-import net.minecraft.client.KeyMapping;
-import net.minecraft.client.renderer.ShaderInstance;
-import net.minecraft.resources.ResourceLocation;
-import net.minecraftforge.api.distmarker.Dist;
-import net.minecraftforge.client.event.RegisterKeyMappingsEvent;
-import net.minecraftforge.client.event.RegisterShadersEvent;
-import net.minecraftforge.client.settings.KeyConflictContext;
-import net.minecraftforge.client.settings.KeyModifier;
-import net.minecraftforge.eventbus.api.SubscribeEvent;
-import net.minecraftforge.fml.common.Mod;
-import nl.requios.effortlessbuilding.proxy.ClientProxy;
-import nl.requios.effortlessbuilding.render.BuildRenderTypes;
-import org.lwjgl.glfw.GLFW;
-
-import java.io.IOException;
-
-@Mod.EventBusSubscriber(bus = Mod.EventBusSubscriber.Bus.MOD, value = {Dist.CLIENT})
-public class ModClientEventHandler {
-
-	@SubscribeEvent
-	public static void registerKeyMappings(RegisterKeyMappingsEvent event) {
-		EffortlessBuilding.log("Registering KeyMappings!");
-
-		// register key bindings
-		ClientProxy.keyBindings = new KeyMapping[6];
-
-		// instantiate the key bindings
-		ClientProxy.keyBindings[0] = new KeyMapping("key.effortlessbuilding.hud.desc", KeyConflictContext.IN_GAME, InputConstants.getKey(GLFW.GLFW_KEY_KP_ADD, 0), "key.effortlessbuilding.category");
-		ClientProxy.keyBindings[1] = new KeyMapping("key.effortlessbuilding.replace.desc", KeyConflictContext.IN_GAME, InputConstants.getKey(GLFW.GLFW_KEY_KP_SUBTRACT, 0), "key.effortlessbuilding.category");
-		ClientProxy.keyBindings[2] = new KeyMapping("key.effortlessbuilding.mode.desc", KeyConflictContext.IN_GAME, InputConstants.getKey(GLFW.GLFW_KEY_LEFT_ALT, 0), "key.effortlessbuilding.category");
-		ClientProxy.keyBindings[3] = new KeyMapping("key.effortlessbuilding.undo.desc", KeyConflictContext.IN_GAME, KeyModifier.CONTROL, InputConstants.getKey(GLFW.GLFW_KEY_Z, 0), "key.effortlessbuilding.category");
-		ClientProxy.keyBindings[4] = new KeyMapping("key.effortlessbuilding.redo.desc", KeyConflictContext.IN_GAME, KeyModifier.CONTROL, InputConstants.getKey(GLFW.GLFW_KEY_Y, 0), "key.effortlessbuilding.category");
-		ClientProxy.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 : ClientProxy.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);
-	}
-}

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

@@ -0,0 +1,30 @@
+package nl.requios.effortlessbuilding;
+
+import net.minecraft.block.Block;
+import net.minecraft.item.Item;
+import net.minecraft.item.ItemBlock;
+import net.minecraftforge.event.RegistryEvent;
+import net.minecraftforge.eventbus.api.SubscribeEvent;
+import net.minecraftforge.fml.common.Mod;
+
+// You can use EventBusSubscriber to automatically subscribe events on the contained class (this is subscribing to the MOD
+// Event bus for receiving Registry Events)
+@Mod.EventBusSubscriber(bus=Mod.EventBusSubscriber.Bus.MOD)
+public class ModEventHandler {
+
+    @SubscribeEvent
+    public static void registerBlocks(RegistryEvent.Register<Block> event) {
+        event.getRegistry().registerAll(EffortlessBuilding.BLOCKS);
+    }
+
+    @SubscribeEvent
+    public static void registerItems(RegistryEvent.Register<Item> event)
+    {
+        event.getRegistry().registerAll(EffortlessBuilding.ITEMS);
+
+        for (Block block : EffortlessBuilding.BLOCKS)
+        {
+            event.getRegistry().register(new ItemBlock(block, new Item.Properties()).setRegistryName(block.getRegistryName()));
+        }
+    }
+}

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

@@ -1,39 +1,40 @@
 package nl.requios.effortlessbuilding.buildmode;
 
-import net.minecraft.world.entity.player.Player;
+import net.minecraft.entity.player.EntityPlayer;
-import net.minecraft.core.Direction;
+import net.minecraft.util.EnumFacing;
-import net.minecraft.core.BlockPos;
+import net.minecraft.util.math.BlockPos;
-import net.minecraft.world.phys.Vec3;
+import net.minecraft.util.math.Vec3d;
 
 import java.util.Dictionary;
 import java.util.Hashtable;
+import java.util.List;
 import java.util.UUID;
 
 public abstract class BaseBuildMode implements IBuildMode {
-	//In singleplayer client and server variables are shared
+    //In singleplayer client and server variables are shared
-	//Split everything that needs separate values and may not be called twice in one click
+    //Split everything that needs separate values and may not be called twice in one click
-	protected Dictionary<UUID, Integer> rightClickClientTable = new Hashtable<>();
+    protected Dictionary<UUID, Integer> rightClickClientTable = new Hashtable<>();
-	protected Dictionary<UUID, Integer> rightClickServerTable = new Hashtable<>();
+    protected Dictionary<UUID, Integer> rightClickServerTable = new Hashtable<>();
-	protected Dictionary<UUID, BlockPos> firstPosTable = new Hashtable<>();
+    protected Dictionary<UUID, BlockPos> firstPosTable = new Hashtable<>();
-	protected Dictionary<UUID, Direction> sideHitTable = new Hashtable<>();
+    protected Dictionary<UUID, EnumFacing> sideHitTable = new Hashtable<>();
-	protected Dictionary<UUID, Vec3> hitVecTable = new Hashtable<>();
+    protected Dictionary<UUID, Vec3d> hitVecTable = new Hashtable<>();
 
-	@Override
+    @Override
-	public void initialize(Player player) {
+    public void initialize(EntityPlayer player) {
-		rightClickClientTable.put(player.getUUID(), 0);
+        rightClickClientTable.put(player.getUniqueID(), 0);
-		rightClickServerTable.put(player.getUUID(), 0);
+        rightClickServerTable.put(player.getUniqueID(), 0);
-		firstPosTable.put(player.getUUID(), BlockPos.ZERO);
+        firstPosTable.put(player.getUniqueID(), BlockPos.ORIGIN);
-		sideHitTable.put(player.getUUID(), Direction.UP);
+        sideHitTable.put(player.getUniqueID(), EnumFacing.UP);
-		hitVecTable.put(player.getUUID(), Vec3.ZERO);
+        hitVecTable.put(player.getUniqueID(), Vec3d.ZERO);
-	}
+    }
 
-	@Override
+    @Override
-	public Direction getSideHit(Player player) {
+    public EnumFacing getSideHit(EntityPlayer player) {
-		return sideHitTable.get(player.getUUID());
+        return sideHitTable.get(player.getUniqueID());
-	}
+    }
 
-	@Override
+    @Override
-	public Vec3 getHitVec(Player player) {
+    public Vec3d getHitVec(EntityPlayer player) {
-		return hitVecTable.get(player.getUUID());
+        return hitVecTable.get(player.getUniqueID());
-	}
+    }
 }

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

@@ -1,12 +1,11 @@
 package nl.requios.effortlessbuilding.buildmode;
 
-import com.mojang.math.Vector4f;
+import net.minecraft.entity.player.EntityPlayer;
-import net.minecraft.world.entity.player.Player;
+import net.minecraft.util.EnumFacing;
-import net.minecraft.core.Direction;
+import net.minecraft.util.math.BlockPos;
-import net.minecraft.core.BlockPos;
+import net.minecraft.util.math.RayTraceFluidMode;
-import net.minecraft.world.level.ClipContext;
+import net.minecraft.util.math.RayTraceResult;
-import net.minecraft.world.phys.HitResult;
+import net.minecraft.util.math.Vec3d;
-import net.minecraft.world.phys.Vec3;
 import nl.requios.effortlessbuilding.EffortlessBuilding;
 import nl.requios.effortlessbuilding.buildmode.buildmodes.*;
 import nl.requios.effortlessbuilding.buildmodifier.BuildModifiers;
@@ -21,282 +20,226 @@ import java.util.Dictionary;
 import java.util.Hashtable;
 import java.util.List;
 
-import static nl.requios.effortlessbuilding.buildmode.ModeOptions.OptionEnum;
+import static nl.requios.effortlessbuilding.buildmode.ModeOptions.*;
 
 public class BuildModes {
 
-	//Static variables are shared between client and server in singleplayer
+    //Static variables are shared between client and server in singleplayer
-	//We need them separate
+    //We need them separate
-	public static Dictionary<Player, Boolean> currentlyBreakingClient = new Hashtable<>();
+    public static Dictionary<EntityPlayer, Boolean> currentlyBreakingClient = new Hashtable<>();
-	public static Dictionary<Player, Boolean> currentlyBreakingServer = new Hashtable<>();
+    public static Dictionary<EntityPlayer, Boolean> currentlyBreakingServer = new Hashtable<>();
 
-	//Uses a network message to get the previous raytraceresult from the player
+    public enum BuildModeEnum {
-	//The server could keep track of all raytraceresults but this might lag with many players
+        NORMAL("effortlessbuilding.mode.normal", new Normal()),
-	//Raytraceresult is needed for sideHit and hitVec
+        NORMAL_PLUS("effortlessbuilding.mode.normal_plus", new NormalPlus(), OptionEnum.BUILD_SPEED),
-	public static void onBlockPlacedMessage(Player player, BlockPlacedMessage message) {
+        LINE("effortlessbuilding.mode.line", new Line() /*, OptionEnum.THICKNESS*/),
+        WALL("effortlessbuilding.mode.wall", new Wall(), OptionEnum.FILL),
+        FLOOR("effortlessbuilding.mode.floor", new Floor(), OptionEnum.FILL),
+        DIAGONAL_LINE("effortlessbuilding.mode.diagonal_line", new DiagonalLine() /*, OptionEnum.THICKNESS*/),
+        DIAGONAL_WALL("effortlessbuilding.mode.diagonal_wall", new DiagonalWall() /*, OptionEnum.FILL*/),
+        SLOPE_FLOOR("effortlessbuilding.mode.slope_floor", new SlopeFloor(), OptionEnum.RAISED_EDGE),
+        CIRCLE("effortlessbuilding.mode.circle", new Circle(), OptionEnum.CIRCLE_START, OptionEnum.FILL),
+        CYLINDER("effortlessbuilding.mode.cylinder", new Cylinder(), OptionEnum.CIRCLE_START, OptionEnum.FILL),
+        SPHERE("effortlessbuilding.mode.sphere", new Sphere(), OptionEnum.CIRCLE_START, OptionEnum.FILL),
+        CUBE("effortlessbuilding.mode.cube", new Cube(), OptionEnum.CUBE_FILL);
 
-		//Check if not in the middle of breaking
+        public String name;
-		Dictionary<Player, Boolean> currentlyBreaking = player.level.isClientSide ? currentlyBreakingClient : currentlyBreakingServer;
+        public IBuildMode instance;
-		if (currentlyBreaking.get(player) != null && currentlyBreaking.get(player)) {
+        public OptionEnum[] options;
-			//Cancel breaking
-			initializeMode(player);
-			return;
-		}
 
-		ModifierSettingsManager.ModifierSettings modifierSettings = ModifierSettingsManager.getModifierSettings(player);
+        BuildModeEnum(String name, IBuildMode instance, OptionEnum... options) {
-		ModeSettingsManager.ModeSettings modeSettings = ModeSettingsManager.getModeSettings(player);
+            this.name = name;
-		BuildModeEnum buildMode = modeSettings.getBuildMode();
+            this.instance = instance;
+            this.options = options;
+        }
+    }
 
-		BlockPos startPos = null;
+    //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(EntityPlayer player, BlockPlacedMessage message) {
 
-		if (message.isBlockHit() && message.getBlockPos() != null) {
+        //Check if not in the middle of breaking
-			startPos = message.getBlockPos();
+        Dictionary<EntityPlayer, Boolean> currentlyBreaking = player.world.isRemote ? currentlyBreakingClient : currentlyBreakingServer;
+        if (currentlyBreaking.get(player) != null && currentlyBreaking.get(player)) {
+            //Cancel breaking
+            initializeMode(player);
+            return;
+        }
 
-			//Offset in direction of sidehit if not quickreplace and not replaceable
+        ModifierSettingsManager.ModifierSettings modifierSettings = ModifierSettingsManager.getModifierSettings(player);
-			boolean replaceable = player.level.getBlockState(startPos).getMaterial().isReplaceable();
+        ModeSettingsManager.ModeSettings modeSettings = ModeSettingsManager.getModeSettings(player);
-			boolean becomesDoubleSlab = SurvivalHelper.doesBecomeDoubleSlab(player, startPos, message.getSideHit());
+        BuildModeEnum buildMode = modeSettings.getBuildMode();
-			if (!modifierSettings.doQuickReplace() && !replaceable && !becomesDoubleSlab) {
-				startPos = startPos.relative(message.getSideHit());
-			}
 
-			//Get under tall grass and other replaceable blocks
+        BlockPos startPos = null;
-			if (modifierSettings.doQuickReplace() && replaceable) {
-				startPos = startPos.below();
-			}
 
-			//Check if player reach does not exceed startpos
+        if (message.isBlockHit() && message.getBlockPos() != null) {
-			int maxReach = ReachHelper.getMaxReach(player);
+            startPos = message.getBlockPos();
-			if (buildMode != BuildModeEnum.NORMAL && player.blockPosition().distSqr(startPos) > maxReach * maxReach) {
-				EffortlessBuilding.log(player, "Placement exceeds your reach.");
-				return;
-			}
-		}
 
-		//Even when no starting block is found, call buildmode instance
+            //Offset in direction of sidehit if not quickreplace and not replaceable
-		//We might want to place things in the air
+            //TODO 1.13 replaceable
-		List<BlockPos> coordinates = buildMode.instance.onRightClick(player, startPos, message.getSideHit(), message.getHitVec(), modifierSettings.doQuickReplace());
+            boolean replaceable = player.world.getBlockState(startPos).getMaterial().isReplaceable();
+            boolean becomesDoubleSlab = SurvivalHelper.doesBecomeDoubleSlab(player, startPos, message.getSideHit());
+            if (!modifierSettings.doQuickReplace() && !replaceable && !becomesDoubleSlab) {
+                startPos = startPos.offset(message.getSideHit());
+            }
 
-		if (coordinates.isEmpty()) {
+            //Get under tall grass and other replaceable blocks
-			currentlyBreaking.put(player, false);
+            if (modifierSettings.doQuickReplace() && replaceable) {
-			return;
+                startPos = startPos.down();
-		}
+            }
 
-		//Limit number of blocks you can place
+            //Check if player reach does not exceed startpos
-		int limit = ReachHelper.getMaxBlocksPlacedAtOnce(player);
+            int maxReach = ReachHelper.getMaxReach(player);
-		if (coordinates.size() > limit) {
+            if (buildMode != BuildModeEnum.NORMAL && player.getPosition().distanceSq(startPos) > maxReach * maxReach) {
-			coordinates = coordinates.subList(0, limit);
+                EffortlessBuilding.log(player, "Placement exceeds your reach.");
-		}
+                return;
+            }
+        }
 
-		Direction sideHit = buildMode.instance.getSideHit(player);
+        //Even when no starting block is found, call buildmode instance
-		if (sideHit == null) sideHit = message.getSideHit();
+        //We might want to place things in the air
+        List<BlockPos> coordinates = buildMode.instance.onRightClick(player, startPos, message.getSideHit(), message.getHitVec(), modifierSettings.doQuickReplace());
 
-		Vec3 hitVec = buildMode.instance.getHitVec(player);
+        if (coordinates.isEmpty()) {
-		if (hitVec == null) hitVec = message.getHitVec();
+            currentlyBreaking.put(player, false);
+            return;
+        }
 
-		BuildModifiers.onBlockPlaced(player, coordinates, sideHit, hitVec, message.getPlaceStartPos());
+        //Limit number of blocks you can place
+        int limit = ReachHelper.getMaxBlocksPlacedAtOnce(player);
+        if (coordinates.size() > limit) {
+            coordinates = coordinates.subList(0, limit);
+        }
 
-		//Only works when finishing a buildmode is equal to placing some blocks
+        EnumFacing sideHit = buildMode.instance.getSideHit(player);
-		//No intermediate blocks allowed
+        if (sideHit == null) sideHit = message.getSideHit();
-		currentlyBreaking.remove(player);
-	}
 
-	//Use a network message to break blocks in the distance using clientside mouse input
+        Vec3d hitVec = buildMode.instance.getHitVec(player);
-	public static void onBlockBrokenMessage(Player player, BlockBrokenMessage message) {
+        if (hitVec == null) hitVec = message.getHitVec();
-		BlockPos startPos = message.isBlockHit() ? message.getBlockPos() : null;
-		onBlockBroken(player, startPos, true);
-	}
 
-	public static void onBlockBroken(Player player, BlockPos startPos, boolean breakStartPos) {
+        BuildModifiers.onBlockPlaced(player, coordinates, sideHit, hitVec, message.getPlaceStartPos());
 
-		//Check if not in the middle of placing
+        //Only works when finishing a buildmode is equal to placing some blocks
-		Dictionary<Player, Boolean> currentlyBreaking = player.level.isClientSide ? currentlyBreakingClient : currentlyBreakingServer;
+        //No intermediate blocks allowed
-		if (currentlyBreaking.get(player) != null && !currentlyBreaking.get(player)) {
+        currentlyBreaking.remove(player);
-			//Cancel placing
-			initializeMode(player);
-			return;
-		}
 
-		if (!ReachHelper.canBreakFar(player)) return;
+    }
 
-		//If first click
+    //Use a network message to break blocks in the distance using clientside mouse input
-		if (currentlyBreaking.get(player) == null) {
+    public static void onBlockBrokenMessage(EntityPlayer player, BlockBrokenMessage message) {
-			//If startpos is null, dont do anything
+        BlockPos startPos = message.isBlockHit() ? message.getBlockPos() : null;
-			if (startPos == null) return;
+        onBlockBroken(player, startPos, true);
-		}
+    }
 
-		ModifierSettingsManager.ModifierSettings modifierSettings = ModifierSettingsManager.getModifierSettings(player);
+    public static void onBlockBroken(EntityPlayer player, BlockPos startPos, boolean breakStartPos) {
-		ModeSettingsManager.ModeSettings modeSettings = ModeSettingsManager.getModeSettings(player);
 
-		//Get coordinates
+        //Check if not in the middle of placing
-		BuildModeEnum buildMode = modeSettings.getBuildMode();
+        Dictionary<EntityPlayer, Boolean> currentlyBreaking = player.world.isRemote ? currentlyBreakingClient : currentlyBreakingServer;
-		List<BlockPos> coordinates = buildMode.instance.onRightClick(player, startPos, Direction.UP, Vec3.ZERO, true);
+        if (currentlyBreaking.get(player) != null && !currentlyBreaking.get(player)) {
+            //Cancel placing
+            initializeMode(player);
+            return;
+        }
 
-		if (coordinates.isEmpty()) {
+        //If first click
-			currentlyBreaking.put(player, true);
+        if (currentlyBreaking.get(player) == null) {
-			return;
+            //If startpos is null, dont do anything
-		}
+            if (startPos == null) return;
+        }
 
-		//Let buildmodifiers break blocks
+        ModifierSettingsManager.ModifierSettings modifierSettings = ModifierSettingsManager.getModifierSettings(player);
-		BuildModifiers.onBlockBroken(player, coordinates, breakStartPos);
+        ModeSettingsManager.ModeSettings modeSettings = ModeSettingsManager.getModeSettings(player);
 
-		//Only works when finishing a buildmode is equal to breaking some blocks
+        //Get coordinates
-		//No intermediate blocks allowed
+        BuildModeEnum buildMode = modeSettings.getBuildMode();
-		currentlyBreaking.remove(player);
+        List<BlockPos> coordinates = buildMode.instance.onRightClick(player, startPos, EnumFacing.UP, Vec3d.ZERO, true);
-	}
 
-	public static List<BlockPos> findCoordinates(Player player, BlockPos startPos, boolean skipRaytrace) {
+        if (coordinates.isEmpty()) {
-		List<BlockPos> coordinates = new ArrayList<>();
+            currentlyBreaking.put(player, true);
+            return;
+        }
 
-		ModeSettingsManager.ModeSettings modeSettings = ModeSettingsManager.getModeSettings(player);
+        //Let buildmodifiers break blocks
-		coordinates.addAll(modeSettings.getBuildMode().instance.findCoordinates(player, startPos, skipRaytrace));
+        BuildModifiers.onBlockBroken(player, coordinates, breakStartPos);
 
-		return coordinates;
+        //Only works when finishing a buildmode is equal to breaking some blocks
-	}
+        //No intermediate blocks allowed
+        currentlyBreaking.remove(player);
+    }
 
-	public static void initializeMode(Player player) {
+    public static List<BlockPos> findCoordinates(EntityPlayer player, BlockPos startPos, boolean skipRaytrace) {
-		//Resetting mode, so not placing or breaking
+        List<BlockPos> coordinates = new ArrayList<>();
-		Dictionary<Player, Boolean> currentlyBreaking = player.level.isClientSide ? currentlyBreakingClient : currentlyBreakingServer;
-		currentlyBreaking.remove(player);
 
-		ModeSettingsManager.getModeSettings(player).getBuildMode().instance.initialize(player);
+        ModeSettingsManager.ModeSettings modeSettings = ModeSettingsManager.getModeSettings(player);
-	}
+        coordinates.addAll(modeSettings.getBuildMode().instance.findCoordinates(player, startPos, skipRaytrace));
 
-	public static boolean isCurrentlyPlacing(Player player) {
+        return coordinates;
-		Dictionary<Player, Boolean> currentlyBreaking = player.level.isClientSide ? currentlyBreakingClient : currentlyBreakingServer;
+    }
-		return currentlyBreaking.get(player) != null && !currentlyBreaking.get(player);
-	}
 
-	public static boolean isCurrentlyBreaking(Player player) {
+    public static void initializeMode(EntityPlayer player) {
-		Dictionary<Player, Boolean> currentlyBreaking = player.level.isClientSide ? currentlyBreakingClient : currentlyBreakingServer;
+        //Resetting mode, so not placing or breaking
-		return currentlyBreaking.get(player) != null && currentlyBreaking.get(player);
+        Dictionary<EntityPlayer, Boolean> currentlyBreaking = player.world.isRemote ? currentlyBreakingClient : currentlyBreakingServer;
-	}
+        currentlyBreaking.remove(player);
 
-	//Either placing or breaking
+        ModeSettingsManager.getModeSettings(player).getBuildMode().instance.initialize(player);
-	public static boolean isActive(Player player) {
+    }
-		Dictionary<Player, Boolean> currentlyBreaking = player.level.isClientSide ? currentlyBreakingClient : currentlyBreakingServer;
-		return currentlyBreaking.get(player) != null;
-	}
 
-	//Find coordinates on a line bound by a plane
+    public static boolean isCurrentlyPlacing(EntityPlayer player) {
-	public static Vec3 findXBound(double x, Vec3 start, Vec3 look) {
+        Dictionary<EntityPlayer, Boolean> currentlyBreaking = player.world.isRemote ? currentlyBreakingClient : currentlyBreakingServer;
-		//then y and z are
+        return currentlyBreaking.get(player) != null && !currentlyBreaking.get(player);
-		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);
+    public static boolean isCurrentlyBreaking(EntityPlayer player) {
-	}
+        Dictionary<EntityPlayer, Boolean> currentlyBreaking = player.world.isRemote ? currentlyBreakingClient : currentlyBreakingServer;
+        return currentlyBreaking.get(player) != null && currentlyBreaking.get(player);
+    }
+
+    //Either placing or breaking
+    public static boolean isActive(EntityPlayer player) {
+        Dictionary<EntityPlayer, Boolean> currentlyBreaking = player.world.isRemote ? currentlyBreakingClient : currentlyBreakingServer;
+        return currentlyBreaking.get(player) != null;
+    }
 
 
-	//-- Common build mode functionality --//
+    //-- Common build mode functionality --//
 
-	public static Vec3 findYBound(double y, Vec3 start, Vec3 look) {
+    //Find coordinates on a line bound by a plane
-		//then x and z are
+    public static Vec3d findXBound(double x, Vec3d start, Vec3d look) {
-		double x = (y - start.y) / look.y * look.x + start.x;
+        //then y and z are
-		double z = (y - start.y) / look.y * look.z + start.z;
+        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 Vec3d(x, y, z);
-	}
+    }
 
-	public static Vec3 findZBound(double z, Vec3 start, Vec3 look) {
+    public static Vec3d findYBound(double y, Vec3d start, Vec3d look) {
-		//then x and y are
+        //then x and z are
-		double x = (z - start.z) / look.z * look.x + start.x;
+        double x = (y - start.y) / look.y * look.x + start.x;
-		double y = (z - start.z) / look.z * look.y + start.y;
+        double z = (y - start.y) / look.y * look.z + start.z;
 
-		return new Vec3(x, y, z);
+        return new Vec3d(x, y, z);
-	}
+    }
 
-	//Use this instead of player.getLookVec() in any buildmodes code
+    public static Vec3d findZBound(double z, Vec3d start, Vec3d look) {
-	public static Vec3 getPlayerLookVec(Player player) {
+        //then x and y are
-		Vec3 lookVec = player.getLookAngle();
+        double x = (z - start.z) / look.z * look.x + start.x;
-		double x = lookVec.x;
+        double y = (z - start.z) / look.z * look.y + start.y;
-		double y = lookVec.y;
-		double z = lookVec.z;
 
-		//Further calculations (findXBound etc) don't like any component being 0 or 1 (e.g. dividing by 0)
+        return new Vec3d(x, y, z);
-		//isCriteriaValid below will take up to 2 minutes to raytrace blocks towards infinity if that is the case
+    }
-		//So make sure they are close to but never exactly 0 or 1
-		if (Math.abs(x) < 0.0001) x = 0.0001;
-		if (Math.abs(x - 1.0) < 0.0001) x = 0.9999;
-		if (Math.abs(x + 1.0) < 0.0001) x = -0.9999;
 
-		if (Math.abs(y) < 0.0001) y = 0.0001;
+    public static boolean isCriteriaValid(Vec3d start, Vec3d look, int reach, EntityPlayer player, boolean skipRaytrace, Vec3d lineBound, Vec3d planeBound, double distToPlayerSq) {
-		if (Math.abs(y - 1.0) < 0.0001) y = 0.9999;
+        boolean intersects = false;
-		if (Math.abs(y + 1.0) < 0.0001) y = -0.9999;
+        if (!skipRaytrace) {
+            //collision within a 1 block radius to selected is fine
+            RayTraceResult rayTraceResult = player.world.rayTraceBlocks(start, lineBound, RayTraceFluidMode.NEVER, true, false);
+            intersects = rayTraceResult != null && rayTraceResult.type == RayTraceResult.Type.BLOCK &&
+                         planeBound.subtract(rayTraceResult.hitVec).lengthSquared() > 4;
+        }
 
-		if (Math.abs(z) < 0.0001) z = 0.0001;
+        return planeBound.subtract(start).dotProduct(look) > 0 &&
-		if (Math.abs(z - 1.0) < 0.0001) z = 0.9999;
+               distToPlayerSq > 2 && distToPlayerSq < reach * reach &&
-		if (Math.abs(z + 1.0) < 0.0001) z = -0.9999;
+               !intersects;
-
+    }
-		return new Vec3(x, y, z);
-	}
-
-	public static boolean isCriteriaValid(Vec3 start, Vec3 look, int reach, Player player, boolean skipRaytrace, Vec3 lineBound, Vec3 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 &&
-				planeBound.subtract(rayTraceResult.getLocation()).lengthSqr() > 4;
-		}
-
-		return planeBound.subtract(start).dot(look) > 0 &&
-			distToPlayerSq > 2 && distToPlayerSq < reach * reach &&
-			!intersects;
-	}
-
-	public enum BuildModeEnum {
-		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),
-		CUBE("cube", new Cube(), BuildModeCategoryEnum.BASIC, OptionEnum.CUBE_FILL),
-		DIAGONAL_LINE("diagonal_line", new DiagonalLine(),  BuildModeCategoryEnum.DIAGONAL /*, OptionEnum.THICKNESS*/),
-		DIAGONAL_WALL("diagonal_wall", new DiagonalWall(),  BuildModeCategoryEnum.DIAGONAL /*, OptionEnum.FILL*/),
-		SLOPE_FLOOR("slope_floor", new SlopeFloor(), BuildModeCategoryEnum.DIAGONAL, OptionEnum.RAISED_EDGE),
-		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 final BuildModeCategoryEnum category;
-		public final OptionEnum[] options;
-
-		BuildModeEnum(String name, IBuildMode instance, BuildModeCategoryEnum category, OptionEnum... options) {
-			this.name = name;
-			this.instance = instance;
-			this.category = category;
-			this.options = options;
-		}
-		
-		public String getName() {
-			return name;
-		}
-
-		public String getNameKey() {
-			return "effortlessbuilding.mode." + name;
-		}
-
-		public String getDescriptionKey() {
-			return "effortlessbuilding.modedescription." + name;
-		}
-	}
-
-	public enum BuildModeCategoryEnum {
-		BASIC(new Vector4f(0f, .5f, 1f, .8f)),
-		DIAGONAL(new Vector4f(0.56f, 0.28f, 0.87f, .8f)),
-		CIRCULAR(new Vector4f(0.29f, 0.76f, 0.3f, 1f)),
-		ROOF(new Vector4f(0.83f, 0.87f, 0.23f, .8f));
-
-		public final Vector4f color;
-
-		BuildModeCategoryEnum(Vector4f color) {
-			this.color = color;
-		}
-	}
 }

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.entity.player.EntityPlayer;
-import net.minecraft.core.Direction;
+import net.minecraft.util.EnumFacing;
-import net.minecraft.core.BlockPos;
+import net.minecraft.util.math.BlockPos;
-import net.minecraft.world.phys.Vec3;
+import net.minecraft.util.math.Vec3d;
 
 import java.util.List;
 
 public interface IBuildMode {
 
-	//Fired when a player selects a buildmode and when it needs to initializeMode
+    //Fired when a player selects a buildmode and when it needs to initializeMode
-	void initialize(Player player);
+    void initialize(EntityPlayer player);
 
-	//Fired when a block would be placed
+    //Fired when a block would be placed
-	//Return a list of coordinates where you want to place blocks
+    //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(EntityPlayer player, BlockPos blockPos, EnumFacing sideHit, Vec3d hitVec, boolean skipRaytrace);
 
-	//Fired continuously for visualization purposes
+    //Fired continuously for visualization purposes
-	List<BlockPos> findCoordinates(Player player, BlockPos blockPos, boolean skipRaytrace);
+    List<BlockPos> findCoordinates(EntityPlayer player, BlockPos blockPos, boolean skipRaytrace);
 
-	Direction getSideHit(Player player);
+    EnumFacing getSideHit(EntityPlayer player);
 
-	Vec3 getHitVec(Player player);
+    Vec3d getHitVec(EntityPlayer player);
 }

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

@@ -1,7 +1,7 @@
 package nl.requios.effortlessbuilding.buildmode;
 
-import net.minecraft.world.entity.player.Player;
+import net.minecraft.entity.player.EntityPlayer;
-import net.minecraft.ChatFormatting;
+import net.minecraft.util.text.TextFormatting;
 import nl.requios.effortlessbuilding.EffortlessBuilding;
 import nl.requios.effortlessbuilding.buildmodifier.ModifierSettingsManager;
 import nl.requios.effortlessbuilding.buildmodifier.UndoRedo;
@@ -9,183 +9,174 @@ import nl.requios.effortlessbuilding.proxy.ClientProxy;
 
 public class ModeOptions {
 
-	private static ActionEnum buildSpeed = ActionEnum.NORMAL_SPEED;
+    public enum ActionEnum {
-	private static ActionEnum fill = ActionEnum.FULL;
+        UNDO("effortlessbuilding.action.undo"),
-	private static ActionEnum cubeFill = ActionEnum.CUBE_FULL;
+        REDO("effortlessbuilding.action.redo"),
-	private static ActionEnum raisedEdge = ActionEnum.SHORT_EDGE;
+        REPLACE("effortlessbuilding.action.replace"),
-	private static ActionEnum lineThickness = ActionEnum.THICKNESS_1;
+        OPEN_MODIFIER_SETTINGS("effortlessbuilding.action.open_modifier_settings"),
-	private static ActionEnum circleStart = ActionEnum.CIRCLE_START_CORNER;
 
-	public static ActionEnum getOptionSetting(OptionEnum option) {
+        NORMAL_SPEED("effortlessbuilding.action.normal_speed"),
-		switch (option) {
+        FAST_SPEED("effortlessbuilding.action.fast_speed"),
-			case BUILD_SPEED:
-				return getBuildSpeed();
-			case FILL:
-				return getFill();
-			case CUBE_FILL:
-				return getCubeFill();
-			case RAISED_EDGE:
-				return getRaisedEdge();
-			case LINE_THICKNESS:
-				return getLineThickness();
-			case CIRCLE_START:
-				return getCircleStart();
-			default:
-				return null;
-		}
-	}
 
-	public static ActionEnum getBuildSpeed() {
+        FULL("effortlessbuilding.action.full"),
-		return buildSpeed;
+        HOLLOW("effortlessbuilding.action.hollow"),
-	}
 
-	public static ActionEnum getFill() {
+        CUBE_FULL("effortlessbuilding.action.full"),
-		return fill;
+        CUBE_HOLLOW("effortlessbuilding.action.hollow"),
-	}
+        CUBE_SKELETON("effortlessbuilding.action.skeleton"),
 
-	public static ActionEnum getCubeFill() {
+        SHORT_EDGE("effortlessbuilding.action.short_edge"),
-		return cubeFill;
+        LONG_EDGE("effortlessbuilding.action.long_edge"),
-	}
 
-	public static ActionEnum getRaisedEdge() {
+        THICKNESS_1("effortlessbuilding.action.thickness_1"),
-		return raisedEdge;
+        THICKNESS_3("effortlessbuilding.action.thickness_3"),
-	}
+        THICKNESS_5("effortlessbuilding.action.thickness_5"),
 
-	public static ActionEnum getLineThickness() {
+        CIRCLE_START_CORNER("effortlessbuilding.action.start_corner"),
-		return lineThickness;
+        CIRCLE_START_CENTER("effortlessbuilding.action.start_center");
-	}
 
-	public static ActionEnum getCircleStart() {
+        public String name;
-		return circleStart;
-	}
 
-	//Called on both client and server
+        ActionEnum(String name) {
-	public static void performAction(Player player, ActionEnum action) {
+            this.name = name;
-		if (action == null) return;
+        }
+    }
 
-		switch (action) {
+    public enum OptionEnum {
-			case UNDO:
+        BUILD_SPEED("effortlessbuilding.action.build_speed", ActionEnum.NORMAL_SPEED, ActionEnum.FAST_SPEED),
-				UndoRedo.undo(player);
+        FILL("effortlessbuilding.action.filling", ActionEnum.FULL, ActionEnum.HOLLOW),
-				break;
+        CUBE_FILL("effortlessbuilding.action.filling", ActionEnum.CUBE_FULL, ActionEnum.CUBE_HOLLOW, ActionEnum.CUBE_SKELETON),
-			case REDO:
+        RAISED_EDGE("effortlessbuilding.action.raised_edge", ActionEnum.SHORT_EDGE, ActionEnum.LONG_EDGE),
-				UndoRedo.redo(player);
+        LINE_THICKNESS("effortlessbuilding.action.thickness", ActionEnum.THICKNESS_1, ActionEnum.THICKNESS_3, ActionEnum.THICKNESS_5),
-				break;
+        CIRCLE_START("effortlessbuilding.action.circle_start", ActionEnum.CIRCLE_START_CORNER, ActionEnum.CIRCLE_START_CENTER);
-			case REPLACE:
-				ModifierSettingsManager.ModifierSettings modifierSettings = ModifierSettingsManager.getModifierSettings(player);
-				modifierSettings.setQuickReplace(!modifierSettings.doQuickReplace());
-				EffortlessBuilding.log(player, "Set " + ChatFormatting.GOLD + "Quick Replace " + ChatFormatting.RESET + (
-					modifierSettings.doQuickReplace() ? "on" : "off"), true);
-				break;
-			case OPEN_MODIFIER_SETTINGS:
-				if (player.level.isClientSide)
-					ClientProxy.openModifierSettings();
-				break;
-			case OPEN_PLAYER_SETTINGS:
-				if (player.level.isClientSide)
-					ClientProxy.openPlayerSettings();
-				break;
 
-			case NORMAL_SPEED:
+        public String name;
-				buildSpeed = ActionEnum.NORMAL_SPEED;
+        public ActionEnum[] actions;
-				break;
-			case FAST_SPEED:
-				buildSpeed = ActionEnum.FAST_SPEED;
-				break;
-			case FULL:
-				fill = ActionEnum.FULL;
-				break;
-			case HOLLOW:
-				fill = ActionEnum.HOLLOW;
-				break;
-			case CUBE_FULL:
-				cubeFill = ActionEnum.CUBE_FULL;
-				break;
-			case CUBE_HOLLOW:
-				cubeFill = ActionEnum.CUBE_HOLLOW;
-				break;
-			case CUBE_SKELETON:
-				cubeFill = ActionEnum.CUBE_SKELETON;
-				break;
-			case SHORT_EDGE:
-				raisedEdge = ActionEnum.SHORT_EDGE;
-				break;
-			case LONG_EDGE:
-				raisedEdge = ActionEnum.LONG_EDGE;
-				break;
-			case THICKNESS_1:
-				lineThickness = ActionEnum.THICKNESS_1;
-				break;
-			case THICKNESS_3:
-				lineThickness = ActionEnum.THICKNESS_3;
-				break;
-			case THICKNESS_5:
-				lineThickness = ActionEnum.THICKNESS_5;
-				break;
-			case CIRCLE_START_CENTER:
-				circleStart = ActionEnum.CIRCLE_START_CENTER;
-				break;
-			case CIRCLE_START_CORNER:
-				circleStart = ActionEnum.CIRCLE_START_CORNER;
-				break;
-		}
 
-		if (player.level.isClientSide &&
+        OptionEnum(String name, ActionEnum... actions){
-			action != ActionEnum.REPLACE &&
+            this.name = name;
-			action != ActionEnum.OPEN_MODIFIER_SETTINGS &&
+            this.actions = actions;
-			action != ActionEnum.OPEN_PLAYER_SETTINGS) {
+        }
+    }
 
-			EffortlessBuilding.logTranslate(player, "", action.name, "", true);
+    private static ActionEnum buildSpeed = ActionEnum.NORMAL_SPEED;
-		}
+    private static ActionEnum fill = ActionEnum.FULL;
-	}
+    private static ActionEnum cubeFill = ActionEnum.CUBE_FULL;
+    private static ActionEnum raisedEdge = ActionEnum.SHORT_EDGE;
+    private static ActionEnum lineThickness = ActionEnum.THICKNESS_1;
+    private static ActionEnum circleStart = ActionEnum.CIRCLE_START_CORNER;
 
-	public enum ActionEnum {
+    public static ActionEnum getOptionSetting(OptionEnum option) {
-		UNDO("effortlessbuilding.action.undo"),
+        switch (option) {
-		REDO("effortlessbuilding.action.redo"),
+            case BUILD_SPEED:
-		REPLACE("effortlessbuilding.action.replace"),
+                return getBuildSpeed();
-		OPEN_MODIFIER_SETTINGS("effortlessbuilding.action.open_modifier_settings"),
+            case FILL:
-		OPEN_PLAYER_SETTINGS("effortlessbuilding.action.open_player_settings"),
+                return getFill();
+            case CUBE_FILL:
+                return getCubeFill();
+            case RAISED_EDGE:
+                return getRaisedEdge();
+            case LINE_THICKNESS:
+                return getLineThickness();
+            case CIRCLE_START:
+                return getCircleStart();
+            default:
+                return null;
+        }
+    }
 
-		NORMAL_SPEED("effortlessbuilding.action.normal_speed"),
+    public static ActionEnum getBuildSpeed() {
-		FAST_SPEED("effortlessbuilding.action.fast_speed"),
+        return buildSpeed;
+    }
 
-		FULL("effortlessbuilding.action.full"),
+    public static ActionEnum getFill() {
-		HOLLOW("effortlessbuilding.action.hollow"),
+        return fill;
+    }
 
-		CUBE_FULL("effortlessbuilding.action.full"),
+    public static ActionEnum getCubeFill() {
-		CUBE_HOLLOW("effortlessbuilding.action.hollow"),
+        return cubeFill;
-		CUBE_SKELETON("effortlessbuilding.action.skeleton"),
+    }
 
-		SHORT_EDGE("effortlessbuilding.action.short_edge"),
+    public static ActionEnum getRaisedEdge() {
-		LONG_EDGE("effortlessbuilding.action.long_edge"),
+        return raisedEdge;
+    }
 
-		THICKNESS_1("effortlessbuilding.action.thickness_1"),
+    public static ActionEnum getLineThickness() {
-		THICKNESS_3("effortlessbuilding.action.thickness_3"),
+        return lineThickness;
-		THICKNESS_5("effortlessbuilding.action.thickness_5"),
+    }
 
-		CIRCLE_START_CORNER("effortlessbuilding.action.start_corner"),
+    public static ActionEnum getCircleStart() {
-		CIRCLE_START_CENTER("effortlessbuilding.action.start_center");
+        return circleStart;
+    }
 
-		public String name;
+    //Called on both client and server
+    public static void performAction(EntityPlayer player, ActionEnum action) {
+        if (action == null) return;
 
-		ActionEnum(String name) {
+        switch (action) {
-			this.name = name;
+            case UNDO:
-		}
+                UndoRedo.undo(player);
-	}
+                break;
+            case REDO:
+                UndoRedo.redo(player);
+                break;
+            case REPLACE:
+                ModifierSettingsManager.ModifierSettings modifierSettings = ModifierSettingsManager.getModifierSettings(player);
+                modifierSettings.setQuickReplace(!modifierSettings.doQuickReplace());
+                EffortlessBuilding.log(player, "Set " + TextFormatting.GOLD + "Quick Replace " + TextFormatting.RESET + (
+                        modifierSettings.doQuickReplace() ? "on" : "off"), true);
+                break;
+            case OPEN_MODIFIER_SETTINGS:
+                if (player.world.isRemote)
+                    ClientProxy.openModifierSettings();
+                break;
 
-	public enum OptionEnum {
+            case NORMAL_SPEED:
-		BUILD_SPEED("effortlessbuilding.action.build_speed", ActionEnum.NORMAL_SPEED, ActionEnum.FAST_SPEED),
+                buildSpeed = ActionEnum.NORMAL_SPEED;
-		FILL("effortlessbuilding.action.filling", ActionEnum.FULL, ActionEnum.HOLLOW),
+                break;
-		CUBE_FILL("effortlessbuilding.action.filling", ActionEnum.CUBE_FULL, ActionEnum.CUBE_HOLLOW, ActionEnum.CUBE_SKELETON),
+            case FAST_SPEED:
-		RAISED_EDGE("effortlessbuilding.action.raised_edge", ActionEnum.SHORT_EDGE, ActionEnum.LONG_EDGE),
+                buildSpeed = ActionEnum.FAST_SPEED;
-		LINE_THICKNESS("effortlessbuilding.action.thickness", ActionEnum.THICKNESS_1, ActionEnum.THICKNESS_3, ActionEnum.THICKNESS_5),
+                break;
-		CIRCLE_START("effortlessbuilding.action.circle_start", ActionEnum.CIRCLE_START_CORNER, ActionEnum.CIRCLE_START_CENTER);
+            case FULL:
+                fill = ActionEnum.FULL;
+                break;
+            case HOLLOW:
+                fill = ActionEnum.HOLLOW;
+                break;
+            case CUBE_FULL:
+                cubeFill = ActionEnum.CUBE_FULL;
+                break;
+            case CUBE_HOLLOW:
+                cubeFill = ActionEnum.CUBE_HOLLOW;
+                break;
+            case CUBE_SKELETON:
+                cubeFill = ActionEnum.CUBE_SKELETON;
+                break;
+            case SHORT_EDGE:
+                raisedEdge = ActionEnum.SHORT_EDGE;
+                break;
+            case LONG_EDGE:
+                raisedEdge = ActionEnum.LONG_EDGE;
+                break;
+            case THICKNESS_1:
+                lineThickness = ActionEnum.THICKNESS_1;
+                break;
+            case THICKNESS_3:
+                lineThickness = ActionEnum.THICKNESS_3;
+                break;
+            case THICKNESS_5:
+                lineThickness = ActionEnum.THICKNESS_5;
+                break;
+            case CIRCLE_START_CENTER:
+                circleStart = ActionEnum.CIRCLE_START_CENTER;
+                break;
+            case CIRCLE_START_CORNER:
+                circleStart = ActionEnum.CIRCLE_START_CORNER;
+                break;
+        }
 
-		public String name;
+        if (player.world.isRemote && action != ActionEnum.REPLACE && action != ActionEnum.OPEN_MODIFIER_SETTINGS) {
-		public ActionEnum[] actions;
+            ClientProxy.logTranslate(action.name);
-
+        }
-		OptionEnum(String name, ActionEnum... actions) {
+    }
-			this.name = name;
-			this.actions = actions;
-		}
-	}
 }

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.entity.player.EntityPlayer;
-import net.minecraft.server.level.ServerPlayer;
+import net.minecraft.entity.player.EntityPlayerMP;
 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,82 +16,83 @@ 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
+    //Never returns null
-	@Nonnull
+    @Nonnull
-	public static ModeSettings getModeSettings(Player player) {
+    public static ModeSettings getModeSettings(EntityPlayer player) {
-		LazyOptional<ModeCapabilityManager.IModeCapability> modeCapability =
+        LazyOptional<ModeCapabilityManager.IModeCapability> modeCapability =
-			player.getCapability(ModeCapabilityManager.MODE_CAPABILITY, null);
+                player.getCapability(ModeCapabilityManager.modeCapability, null);
 
-		if (modeCapability.isPresent()) {
+        if (modeCapability.isPresent()) {
-			ModeCapabilityManager.IModeCapability capability = modeCapability.orElse(null);
+            ModeCapabilityManager.IModeCapability capability = modeCapability.orElse(null);
-			if (capability.getModeData() == null){
+            if (capability.getModeData() == null) {
-				capability.setModeData(new ModeSettings());
+                capability.setModeData(new ModeSettings());
-			}
+            }
-			return capability.getModeData();
+            return capability.getModeData();
-		}
+        }
 
-//		EffortlessBuilding.logger.warn("Player does not have modeCapability: " + player);
+        //Player does not have modeCapability capability
-		//Return dummy settings
+        //Return dummy settings
-		return new ModeSettings();
+        return new ModeSettings();
-	}
+//        throw new IllegalArgumentException("Player does not have modeCapability capability");
+    }
 
-	public static void setModeSettings(Player player, ModeSettings modeSettings) {
+    public static void setModeSettings(EntityPlayer player, ModeSettings modeSettings) {
-		if (player == null) {
+        if (player == null) {
-			EffortlessBuilding.log("Cannot set buildmode settings, player is null");
+            EffortlessBuilding.log("Cannot set buildmode settings, player is null");
-			return;
+            return;
-		}
+        }
-		LazyOptional<ModeCapabilityManager.IModeCapability> modeCapability =
+        LazyOptional<ModeCapabilityManager.IModeCapability> modeCapability =
-			player.getCapability(ModeCapabilityManager.MODE_CAPABILITY, null);
+                player.getCapability(ModeCapabilityManager.modeCapability, null);
 
-		modeCapability.ifPresent((capability) -> {
+        modeCapability.ifPresent((capability) -> {
-			capability.setModeData(modeSettings);
+            capability.setModeData(modeSettings);
 
-			BuildModes.initializeMode(player);
+            BuildModes.initializeMode(player);
-		});
+        });
 
-		if (!modeCapability.isPresent()) {
+        if (!modeCapability.isPresent()) {
-			EffortlessBuilding.log(player, "Saving buildmode settings failed.");
+            EffortlessBuilding.log(player, "Saving buildmode settings failed.");
-		}
+        }
-	}
+    }
 
-	public static String sanitize(ModeSettings modeSettings, Player player) {
+    public static String sanitize(ModeSettings modeSettings, EntityPlayer player) {
-		int maxReach = ReachHelper.getMaxReach(player);
+        int maxReach = ReachHelper.getMaxReach(player);
-		String error = "";
+        String error = "";
 
-		//TODO sanitize
+        //TODO sanitize
 
-		return error;
+        return error;
-	}
+    }
 
-	public static void handleNewPlayer(Player player) {
+    public static class ModeSettings {
-		//Makes sure player has mode settings (if it doesnt it will create it)
+        private BuildModes.BuildModeEnum buildMode = BuildModes.BuildModeEnum.NORMAL;
-		getModeSettings(player);
 
-		//Only on server
+        public ModeSettings() {
-		if (!player.level.isClientSide) {
+        }
-			//Send to client
-			ModeSettingsMessage msg = new ModeSettingsMessage(getModeSettings(player));
-			PacketHandler.INSTANCE.send(PacketDistributor.PLAYER.with(() -> (ServerPlayer) player), msg);
-		}
-	}
 
-	public static class ModeSettings {
+        public ModeSettings(BuildModes.BuildModeEnum buildMode) {
-		private BuildModes.BuildModeEnum buildMode = BuildModes.BuildModeEnum.NORMAL;
+            this.buildMode = buildMode;
+        }
 
-		public ModeSettings() {
+        public BuildModes.BuildModeEnum getBuildMode() {
-		}
+            return this.buildMode;
+        }
 
-		public ModeSettings(BuildModes.BuildModeEnum buildMode) {
+        public void setBuildMode(BuildModes.BuildModeEnum buildMode) {
-			this.buildMode = buildMode;
+            this.buildMode = buildMode;
-		}
+        }
+    }
 
-		public BuildModes.BuildModeEnum getBuildMode() {
+    public static void handleNewPlayer(EntityPlayer player){
-			return this.buildMode;
+        //Makes sure player has mode settings (if it doesnt it will create it)
-		}
+        getModeSettings(player);
 
-		public void setBuildMode(BuildModes.BuildModeEnum buildMode) {
+        //Only on server
-			this.buildMode = buildMode;
+        if (!player.world.isRemote) {
-		}
+            //Send to client
-	}
+            ModeSettingsMessage msg = new ModeSettingsMessage(getModeSettings(player));
+            PacketHandler.INSTANCE.send(PacketDistributor.PLAYER.with(() -> (EntityPlayerMP) player), msg);
+        }
+    }
 }

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

@@ -1,213 +1,215 @@
 package nl.requios.effortlessbuilding.buildmode;
 
-import net.minecraft.world.entity.player.Player;
+import net.minecraft.entity.player.EntityPlayer;
-import net.minecraft.core.Direction;
+import net.minecraft.util.EnumFacing;
-import net.minecraft.core.BlockPos;
+import net.minecraft.util.math.BlockPos;
-import net.minecraft.world.phys.Vec3;
+import net.minecraft.util.math.Vec3d;
+import nl.requios.effortlessbuilding.buildmode.buildmodes.DiagonalLine;
+import nl.requios.effortlessbuilding.buildmode.buildmodes.Floor;
 import nl.requios.effortlessbuilding.helper.ReachHelper;
 
 import java.util.*;
 
 public abstract class ThreeClicksBuildMode extends BaseBuildMode {
-	protected Dictionary<UUID, BlockPos> secondPosTable = new Hashtable<>();
+    protected Dictionary<UUID, BlockPos> secondPosTable = new Hashtable<>();
 
-	//Finds height after floor has been chosen in buildmodes with 3 clicks
+    static class HeightCriteria {
-	public static BlockPos findHeight(Player player, BlockPos secondPos, boolean skipRaytrace) {
+        Vec3d planeBound;
-		Vec3 look = BuildModes.getPlayerLookVec(player);
+        Vec3d lineBound;
-		Vec3 start = new Vec3(player.getX(), player.getY() + player.getEyeHeight(), player.getZ());
+        double distToLineSq;
+        double distToPlayerSq;
 
-		List<HeightCriteria> criteriaList = new ArrayList<>(3);
+        HeightCriteria(Vec3d planeBound, BlockPos secondPos, Vec3d start) {
+            this.planeBound = planeBound;
+            this.lineBound = toLongestLine(this.planeBound, secondPos);
+            this.distToLineSq = this.lineBound.subtract(this.planeBound).lengthSquared();
+            this.distToPlayerSq = this.planeBound.subtract(start).lengthSquared();
+        }
 
-		//X
+        //Make it from a plane into a line, on y axis only
-		Vec3 xBound = BuildModes.findXBound(secondPos.getX(), start, look);
+        private Vec3d toLongestLine(Vec3d boundVec, BlockPos secondPos) {
-		criteriaList.add(new HeightCriteria(xBound, secondPos, start));
+            BlockPos bound = new BlockPos(boundVec);
+            return new Vec3d(secondPos.getX(), bound.getY(), secondPos.getZ());
+        }
 
-		//Z
+        //check if its not behind the player and its not too close and not too far
-		Vec3 zBound = BuildModes.findZBound(secondPos.getZ(), start, look);
+        //also check if raytrace from player to block does not intersect blocks
-		criteriaList.add(new HeightCriteria(zBound, secondPos, start));
+        public boolean isValid(Vec3d start, Vec3d look, int reach, EntityPlayer player, boolean skipRaytrace) {
 
-		//Remove invalid criteria
+            return BuildModes.isCriteriaValid(start, look, reach, player, skipRaytrace, lineBound, planeBound, distToPlayerSq);
-		int reach = ReachHelper.getPlacementReach(player) * 4; //4 times as much as normal placement reach
+        }
-		criteriaList.removeIf(criteria -> !criteria.isValid(start, look, reach, player, skipRaytrace));
+    }
 
-		//If none are valid, return empty list of blocks
+    @Override
-		if (criteriaList.isEmpty()) return null;
+    public void initialize(EntityPlayer player) {
+        super.initialize(player);
+        secondPosTable.put(player.getUniqueID(), BlockPos.ORIGIN);
+    }
 
-		//If only 1 is valid, choose that one
+    @Override
-		HeightCriteria selected = criteriaList.get(0);
+    public List<BlockPos> onRightClick(EntityPlayer player, BlockPos blockPos, EnumFacing sideHit, Vec3d hitVec, boolean skipRaytrace) {
+        List<BlockPos> list = new ArrayList<>();
 
-		//If multiple are valid, choose based on criteria
+        Dictionary<UUID, Integer> rightClickTable = player.world.isRemote ? rightClickClientTable : rightClickServerTable;
-		if (criteriaList.size() > 1) {
+        int rightClickNr = rightClickTable.get(player.getUniqueID());
-			//Select the one that is closest (from wall position to its line counterpart)
+        rightClickNr++;
-			for (int i = 1; i < criteriaList.size(); i++) {
+        rightClickTable.put(player.getUniqueID(), rightClickNr);
-				HeightCriteria criteria = criteriaList.get(i);
-				if (criteria.distToLineSq < 2.0 && selected.distToLineSq < 2.0) {
-					//Both very close to line, choose closest to player
-					if (criteria.distToPlayerSq < selected.distToPlayerSq)
-						selected = criteria;
-				} else {
-					//Pick closest to line
-					if (criteria.distToLineSq < selected.distToLineSq)
-						selected = criteria;
-				}
-			}
-		}
-		return new BlockPos(selected.lineBound);
-	}
 
-	@Override
+        if (rightClickNr == 1) {
-	public void initialize(Player player) {
+            //If clicking in air, reset and try again
-		super.initialize(player);
+            if (blockPos == null) {
-		secondPosTable.put(player.getUUID(), BlockPos.ZERO);
+                rightClickTable.put(player.getUniqueID(), 0);
-	}
+                return list;
+            }
 
-	@Override
+            //First click, remember starting position
-	public List<BlockPos> onRightClick(Player player, BlockPos blockPos, Direction sideHit, Vec3 hitVec, boolean skipRaytrace) {
+            firstPosTable.put(player.getUniqueID(), blockPos);
-		List<BlockPos> list = new ArrayList<>();
+            sideHitTable.put(player.getUniqueID(), sideHit);
+            hitVecTable.put(player.getUniqueID(), hitVec);
+            //Keep list empty, dont place any blocks yet
+        } else if (rightClickNr == 2) {
+            //Second click, find other floor point
+            BlockPos firstPos = firstPosTable.get(player.getUniqueID());
+            BlockPos secondPos = findSecondPos(player, firstPos, true);
 
-		Dictionary<UUID, Integer> rightClickTable = player.level.isClientSide ? rightClickClientTable : rightClickServerTable;
+            if (secondPos == null) {
-		int rightClickNr = rightClickTable.get(player.getUUID());
+                rightClickTable.put(player.getUniqueID(), 1);
-		rightClickNr++;
+                return list;
-		rightClickTable.put(player.getUUID(), rightClickNr);
+            }
 
-		if (rightClickNr == 1) {
+            secondPosTable.put(player.getUniqueID(), secondPos);
-			//If clicking in air, reset and try again
-			if (blockPos == null) {
-				rightClickTable.put(player.getUUID(), 0);
-				return list;
-			}
 
-			//First click, remember starting position
+        } else {
-			firstPosTable.put(player.getUUID(), blockPos);
+            //Third click, place diagonal wall with height
-			sideHitTable.put(player.getUUID(), sideHit);
+            list = findCoordinates(player, blockPos, skipRaytrace);
-			hitVecTable.put(player.getUUID(), hitVec);
+            rightClickTable.put(player.getUniqueID(), 0);
-			//Keep list empty, dont place any blocks yet
+        }
-		} else if (rightClickNr == 2) {
-			//Second click, find other floor point
-			BlockPos firstPos = firstPosTable.get(player.getUUID());
-			BlockPos secondPos = findSecondPos(player, firstPos, true);
 
-			if (secondPos == null) {
+        return list;
-				rightClickTable.put(player.getUUID(), 1);
+    }
-				return list;
-			}
 
-			secondPosTable.put(player.getUUID(), secondPos);
+    @Override
+    public List<BlockPos> findCoordinates(EntityPlayer player, BlockPos blockPos, boolean skipRaytrace) {
+        List<BlockPos> list = new ArrayList<>();
+        Dictionary<UUID, Integer> rightClickTable = player.world.isRemote ? rightClickClientTable : rightClickServerTable;
+        int rightClickNr = rightClickTable.get(player.getUniqueID());
 
-		} else {
+        if (rightClickNr == 0) {
-			//Third click, place diagonal wall with height
+            if (blockPos != null)
-			list = findCoordinates(player, blockPos, skipRaytrace);
+                list.add(blockPos);
-			rightClickTable.put(player.getUUID(), 0);
+        } else if (rightClickNr == 1) {
-		}
+            BlockPos firstPos = firstPosTable.get(player.getUniqueID());
 
-		return list;
+            BlockPos secondPos = findSecondPos(player, firstPos, true);
-	}
+            if (secondPos == null) return list;
 
-	@Override
+            //Limit amount of blocks you can place per row
-	public List<BlockPos> findCoordinates(Player player, BlockPos blockPos, boolean skipRaytrace) {
+            int axisLimit = ReachHelper.getMaxBlocksPerAxis(player);
-		List<BlockPos> list = new ArrayList<>();
-		Dictionary<UUID, Integer> rightClickTable = player.level.isClientSide ? rightClickClientTable : rightClickServerTable;
-		int rightClickNr = rightClickTable.get(player.getUUID());
 
-		if (rightClickNr == 0) {
+            int x1 = firstPos.getX(), x2 = secondPos.getX();
-			if (blockPos != null)
+            int y1 = firstPos.getY(), y2 = secondPos.getY();
-				list.add(blockPos);
+            int z1 = firstPos.getZ(), z2 = secondPos.getZ();
-		} else if (rightClickNr == 1) {
-			BlockPos firstPos = firstPosTable.get(player.getUUID());
 
-			BlockPos secondPos = findSecondPos(player, firstPos, true);
+            //limit axis
-			if (secondPos == null) return list;
+            if (x2 - x1 >= axisLimit) x2 = x1 + axisLimit - 1;
+            if (x1 - x2 >= axisLimit) x2 = x1 - axisLimit + 1;
+            if (y2 - y1 >= axisLimit) y2 = y1 + axisLimit - 1;
+            if (y1 - y2 >= axisLimit) y2 = y1 - axisLimit + 1;
+            if (z2 - z1 >= axisLimit) z2 = z1 + axisLimit - 1;
+            if (z1 - z2 >= axisLimit) z2 = z1 - axisLimit + 1;
 
-			//Limit amount of blocks you can place per row
+            //Add diagonal line from first to second
-			int axisLimit = ReachHelper.getMaxBlocksPerAxis(player);
+            list.addAll(getIntermediateBlocks(player, x1, y1, z1, x2, y2, z2));
 
-			int x1 = firstPos.getX(), x2 = secondPos.getX();
+        } else {
-			int y1 = firstPos.getY(), y2 = secondPos.getY();
+            BlockPos firstPos = firstPosTable.get(player.getUniqueID());
-			int z1 = firstPos.getZ(), z2 = secondPos.getZ();
+            BlockPos secondPos = secondPosTable.get(player.getUniqueID());
 
-			//limit axis
+            BlockPos thirdPos = findThirdPos(player, firstPos, secondPos, skipRaytrace);
-			if (x2 - x1 >= axisLimit) x2 = x1 + axisLimit - 1;
+            if (thirdPos == null) return list;
-			if (x1 - x2 >= axisLimit) x2 = x1 - axisLimit + 1;
-			if (y2 - y1 >= axisLimit) y2 = y1 + axisLimit - 1;
-			if (y1 - y2 >= axisLimit) y2 = y1 - axisLimit + 1;
-			if (z2 - z1 >= axisLimit) z2 = z1 + axisLimit - 1;
-			if (z1 - z2 >= axisLimit) z2 = z1 - axisLimit + 1;
 
-			//Add diagonal line from first to second
+            //Limit amount of blocks you can place per row
-			list.addAll(getIntermediateBlocks(player, x1, y1, z1, x2, y2, z2));
+            int axisLimit = ReachHelper.getMaxBlocksPerAxis(player);
 
-		} else {
+            int x1 = firstPos.getX(), x2 = secondPos.getX(), x3 = thirdPos.getX();
-			BlockPos firstPos = firstPosTable.get(player.getUUID());
+            int y1 = firstPos.getY(), y2 = secondPos.getY(), y3 = thirdPos.getY();
-			BlockPos secondPos = secondPosTable.get(player.getUUID());
+            int z1 = firstPos.getZ(), z2 = secondPos.getZ(), z3 = thirdPos.getZ();
 
-			BlockPos thirdPos = findThirdPos(player, firstPos, secondPos, skipRaytrace);
+            //limit axis
-			if (thirdPos == null) return list;
+            if (x2 - x1 >= axisLimit) x2 = x1 + axisLimit - 1;
+            if (x1 - x2 >= axisLimit) x2 = x1 - axisLimit + 1;
+            if (y2 - y1 >= axisLimit) y2 = y1 + axisLimit - 1;
+            if (y1 - y2 >= axisLimit) y2 = y1 - axisLimit + 1;
+            if (z2 - z1 >= axisLimit) z2 = z1 + axisLimit - 1;
+            if (z1 - z2 >= axisLimit) z2 = z1 - axisLimit + 1;
 
-			//Limit amount of blocks you can place per row
+            if (x3 - x1 >= axisLimit) x3 = x1 + axisLimit - 1;
-			int axisLimit = ReachHelper.getMaxBlocksPerAxis(player);
+            if (x1 - x3 >= axisLimit) x3 = x1 - axisLimit + 1;
+            if (y3 - y1 >= axisLimit) y3 = y1 + axisLimit - 1;
+            if (y1 - y3 >= axisLimit) y3 = y1 - axisLimit + 1;
+            if (z3 - z1 >= axisLimit) z3 = z1 + axisLimit - 1;
+            if (z1 - z3 >= axisLimit) z3 = z1 - axisLimit + 1;
 
-			int x1 = firstPos.getX(), x2 = secondPos.getX(), x3 = thirdPos.getX();
+            //Add diagonal line from first to third
-			int y1 = firstPos.getY(), y2 = secondPos.getY(), y3 = thirdPos.getY();
+            list.addAll(getFinalBlocks(player, x1, y1, z1, x2, y2, z2, x3, y3, z3));
-			int z1 = firstPos.getZ(), z2 = secondPos.getZ(), z3 = thirdPos.getZ();
+        }
 
-			//limit axis
+        return list;
-			if (x2 - x1 >= axisLimit) x2 = x1 + axisLimit - 1;
+    }
-			if (x1 - x2 >= axisLimit) x2 = x1 - axisLimit + 1;
-			if (y2 - y1 >= axisLimit) y2 = y1 + axisLimit - 1;
-			if (y1 - y2 >= axisLimit) y2 = y1 - axisLimit + 1;
-			if (z2 - z1 >= axisLimit) z2 = z1 + axisLimit - 1;
-			if (z1 - z2 >= axisLimit) z2 = z1 - axisLimit + 1;
 
-			if (x3 - x1 >= axisLimit) x3 = x1 + axisLimit - 1;
+    //Finds the place of the second block pos
-			if (x1 - x3 >= axisLimit) x3 = x1 - axisLimit + 1;
+    protected abstract BlockPos findSecondPos(EntityPlayer player, BlockPos firstPos, boolean skipRaytrace);
-			if (y3 - y1 >= axisLimit) y3 = y1 + axisLimit - 1;
-			if (y1 - y3 >= axisLimit) y3 = y1 - axisLimit + 1;
-			if (z3 - z1 >= axisLimit) z3 = z1 + axisLimit - 1;
-			if (z1 - z3 >= axisLimit) z3 = z1 - axisLimit + 1;
 
-			//Add diagonal line from first to third
+    //Finds the place of the third block pos
-			list.addAll(getFinalBlocks(player, x1, y1, z1, x2, y2, z2, x3, y3, z3));
+    protected abstract BlockPos findThirdPos(EntityPlayer player, BlockPos firstPos, BlockPos secondPos, boolean skipRaytrace);
-		}
 
-		return list;
+    //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(EntityPlayer player, int x1, int y1, int z1, int x2, int y2, int z2);
 
-	//Finds the place of the second block pos
+    //After first, second and third pos are known, we want all the blocks
-	protected abstract BlockPos findSecondPos(Player player, BlockPos firstPos, boolean skipRaytrace);
+    protected abstract List<BlockPos> getFinalBlocks(EntityPlayer player, int x1, int y1, int z1, int x2, int y2, int z2, int x3, int y3, int z3);
 
-	//Finds the place of the third block pos
+    //Finds height after floor has been chosen in buildmodes with 3 clicks
-	protected abstract BlockPos findThirdPos(Player player, BlockPos firstPos, BlockPos secondPos, boolean skipRaytrace);
+    public static BlockPos findHeight(EntityPlayer player, BlockPos secondPos, boolean skipRaytrace) {
+        Vec3d look = player.getLookVec();
+        Vec3d start = new Vec3d(player.posX, player.posY + player.getEyeHeight(), player.posZ);
 
-	//After first and second pos are known, we want to visualize the blocks in a way (like floor for cube)
+        List<HeightCriteria> criteriaList = new ArrayList<>(3);
-	protected abstract List<BlockPos> getIntermediateBlocks(Player 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
+        //X
-	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);
+        Vec3d xBound = BuildModes.findXBound(secondPos.getX(), start, look);
+        criteriaList.add(new HeightCriteria(xBound, secondPos, start));
 
-	static class HeightCriteria {
+        //Z
-		Vec3 planeBound;
+        Vec3d zBound = BuildModes.findZBound(secondPos.getZ(), start, look);
-		Vec3 lineBound;
+        criteriaList.add(new HeightCriteria(zBound, secondPos, start));
-		double distToLineSq;
-		double distToPlayerSq;
 
-		HeightCriteria(Vec3 planeBound, BlockPos secondPos, Vec3 start) {
+        //Remove invalid criteria
-			this.planeBound = planeBound;
+        int reach = ReachHelper.getPlacementReach(player) * 4; //4 times as much as normal placement reach
-			this.lineBound = toLongestLine(this.planeBound, secondPos);
+        criteriaList.removeIf(criteria -> !criteria.isValid(start, look, reach, player, skipRaytrace));
-			this.distToLineSq = this.lineBound.subtract(this.planeBound).lengthSqr();
-			this.distToPlayerSq = this.planeBound.subtract(start).lengthSqr();
-		}
 
-		//Make it from a plane into a line, on y axis only
+        //If none are valid, return empty list of blocks
-		private Vec3 toLongestLine(Vec3 boundVec, BlockPos secondPos) {
+        if (criteriaList.isEmpty()) return null;
-			BlockPos bound = new BlockPos(boundVec);
-			return new Vec3(secondPos.getX(), bound.getY(), secondPos.getZ());
-		}
 
-		//check if its not behind the player and its not too close and not too far
+        //If only 1 is valid, choose that one
-		//also check if raytrace from player to block does not intersect blocks
+        HeightCriteria selected = criteriaList.get(0);
-		public boolean isValid(Vec3 start, Vec3 look, int reach, Player player, boolean skipRaytrace) {
 
-			return BuildModes.isCriteriaValid(start, look, reach, player, skipRaytrace, lineBound, planeBound, distToPlayerSq);
+        //If multiple are valid, choose based on criteria
-		}
+        if (criteriaList.size() > 1) {
-	}
+            //Select the one that is closest (from wall position to its line counterpart)
+            for (int i = 1; i < criteriaList.size(); i++) {
+                HeightCriteria criteria = criteriaList.get(i);
+                if (criteria.distToLineSq < 2.0 && selected.distToLineSq < 2.0) {
+                    //Both very close to line, choose closest to player
+                    if (criteria.distToPlayerSq < selected.distToPlayerSq)
+                        selected = criteria;
+                } else {
+                    //Pick closest to line
+                    if (criteria.distToLineSq < selected.distToLineSq)
+                        selected = criteria;
+                }
+            }
+        }
+        return new BlockPos(selected.lineBound);
+    }
 }

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.entity.player.EntityPlayer;
-import net.minecraft.core.Direction;
+import net.minecraft.util.EnumFacing;
-import net.minecraft.core.BlockPos;
+import net.minecraft.util.math.BlockPos;
-import net.minecraft.world.phys.Vec3;
+import net.minecraft.util.math.Vec3d;
 import nl.requios.effortlessbuilding.helper.ReachHelper;
 
 import java.util.ArrayList;
@@ -13,74 +13,74 @@ import java.util.UUID;
 
 public abstract class TwoClicksBuildMode extends BaseBuildMode {
 
-	@Override
+    @Override
-	public List<BlockPos> onRightClick(Player player, BlockPos blockPos, Direction sideHit, Vec3 hitVec, boolean skipRaytrace) {
+    public List<BlockPos> onRightClick(EntityPlayer player, BlockPos blockPos, EnumFacing sideHit, Vec3d hitVec, boolean skipRaytrace) {
-		List<BlockPos> list = new ArrayList<>();
+        List<BlockPos> list = new ArrayList<>();
 
-		Dictionary<UUID, Integer> rightClickTable = player.level.isClientSide ? rightClickClientTable : rightClickServerTable;
+        Dictionary<UUID, Integer> rightClickTable = player.world.isRemote ? rightClickClientTable : rightClickServerTable;
-		int rightClickNr = rightClickTable.get(player.getUUID());
+        int rightClickNr = rightClickTable.get(player.getUniqueID());
-		rightClickNr++;
+        rightClickNr++;
-		rightClickTable.put(player.getUUID(), rightClickNr);
+        rightClickTable.put(player.getUniqueID(), rightClickNr);
 
-		if (rightClickNr == 1) {
+        if (rightClickNr == 1) {
-			//If clicking in air, reset and try again
+            //If clicking in air, reset and try again
-			if (blockPos == null) {
+            if (blockPos == null) {
-				rightClickTable.put(player.getUUID(), 0);
+                rightClickTable.put(player.getUniqueID(), 0);
-				return list;
+                return list;
-			}
+            }
 
-			//First click, remember starting position
+            //First click, remember starting position
-			firstPosTable.put(player.getUUID(), blockPos);
+            firstPosTable.put(player.getUniqueID(), blockPos);
-			sideHitTable.put(player.getUUID(), sideHit);
+            sideHitTable.put(player.getUniqueID(), sideHit);
-			hitVecTable.put(player.getUUID(), hitVec);
+            hitVecTable.put(player.getUniqueID(), hitVec);
-			//Keep list empty, dont place any blocks yet
+            //Keep list empty, dont place any blocks yet
-		} else {
+        } else {
-			//Second click, place blocks
+            //Second click, place blocks
-			list = findCoordinates(player, blockPos, skipRaytrace);
+            list = findCoordinates(player, blockPos, skipRaytrace);
-			rightClickTable.put(player.getUUID(), 0);
+            rightClickTable.put(player.getUniqueID(), 0);
-		}
+        }
 
-		return list;
+        return list;
-	}
+    }
 
-	@Override
+    @Override
-	public List<BlockPos> findCoordinates(Player player, BlockPos blockPos, boolean skipRaytrace) {
+    public List<BlockPos> findCoordinates(EntityPlayer player, BlockPos blockPos, boolean skipRaytrace) {
-		List<BlockPos> list = new ArrayList<>();
+        List<BlockPos> list = new ArrayList<>();
-		Dictionary<UUID, Integer> rightClickTable = player.level.isClientSide ? rightClickClientTable : rightClickServerTable;
+        Dictionary<UUID, Integer> rightClickTable = player.world.isRemote ? rightClickClientTable : rightClickServerTable;
-		int rightClickNr = rightClickTable.get(player.getUUID());
+        int rightClickNr = rightClickTable.get(player.getUniqueID());
-		BlockPos firstPos = firstPosTable.get(player.getUUID());
+        BlockPos firstPos = firstPosTable.get(player.getUniqueID());
 
-		if (rightClickNr == 0) {
+        if (rightClickNr == 0) {
-			if (blockPos != null)
+            if (blockPos != null)
-				list.add(blockPos);
+                list.add(blockPos);
-		} else {
+        } else {
-			BlockPos secondPos = findSecondPos(player, firstPos, skipRaytrace);
+            BlockPos secondPos = findSecondPos(player, firstPos, skipRaytrace);
-			if (secondPos == null) return list;
+            if (secondPos == null) return list;
 
-			//Limit amount of blocks we can place per row
+            //Limit amount of blocks we can place per row
-			int axisLimit = ReachHelper.getMaxBlocksPerAxis(player);
+            int axisLimit = ReachHelper.getMaxBlocksPerAxis(player);
 
-			int x1 = firstPos.getX(), x2 = secondPos.getX();
+            int x1 = firstPos.getX(), x2 = secondPos.getX();
-			int y1 = firstPos.getY(), y2 = secondPos.getY();
+            int y1 = firstPos.getY(), y2 = secondPos.getY();
-			int z1 = firstPos.getZ(), z2 = secondPos.getZ();
+            int z1 = firstPos.getZ(), z2 = secondPos.getZ();
 
-			//limit axis
+            //limit axis
-			if (x2 - x1 >= axisLimit) x2 = x1 + axisLimit - 1;
+            if (x2 - x1 >= axisLimit) x2 = x1 + axisLimit - 1;
-			if (x1 - x2 >= axisLimit) x2 = x1 - axisLimit + 1;
+            if (x1 - x2 >= axisLimit) x2 = x1 - axisLimit + 1;
-			if (y2 - y1 >= axisLimit) y2 = y1 + axisLimit - 1;
+            if (y2 - y1 >= axisLimit) y2 = y1 + axisLimit - 1;
-			if (y1 - y2 >= axisLimit) y2 = y1 - axisLimit + 1;
+            if (y1 - y2 >= axisLimit) y2 = y1 - axisLimit + 1;
-			if (z2 - z1 >= axisLimit) z2 = z1 + axisLimit - 1;
+            if (z2 - z1 >= axisLimit) z2 = z1 + axisLimit - 1;
-			if (z1 - z2 >= axisLimit) z2 = z1 - axisLimit + 1;
+            if (z1 - z2 >= axisLimit) z2 = z1 - axisLimit + 1;
 
-			list.addAll(getAllBlocks(player, x1, y1, z1, x2, y2, z2));
+            list.addAll(getAllBlocks(player, x1, y1, z1, x2, y2, z2));
-		}
+        }
 
-		return list;
+        return list;
-	}
+    }
 
-	//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)
+    //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(EntityPlayer player, BlockPos firstPos, boolean skipRaytrace);
 
-	//After first and second pos are known, we want all the blocks
+    //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(EntityPlayer player, int x1, int y1, int z1, int x2, int y2, int z2);
 }

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

@@ -1,89 +1,88 @@
 package nl.requios.effortlessbuilding.buildmode.buildmodes;
 
-import net.minecraft.world.entity.player.Player;
+import net.minecraft.entity.player.EntityPlayer;
-import net.minecraft.core.BlockPos;
+import net.minecraft.util.math.BlockPos;
-import net.minecraft.util.Mth;
+import net.minecraft.util.math.MathHelper;
-import nl.requios.effortlessbuilding.buildmode.ModeOptions;
 import nl.requios.effortlessbuilding.buildmode.TwoClicksBuildMode;
+import nl.requios.effortlessbuilding.buildmode.ModeOptions;
 
-import java.util.ArrayList;
+import java.util.*;
-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) {
+    @Override
-		List<BlockPos> list = new ArrayList<>();
+    protected BlockPos findSecondPos(EntityPlayer player, BlockPos firstPos, boolean skipRaytrace) {
+        return Floor.findFloor(player, firstPos, skipRaytrace);
+    }
 
-		float centerX = x1;
+    @Override
-		float centerZ = z1;
+    protected List<BlockPos> getAllBlocks(EntityPlayer player, int x1, int y1, int z1, int x2, int y2, int z2) {
+        return getCircleBlocks(player, x1, y1, z1, x2, y2, z2);
+    }
 
-		//Adjust for CIRCLE_START
+    public static List<BlockPos> getCircleBlocks(EntityPlayer player, int x1, int y1, int z1, int x2, int y2, int z2) {
-		if (ModeOptions.getCircleStart() == ModeOptions.ActionEnum.CIRCLE_START_CORNER) {
+        List<BlockPos> list = new ArrayList<>();
-			centerX = x1 + (x2 - x1) / 2f;
-			centerZ = z1 + (z2 - z1) / 2f;
-		} else {
-			x1 = (int) (centerX - (x2 - centerX));
-			z1 = (int) (centerZ - (z2 - centerZ));
-		}
 
-		float radiusX = Mth.abs(x2 - centerX);
+        float centerX = x1;
-		float radiusZ = Mth.abs(z2 - centerZ);
+        float centerZ = z1;
 
-		if (ModeOptions.getFill() == ModeOptions.ActionEnum.FULL)
+        //Adjust for CIRCLE_START
-			addCircleBlocks(list, x1, y1, z1, x2, y2, z2, centerX, centerZ, radiusX, radiusZ);
+        if (ModeOptions.getCircleStart() == ModeOptions.ActionEnum.CIRCLE_START_CORNER) {
-		else
+            centerX = x1 + (x2 - x1) / 2f;
-			addHollowCircleBlocks(list, x1, y1, z1, x2, y2, z2, centerX, centerZ, radiusX, radiusZ);
+            centerZ = z1 + (z2 - z1) / 2f;
+        } else {
+            x1 = (int) (centerX - (x2 - centerX));
+            z1 = (int) (centerZ - (z2 - centerZ));
+        }
 
-		return list;
+        float radiusX = MathHelper.abs(x2 - centerX);
-	}
+        float radiusZ = MathHelper.abs(z2 - centerZ);
 
-	public static void addCircleBlocks(List<BlockPos> list, int x1, int y1, int z1, int x2, int y2, int z2, float centerX, float centerZ, float radiusX, float radiusZ) {
+        if (ModeOptions.getFill() == ModeOptions.ActionEnum.FULL)
+            addCircleBlocks(list, x1, y1, z1, x2, y2, z2, centerX, centerZ, radiusX, radiusZ);
+        else
+            addHollowCircleBlocks(list, x1, y1, z1, x2, y2, z2, centerX, centerZ, radiusX, radiusZ);
 
-		for (int l = x1; x1 < x2 ? l <= x2 : l >= x2; l += x1 < x2 ? 1 : -1) {
+        return list;
+    }
 
-			for (int n = z1; z1 < z2 ? n <= z2 : n >= z2; n += z1 < z2 ? 1 : -1) {
+    public static void addCircleBlocks(List<BlockPos> list, int x1, int y1, int z1, int x2, int y2, int z2, float centerX, float centerZ, float radiusX, float radiusZ) {
 
-				float distance = distance(l, n, centerX, centerZ);
+        for (int l = x1; x1 < x2 ? l <= x2 : l >= x2; l += x1 < x2 ? 1 : -1) {
-				float radius = calculateEllipseRadius(centerX, centerZ, radiusX, radiusZ, l, n);
-				if (distance < radius + 0.4f)
-					list.add(new BlockPos(l, y1, n));
-			}
-		}
-	}
 
-	public static void addHollowCircleBlocks(List<BlockPos> list, int x1, int y1, int z1, int x2, int y2, int z2, float centerX, float centerZ, float radiusX, float radiusZ) {
+            for (int n = z1; z1 < z2 ? n <= z2 : n >= z2; n += z1 < z2 ? 1 : -1) {
 
-		for (int l = x1; x1 < x2 ? l <= x2 : l >= x2; l += x1 < x2 ? 1 : -1) {
+                float distance = distance(l, n, centerX, centerZ);
+                float radius = calculateEllipseRadius(centerX, centerZ, radiusX, radiusZ, l, n);
+                if (distance < radius + 0.4f)
+                    list.add(new BlockPos(l, y1, n));
+            }
+        }
+    }
 
-			for (int n = z1; z1 < z2 ? n <= z2 : n >= z2; n += z1 < z2 ? 1 : -1) {
+    public static void addHollowCircleBlocks(List<BlockPos> list, int x1, int y1, int z1, int x2, int y2, int z2, float centerX, float centerZ, float radiusX, float radiusZ) {
 
-				float distance = distance(l, n, centerX, centerZ);
+        for (int l = x1; x1 < x2 ? l <= x2 : l >= x2; l += x1 < x2 ? 1 : -1) {
-				float radius = calculateEllipseRadius(centerX, centerZ, radiusX, radiusZ, l, n);
-				if (distance < radius + 0.4f && distance > radius - 0.6f)
-					list.add(new BlockPos(l, y1, n));
-			}
-		}
-	}
 
-	private static float distance(float x1, float z1, float x2, float z2) {
+            for (int n = z1; z1 < z2 ? n <= z2 : n >= z2; n += z1 < z2 ? 1 : -1) {
-		return Mth.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) {
+                float distance = distance(l, n, centerX, centerZ);
-		//https://math.stackexchange.com/questions/432902/how-to-get-the-radius-of-an-ellipse-at-a-specific-angle-by-knowing-its-semi-majo
+                float radius = calculateEllipseRadius(centerX, centerZ, radiusX, radiusZ, l, n);
-		float theta = (float) Mth.atan2(z - centerZ, x - centerX);
+                if (distance < radius + 0.4f && distance > radius - 0.6f)
-		float part1 = radiusX * radiusX * Mth.sin(theta) * Mth.sin(theta);
+                    list.add(new BlockPos(l, y1, n));
-		float part2 = radiusZ * radiusZ * Mth.cos(theta) * Mth.cos(theta);
+            }
-		return radiusX * radiusZ / Mth.sqrt(part1 + part2);
+        }
-	}
+    }
 
-	@Override
+    private static float distance(float x1, float z1, float x2, float z2) {
-	protected BlockPos findSecondPos(Player player, BlockPos firstPos, boolean skipRaytrace) {
+        return MathHelper.sqrt((x2 - x1) * (x2 - x1) + (z2 - z1) * (z2 - z1));
-		return Floor.findFloor(player, firstPos, skipRaytrace);
+    }
-	}
 
-	@Override
+    public static float calculateEllipseRadius(float centerX, float centerZ, float radiusX, float radiusZ, int x, int z) {
-	protected List<BlockPos> getAllBlocks(Player player, int x1, int y1, int z1, int x2, int y2, int z2) {
+        //https://math.stackexchange.com/questions/432902/how-to-get-the-radius-of-an-ellipse-at-a-specific-angle-by-knowing-its-semi-majo
-		return getCircleBlocks(player, x1, y1, z1, x2, y2, z2);
+        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);
+    }
 }

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,101 +1,104 @@
 package nl.requios.effortlessbuilding.buildmode.buildmodes;
 
-import net.minecraft.world.entity.player.Player;
+import net.minecraft.entity.player.EntityPlayer;
-import net.minecraft.core.BlockPos;
+import net.minecraft.util.EnumFacing;
+import net.minecraft.util.math.BlockPos;
+import net.minecraft.util.math.Vec3d;
+import nl.requios.effortlessbuilding.buildmode.IBuildMode;
 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.*;
-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) {
+    @Override
-		List<BlockPos> list = new ArrayList<>();
+    protected BlockPos findSecondPos(EntityPlayer player, BlockPos firstPos, boolean skipRaytrace) {
+        return Floor.findFloor(player, firstPos, skipRaytrace);
+    }
 
-		if (ModeOptions.getCubeFill() == ModeOptions.ActionEnum.CUBE_SKELETON)
+    @Override
-			Floor.addHollowFloorBlocks(list, x1, x2, y1, z1, z2);
+    protected BlockPos findThirdPos(EntityPlayer player, BlockPos firstPos, BlockPos secondPos, boolean skipRaytrace) {
-		else
+        return findHeight(player, secondPos, skipRaytrace);
-			Floor.addFloorBlocks(list, x1, x2, y1, z1, z2);
+    }
 
-		return list;
+    @Override
-	}
+    protected List<BlockPos> getIntermediateBlocks(EntityPlayer player, int x1, int y1, int z1, int x2, int y2, int z2) {
+        return getFloorBlocksUsingCubeFill(player, x1, y1, z1, x2, y2, z2);
+    }
 
-	public static List<BlockPos> getCubeBlocks(Player player, int x1, int y1, int z1, int x2, int y2, int z2) {
+    @Override
-		List<BlockPos> list = new ArrayList<>();
+    protected List<BlockPos> getFinalBlocks(EntityPlayer 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);
+    }
 
-		switch (ModeOptions.getCubeFill()) {
+    public static List<BlockPos> getFloorBlocksUsingCubeFill(EntityPlayer player, int x1, int y1, int z1, int x2, int y2, int z2) {
-			case CUBE_FULL:
+        List<BlockPos> list = new ArrayList<>();
-				addCubeBlocks(list, x1, x2, y1, y2, z1, z2);
-				break;
-			case CUBE_HOLLOW:
-				addHollowCubeBlocks(list, x1, x2, y1, y2, z1, z2);
-				break;
-			case CUBE_SKELETON:
-				addSkeletonCubeBlocks(list, x1, x2, y1, y2, z1, z2);
-				break;
-		}
 
-		return list;
+        if (ModeOptions.getCubeFill() == ModeOptions.ActionEnum.CUBE_SKELETON)
-	}
+            Floor.addHollowFloorBlocks(list, x1, x2, y1, z1, z2);
+        else
+            Floor.addFloorBlocks(list, x1, x2, y1, z1, z2);
 
-	public static void addCubeBlocks(List<BlockPos> list, int x1, int x2, int y1, int y2, int z1, int z2) {
+        return list;
-		for (int l = x1; x1 < x2 ? l <= x2 : l >= x2; l += x1 < x2 ? 1 : -1) {
+    }
 
-			for (int n = z1; z1 < z2 ? n <= z2 : n >= z2; n += z1 < z2 ? 1 : -1) {
+    public static List<BlockPos> getCubeBlocks(EntityPlayer player, int x1, int y1, int z1, int x2, int y2, int z2) {
+        List<BlockPos> list = new ArrayList<>();
 
-				for (int m = y1; y1 < y2 ? m <= y2 : m >= y2; m += y1 < y2 ? 1 : -1) {
+        switch (ModeOptions.getCubeFill()) {
-					list.add(new BlockPos(l, m, n));
+            case CUBE_FULL:
-				}
+                addCubeBlocks(list, x1, x2, y1, y2, z1, z2);
-			}
+                break;
-		}
+            case CUBE_HOLLOW:
-	}
+                addHollowCubeBlocks(list, x1, x2, y1, y2, z1, z2);
+                break;
+            case CUBE_SKELETON:
+                addSkeletonCubeBlocks(list, x1, x2, y1, y2, z1, z2);
+                break;
+        }
 
-	public static void addHollowCubeBlocks(List<BlockPos> list, int x1, int x2, int y1, int y2, int z1, int z2) {
+        return list;
-		Wall.addXWallBlocks(list, x1, y1, y2, z1, z2);
+    }
-		Wall.addXWallBlocks(list, x2, y1, y2, z1, z2);
 
-		Wall.addZWallBlocks(list, x1, x2, y1, y2, z1);
+    public static void addCubeBlocks(List<BlockPos> list, int x1, int x2, int y1, int y2, int z1, int z2) {
-		Wall.addZWallBlocks(list, x1, x2, y1, y2, z2);
+        for (int l = x1; x1 < x2 ? l <= x2 : l >= x2; l += x1 < x2 ? 1 : -1) {
 
-		Floor.addFloorBlocks(list, x1, x2, y1, z1, z2);
+            for (int n = z1; z1 < z2 ? n <= z2 : n >= z2; n += z1 < z2 ? 1 : -1) {
-		Floor.addFloorBlocks(list, x1, x2, y2, z1, z2);
-	}
 
-	public static void addSkeletonCubeBlocks(List<BlockPos> list, int x1, int x2, int y1, int y2, int z1, int z2) {
+                for (int m = y1; y1 < y2 ? m <= y2 : m >= y2; m += y1 < y2 ? 1 : -1) {
-		Line.addXLineBlocks(list, x1, x2, y1, z1);
+                    list.add(new BlockPos(l, m, n));
-		Line.addXLineBlocks(list, x1, x2, y1, z2);
+                }
-		Line.addXLineBlocks(list, x1, x2, y2, z1);
+            }
-		Line.addXLineBlocks(list, x1, x2, y2, z2);
+        }
+    }
 
-		Line.addYLineBlocks(list, y1, y2, x1, z1);
+    public static void addHollowCubeBlocks(List<BlockPos> list, int x1, int x2, int y1, int y2, int z1, int z2) {
-		Line.addYLineBlocks(list, y1, y2, x1, z2);
+        Wall.addXWallBlocks(list, x1, y1, y2, z1, z2);
-		Line.addYLineBlocks(list, y1, y2, x2, z1);
+        Wall.addXWallBlocks(list, x2, y1, y2, z1, z2);
-		Line.addYLineBlocks(list, y1, y2, x2, z2);
 
-		Line.addZLineBlocks(list, z1, z2, x1, y1);
+        Wall.addZWallBlocks(list, x1, x2, y1, y2, z1);
-		Line.addZLineBlocks(list, z1, z2, x1, y2);
+        Wall.addZWallBlocks(list, x1, x2, y1, y2, z2);
-		Line.addZLineBlocks(list, z1, z2, x2, y1);
-		Line.addZLineBlocks(list, z1, z2, x2, y2);
-	}
 
-	@Override
+        Floor.addFloorBlocks(list, x1, x2, y1, z1, z2);
-	protected BlockPos findSecondPos(Player player, BlockPos firstPos, boolean skipRaytrace) {
+        Floor.addFloorBlocks(list, x1, x2, y2, z1, z2);
-		return Floor.findFloor(player, firstPos, skipRaytrace);
+    }
-	}
 
-	@Override
+    public static void addSkeletonCubeBlocks(List<BlockPos> list, int x1, int x2, int y1, int y2, int z1, int z2) {
-	protected BlockPos findThirdPos(Player player, BlockPos firstPos, BlockPos secondPos, boolean skipRaytrace) {
+        Line.addXLineBlocks(list, x1, x2, y1, z1);
-		return findHeight(player, secondPos, skipRaytrace);
+        Line.addXLineBlocks(list, x1, x2, y1, z2);
-	}
+        Line.addXLineBlocks(list, x1, x2, y2, z1);
+        Line.addXLineBlocks(list, x1, x2, y2, z2);
 
-	@Override
+        Line.addYLineBlocks(list, y1, y2, x1, z1);
-	protected List<BlockPos> getIntermediateBlocks(Player player, int x1, int y1, int z1, int x2, int y2, int z2) {
+        Line.addYLineBlocks(list, y1, y2, x1, z2);
-		return getFloorBlocksUsingCubeFill(player, x1, y1, z1, x2, y2, z2);
+        Line.addYLineBlocks(list, y1, y2, x2, z1);
-	}
+        Line.addYLineBlocks(list, y1, y2, x2, z2);
 
-	@Override
+        Line.addZLineBlocks(list, z1, z2, x1, y1);
-	protected List<BlockPos> getFinalBlocks(Player player, int x1, int y1, int z1, int x2, int y2, int z2, int x3, int y3, int z3) {
+        Line.addZLineBlocks(list, z1, z2, x1, y2);
-		return getCubeBlocks(player, x1, y1, z1, x3, y3, z3);
+        Line.addZLineBlocks(list, z1, z2, x2, y1);
-	}
+        Line.addZLineBlocks(list, z1, z2, x2, y2);
+    }
 }

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.entity.player.EntityPlayer;
-import net.minecraft.core.BlockPos;
+import net.minecraft.util.math.BlockPos;
 import nl.requios.effortlessbuilding.buildmode.ThreeClicksBuildMode;
 
 import java.util.ArrayList;
@@ -9,42 +9,42 @@ 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) {
+    @Override
-		List<BlockPos> list = new ArrayList<>();
+    public BlockPos findSecondPos(EntityPlayer player, BlockPos firstPos, boolean skipRaytrace) {
+        return Floor.findFloor(player, firstPos, skipRaytrace);
+    }
 
-		//Get circle blocks (using CIRCLE_START and FILL options built-in)
+    @Override
-		List<BlockPos> circleBlocks = Circle.getCircleBlocks(player, x1, y1, z1, x2, y2, z2);
+    public BlockPos findThirdPos(EntityPlayer player, BlockPos firstPos, BlockPos secondPos, boolean skipRaytrace) {
+        return findHeight(player, secondPos, skipRaytrace);
+    }
 
-		int lowest = Math.min(y1, y3);
+    @Override
-		int highest = Math.max(y1, y3);
+    public List<BlockPos> getIntermediateBlocks(EntityPlayer player, int x1, int y1, int z1, int x2, int y2, int z2) {
+        return Circle.getCircleBlocks(player, x1, y1, z1, x2, y2, z2);
+    }
 
-		//Copy circle on y axis
+    @Override
-		for (int y = lowest; y <= highest; y++) {
+    public List<BlockPos> getFinalBlocks(EntityPlayer player, int x1, int y1, int z1, int x2, int y2, int z2, int x3, int y3, int z3) {
-			for (BlockPos blockPos : circleBlocks) {
+        return getCylinderBlocks(player, x1, y1, z1, x2, y2, z2, x3, y3, z3);
-				list.add(new BlockPos(blockPos.getX(), y, blockPos.getZ()));
+    }
-			}
-		}
 
-		return list;
+    public static List<BlockPos> getCylinderBlocks(EntityPlayer player, int x1, int y1, int z1, int x2, int y2, int z2, int x3, int y3, int z3) {
-	}
+        List<BlockPos> list = new ArrayList<>();
 
-	@Override
+        //Get circle blocks (using CIRCLE_START and FILL options built-in)
-	public BlockPos findSecondPos(Player player, BlockPos firstPos, boolean skipRaytrace) {
+        List<BlockPos> circleBlocks = Circle.getCircleBlocks(player, x1, y1, z1, x2, y2, z2);
-		return Floor.findFloor(player, firstPos, skipRaytrace);
-	}
 
-	@Override
+        int lowest = Math.min(y1, y3);
-	public BlockPos findThirdPos(Player player, BlockPos firstPos, BlockPos secondPos, boolean skipRaytrace) {
+        int highest = Math.max(y1, y3);
-		return findHeight(player, secondPos, skipRaytrace);
-	}
 
-	@Override
+        //Copy circle on y axis
-	public List<BlockPos> getIntermediateBlocks(Player player, int x1, int y1, int z1, int x2, int y2, int z2) {
+        for (int y = lowest; y <= highest; y++) {
-		return Circle.getCircleBlocks(player, x1, y1, z1, x2, y2, z2);
+            for (BlockPos blockPos : circleBlocks) {
-	}
+                list.add(new BlockPos(blockPos.getX(), y, blockPos.getZ()));
+            }
+        }
 
-	@Override
+        return list;
-	public List<BlockPos> getFinalBlocks(Player 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,53 +1,54 @@
 package nl.requios.effortlessbuilding.buildmode.buildmodes;
 
-import net.minecraft.world.entity.player.Player;
+import net.minecraft.entity.player.EntityPlayer;
-import net.minecraft.core.BlockPos;
+import net.minecraft.util.math.BlockPos;
-import net.minecraft.world.phys.Vec3;
+import net.minecraft.util.math.Vec3d;
 import nl.requios.effortlessbuilding.buildmode.ThreeClicksBuildMode;
+import nl.requios.effortlessbuilding.helper.ReachHelper;
 
 import java.util.ArrayList;
 import java.util.List;
 
 public class DiagonalLine extends ThreeClicksBuildMode {
 
-	//Add diagonal line from first to second
+    @Override
-	public static List<BlockPos> getDiagonalLineBlocks(Player player, int x1, int y1, int z1, int x2, int y2, int z2, float sampleMultiplier) {
+    protected BlockPos findSecondPos(EntityPlayer player, BlockPos firstPos, boolean skipRaytrace) {
-		List<BlockPos> list = new ArrayList<>();
+        return Floor.findFloor(player, firstPos, skipRaytrace);
+    }
 
-		Vec3 first = new Vec3(x1, y1, z1).add(0.5, 0.5, 0.5);
+    @Override
-		Vec3 second = new Vec3(x2, y2, z2).add(0.5, 0.5, 0.5);
+    protected BlockPos findThirdPos(EntityPlayer player, BlockPos firstPos, BlockPos secondPos, boolean skipRaytrace) {
+        return findHeight(player, secondPos, skipRaytrace);
+    }
 
-		int iterations = (int) Math.ceil(first.distanceTo(second) * sampleMultiplier);
+    @Override
-		for (double t = 0; t <= 1.0; t += 1.0 / iterations) {
+    protected List<BlockPos> getIntermediateBlocks(EntityPlayer player, int x1, int y1, int z1, int x2, int y2, int z2) {
-			Vec3 lerp = first.add(second.subtract(first).scale(t));
+        //Add diagonal line from first to second
-			BlockPos candidate = new BlockPos(lerp);
+        return getDiagonalLineBlocks(player, x1, y1, z1, x2, y2, z2, 10);
-			//Only add if not equal to the last in the list
+    }
-			if (list.isEmpty() || !list.get(list.size() - 1).equals(candidate))
-				list.add(candidate);
-		}
 
-		return list;
+    @Override
-	}
+    protected List<BlockPos> getFinalBlocks(EntityPlayer 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);
+    }
 
-	@Override
+    //Add diagonal line from first to second
-	protected BlockPos findSecondPos(Player player, BlockPos firstPos, boolean skipRaytrace) {
+    public static List<BlockPos> getDiagonalLineBlocks(EntityPlayer player, int x1, int y1, int z1, int x2, int y2, int z2, float sampleMultiplier) {
-		return Floor.findFloor(player, firstPos, skipRaytrace);
+        List<BlockPos> list = new ArrayList<>();
-	}
 
-	@Override
+        Vec3d first = new Vec3d(x1, y1, z1).add(0.5, 0.5, 0.5);
-	protected BlockPos findThirdPos(Player player, BlockPos firstPos, BlockPos secondPos, boolean skipRaytrace) {
+        Vec3d second = new Vec3d(x2, y2, z2).add(0.5, 0.5, 0.5);
-		return findHeight(player, secondPos, skipRaytrace);
-	}
 
-	@Override
+        int iterations = (int) Math.ceil(first.distanceTo(second) * sampleMultiplier);
-	protected List<BlockPos> getIntermediateBlocks(Player player, int x1, int y1, int z1, int x2, int y2, int z2) {
+        for (double t = 0; t <= 1.0; t += 1.0/iterations) {
-		//Add diagonal line from first to second
+            Vec3d lerp = first.add(second.subtract(first).scale(t));
-		return getDiagonalLineBlocks(player, x1, y1, z1, x2, y2, z2, 10);
+            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))
+                list.add(candidate);
+        }
 
-	@Override
+        return list;
-	protected List<BlockPos> getFinalBlocks(Player 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,51 +1,52 @@
 package nl.requios.effortlessbuilding.buildmode.buildmodes;
 
-import net.minecraft.world.entity.player.Player;
+import net.minecraft.entity.player.EntityPlayer;
-import net.minecraft.core.BlockPos;
+import net.minecraft.util.math.BlockPos;
 import nl.requios.effortlessbuilding.buildmode.ThreeClicksBuildMode;
+import nl.requios.effortlessbuilding.helper.ReachHelper;
 
 import java.util.ArrayList;
 import java.util.List;
 
 public class DiagonalWall extends ThreeClicksBuildMode {
 
-	//Add diagonal wall from first to second
+    @Override
-	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) {
+    protected BlockPos findSecondPos(EntityPlayer player, BlockPos firstPos, boolean skipRaytrace) {
-		List<BlockPos> list = new ArrayList<>();
+        return Floor.findFloor(player, firstPos, skipRaytrace);
+    }
 
-		//Get diagonal line blocks
+    @Override
-		List<BlockPos> diagonalLineBlocks = DiagonalLine.getDiagonalLineBlocks(player, x1, y1, z1, x2, y2, z2, 1);
+    protected BlockPos findThirdPos(EntityPlayer player, BlockPos firstPos, BlockPos secondPos, boolean skipRaytrace) {
+        return findHeight(player, secondPos, skipRaytrace);
+    }
 
-		int lowest = Math.min(y1, y3);
+    @Override
-		int highest = Math.max(y1, y3);
+    protected List<BlockPos> getIntermediateBlocks(EntityPlayer player, int x1, int y1, int z1, int x2, int y2, int z2) {
+        return DiagonalLine.getDiagonalLineBlocks(player, x1, y1, z1, x2, y2, z2, 1);
+    }
 
-		//Copy diagonal line on y axis
+    @Override
-		for (int y = lowest; y <= highest; y++) {
+    protected List<BlockPos> getFinalBlocks(EntityPlayer player, int x1, int y1, int z1, int x2, int y2, int z2, int x3, int y3, int z3) {
-			for (BlockPos blockPos : diagonalLineBlocks) {
+        return getDiagonalWallBlocks(player, x1, y1, z1, x2, y2, z2, x3, y3, z3);
-				list.add(new BlockPos(blockPos.getX(), y, blockPos.getZ()));
+    }
-			}
-		}
 
-		return list;
+    //Add diagonal wall from first to second
-	}
+    public static List<BlockPos> getDiagonalWallBlocks(EntityPlayer player, int x1, int y1, int z1, int x2, int y2, int z2, int x3, int y3, int z3) {
+        List<BlockPos> list = new ArrayList<>();
 
-	@Override
+        //Get diagonal line blocks
-	protected BlockPos findSecondPos(Player player, BlockPos firstPos, boolean skipRaytrace) {
+        List<BlockPos> diagonalLineBlocks = DiagonalLine.getDiagonalLineBlocks(player, x1, y1, z1, x2, y2, z2, 1);
-		return Floor.findFloor(player, firstPos, skipRaytrace);
-	}
 
-	@Override
+        int lowest = Math.min(y1, y3);
-	protected BlockPos findThirdPos(Player player, BlockPos firstPos, BlockPos secondPos, boolean skipRaytrace) {
+        int highest = Math.max(y1, y3);
-		return findHeight(player, secondPos, skipRaytrace);
-	}
 
-	@Override
+        //Copy diagonal line on y axis
-	protected List<BlockPos> getIntermediateBlocks(Player player, int x1, int y1, int z1, int x2, int y2, int z2) {
+        for (int y = lowest; y <= highest; y++) {
-		return DiagonalLine.getDiagonalLineBlocks(player, x1, y1, z1, x2, y2, z2, 1);
+            for (BlockPos blockPos : diagonalLineBlocks) {
-	}
+                list.add(new BlockPos(blockPos.getX(), y, blockPos.getZ()));
+            }
+        }
 
-	@Override
+        return list;
-	protected List<BlockPos> getFinalBlocks(Player 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/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,94 +1,93 @@
 package nl.requios.effortlessbuilding.buildmode.buildmodes;
 
-import net.minecraft.world.entity.player.Player;
+import net.minecraft.entity.player.EntityPlayer;
-import net.minecraft.core.BlockPos;
+import net.minecraft.util.math.BlockPos;
-import net.minecraft.world.phys.Vec3;
+import net.minecraft.util.math.Vec3d;
 import nl.requios.effortlessbuilding.buildmode.BuildModes;
-import nl.requios.effortlessbuilding.buildmode.ModeOptions;
 import nl.requios.effortlessbuilding.buildmode.TwoClicksBuildMode;
+import nl.requios.effortlessbuilding.buildmode.ModeOptions;
 import nl.requios.effortlessbuilding.helper.ReachHelper;
 
-import java.util.ArrayList;
+import java.util.*;
-import java.util.List;
 
 public class Floor extends TwoClicksBuildMode {
 
-	public static BlockPos findFloor(Player player, BlockPos firstPos, boolean skipRaytrace) {
+    static class Criteria {
-		Vec3 look = BuildModes.getPlayerLookVec(player);
+        Vec3d planeBound;
-		Vec3 start = new Vec3(player.getX(), player.getY() + player.getEyeHeight(), player.getZ());
+        double distToPlayerSq;
 
-		List<Criteria> criteriaList = new ArrayList<>(3);
+        Criteria(Vec3d planeBound, Vec3d start) {
+            this.planeBound = planeBound;
+            this.distToPlayerSq = this.planeBound.subtract(start).lengthSquared();
+        }
 
-		//Y
+        //check if its not behind the player and its not too close and not too far
-		Vec3 yBound = BuildModes.findYBound(firstPos.getY(), start, look);
+        //also check if raytrace from player to block does not intersect blocks
-		criteriaList.add(new Criteria(yBound, start));
+        public boolean isValid(Vec3d start, Vec3d look, int reach, EntityPlayer player, boolean skipRaytrace) {
 
-		//Remove invalid criteria
+            return BuildModes.isCriteriaValid(start, look, reach, player, skipRaytrace, planeBound, planeBound, distToPlayerSq);
-		int reach = ReachHelper.getPlacementReach(player) * 4; //4 times as much as normal placement reach
+        }
-		criteriaList.removeIf(criteria -> !criteria.isValid(start, look, reach, player, skipRaytrace));
+    }
 
-		//If none are valid, return empty list of blocks
+    @Override
-		if (criteriaList.isEmpty()) return null;
+    protected BlockPos findSecondPos(EntityPlayer player, BlockPos firstPos, boolean skipRaytrace) {
+        return findFloor(player, firstPos, skipRaytrace);
+    }
 
-		//Then only 1 can be valid, return that one
+    public static BlockPos findFloor(EntityPlayer player, BlockPos firstPos, boolean skipRaytrace) {
-		Criteria selected = criteriaList.get(0);
+        Vec3d look = player.getLookVec();
+        Vec3d start = new Vec3d(player.posX, player.posY + player.getEyeHeight(), player.posZ);
 
-		return new BlockPos(selected.planeBound);
+        List<Criteria> criteriaList = new ArrayList<>(3);
-	}
 
-	public static List<BlockPos> getFloorBlocks(Player player, int x1, int y1, int z1, int x2, int y2, int z2) {
+        //Y
-		List<BlockPos> list = new ArrayList<>();
+        Vec3d yBound = BuildModes.findYBound(firstPos.getY(), start, look);
+        criteriaList.add(new Criteria(yBound, start));
 
-		if (ModeOptions.getFill() == ModeOptions.ActionEnum.FULL)
+        //Remove invalid criteria
-			addFloorBlocks(list, x1, x2, y1, z1, z2);
+        int reach = ReachHelper.getPlacementReach(player) * 4; //4 times as much as normal placement reach
-		else
+        criteriaList.removeIf(criteria -> !criteria.isValid(start, look, reach, player, skipRaytrace));
-			addHollowFloorBlocks(list, x1, x2, y1, z1, z2);
 
-		return list;
+        //If none are valid, return empty list of blocks
-	}
+        if (criteriaList.isEmpty()) return null;
 
-	public static void addFloorBlocks(List<BlockPos> list, int x1, int x2, int y, int z1, int z2) {
+        //Then only 1 can be valid, return that one
+        Criteria selected = criteriaList.get(0);
 
-		for (int l = x1; x1 < x2 ? l <= x2 : l >= x2; l += x1 < x2 ? 1 : -1) {
+        return new BlockPos(selected.planeBound);
+    }
 
-			for (int n = z1; z1 < z2 ? n <= z2 : n >= z2; n += z1 < z2 ? 1 : -1) {
+    @Override
+    protected List<BlockPos> getAllBlocks(EntityPlayer player, int x1, int y1, int z1, int x2, int y2, int z2) {
+        return getFloorBlocks(player, x1, y1, z1, x2, y2, z2);
+    }
 
-				list.add(new BlockPos(l, y, n));
+    public static List<BlockPos> getFloorBlocks(EntityPlayer player, int x1, int y1, int z1, int x2, int y2, int z2) {
-			}
+        List<BlockPos> list = new ArrayList<>();
-		}
-	}
 
-	public static void addHollowFloorBlocks(List<BlockPos> list, int x1, int x2, int y, int z1, int z2) {
+        if (ModeOptions.getFill() == ModeOptions.ActionEnum.FULL)
-		Line.addXLineBlocks(list, x1, x2, y, z1);
+            addFloorBlocks(list, x1, x2, y1, z1, z2);
-		Line.addXLineBlocks(list, x1, x2, y, z2);
+        else
-		Line.addZLineBlocks(list, z1, z2, x1, y);
+            addHollowFloorBlocks(list, x1, x2, y1, z1, z2);
-		Line.addZLineBlocks(list, z1, z2, x2, y);
-	}
 
-	@Override
+        return list;
-	protected BlockPos findSecondPos(Player player, BlockPos firstPos, boolean skipRaytrace) {
+    }
-		return findFloor(player, firstPos, skipRaytrace);
-	}
 
-	@Override
+    public static void addFloorBlocks(List<BlockPos> list, int x1, int x2, int y, int z1, int z2) {
-	protected List<BlockPos> getAllBlocks(Player 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 {
+        for (int l = x1; x1 < x2 ? l <= x2 : l >= x2; l += x1 < x2 ? 1 : -1) {
-		Vec3 planeBound;
-		double distToPlayerSq;
 
-		Criteria(Vec3 planeBound, Vec3 start) {
+            for (int n = z1; z1 < z2 ? n <= z2 : n >= z2; n += z1 < z2 ? 1 : -1) {
-			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
+                list.add(new BlockPos(l, y, n));
-		//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) {
+        }
+    }
 
-			return BuildModes.isCriteriaValid(start, look, reach, player, skipRaytrace, planeBound, planeBound, distToPlayerSq);
+    public static void addHollowFloorBlocks(List<BlockPos> list, int x1, int x2, int y, int z1, int z2) {
-		}
+        Line.addXLineBlocks(list, x1, x2, y, z1);
-	}
+        Line.addXLineBlocks(list, x1, x2, y, z2);
+        Line.addZLineBlocks(list, z1, z2, x1, y);
+        Line.addZLineBlocks(list, z1, z2, x2, y);
+    }
 }

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.entity.player.EntityPlayer;
-import net.minecraft.core.BlockPos;
+import net.minecraft.util.math.BlockPos;
-import net.minecraft.world.phys.Vec3;
+import net.minecraft.util.math.Vec3d;
 import nl.requios.effortlessbuilding.buildmode.BuildModes;
 import nl.requios.effortlessbuilding.buildmode.TwoClicksBuildMode;
 import nl.requios.effortlessbuilding.helper.ReachHelper;
@@ -12,136 +12,136 @@ import java.util.List;
 
 public class Line extends TwoClicksBuildMode {
 
-	public static BlockPos findLine(Player player, BlockPos firstPos, boolean skipRaytrace) {
+    static class Criteria {
-		Vec3 look = BuildModes.getPlayerLookVec(player);
+        Vec3d planeBound;
-		Vec3 start = new Vec3(player.getX(), player.getY() + player.getEyeHeight(), player.getZ());
+        Vec3d lineBound;
+        double distToLineSq;
+        double distToPlayerSq;
 
-		List<Criteria> criteriaList = new ArrayList<>(3);
+        Criteria(Vec3d planeBound, BlockPos firstPos, Vec3d start) {
+            this.planeBound = planeBound;
+            this.lineBound = toLongestLine(this.planeBound, firstPos);
+            this.distToLineSq = this.lineBound.subtract(this.planeBound).lengthSquared();
+            this.distToPlayerSq = this.planeBound.subtract(start).lengthSquared();
+        }
 
-		//X
+        //Make it from a plane into a line
-		Vec3 xBound = BuildModes.findXBound(firstPos.getX(), start, look);
+        //Select the axis that is longest
-		criteriaList.add(new Criteria(xBound, firstPos, start));
+        private Vec3d toLongestLine(Vec3d boundVec, BlockPos firstPos) {
+            BlockPos bound = new BlockPos(boundVec);
 
-		//Y
+            BlockPos firstToSecond = bound.subtract(firstPos);
-		Vec3 yBound = BuildModes.findYBound(firstPos.getY(), start, look);
+            firstToSecond = new BlockPos(Math.abs(firstToSecond.getX()), Math.abs(firstToSecond.getY()), Math.abs(firstToSecond.getZ()));
-		criteriaList.add(new Criteria(yBound, firstPos, start));
+            int longest = Math.max(firstToSecond.getX(), Math.max(firstToSecond.getY(), firstToSecond.getZ()));
+            if (longest == firstToSecond.getX()) {
+                return new Vec3d(bound.getX(), firstPos.getY(), firstPos.getZ());
+            }
+            if (longest == firstToSecond.getY()) {
+                return new Vec3d(firstPos.getX(), bound.getY(), firstPos.getZ());
+            }
+            if (longest == firstToSecond.getZ()) {
+                return new Vec3d(firstPos.getX(), firstPos.getY(), bound.getZ());
+            }
+            return null;
+        }
 
-		//Z
+        //check if its not behind the player and its not too close and not too far
-		Vec3 zBound = BuildModes.findZBound(firstPos.getZ(), start, look);
+        //also check if raytrace from player to block does not intersect blocks
-		criteriaList.add(new Criteria(zBound, firstPos, start));
+        public boolean isValid(Vec3d start, Vec3d look, int reach, EntityPlayer player, boolean skipRaytrace) {
 
-		//Remove invalid criteria
+            return BuildModes.isCriteriaValid(start, look, reach, player, skipRaytrace, lineBound, planeBound, distToPlayerSq);
-		int reach = ReachHelper.getPlacementReach(player) * 4; //4 times as much as normal placement reach
+        }
-		criteriaList.removeIf(criteria -> !criteria.isValid(start, look, reach, player, skipRaytrace));
 
-		//If none are valid, return empty list of blocks
+    }
-		if (criteriaList.isEmpty()) return null;
 
-		//If only 1 is valid, choose that one
+    @Override
-		Criteria selected = criteriaList.get(0);
+    protected BlockPos findSecondPos(EntityPlayer player, BlockPos firstPos, boolean skipRaytrace) {
+        return findLine(player, firstPos, skipRaytrace);
+    }
 
-		//If multiple are valid, choose based on criteria
+    public static BlockPos findLine(EntityPlayer player, BlockPos firstPos, boolean skipRaytrace) {
-		if (criteriaList.size() > 1) {
+        Vec3d look = player.getLookVec();
-			//Select the one that is closest (from wall position to its line counterpart)
+        Vec3d start = new Vec3d(player.posX, player.posY + player.getEyeHeight(), player.posZ);
-			for (int i = 1; i < criteriaList.size(); i++) {
-				Criteria criteria = criteriaList.get(i);
-				if (criteria.distToLineSq < 2.0 && selected.distToLineSq < 2.0) {
-					//Both very close to line, choose closest to player
-					if (criteria.distToPlayerSq < selected.distToPlayerSq)
-						selected = criteria;
-				} else {
-					//Pick closest to line
-					if (criteria.distToLineSq < selected.distToLineSq)
-						selected = criteria;
-				}
-			}
 
-		}
+        List<Criteria> criteriaList = new ArrayList<>(3);
 
-		return new BlockPos(selected.lineBound);
+        //X
-	}
+        Vec3d xBound = BuildModes.findXBound(firstPos.getX(), start, look);
+        criteriaList.add(new Criteria(xBound, firstPos, start));
 
-	public static List<BlockPos> getLineBlocks(Player player, int x1, int y1, int z1, int x2, int y2, int z2) {
+        //Y
-		List<BlockPos> list = new ArrayList<>();
+        Vec3d yBound = BuildModes.findYBound(firstPos.getY(), start, look);
+        criteriaList.add(new Criteria(yBound, firstPos, start));
 
-		if (x1 != x2) {
+        //Z
-			addXLineBlocks(list, x1, x2, y1, z1);
+        Vec3d zBound = BuildModes.findZBound(firstPos.getZ(), start, look);
-		} else if (y1 != y2) {
+        criteriaList.add(new Criteria(zBound, firstPos, start));
-			addYLineBlocks(list, y1, y2, x1, z1);
-		} else {
-			addZLineBlocks(list, z1, z2, x1, y1);
-		}
 
-		return list;
+        //Remove invalid criteria
-	}
+        int reach = ReachHelper.getPlacementReach(player) * 4; //4 times as much as normal placement reach
+        criteriaList.removeIf(criteria -> !criteria.isValid(start, look, reach, player, skipRaytrace));
 
-	public static void addXLineBlocks(List<BlockPos> list, int x1, int x2, int y, int z) {
+        //If none are valid, return empty list of blocks
-		for (int x = x1; x1 < x2 ? x <= x2 : x >= x2; x += x1 < x2 ? 1 : -1) {
+        if (criteriaList.isEmpty()) return null;
-			list.add(new BlockPos(x, y, z));
-		}
-	}
 
-	public static void addYLineBlocks(List<BlockPos> list, int y1, int y2, int x, int z) {
+        //If only 1 is valid, choose that one
-		for (int y = y1; y1 < y2 ? y <= y2 : y >= y2; y += y1 < y2 ? 1 : -1) {
+        Criteria selected = criteriaList.get(0);
-			list.add(new BlockPos(x, y, z));
-		}
-	}
 
-	public static void addZLineBlocks(List<BlockPos> list, int z1, int z2, int x, int y) {
+        //If multiple are valid, choose based on criteria
-		for (int z = z1; z1 < z2 ? z <= z2 : z >= z2; z += z1 < z2 ? 1 : -1) {
+        if (criteriaList.size() > 1) {
-			list.add(new BlockPos(x, y, z));
+            //Select the one that is closest (from wall position to its line counterpart)
-		}
+            for (int i = 1; i < criteriaList.size(); i++) {
-	}
+                Criteria criteria = criteriaList.get(i);
+                if (criteria.distToLineSq < 2.0 && selected.distToLineSq < 2.0) {
+                    //Both very close to line, choose closest to player
+                    if (criteria.distToPlayerSq < selected.distToPlayerSq)
+                        selected = criteria;
+                } else {
+                    //Pick closest to line
+                    if (criteria.distToLineSq < selected.distToLineSq)
+                        selected = criteria;
+                }
+            }
 
-	@Override
+        }
-	protected BlockPos findSecondPos(Player player, BlockPos firstPos, boolean skipRaytrace) {
-		return findLine(player, firstPos, skipRaytrace);
-	}
 
-	@Override
+        return new BlockPos(selected.lineBound);
-	protected List<BlockPos> getAllBlocks(Player 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 {
+    @Override
-		Vec3 planeBound;
+    protected List<BlockPos> getAllBlocks(EntityPlayer player, int x1, int y1, int z1, int x2, int y2, int z2) {
-		Vec3 lineBound;
+        return getLineBlocks(player, x1, y1, z1, x2, y2, z2);
-		double distToLineSq;
+    }
-		double distToPlayerSq;
 
-		Criteria(Vec3 planeBound, BlockPos firstPos, Vec3 start) {
+    public static List<BlockPos> getLineBlocks(EntityPlayer player, int x1, int y1, int z1, int x2, int y2, int z2) {
-			this.planeBound = planeBound;
+        List<BlockPos> list = new ArrayList<>();
-			this.lineBound = toLongestLine(this.planeBound, firstPos);
-			this.distToLineSq = this.lineBound.subtract(this.planeBound).lengthSqr();
-			this.distToPlayerSq = this.planeBound.subtract(start).lengthSqr();
-		}
 
-		//Make it from a plane into a line
+        if (x1 != x2) {
-		//Select the axis that is longest
+            addXLineBlocks(list, x1, x2, y1, z1);
-		private Vec3 toLongestLine(Vec3 boundVec, BlockPos firstPos) {
+        } else if (y1 != y2) {
-			BlockPos bound = new BlockPos(boundVec);
+            addYLineBlocks(list, y1, y2, x1, z1);
+        } else {
+            addZLineBlocks(list, z1, z2, x1, y1);
+        }
 
-			BlockPos firstToSecond = bound.subtract(firstPos);
+        return list;
-			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());
-			}
-			if (longest == firstToSecond.getY()) {
-				return new Vec3(firstPos.getX(), bound.getY(), firstPos.getZ());
-			}
-			if (longest == firstToSecond.getZ()) {
-				return new Vec3(firstPos.getX(), firstPos.getY(), bound.getZ());
-			}
-			return null;
-		}
 
-		//check if its not behind the player and its not too close and not too far
+    public static void addXLineBlocks(List<BlockPos> list, int x1, int x2, int y, int z) {
-		//also check if raytrace from player to block does not intersect blocks
+        for (int x = x1; x1 < x2 ? x <= x2 : x >= x2; x += x1 < x2 ? 1 : -1) {
-		public boolean isValid(Vec3 start, Vec3 look, int reach, Player player, boolean skipRaytrace) {
+            list.add(new BlockPos(x, y, z));
+        }
+    }
 
-			return BuildModes.isCriteriaValid(start, look, reach, player, skipRaytrace, lineBound, planeBound, distToPlayerSq);
+    public static void addYLineBlocks(List<BlockPos> list, int y1, int y2, int x, int z) {
-		}
+        for (int y = y1; y1 < y2 ? y <= y2 : y >= y2; y += y1 < y2 ? 1 : -1) {
+            list.add(new BlockPos(x, y, z));
+        }
+    }
 
-	}
+    public static void addZLineBlocks(List<BlockPos> list, int z1, int z2, int x, int y) {
+        for (int z = z1; z1 < z2 ? z <= z2 : z >= z2; z += z1 < z2 ? 1 : -1) {
+            list.add(new BlockPos(x, y, z));
+        }
+    }
 }

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

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

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

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

@@ -1,7 +1,7 @@
 package nl.requios.effortlessbuilding.buildmode.buildmodes;
 
-import net.minecraft.world.entity.player.Player;
+import net.minecraft.entity.player.EntityPlayer;
-import net.minecraft.core.BlockPos;
+import net.minecraft.util.math.BlockPos;
 import nl.requios.effortlessbuilding.buildmode.ModeOptions;
 import nl.requios.effortlessbuilding.buildmode.ThreeClicksBuildMode;
 import nl.requios.effortlessbuilding.helper.ReachHelper;
@@ -11,85 +11,85 @@ import java.util.List;
 
 public class SlopeFloor extends ThreeClicksBuildMode {
 
-	//Add slope floor from first to second
+    @Override
-	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) {
+    protected BlockPos findSecondPos(EntityPlayer player, BlockPos firstPos, boolean skipRaytrace) {
-		List<BlockPos> list = new ArrayList<>();
+        return Floor.findFloor(player, firstPos, skipRaytrace);
+    }
 
-		int axisLimit = ReachHelper.getMaxBlocksPerAxis(player);
+    @Override
+    protected BlockPos findThirdPos(EntityPlayer player, BlockPos firstPos, BlockPos secondPos, boolean skipRaytrace) {
+        return findHeight(player, secondPos, skipRaytrace);
+    }
 
-		//Determine whether to use x or z axis to slope up
+    @Override
-		boolean onXAxis = true;
+    protected List<BlockPos> getIntermediateBlocks(EntityPlayer player, int x1, int y1, int z1, int x2, int y2, int z2) {
+        return Floor.getFloorBlocks(player, x1, y1, z1, x2, y2, z2);
+    }
 
-		int xLength = Math.abs(x2 - x1);
+    @Override
-		int zLength = Math.abs(z2 - z1);
+    protected List<BlockPos> getFinalBlocks(EntityPlayer 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);
+    }
 
-		if (ModeOptions.getRaisedEdge() == ModeOptions.ActionEnum.SHORT_EDGE) {
+    //Add slope floor from first to second
-			//Slope along short edge
+    public static List<BlockPos> getSlopeFloorBlocks(EntityPlayer player, int x1, int y1, int z1, int x2, int y2, int z2, int x3, int y3, int z3) {
-			if (zLength > xLength) onXAxis = false;
+        List<BlockPos> list = new ArrayList<>();
-		} else {
-			//Slope along long edge
-			if (zLength <= xLength) onXAxis = false;
-		}
 
-		if (onXAxis) {
+        int axisLimit = ReachHelper.getMaxBlocksPerAxis(player);
-			//Along X goes up
 
-			//Get diagonal line blocks
+        //Determine whether to use x or z axis to slope up
-			List<BlockPos> diagonalLineBlocks = DiagonalLine.getDiagonalLineBlocks(player, x1, y1, z1, x2, y3, z1, 1f);
+        boolean onXAxis = true;
 
-			//Limit amount of blocks we can place
+        int xLength = Math.abs(x2 - x1);
-			int lowest = Math.min(z1, z2);
+        int zLength = Math.abs(z2 - z1);
-			int highest = Math.max(z1, z2);
 
-			if (highest - lowest >= axisLimit) highest = lowest + axisLimit - 1;
+        if (ModeOptions.getRaisedEdge() == ModeOptions.ActionEnum.SHORT_EDGE) {
+            //Slope along short edge
+            if (zLength > xLength) onXAxis = false;
+        } else {
+            //Slope along long edge
+            if (zLength <= xLength) onXAxis = false;
+        }
 
-			//Copy diagonal line on x axis
+        if (onXAxis) {
-			for (int z = lowest; z <= highest; z++) {
+            //Along X goes up
-				for (BlockPos blockPos : diagonalLineBlocks) {
-					list.add(new BlockPos(blockPos.getX(), blockPos.getY(), z));
-				}
-			}
 
-		} else {
+            //Get diagonal line blocks
-			//Along Z goes up
+            List<BlockPos> diagonalLineBlocks = DiagonalLine.getDiagonalLineBlocks(player, x1, y1, z1, x2, y3, z1, 1f);
 
-			//Get diagonal line blocks
+            //Limit amount of blocks we can place
-			List<BlockPos> diagonalLineBlocks = DiagonalLine.getDiagonalLineBlocks(player, x1, y1, z1, x1, y3, z2, 1f);
+            int lowest = Math.min(z1, z2);
+            int highest = Math.max(z1, z2);
 
-			//Limit amount of blocks we can place
+            if (highest - lowest >= axisLimit) highest = lowest + axisLimit - 1;
-			int lowest = Math.min(x1, x2);
-			int highest = Math.max(x1, x2);
 
-			if (highest - lowest >= axisLimit) highest = lowest + axisLimit - 1;
+            //Copy diagonal line on x axis
+            for (int z = lowest; z <= highest; z++) {
+                for (BlockPos blockPos : diagonalLineBlocks) {
+                    list.add(new BlockPos(blockPos.getX(), blockPos.getY(), z));
+                }
+            }
 
-			//Copy diagonal line on x axis
+        } else {
-			for (int x = lowest; x <= highest; x++) {
+            //Along Z goes up
-				for (BlockPos blockPos : diagonalLineBlocks) {
-					list.add(new BlockPos(x, blockPos.getY(), blockPos.getZ()));
-				}
-			}
-		}
 
-		return list;
+            //Get diagonal line blocks
-	}
+            List<BlockPos> diagonalLineBlocks = DiagonalLine.getDiagonalLineBlocks(player, x1, y1, z1, x1, y3, z2, 1f);
 
-	@Override
+            //Limit amount of blocks we can place
-	protected BlockPos findSecondPos(Player player, BlockPos firstPos, boolean skipRaytrace) {
+            int lowest = Math.min(x1, x2);
-		return Floor.findFloor(player, firstPos, skipRaytrace);
+            int highest = Math.max(x1, x2);
-	}
 
-	@Override
+            if (highest - lowest >= axisLimit) highest = lowest + axisLimit - 1;
-	protected BlockPos findThirdPos(Player player, BlockPos firstPos, BlockPos secondPos, boolean skipRaytrace) {
-		return findHeight(player, secondPos, skipRaytrace);
-	}
 
-	@Override
+            //Copy diagonal line on x axis
-	protected List<BlockPos> getIntermediateBlocks(Player player, int x1, int y1, int z1, int x2, int y2, int z2) {
+            for (int x = lowest; x <= highest; x++) {
-		return Floor.getFloorBlocks(player, x1, y1, z1, x2, y2, z2);
+                for (BlockPos blockPos : diagonalLineBlocks) {
-	}
+                    list.add(new BlockPos(x, blockPos.getY(), blockPos.getZ()));
+                }
+            }
+        }
 
-	@Override
+        return list;
-	protected List<BlockPos> getFinalBlocks(Player 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.entity.player.EntityPlayer;
-import net.minecraft.core.BlockPos;
+import net.minecraft.util.math.BlockPos;
-import net.minecraft.util.Mth;
+import net.minecraft.util.math.MathHelper;
 import nl.requios.effortlessbuilding.buildmode.ModeOptions;
 import nl.requios.effortlessbuilding.buildmode.ThreeClicksBuildMode;
 
@@ -11,100 +11,100 @@ 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) {
+    @Override
-		List<BlockPos> list = new ArrayList<>();
+    public BlockPos findSecondPos(EntityPlayer player, BlockPos firstPos, boolean skipRaytrace) {
+        return Floor.findFloor(player, firstPos, skipRaytrace);
+    }
 
-		float centerX = x1;
+    @Override
-		float centerY = y1;
+    public BlockPos findThirdPos(EntityPlayer player, BlockPos firstPos, BlockPos secondPos, boolean skipRaytrace) {
-		float centerZ = z1;
+        return findHeight(player, secondPos, skipRaytrace);
+    }
 
-		//Adjust for CIRCLE_START
+    @Override
-		if (ModeOptions.getCircleStart() == ModeOptions.ActionEnum.CIRCLE_START_CORNER) {
+    public List<BlockPos> getIntermediateBlocks(EntityPlayer player, int x1, int y1, int z1, int x2, int y2, int z2) {
-			centerX = x1 + (x2 - x1) / 2f;
+        return Circle.getCircleBlocks(player, x1, y1, z1, x2, y2, z2);
-			centerY = y1 + (y3 - y1) / 2f;
+    }
-			centerZ = z1 + (z2 - z1) / 2f;
-		} else {
-			x1 = (int) (centerX - (x2 - centerX));
-			y1 = (int) (centerY - (y3 - centerY));
-			z1 = (int) (centerZ - (z2 - centerZ));
-		}
 
-		float radiusX = Mth.abs(x2 - centerX);
+    @Override
-		float radiusY = Mth.abs(y3 - centerY);
+    public List<BlockPos> getFinalBlocks(EntityPlayer player, int x1, int y1, int z1, int x2, int y2, int z2, int x3, int y3, int z3) {
-		float radiusZ = Mth.abs(z2 - centerZ);
+        return getSphereBlocks(player, x1, y1, z1, x2, y2, z2, x3, y3, z3);
+    }
 
-		if (ModeOptions.getFill() == ModeOptions.ActionEnum.FULL)
+    public static List<BlockPos> getSphereBlocks(EntityPlayer player, int x1, int y1, int z1, int x2, int y2, int z2, int x3, int y3, int z3) {
-			addSphereBlocks(list, x1, y1, z1, x3, y3, z3, centerX, centerY, centerZ, radiusX, radiusY, radiusZ);
+        List<BlockPos> list = new ArrayList<>();
-		else
-			addHollowSphereBlocks(list, x1, y1, z1, x3, y3, z3, centerX, centerY, centerZ, radiusX, radiusY, radiusZ);
 
-		return list;
+        float centerX = x1;
-	}
+        float centerY = y1;
+        float centerZ = z1;
 
-	public static void addSphereBlocks(List<BlockPos> list, int x1, int y1, int z1, int x2, int y2, int z2,
+        //Adjust for CIRCLE_START
-									   float centerX, float centerY, float centerZ, float radiusX, float radiusY, float radiusZ) {
+        if (ModeOptions.getCircleStart() == ModeOptions.ActionEnum.CIRCLE_START_CORNER) {
-		for (int l = x1; x1 < x2 ? l <= x2 : l >= x2; l += x1 < x2 ? 1 : -1) {
+            centerX = x1 + (x2 - x1) / 2f;
+            centerY = y1 + (y3 - y1) / 2f;
+            centerZ = z1 + (z2 - z1) / 2f;
+        } else {
+            x1 = (int) (centerX - (x2 - centerX));
+            y1 = (int) (centerY - (y3 - centerY));
+            z1 = (int) (centerZ - (z2 - centerZ));
+        }
 
-			for (int n = z1; z1 < z2 ? n <= z2 : n >= z2; n += z1 < z2 ? 1 : -1) {
+        float radiusX = MathHelper.abs(x2 - centerX);
+        float radiusY = MathHelper.abs(y3 - centerY);
+        float radiusZ = MathHelper.abs(z2 - centerZ);
 
-				for (int m = y1; y1 < y2 ? m <= y2 : m >= y2; m += y1 < y2 ? 1 : -1) {
+        if (ModeOptions.getFill() == ModeOptions.ActionEnum.FULL)
+            addSphereBlocks(list, x1, y1, z1, x3, y3, z3, centerX, centerY, centerZ, radiusX, radiusY, radiusZ);
+        else
+            addHollowSphereBlocks(list, x1, y1, z1, x3, y3, z3, centerX, centerY, centerZ, radiusX, radiusY, radiusZ);
 
-					float distance = distance(l, m, n, centerX, centerY, centerZ);
+        return list;
-					float radius = calculateSpheroidRadius(centerX, centerY, centerZ, radiusX, radiusY, radiusZ, l, m, n);
+    }
-					if (distance < radius + 0.4f)
-						list.add(new BlockPos(l, m, n));
-				}
-			}
-		}
-	}
 
-	public static void addHollowSphereBlocks(List<BlockPos> list, int x1, int y1, int z1, int x2, int y2, int z2,
+    public static void addSphereBlocks(List<BlockPos> list, int x1, int y1, int z1, int x2, int y2, int z2,
-											 float centerX, float centerY, float centerZ, float radiusX, float radiusY, float radiusZ) {
+                                       float centerX, float centerY, float centerZ, float radiusX, float radiusY, float radiusZ) {
-		for (int l = x1; x1 < x2 ? l <= x2 : l >= x2; l += x1 < x2 ? 1 : -1) {
+        for (int l = x1; x1 < x2 ? l <= x2 : l >= x2; l += x1 < x2 ? 1 : -1) {
 
-			for (int n = z1; z1 < z2 ? n <= z2 : n >= z2; n += z1 < z2 ? 1 : -1) {
+            for (int n = z1; z1 < z2 ? n <= z2 : n >= z2; n += z1 < z2 ? 1 : -1) {
 
-				for (int m = y1; y1 < y2 ? m <= y2 : m >= y2; m += y1 < y2 ? 1 : -1) {
+                for (int m = y1; y1 < y2 ? m <= y2 : m >= y2; m += y1 < y2 ? 1 : -1) {
 
-					float distance = distance(l, m, n, centerX, centerY, centerZ);
+                    float distance = distance(l, m, n, centerX, centerY, centerZ);
-					float radius = calculateSpheroidRadius(centerX, centerY, centerZ, radiusX, radiusY, radiusZ, l, m, n);
+                    float radius = calculateSpheroidRadius(centerX, centerY, centerZ, radiusX, radiusY, radiusZ, l, m, n);
-					if (distance < radius + 0.4f && distance > radius - 0.6f)
+                    if (distance < radius + 0.4f)
-						list.add(new BlockPos(l, m, n));
+                        list.add(new BlockPos(l, m, n));
-				}
+                }
-			}
+            }
-		}
+        }
-	}
+    }
 
-	private static float distance(float x1, float y1, float z1, float x2, float y2, float z2) {
+    public static void addHollowSphereBlocks(List<BlockPos> list, int x1, int y1, int z1, int x2, int y2, int z2,
-		return Mth.sqrt((x2 - x1) * (x2 - x1) + (y2 - y1) * (y2 - y1) + (z2 - z1) * (z2 - z1));
+                                             float centerX, float centerY, float centerZ, float radiusX, float radiusY, float radiusZ) {
-	}
+        for (int l = x1; x1 < x2 ? l <= x2 : l >= x2; l += x1 < x2 ? 1 : -1) {
 
-	public static float calculateSpheroidRadius(float centerX, float centerY, float centerZ, float radiusX, float radiusY, float radiusZ, int x, int y, int z) {
+            for (int n = z1; z1 < z2 ? n <= z2 : n >= z2; n += z1 < z2 ? 1 : -1) {
-		//Twice ellipse radius
-		float radiusXZ = Circle.calculateEllipseRadius(centerX, centerZ, radiusX, radiusZ, x, z);
 
-		//TODO project x to plane
+                for (int m = y1; y1 < y2 ? m <= y2 : m >= y2; m += y1 < y2 ? 1 : -1) {
 
-		return Circle.calculateEllipseRadius(centerX, centerY, radiusXZ, radiusY, x, y);
+                    float distance = distance(l, m, n, centerX, centerY, centerZ);
-	}
+                    float radius = calculateSpheroidRadius(centerX, centerY, centerZ, radiusX, radiusY, radiusZ, l, m, n);
+                    if (distance < radius + 0.4f && distance > radius - 0.6f)
+                        list.add(new BlockPos(l, m, n));
+                }
+            }
+        }
+    }
 
-	@Override
+    private static float distance(float x1, float y1, float z1, float x2, float y2, float z2) {
-	public BlockPos findSecondPos(Player player, BlockPos firstPos, boolean skipRaytrace) {
+        return MathHelper.sqrt((x2 - x1) * (x2 - x1) + (y2 - y1) * (y2 - y1) + (z2 - z1) * (z2 - z1));
-		return Floor.findFloor(player, firstPos, skipRaytrace);
+    }
-	}
 
-	@Override
+    public static float calculateSpheroidRadius(float centerX, float centerY, float centerZ, float radiusX, float radiusY, float radiusZ, int x, int y, int z) {
-	public BlockPos findThirdPos(Player player, BlockPos firstPos, BlockPos secondPos, boolean skipRaytrace) {
+        //Twice ellipse radius
-		return findHeight(player, secondPos, skipRaytrace);
+        float radiusXZ = Circle.calculateEllipseRadius(centerX, centerZ, radiusX, radiusZ, x, z);
-	}
 
-	@Override
+        //TODO project x to plane
-	public List<BlockPos> getIntermediateBlocks(Player player, int x1, int y1, int z1, int x2, int y2, int z2) {
-		return Circle.getCircleBlocks(player, x1, y1, z1, x2, y2, z2);
-	}
 
-	@Override
+        return Circle.calculateEllipseRadius(centerX, centerY, radiusXZ, radiusY, x, y);
-	public List<BlockPos> getFinalBlocks(Player 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,135 +1,134 @@
 package nl.requios.effortlessbuilding.buildmode.buildmodes;
 
-import net.minecraft.world.entity.player.Player;
+import net.minecraft.entity.player.EntityPlayer;
-import net.minecraft.core.BlockPos;
+import net.minecraft.util.math.BlockPos;
-import net.minecraft.world.phys.Vec3;
+import net.minecraft.util.math.Vec3d;
 import nl.requios.effortlessbuilding.buildmode.BuildModes;
-import nl.requios.effortlessbuilding.buildmode.ModeOptions;
 import nl.requios.effortlessbuilding.buildmode.TwoClicksBuildMode;
+import nl.requios.effortlessbuilding.buildmode.ModeOptions;
 import nl.requios.effortlessbuilding.helper.ReachHelper;
 
-import java.util.ArrayList;
+import java.util.*;
-import java.util.List;
 
 public class Wall extends TwoClicksBuildMode {
 
-	public static BlockPos findWall(Player player, BlockPos firstPos, boolean skipRaytrace) {
+    static class Criteria {
-		Vec3 look = BuildModes.getPlayerLookVec(player);
+        Vec3d planeBound;
-		Vec3 start = new Vec3(player.getX(), player.getY() + player.getEyeHeight(), player.getZ());
+        double distToPlayerSq;
+        double angle;
 
-		List<Criteria> criteriaList = new ArrayList<>(3);
+        Criteria(Vec3d planeBound, BlockPos firstPos, Vec3d start, Vec3d look) {
+            this.planeBound = planeBound;
+            this.distToPlayerSq = this.planeBound.subtract(start).lengthSquared();
+            Vec3d wall = this.planeBound.subtract(new Vec3d(firstPos));
+            this.angle = wall.x * look.x + wall.z * look.z; //dot product ignoring y (looking up/down should not affect this angle)
+        }
 
-		//X
+        //check if its not behind the player and its not too close and not too far
-		Vec3 xBound = BuildModes.findXBound(firstPos.getX(), start, look);
+        //also check if raytrace from player to block does not intersect blocks
-		criteriaList.add(new Criteria(xBound, firstPos, start, look));
+        public boolean isValid(Vec3d start, Vec3d look, int reach, EntityPlayer player, boolean skipRaytrace) {
 
-		//Z
+            return BuildModes.isCriteriaValid(start, look, reach, player, skipRaytrace, planeBound, planeBound, distToPlayerSq);
-		Vec3 zBound = BuildModes.findZBound(firstPos.getZ(), start, look);
+        }
-		criteriaList.add(new Criteria(zBound, firstPos, start, look));
+    }
 
-		//Remove invalid criteria
+    @Override
-		int reach = ReachHelper.getPlacementReach(player) * 4; //4 times as much as normal placement reach
+    protected BlockPos findSecondPos(EntityPlayer player, BlockPos firstPos, boolean skipRaytrace) {
-		criteriaList.removeIf(criteria -> !criteria.isValid(start, look, reach, player, skipRaytrace));
+        return findWall(player, firstPos, skipRaytrace);
+    }
 
-		//If none are valid, return empty list of blocks
+    public static BlockPos findWall(EntityPlayer player, BlockPos firstPos, boolean skipRaytrace) {
-		if (criteriaList.isEmpty()) return null;
+        Vec3d look = player.getLookVec();
+        Vec3d start = new Vec3d(player.posX, player.posY + player.getEyeHeight(), player.posZ);
 
-		//If only 1 is valid, choose that one
+        List<Criteria> criteriaList = new ArrayList<>(3);
-		Criteria selected = criteriaList.get(0);
 
-		//If multiple are valid, choose based on criteria
+        //X
-		if (criteriaList.size() > 1) {
+        Vec3d xBound = BuildModes.findXBound(firstPos.getX(), start, look);
-			//Select the one that is closest
+        criteriaList.add(new Criteria(xBound, firstPos, start, look));
-			//Limit the angle to not be too extreme
-			for (int i = 1; i < criteriaList.size(); i++) {
-				Criteria criteria = criteriaList.get(i);
-				if (criteria.distToPlayerSq < selected.distToPlayerSq && Math.abs(criteria.angle) - Math.abs(selected.angle) < 3)
-					selected = criteria;
-			}
-		}
 
-		return new BlockPos(selected.planeBound);
+        //Z
-	}
+        Vec3d zBound = BuildModes.findZBound(firstPos.getZ(), start, look);
+        criteriaList.add(new Criteria(zBound, firstPos, start, look));
 
-	public static List<BlockPos> getWallBlocks(Player player, int x1, int y1, int z1, int x2, int y2, int z2) {
+        //Remove invalid criteria
-		List<BlockPos> list = new ArrayList<>();
+        int reach = ReachHelper.getPlacementReach(player) * 4; //4 times as much as normal placement reach
+        criteriaList.removeIf(criteria -> !criteria.isValid(start, look, reach, player, skipRaytrace));
 
-		if (x1 == x2) {
+        //If none are valid, return empty list of blocks
-			if (ModeOptions.getFill() == ModeOptions.ActionEnum.FULL)
+        if (criteriaList.isEmpty()) return null;
-				addXWallBlocks(list, x1, y1, y2, z1, z2);
-			else
-				addXHollowWallBlocks(list, x1, y1, y2, z1, z2);
-		} else {
-			if (ModeOptions.getFill() == ModeOptions.ActionEnum.FULL)
-				addZWallBlocks(list, x1, x2, y1, y2, z1);
-			else
-				addZHollowWallBlocks(list, x1, x2, y1, y2, z1);
-		}
 
-		return list;
+        //If only 1 is valid, choose that one
-	}
+        Criteria selected = criteriaList.get(0);
 
-	public static void addXWallBlocks(List<BlockPos> list, int x, int y1, int y2, int z1, int z2) {
+        //If multiple are valid, choose based on criteria
+        if (criteriaList.size() > 1) {
+            //Select the one that is closest
+            //Limit the angle to not be too extreme
+            for (int i = 1; i < criteriaList.size(); i++) {
+                Criteria criteria = criteriaList.get(i);
+                if (criteria.distToPlayerSq < selected.distToPlayerSq && Math.abs(criteria.angle) - Math.abs(selected.angle) < 3)
+                    selected = criteria;
+            }
+        }
 
-		for (int z = z1; z1 < z2 ? z <= z2 : z >= z2; z += z1 < z2 ? 1 : -1) {
+        return new BlockPos(selected.planeBound);
+    }
 
-			for (int y = y1; y1 < y2 ? y <= y2 : y >= y2; y += y1 < y2 ? 1 : -1) {
+    @Override
-				list.add(new BlockPos(x, y, z));
+    protected List<BlockPos> getAllBlocks(EntityPlayer player, int x1, int y1, int z1, int x2, int y2, int z2) {
-			}
+        return getWallBlocks(player, x1, y1, z1, x2, y2, z2);
-		}
+    }
-	}
 
-	public static void addZWallBlocks(List<BlockPos> list, int x1, int x2, int y1, int y2, int z) {
+    public static List<BlockPos> getWallBlocks(EntityPlayer player, int x1, int y1, int z1, int x2, int y2, int z2) {
+        List<BlockPos> list = new ArrayList<>();
 
-		for (int x = x1; x1 < x2 ? x <= x2 : x >= x2; x += x1 < x2 ? 1 : -1) {
+        if (x1 == x2) {
+            if (ModeOptions.getFill() == ModeOptions.ActionEnum.FULL)
+                addXWallBlocks(list, x1, y1, y2, z1, z2);
+            else
+                addXHollowWallBlocks(list, x1, y1, y2, z1, z2);
+        } else {
+            if (ModeOptions.getFill() == ModeOptions.ActionEnum.FULL)
+                addZWallBlocks(list, x1, x2, y1, y2, z1);
+            else
+                addZHollowWallBlocks(list, x1, x2, y1, y2, z1);
+        }
 
-			for (int y = y1; y1 < y2 ? y <= y2 : y >= y2; y += y1 < y2 ? 1 : -1) {
+        return list;
-				list.add(new BlockPos(x, y, z));
+    }
-			}
-		}
-	}
 
-	public static void addXHollowWallBlocks(List<BlockPos> list, int x, int y1, int y2, int z1, int z2) {
+    public static void addXWallBlocks(List<BlockPos> list, int x, int y1, int y2, int z1, int z2) {
-		Line.addZLineBlocks(list, z1, z2, x, y1);
-		Line.addZLineBlocks(list, z1, z2, x, y2);
-		Line.addYLineBlocks(list, y1, y2, x, z1);
-		Line.addYLineBlocks(list, y1, y2, x, z2);
-	}
 
-	public static void addZHollowWallBlocks(List<BlockPos> list, int x1, int x2, int y1, int y2, int z) {
+        for (int z = z1; z1 < z2 ? z <= z2 : z >= z2; z += z1 < z2 ? 1 : -1) {
-		Line.addXLineBlocks(list, x1, x2, y1, z);
-		Line.addXLineBlocks(list, x1, x2, y2, z);
-		Line.addYLineBlocks(list, y1, y2, x1, z);
-		Line.addYLineBlocks(list, y1, y2, x2, z);
-	}
 
-	@Override
+            for (int y = y1; y1 < y2 ? y <= y2 : y >= y2; y += y1 < y2 ? 1 : -1) {
-	protected BlockPos findSecondPos(Player player, BlockPos firstPos, boolean skipRaytrace) {
+                list.add(new BlockPos(x, y, z));
-		return findWall(player, firstPos, skipRaytrace);
+            }
-	}
+        }
+    }
 
-	@Override
+    public static void addZWallBlocks(List<BlockPos> list, int x1, int x2, int y1, int y2, int z) {
-	protected List<BlockPos> getAllBlocks(Player 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 {
+        for (int x = x1; x1 < x2 ? x <= x2 : x >= x2; x += x1 < x2 ? 1 : -1) {
-		Vec3 planeBound;
-		double distToPlayerSq;
-		double angle;
 
-		Criteria(Vec3 planeBound, BlockPos firstPos, Vec3 start, Vec3 look) {
+            for (int y = y1; y1 < y2 ? y <= y2 : y >= y2; y += y1 < y2 ? 1 : -1) {
-			this.planeBound = planeBound;
+                list.add(new BlockPos(x, y, z));
-			this.distToPlayerSq = this.planeBound.subtract(start).lengthSqr();
+            }
-			Vec3 wall = this.planeBound.subtract(Vec3.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
+    public static void addXHollowWallBlocks(List<BlockPos> list, int x, int y1, int y2, int z1, int z2) {
-		//also check if raytrace from player to block does not intersect blocks
+        Line.addZLineBlocks(list, z1, z2, x, y1);
-		public boolean isValid(Vec3 start, Vec3 look, int reach, Player player, boolean skipRaytrace) {
+        Line.addZLineBlocks(list, z1, z2, x, y2);
+        Line.addYLineBlocks(list, y1, y2, x, z1);
+        Line.addYLineBlocks(list, y1, y2, x, z2);
+    }
 
-			return BuildModes.isCriteriaValid(start, look, reach, player, skipRaytrace, planeBound, planeBound, distToPlayerSq);
+    public static void addZHollowWallBlocks(List<BlockPos> list, int x1, int x2, int y1, int y2, int z) {
-		}
+        Line.addXLineBlocks(list, x1, x2, y1, z);
-	}
+        Line.addXLineBlocks(list, x1, x2, y2, z);
+        Line.addYLineBlocks(list, y1, y2, x1, z);
+        Line.addYLineBlocks(list, y1, y2, x2, z);
+    }
 }

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

@@ -1,104 +1,104 @@
 package nl.requios.effortlessbuilding.buildmodifier;
 
-import net.minecraft.world.level.block.state.BlockState;
+import net.minecraft.block.state.IBlockState;
-import net.minecraft.world.entity.player.Player;
+import net.minecraft.entity.player.EntityPlayer;
-import net.minecraft.world.item.ItemStack;
+import net.minecraft.item.ItemStack;
-import net.minecraft.core.Direction;
+import net.minecraft.util.EnumFacing;
-import net.minecraft.world.InteractionHand;
+import net.minecraft.util.EnumHand;
-import net.minecraft.core.BlockPos;
+import net.minecraft.util.math.BlockPos;
-import net.minecraft.world.phys.Vec3;
+import net.minecraft.util.math.Vec3d;
-import net.minecraft.core.Vec3i;
+import net.minecraft.util.math.Vec3i;
 import net.minecraftforge.items.IItemHandler;
-import nl.requios.effortlessbuilding.item.AbstractRandomizerBagItem;
+import nl.requios.effortlessbuilding.item.ItemRandomizerBag;
 
 import java.util.ArrayList;
 import java.util.List;
 
 public class Array {
 
-	public static List<BlockPos> findCoordinates(Player player, BlockPos startPos) {
+    public static class ArraySettings{
-		List<BlockPos> coordinates = new ArrayList<>();
+        public boolean enabled = false;
+        public BlockPos offset = BlockPos.ORIGIN;
+        public int count = 5;
 
-		//find arraysettings for the player
+        public ArraySettings() {
-		ArraySettings a = ModifierSettingsManager.getModifierSettings(player).getArraySettings();
+        }
-		if (!isEnabled(a)) return coordinates;
 
-		BlockPos pos = startPos;
+        public ArraySettings(boolean enabled, BlockPos offset, int count) {
-		Vec3i offset = new Vec3i(a.offset.getX(), a.offset.getY(), a.offset.getZ());
+            this.enabled = enabled;
+            this.offset = offset;
+            this.count = count;
+        }
 
-		for (int i = 0; i < a.count; i++) {
+        public int getReach() {
-			pos = pos.offset(offset);
+            //find largest offset
-			coordinates.add(pos);
+            int x = Math.abs(offset.getX());
-		}
+            int y = Math.abs(offset.getY());
+            int z = Math.abs(offset.getZ());
+            int largestOffset = Math.max(Math.max(x, y), z);
 
-		return coordinates;
+            return largestOffset * count;
-	}
+        }
+    }
 
-	public static List<BlockState> findBlockStates(Player player, BlockPos startPos, BlockState blockState, ItemStack itemStack, List<ItemStack> itemStacks) {
+    public static List<BlockPos> findCoordinates(EntityPlayer player, BlockPos startPos) {
-		List<BlockState> blockStates = new ArrayList<>();
+        List<BlockPos> coordinates = new ArrayList<>();
 
-		//find arraysettings for the player that placed the block
+        //find arraysettings for the player
-		ArraySettings a = ModifierSettingsManager.getModifierSettings(player).getArraySettings();
+        ArraySettings a = ModifierSettingsManager.getModifierSettings(player).getArraySettings();
-		if (!isEnabled(a)) return blockStates;
+        if (!isEnabled(a)) return coordinates;
 
-		BlockPos pos = startPos;
+        BlockPos pos = startPos;
-		Vec3i offset = new Vec3i(a.offset.getX(), a.offset.getY(), a.offset.getZ());
+        Vec3i offset = new Vec3i(a.offset.getX(), a.offset.getY(), a.offset.getZ());
 
-		//Randomizer bag synergy
+        for (int i = 0; i < a.count; i++) {
-		AbstractRandomizerBagItem randomizerBagItem = null;
+            pos = pos.add(offset);
-		IItemHandler bagInventory = null;
+            coordinates.add(pos);
-		if (!itemStack.isEmpty() && itemStack.getItem() instanceof AbstractRandomizerBagItem) {
+        }
-			randomizerBagItem = (AbstractRandomizerBagItem) itemStack.getItem() ;
-			bagInventory = randomizerBagItem.getBagInventory(itemStack);
-		}
 
-		for (int i = 0; i < a.count; i++) {
+        return coordinates;
-			pos = pos.offset(offset);
+    }
 
-			//Randomizer bag synergy
+    public static List<IBlockState> findBlockStates(EntityPlayer player, BlockPos startPos, IBlockState blockState, ItemStack itemStack, List<ItemStack> itemStacks) {
-			if (randomizerBagItem != null) {
+        List<IBlockState> blockStates = new ArrayList<>();
-				itemStack = randomizerBagItem.pickRandomStack(bagInventory);
-				blockState = BuildModifiers
-					.getBlockStateFromItem(itemStack, player, startPos, Direction.UP, new Vec3(0, 0, 0), InteractionHand.MAIN_HAND);
-			}
 
-			//blockState = blockState.getBlock().getStateForPlacement(player.world, pos, )
+        //find arraysettings for the player that placed the block
-			blockStates.add(blockState);
+        ArraySettings a = ModifierSettingsManager.getModifierSettings(player).getArraySettings();
-			itemStacks.add(itemStack);
+        if (!isEnabled(a)) return blockStates;
-		}
 
-		return blockStates;
+        BlockPos pos = startPos;
-	}
+        Vec3i offset = new Vec3i(a.offset.getX(), a.offset.getY(), a.offset.getZ());
 
-	public static boolean isEnabled(ArraySettings a) {
+        //Randomizer bag synergy
-		if (a == null || !a.enabled) return false;
+        IItemHandler bagInventory = null;
+        if (!itemStack.isEmpty() && itemStack.getItem() instanceof ItemRandomizerBag) {
+            bagInventory = ItemRandomizerBag.getBagInventory(itemStack);
+        }
 
-		return a.offset.getX() != 0 || a.offset.getY() != 0 || a.offset.getZ() != 0;
+        for (int i = 0; i < a.count; i++) {
-	}
+            pos = pos.add(offset);
 
-	public static class ArraySettings {
+            //Randomizer bag synergy
-		public boolean enabled = false;
+            if (bagInventory != null) {
-		public BlockPos offset = BlockPos.ZERO;
+                itemStack = ItemRandomizerBag.pickRandomStack(bagInventory);
-		public int count = 5;
+                blockState = BuildModifiers
+                        .getBlockStateFromItem(itemStack, player, startPos, EnumFacing.UP, new Vec3d(0, 0, 0), EnumHand.MAIN_HAND);
+            }
 
-		public ArraySettings() {
+            //blockState = blockState.getBlock().getStateForPlacement(player.world, pos, )
-		}
+            blockStates.add(blockState);
+            itemStacks.add(itemStack);
+        }
 
-		public ArraySettings(boolean enabled, BlockPos offset, int count) {
+        return blockStates;
-			this.enabled = enabled;
+    }
-			this.offset = offset;
-			this.count = count;
-		}
 
-		public int getReach() {
+    public static boolean isEnabled(ArraySettings a) {
-			//find largest offset
+        if (a == null || !a.enabled) return false;
-			int x = Math.abs(offset.getX());
-			int y = Math.abs(offset.getY());
-			int z = Math.abs(offset.getZ());
-			int largestOffset = Math.max(Math.max(x, y), z);
 
-			return largestOffset * count;
+        if (a.offset.getX() == 0 && a.offset.getY() == 0 && a.offset.getZ() == 0) return false;
-		}
+
-	}
+        return true;
+    }
 
 }

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

@@ -1,50 +1,50 @@
 package nl.requios.effortlessbuilding.buildmodifier;
 
-import net.minecraft.world.level.block.state.BlockState;
+import net.minecraft.block.state.IBlockState;
-import net.minecraft.core.BlockPos;
+import net.minecraft.util.math.BlockPos;
-import net.minecraft.world.phys.Vec3;
+import net.minecraft.util.math.Vec3d;
 
 import java.util.List;
 
 public class BlockSet {
-	private final List<BlockPos> coordinates;
+    private List<BlockPos> coordinates;
-	private final List<BlockState> previousBlockStates;
+    private List<IBlockState> previousBlockStates;
-	private final List<BlockState> newBlockStates;
+    private List<IBlockState> newBlockStates;
-	private final Vec3 hitVec;
+    private Vec3d hitVec;
-	private final BlockPos firstPos;
+    private BlockPos firstPos;
-	private final BlockPos secondPos;
+    private BlockPos secondPos;
 
-	public BlockSet(List<BlockPos> coordinates, List<BlockState> previousBlockStates, List<BlockState> newBlockStates, Vec3 hitVec,
+    public BlockSet(List<BlockPos> coordinates, List<IBlockState> previousBlockStates,  List<IBlockState> newBlockStates, Vec3d hitVec,
-					BlockPos firstPos, BlockPos secondPos) {
+                    BlockPos firstPos, BlockPos secondPos) {
-		this.coordinates = coordinates;
+        this.coordinates = coordinates;
-		this.previousBlockStates = previousBlockStates;
+        this.previousBlockStates = previousBlockStates;
-		this.newBlockStates = newBlockStates;
+        this.newBlockStates = newBlockStates;
-		this.hitVec = hitVec;
+        this.hitVec = hitVec;
-		this.firstPos = firstPos;
+        this.firstPos = firstPos;
-		this.secondPos = secondPos;
+        this.secondPos = secondPos;
-	}
+    }
 
-	public List<BlockPos> getCoordinates() {
+    public List<BlockPos> getCoordinates() {
-		return coordinates;
+        return coordinates;
-	}
+    }
 
-	public List<BlockState> getPreviousBlockStates() {
+    public List<IBlockState> getPreviousBlockStates() {
-		return previousBlockStates;
+        return previousBlockStates;
-	}
+    }
 
-	public List<BlockState> getNewBlockStates() {
+    public List<IBlockState> getNewBlockStates() {
-		return newBlockStates;
+        return newBlockStates;
-	}
+    }
 
-	public Vec3 getHitVec() {
+    public Vec3d getHitVec() {
-		return hitVec;
+        return hitVec;
-	}
+    }
 
-	public BlockPos getFirstPos() {
+    public BlockPos getFirstPos() {
-		return firstPos;
+        return firstPos;
-	}
+    }
 
-	public BlockPos getSecondPos() {
+    public BlockPos getSecondPos() {
-		return secondPos;
+        return secondPos;
-	}
+    }
 }

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

@@ -1,267 +1,260 @@
 package nl.requios.effortlessbuilding.buildmodifier;
 
-import net.minecraft.world.level.block.Block;
+import net.minecraft.block.Block;
-import net.minecraft.world.level.block.state.BlockState;
+import net.minecraft.block.state.IBlockState;
-import net.minecraft.world.level.block.Blocks;
+import net.minecraft.entity.player.EntityPlayer;
-import net.minecraft.world.entity.player.Player;
+import net.minecraft.init.Blocks;
-import net.minecraft.world.item.BlockItem;
+import net.minecraft.item.BlockItemUseContext;
-import net.minecraft.world.item.context.BlockPlaceContext;
+import net.minecraft.item.ItemBlock;
-import net.minecraft.world.item.ItemStack;
+import net.minecraft.item.ItemStack;
-import net.minecraft.world.item.context.UseOnContext;
+import net.minecraft.util.EnumFacing;
-import net.minecraft.core.Direction;
+import net.minecraft.util.EnumHand;
-import net.minecraft.world.InteractionHand;
+import net.minecraft.util.math.BlockPos;
-import net.minecraft.core.BlockPos;
+import net.minecraft.util.math.Vec3d;
-import net.minecraft.world.phys.BlockHitResult;
+import net.minecraft.world.World;
-import net.minecraft.world.phys.Vec3;
+import nl.requios.effortlessbuilding.EffortlessBuilding;
-import net.minecraft.world.level.Level;
 import nl.requios.effortlessbuilding.compatibility.CompatHelper;
 import nl.requios.effortlessbuilding.helper.InventoryHelper;
 import nl.requios.effortlessbuilding.helper.SurvivalHelper;
-import nl.requios.effortlessbuilding.item.AbstractRandomizerBagItem;
+import nl.requios.effortlessbuilding.item.ItemRandomizerBag;
 import nl.requios.effortlessbuilding.render.BlockPreviewRenderer;
 
-import java.util.ArrayList;
+import java.util.*;
-import java.util.Collections;
-import java.util.List;
 
 public class BuildModifiers {
 
-	//Called from BuildModes
+    //Called from BuildModes
-	public static void onBlockPlaced(Player player, List<BlockPos> startCoordinates, Direction sideHit, Vec3 hitVec, boolean placeStartPos) {
+    public static void onBlockPlaced(EntityPlayer player, List<BlockPos> startCoordinates, EnumFacing sideHit, Vec3d hitVec, boolean placeStartPos) {
-		Level world = player.level;
+        World world = player.world;
-		AbstractRandomizerBagItem.renewRandomness();
+        ItemRandomizerBag.renewRandomness();
 
-		//Format hitvec to 0.x
+        //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 Vec3d(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
+        //find coordinates and blockstates
-		List<BlockPos> coordinates = findCoordinates(player, startCoordinates);
+        List<BlockPos> coordinates = findCoordinates(player, startCoordinates);
-		List<ItemStack> itemStacks = new ArrayList<>();
+        List<ItemStack> itemStacks = new ArrayList<>();
-		List<BlockState> blockStates = findBlockStates(player, startCoordinates, hitVec, sideHit, itemStacks);
+        List<IBlockState> blockStates = findBlockStates(player, startCoordinates, hitVec, sideHit, itemStacks);
 
-		//check if valid blockstates
+        //check if valid blockstates
-		if (blockStates.size() == 0 || coordinates.size() != blockStates.size()) return;
+        if (blockStates.size() == 0 || coordinates.size() != blockStates.size()) return;
 
-		//remember previous blockstates for undo
+        //remember previous blockstates for undo
-		List<BlockState> previousBlockStates = new ArrayList<>(coordinates.size());
+        List<IBlockState> previousBlockStates = new ArrayList<>(coordinates.size());
-		List<BlockState> newBlockStates = new ArrayList<>(coordinates.size());
+        List<IBlockState> newBlockStates = new ArrayList<>(coordinates.size());
-		for (BlockPos coordinate : coordinates) {
+        for (BlockPos coordinate : coordinates) {
-			previousBlockStates.add(world.getBlockState(coordinate));
+            previousBlockStates.add(world.getBlockState(coordinate));
-		}
+        }
 
-		if (world.isClientSide) {
+        if (world.isRemote) {
 
-			BlockPreviewRenderer.onBlocksPlaced();
+            BlockPreviewRenderer.onBlocksPlaced();
 
-			newBlockStates = blockStates;
+            newBlockStates = blockStates;
 
-		} else {
+        } else {
 
-			//place blocks
+            //place blocks
-			for (int i = placeStartPos ? 0 : 1; i < coordinates.size(); i++) {
+            for (int i = placeStartPos ? 0 : 1; i < coordinates.size(); i++) {
-				BlockPos blockPos = coordinates.get(i);
+                BlockPos blockPos = coordinates.get(i);
-				BlockState blockState = blockStates.get(i);
+                IBlockState blockState = blockStates.get(i);
-				ItemStack itemStack = itemStacks.get(i);
+                ItemStack itemStack = itemStacks.get(i);
 
-				if (world.isLoaded(blockPos)) {
+                if (world.isBlockLoaded(blockPos, true)) {
-					//check itemstack empty
+                    //check itemstack empty
-					if (itemStack.isEmpty()) {
+                    if (itemStack.isEmpty()) {
-						//try to find new stack, otherwise continue
+                        //try to find new stack, otherwise continue
-						itemStack = InventoryHelper.findItemStackInInventory(player, blockState.getBlock());
+                        itemStack = InventoryHelper.findItemStackInInventory(player, blockState.getBlock());
-						if (itemStack.isEmpty()) continue;
+                        if (itemStack.isEmpty()) continue;
-					}
+                    }
-					SurvivalHelper.placeBlock(world, player, blockPos, blockState, itemStack, Direction.UP, hitVec, false, false, false);
+                    SurvivalHelper.placeBlock(world, player, blockPos, blockState, itemStack, EnumFacing.UP, hitVec, false, false, false);
-				}
+                }
-			}
+            }
 
-			//find actual new blockstates for undo
+            //find actual new blockstates for undo
-			for (BlockPos coordinate : coordinates) {
+            for (BlockPos coordinate : coordinates) {
-				newBlockStates.add(world.getBlockState(coordinate));
+                newBlockStates.add(world.getBlockState(coordinate));
-			}
+            }
-		}
+        }
 
-		//Set first previousBlockState to empty if in NORMAL mode, to make undo/redo work
+        //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)
+        //(Block is placed by the time it gets here, and unplaced after this)
-		if (!placeStartPos) previousBlockStates.set(0, Blocks.AIR.defaultBlockState());
+        if (!placeStartPos) previousBlockStates.set(0, Blocks.AIR.getDefaultState());
 
-		//If all new blockstates are air then no use in adding it, no block was actually placed
+        //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
+        //Can happen when e.g. placing one block in yourself
-		if (Collections.frequency(newBlockStates, Blocks.AIR.defaultBlockState()) != newBlockStates.size()) {
+        if (Collections.frequency(newBlockStates, Blocks.AIR.getDefaultState()) != newBlockStates.size()) {
-			//add to undo stack
+            //add to undo stack
-			BlockPos firstPos = startCoordinates.get(0);
+            BlockPos firstPos = startCoordinates.get(0);
-			BlockPos secondPos = startCoordinates.get(startCoordinates.size() - 1);
+            BlockPos secondPos = startCoordinates.get(startCoordinates.size() - 1);
-			UndoRedo.addUndo(player, new BlockSet(coordinates, previousBlockStates, newBlockStates, hitVec, firstPos, secondPos));
+            UndoRedo.addUndo(player, new BlockSet(coordinates, previousBlockStates, newBlockStates, hitVec, firstPos, secondPos));
-		}
+        }
-	}
+    }
 
-	public static void onBlockBroken(Player player, List<BlockPos> startCoordinates, boolean breakStartPos) {
+    public static void onBlockBroken(EntityPlayer player, List<BlockPos> startCoordinates, boolean breakStartPos) {
-		Level world = player.level;
+        World world = player.world;
 
-		List<BlockPos> coordinates = findCoordinates(player, startCoordinates);
+        List<BlockPos> coordinates = findCoordinates(player, startCoordinates);
 
-		if (coordinates.isEmpty()) return;
+        if (coordinates.isEmpty()) return;
 
-		//remember previous blockstates for undo
+        //remember previous blockstates for undo
-		List<BlockState> previousBlockStates = new ArrayList<>(coordinates.size());
+        List<IBlockState> previousBlockStates = new ArrayList<>(coordinates.size());
-		List<BlockState> newBlockStates = new ArrayList<>(coordinates.size());
+        List<IBlockState> newBlockStates = new ArrayList<>(coordinates.size());
-		for (BlockPos coordinate : coordinates) {
+        for (BlockPos coordinate : coordinates) {
-			previousBlockStates.add(world.getBlockState(coordinate));
+            previousBlockStates.add(world.getBlockState(coordinate));
-		}
+        }
 
-		if (world.isClientSide) {
+        if (world.isRemote) {
-			BlockPreviewRenderer.onBlocksBroken();
+            BlockPreviewRenderer.onBlocksBroken();
 
-			//list of air blockstates
+            //list of air blockstates
-			for (int i = 0; i < coordinates.size(); i++) {
+            for (int i = 0; i < coordinates.size(); i++) {
-				newBlockStates.add(Blocks.AIR.defaultBlockState());
+                newBlockStates.add(Blocks.AIR.getDefaultState());
-			}
+            }
 
-		} else {
+        } else {
 
-			//If the player is going to instabreak grass or a plant, only break other instabreaking things
+            //If the player is going to instabreak grass or a plant, only break other instabreaking things
-			boolean onlyInstaBreaking = !player.isCreative() &&
+            boolean onlyInstaBreaking = !player.isCreative() &&
-				world.getBlockState(startCoordinates.get(0)).getDestroySpeed(world, startCoordinates.get(0)) == 0f;
+                                        world.getBlockState(startCoordinates.get(0)).getBlockHardness(world, startCoordinates.get(0)) == 0f;
 
-			//break all those blocks
+            //break all those blocks
-			for (int i = breakStartPos ? 0 : 1; i < coordinates.size(); i++) {
+            for (int i = breakStartPos ? 0 : 1; i < coordinates.size(); i++) {
-				BlockPos coordinate = coordinates.get(i);
+                BlockPos coordinate = coordinates.get(i);
-				if (world.isLoaded(coordinate) && !world.isEmptyBlock(coordinate)) {
+                if (world.isBlockLoaded(coordinate, false)) {
-					if (!onlyInstaBreaking || world.getBlockState(coordinate).getDestroySpeed(world, coordinate) == 0f) {
+                    if (!onlyInstaBreaking || world.getBlockState(coordinate).getBlockHardness(world, coordinate) == 0f) {
-						SurvivalHelper.breakBlock(world, player, coordinate, false);
+                        SurvivalHelper.breakBlock(world, player, coordinate, false);
-					}
+                    }
-				}
+                }
-			}
+            }
 
-			//find actual new blockstates for undo
+            //find actual new blockstates for undo
-			for (BlockPos coordinate : coordinates) {
+            for (BlockPos coordinate : coordinates) {
-				newBlockStates.add(world.getBlockState(coordinate));
+                newBlockStates.add(world.getBlockState(coordinate));
-			}
+            }
-		}
+        }
 
-		//Set first newBlockState to empty if in NORMAL mode, to make undo/redo work
+        //Set first newBlockState to empty if in NORMAL mode, to make undo/redo work
-		//(Block isn't broken yet by the time it gets here, and broken after this)
+        //(Block isn't broken yet by the time it gets here, and broken after this)
-		if (!breakStartPos) newBlockStates.set(0, Blocks.AIR.defaultBlockState());
+        if (!breakStartPos) newBlockStates.set(0, Blocks.AIR.getDefaultState());
 
-		//add to undo stack
+        //add to undo stack
-		BlockPos firstPos = startCoordinates.get(0);
+        BlockPos firstPos = startCoordinates.get(0);
-		BlockPos secondPos = startCoordinates.get(startCoordinates.size() - 1);
+        BlockPos secondPos = startCoordinates.get(startCoordinates.size() - 1);
-		Vec3 hitVec = new Vec3(0.5, 0.5, 0.5);
+        Vec3d hitVec = new Vec3d(0.5, 0.5, 0.5);
-		UndoRedo.addUndo(player, new BlockSet(coordinates, previousBlockStates, newBlockStates, hitVec, firstPos, secondPos));
+        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(EntityPlayer player, List<BlockPos> posList) {
-		List<BlockPos> coordinates = new ArrayList<>();
+        List<BlockPos> coordinates = new ArrayList<>();
-		//Add current blocks being placed too
+        //Add current blocks being placed too
-		coordinates.addAll(posList);
+        coordinates.addAll(posList);
 
-		//Find mirror/array/radial mirror coordinates for each blockpos
+        //Find mirror/array/radial mirror coordinates for each blockpos
-		for (BlockPos blockPos : posList) {
+        for (BlockPos blockPos : posList) {
-			List<BlockPos> arrayCoordinates = Array.findCoordinates(player, blockPos);
+            List<BlockPos> arrayCoordinates = Array.findCoordinates(player, blockPos);
-			coordinates.addAll(arrayCoordinates);
+            coordinates.addAll(arrayCoordinates);
-			coordinates.addAll(Mirror.findCoordinates(player, blockPos));
+            coordinates.addAll(Mirror.findCoordinates(player, blockPos));
-			coordinates.addAll(RadialMirror.findCoordinates(player, blockPos));
+            coordinates.addAll(RadialMirror.findCoordinates(player, blockPos));
-			//get mirror for each array coordinate
+            //get mirror for each array coordinate
-			for (BlockPos coordinate : arrayCoordinates) {
+            for (BlockPos coordinate : arrayCoordinates) {
-				coordinates.addAll(Mirror.findCoordinates(player, coordinate));
+                coordinates.addAll(Mirror.findCoordinates(player, coordinate));
-				coordinates.addAll(RadialMirror.findCoordinates(player, coordinate));
+                coordinates.addAll(RadialMirror.findCoordinates(player, coordinate));
-			}
+            }
-		}
+        }
 
-		return coordinates;
+        return coordinates;
-	}
+    }
 
-	public static List<BlockPos> findCoordinates(Player player, BlockPos blockPos) {
+    public static List<BlockPos> findCoordinates(EntityPlayer player, BlockPos blockPos) {
-		return findCoordinates(player, new ArrayList<>(Collections.singletonList(blockPos)));
+        return findCoordinates(player, new ArrayList<>(Arrays.asList(blockPos)));
-	}
+    }
 
-	public static List<BlockState> findBlockStates(Player player, List<BlockPos> posList, Vec3 hitVec, Direction facing, List<ItemStack> itemStacks) {
+    public static List<IBlockState> findBlockStates(EntityPlayer player, List<BlockPos> posList, Vec3d hitVec, EnumFacing facing, List<ItemStack> itemStacks) {
-		List<BlockState> blockStates = new ArrayList<>();
+        List<IBlockState> blockStates = new ArrayList<>();
-		itemStacks.clear();
+        itemStacks.clear();
 
-		//Get itemstack
+        //Get itemstack
-		ItemStack itemStack = player.getItemInHand(InteractionHand.MAIN_HAND);
+        ItemStack itemStack = player.getHeldItem(EnumHand.MAIN_HAND);
-		if (itemStack.isEmpty() || !CompatHelper.isItemBlockProxy(itemStack)) {
+        if (itemStack.isEmpty() || !CompatHelper.isItemBlockProxy(itemStack)) {
-			itemStack = player.getItemInHand(InteractionHand.OFF_HAND);
+            itemStack = player.getHeldItem(EnumHand.OFF_HAND);
-		}
+        }
-		if (itemStack.isEmpty() || !CompatHelper.isItemBlockProxy(itemStack)) {
+        if (itemStack.isEmpty() || !CompatHelper.isItemBlockProxy(itemStack)) {
-			return blockStates;
+            return blockStates;
-		}
+        }
 
-		//Get ItemBlock stack
+        //Get ItemBlock stack
-		ItemStack itemBlock = ItemStack.EMPTY;
+        ItemStack itemBlock = ItemStack.EMPTY;
-		if (itemStack.getItem() instanceof BlockItem) itemBlock = itemStack;
+        if (itemStack.getItem() instanceof ItemBlock) itemBlock = itemStack;
-		else itemBlock = CompatHelper.getItemBlockFromStack(itemStack);
+        else itemBlock = CompatHelper.getItemBlockFromStack(itemStack);
-		AbstractRandomizerBagItem.resetRandomness();
+        ItemRandomizerBag.resetRandomness();
 
-		//Add blocks in posList first
+        //Add blocks in posList first
-		for (BlockPos blockPos : posList) {
+        for (BlockPos blockPos : posList) {
-			if (!(itemStack.getItem() instanceof BlockItem)) itemBlock = CompatHelper.getItemBlockFromStack(itemStack);
+            if (!(itemStack.getItem() instanceof ItemBlock)) itemBlock = CompatHelper.getItemBlockFromStack(itemStack);
-			BlockState blockState = getBlockStateFromItem(itemBlock, player, blockPos, facing, hitVec, InteractionHand.MAIN_HAND);
+            IBlockState blockState = getBlockStateFromItem(itemBlock, player, blockPos, facing, hitVec, EnumHand.MAIN_HAND);
-			if (blockState == null) continue;
+            blockStates.add(blockState);
+            itemStacks.add(itemBlock);
+        }
 
-			blockStates.add(blockState);
+        for (BlockPos blockPos : posList) {
-			itemStacks.add(itemBlock);
+            IBlockState blockState = getBlockStateFromItem(itemBlock, player, blockPos, facing, hitVec, EnumHand.MAIN_HAND);
-		}
 
-		for (BlockPos blockPos : posList) {
+            List<IBlockState> arrayBlockStates = Array.findBlockStates(player, blockPos, blockState, itemStack, itemStacks);
-			BlockState blockState = getBlockStateFromItem(itemBlock, player, blockPos, facing, hitVec, InteractionHand.MAIN_HAND);
+            blockStates.addAll(arrayBlockStates);
-			if (blockState == null) continue;
+            blockStates.addAll(Mirror.findBlockStates(player, blockPos, blockState, itemStack, itemStacks));
+            blockStates.addAll(RadialMirror.findBlockStates(player, blockPos, blockState, itemStack, itemStacks));
+            //add mirror for each array coordinate
+            List<BlockPos> arrayCoordinates = Array.findCoordinates(player, blockPos);
+            for (int i = 0; i < arrayCoordinates.size(); i++) {
+                BlockPos coordinate = arrayCoordinates.get(i);
+                IBlockState blockState1 = arrayBlockStates.get(i);
+                blockStates.addAll(Mirror.findBlockStates(player, coordinate, blockState1, itemStack, itemStacks));
+                blockStates.addAll(RadialMirror.findBlockStates(player, coordinate, blockState1, itemStack, itemStacks));
+            }
 
-			List<BlockState> arrayBlockStates = Array.findBlockStates(player, blockPos, blockState, itemStack, itemStacks);
+            //Adjust blockstates for torches and ladders etc to place on a valid side
-			blockStates.addAll(arrayBlockStates);
+            //TODO optimize findCoordinates (done twice now)
-			blockStates.addAll(Mirror.findBlockStates(player, blockPos, blockState, itemStack, itemStacks));
+            //TODO fix mirror
-			blockStates.addAll(RadialMirror.findBlockStates(player, blockPos, blockState, itemStack, itemStacks));
-			//add mirror for each array coordinate
-			List<BlockPos> arrayCoordinates = Array.findCoordinates(player, blockPos);
-			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));
-			}
-
-			//Adjust blockstates for torches and ladders etc to place on a valid side
-			//TODO optimize findCoordinates (done twice now)
-			//TODO fix mirror
 //            List<BlockPos> coordinates = findCoordinates(player, startPos);
 //            for (int i = 0; i < blockStates.size(); i++) {
 //                blockStates.set(i, blockStates.get(i).getBlock().getStateForPlacement(player.world, coordinates.get(i), facing,
 //                        (float) hitVec.x, (float) hitVec.y, (float) hitVec.z, itemStacks.get(i).getMetadata(), player, EnumHand.MAIN_HAND));
 //            }
-		}
+        }
 
-		return blockStates;
+        return blockStates;
-	}
+    }
 
-	public static boolean isEnabled(ModifierSettingsManager.ModifierSettings modifierSettings, BlockPos startPos) {
+    public static boolean isEnabled(ModifierSettingsManager.ModifierSettings modifierSettings, BlockPos startPos) {
-		return Mirror.isEnabled(modifierSettings.getMirrorSettings(), startPos) ||
+        return Mirror.isEnabled(modifierSettings.getMirrorSettings(), startPos) ||
-			Array.isEnabled(modifierSettings.getArraySettings()) ||
+               Array.isEnabled(modifierSettings.getArraySettings()) ||
-			RadialMirror.isEnabled(modifierSettings.getRadialMirrorSettings(), startPos) ||
+               RadialMirror.isEnabled(modifierSettings.getRadialMirrorSettings(), startPos) ||
-			modifierSettings.doQuickReplace();
+               modifierSettings.doQuickReplace();
-	}
+    }
 
-	public static BlockState getBlockStateFromItem(ItemStack itemStack, Player player, BlockPos blockPos, Direction facing, Vec3 hitVec, InteractionHand hand) {
+    public static IBlockState getBlockStateFromItem(ItemStack itemStack, EntityPlayer player, BlockPos blockPos, EnumFacing facing, Vec3d hitVec, EnumHand hand) {
-		return Block.byItem(itemStack.getItem()).getStateForPlacement(new BlockPlaceContext(new UseOnContext(player, hand, new BlockHitResult(hitVec, facing, blockPos, false))));
+        return Block.getBlockFromItem(itemStack.getItem()).getStateForPlacement(new BlockItemUseContext(player.world, player, itemStack, blockPos, facing,
-	}
+                ((float) hitVec.x), ((float) hitVec.y), ((float) hitVec.z)));
+    }
 
-	//Returns true if equal (or both null)
+    //Returns true if equal (or both null)
-	public static boolean compareCoordinates(List<BlockPos> coordinates1, List<BlockPos> coordinates2) {
+    public static boolean compareCoordinates(List<BlockPos> coordinates1, List<BlockPos> coordinates2) {
-		if (coordinates1 == null && coordinates2 == null) return true;
+        if (coordinates1 == null && coordinates2 == null) return true;
-		if (coordinates1 == null || coordinates2 == null) return false;
+        if (coordinates1 == null || coordinates2 == null) return false;
 
-		//Check count, not actual values
+        //Check count, not actual values
-		if (coordinates1.size() == coordinates2.size()) {
+        if (coordinates1.size() == coordinates2.size()){
-			if (coordinates1.size() == 1) {
+            if (coordinates1.size() == 1){
-				return coordinates1.get(0).equals(coordinates2.get(0));
+                return coordinates1.get(0).equals(coordinates2.get(0));
-			}
+            }
-			return true;
+            return true;
-		} else {
+        } else {
-			return false;
+            return false;
-		}
+        }
 
 //        return coordinates1.equals(coordinates2);
-	}
+    }
 }

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

@@ -1,234 +1,228 @@
 package nl.requios.effortlessbuilding.buildmodifier;
 
-import net.minecraft.world.entity.player.Player;
+import net.minecraft.block.BlockDirectional;
-import net.minecraft.world.item.ItemStack;
+import net.minecraft.block.BlockDispenser;
-import net.minecraft.world.level.block.state.properties.Half;
+import net.minecraft.block.BlockSlab;
-import net.minecraft.world.level.block.state.properties.SlabType;
+import net.minecraft.block.BlockStairs;
-import net.minecraft.core.Direction;
+import net.minecraft.block.state.IBlockState;
-import net.minecraft.world.InteractionHand;
+import net.minecraft.entity.player.EntityPlayer;
-import net.minecraft.core.BlockPos;
+import net.minecraft.item.ItemStack;
-import net.minecraft.world.phys.Vec3;
+import net.minecraft.state.properties.Half;
+import net.minecraft.state.properties.SlabType;
+import net.minecraft.util.EnumFacing;
+import net.minecraft.util.EnumHand;
+import net.minecraft.util.math.BlockPos;
+import net.minecraft.util.math.Vec3d;
 import net.minecraftforge.items.IItemHandler;
-import nl.requios.effortlessbuilding.item.AbstractRandomizerBagItem;
+import nl.requios.effortlessbuilding.item.ItemRandomizerBag;
 
 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 class MirrorSettings {
-		List<BlockPos> coordinates = new ArrayList<>();
+        public boolean enabled = false;
+        public Vec3d position = new Vec3d(0.5, 64.5, 0.5);
+        public boolean mirrorX = true, mirrorY = false, mirrorZ = false;
+        public int radius = 10;
+        public boolean drawLines = true, drawPlanes = true;
 
-		//find mirrorsettings for the player
+        public MirrorSettings() {
-		MirrorSettings m = ModifierSettingsManager.getModifierSettings(player).getMirrorSettings();
+        }
-		if (!isEnabled(m, startPos)) return coordinates;
 
-		if (m.mirrorX) coordinateMirrorX(m, startPos, coordinates);
+        public MirrorSettings(boolean mirrorEnabled, Vec3d position, boolean mirrorX, boolean mirrorY, boolean mirrorZ, int radius, boolean drawLines, boolean drawPlanes) {
-		if (m.mirrorY) coordinateMirrorY(m, startPos, coordinates);
+            this.enabled = mirrorEnabled;
-		if (m.mirrorZ) coordinateMirrorZ(m, startPos, coordinates);
+            this.position = position;
+            this.mirrorX = mirrorX;
+            this.mirrorY = mirrorY;
+            this.mirrorZ = mirrorZ;
+            this.radius = radius;
+            this.drawLines = drawLines;
+            this.drawPlanes = drawPlanes;
+        }
 
-		return coordinates;
+        public int getReach() {
-	}
+            return radius * 2; //Change ModifierSettings#setReachUpgrade too
+        }
+    }
     
-	private static void coordinateMirrorX(MirrorSettings m, BlockPos oldBlockPos, List<BlockPos> coordinates) {
+    public static List<BlockPos> findCoordinates(EntityPlayer player, BlockPos startPos) {
-		//find mirror position
+        List<BlockPos> coordinates = new ArrayList<>();
-		double x = m.position.x + (m.position.x - oldBlockPos.getX() - 0.5);
-		BlockPos newBlockPos = new BlockPos(x, oldBlockPos.getY(), oldBlockPos.getZ());
-		coordinates.add(newBlockPos);
 
-		if (m.mirrorY) coordinateMirrorY(m, newBlockPos, coordinates);
+        //find mirrorsettings for the player
-		if (m.mirrorZ) coordinateMirrorZ(m, newBlockPos, coordinates);
+        MirrorSettings m = ModifierSettingsManager.getModifierSettings(player).getMirrorSettings();
-	}
+        if (!isEnabled(m, startPos)) return coordinates;
 
-	private static void coordinateMirrorY(MirrorSettings m, BlockPos oldBlockPos, List<BlockPos> coordinates) {
+        if (m.mirrorX) coordinateMirrorX(m, startPos, coordinates);
-		//find mirror position
+        if (m.mirrorY) coordinateMirrorY(m, startPos, coordinates);
-		double y = m.position.y + (m.position.y - oldBlockPos.getY() - 0.5);
+        if (m.mirrorZ) coordinateMirrorZ(m, startPos, coordinates);
-		BlockPos newBlockPos = new BlockPos(oldBlockPos.getX(), y, oldBlockPos.getZ());
-		coordinates.add(newBlockPos);
 
-		if (m.mirrorZ) coordinateMirrorZ(m, newBlockPos, coordinates);
+        return coordinates;
-	}
+    }
 
-	private static void coordinateMirrorZ(MirrorSettings m, BlockPos oldBlockPos, List<BlockPos> coordinates) {
+    private static void coordinateMirrorX(MirrorSettings m, BlockPos oldBlockPos, List<BlockPos> coordinates) {
-		//find mirror position
+        //find mirror position
-		double z = m.position.z + (m.position.z - oldBlockPos.getZ() - 0.5);
+        double x = m.position.x + (m.position.x - oldBlockPos.getX() - 0.5);
-		BlockPos newBlockPos = new BlockPos(oldBlockPos.getX(), oldBlockPos.getY(), z);
+        BlockPos newBlockPos = new BlockPos(x, oldBlockPos.getY(), oldBlockPos.getZ());
-		coordinates.add(newBlockPos);
+        coordinates.add(newBlockPos);
-	}
 
-	public static List<BlockState> findBlockStates(Player player, BlockPos startPos, BlockState blockState, ItemStack itemStack, List<ItemStack> itemStacks) {
+        if (m.mirrorY) coordinateMirrorY(m, newBlockPos, coordinates);
-		List<BlockState> blockStates = new ArrayList<>();
+        if (m.mirrorZ) coordinateMirrorZ(m, newBlockPos, coordinates);
+    }
 
-		//find mirrorsettings for the player
+    private static void coordinateMirrorY(MirrorSettings m, BlockPos oldBlockPos, List<BlockPos> coordinates) {
-		MirrorSettings m = ModifierSettingsManager.getModifierSettings(player).getMirrorSettings();
+        //find mirror position
-		if (!isEnabled(m, startPos)) return blockStates;
+        double y = m.position.y + (m.position.y - oldBlockPos.getY() - 0.5);
+        BlockPos newBlockPos = new BlockPos(oldBlockPos.getX(), y, oldBlockPos.getZ());
+        coordinates.add(newBlockPos);
 
-		//Randomizer bag synergy
+        if (m.mirrorZ) coordinateMirrorZ(m, newBlockPos, coordinates);
-		AbstractRandomizerBagItem randomizerBagItem = null;
+    }
-		IItemHandler bagInventory = null;
-		if (!itemStack.isEmpty() && itemStack.getItem() instanceof AbstractRandomizerBagItem) {
-			randomizerBagItem = (AbstractRandomizerBagItem) itemStack.getItem() ;
-			bagInventory = randomizerBagItem.getBagInventory(itemStack);
-		}
 
-		if (m.mirrorX)
+    private static void coordinateMirrorZ(MirrorSettings m, BlockPos oldBlockPos, List<BlockPos> coordinates) {
-			blockStateMirrorX(player, m, startPos, blockState, bagInventory, itemStack, InteractionHand.MAIN_HAND, blockStates, itemStacks);
+        //find mirror position
-		if (m.mirrorY)
+        double z = m.position.z + (m.position.z - oldBlockPos.getZ() - 0.5);
-			blockStateMirrorY(player, m, startPos, blockState, bagInventory, itemStack, InteractionHand.MAIN_HAND, blockStates, itemStacks);
+        BlockPos newBlockPos = new BlockPos(oldBlockPos.getX(), oldBlockPos.getY(), z);
-		if (m.mirrorZ)
+        coordinates.add(newBlockPos);
-			blockStateMirrorZ(player, m, startPos, blockState, bagInventory, itemStack, InteractionHand.MAIN_HAND, blockStates, itemStacks);
+    }
 
-		return blockStates;
+    public static List<IBlockState> findBlockStates(EntityPlayer player, BlockPos startPos, IBlockState blockState, ItemStack itemStack, List<ItemStack> itemStacks) {
-	}
+        List<IBlockState> blockStates = new ArrayList<>();
 
-	private static void blockStateMirrorX(Player player, MirrorSettings m, BlockPos oldBlockPos, BlockState oldBlockState,
+        //find mirrorsettings for the player
-										  IItemHandler bagInventory, ItemStack itemStack, InteractionHand hand, List<BlockState> blockStates, List<ItemStack> itemStacks) {
+        MirrorSettings m = ModifierSettingsManager.getModifierSettings(player).getMirrorSettings();
-		//find mirror position
+        if (!isEnabled(m, startPos)) return blockStates;
-		double x = m.position.x + (m.position.x - oldBlockPos.getX() - 0.5);
-		BlockPos newBlockPos = new BlockPos(x, oldBlockPos.getY(), oldBlockPos.getZ());
 
-		//Randomizer bag synergy
+        //Randomizer bag synergy
-		if (bagInventory != null) {
+        IItemHandler bagInventory = null;
-			itemStack = ((AbstractRandomizerBagItem)itemStack.getItem()).pickRandomStack(bagInventory);
+        if (!itemStack.isEmpty() && itemStack.getItem() instanceof ItemRandomizerBag) {
-			oldBlockState = BuildModifiers.getBlockStateFromItem(itemStack, player, oldBlockPos, Direction.UP, new Vec3(0, 0, 0), hand);
+            bagInventory = ItemRandomizerBag.getBagInventory(itemStack);
-		}
+        }
 
-		//Find blockstate
+        if (m.mirrorX) blockStateMirrorX(player, m, startPos, blockState, bagInventory, itemStack, EnumHand.MAIN_HAND, blockStates, itemStacks);
-		BlockState newBlockState = oldBlockState == null ? null : oldBlockState.mirror(net.minecraft.world.level.block.Mirror.FRONT_BACK);
+        if (m.mirrorY) blockStateMirrorY(player, m, startPos, blockState, bagInventory, itemStack, EnumHand.MAIN_HAND, blockStates, itemStacks);
+        if (m.mirrorZ) blockStateMirrorZ(player, m, startPos, blockState, bagInventory, itemStack, EnumHand.MAIN_HAND, blockStates, itemStacks);
 
-		//Store blockstate and itemstack
+        return blockStates;
-		blockStates.add(newBlockState);
+    }
-		itemStacks.add(itemStack);
 
-		if (m.mirrorY)
+    private static void blockStateMirrorX(EntityPlayer player, MirrorSettings m, BlockPos oldBlockPos, IBlockState oldBlockState,
-			blockStateMirrorY(player, m, newBlockPos, newBlockState, bagInventory, itemStack, hand, blockStates, itemStacks);
+                                          IItemHandler bagInventory, ItemStack itemStack, EnumHand hand, List<IBlockState> blockStates, List<ItemStack> itemStacks) {
-		if (m.mirrorZ)
+        //find mirror position
-			blockStateMirrorZ(player, m, newBlockPos, newBlockState, bagInventory, itemStack, hand, blockStates, itemStacks);
+        double x = m.position.x + (m.position.x - oldBlockPos.getX() - 0.5);
-	}
+        BlockPos newBlockPos = new BlockPos(x, oldBlockPos.getY(), oldBlockPos.getZ());
 
-	private static void blockStateMirrorY(Player player, MirrorSettings m, BlockPos oldBlockPos, BlockState oldBlockState,
+        //Randomizer bag synergy
-										  IItemHandler bagInventory, ItemStack itemStack, InteractionHand hand, List<BlockState> blockStates, List<ItemStack> itemStacks) {
+        if (bagInventory != null) {
-		//find mirror position
+            itemStack = ItemRandomizerBag.pickRandomStack(bagInventory);
-		double y = m.position.y + (m.position.y - oldBlockPos.getY() - 0.5);
+            oldBlockState = BuildModifiers.getBlockStateFromItem(itemStack, player, oldBlockPos, EnumFacing.UP, new Vec3d(0, 0, 0), hand);
-		BlockPos newBlockPos = new BlockPos(oldBlockPos.getX(), y, oldBlockPos.getZ());
+        }
 
-		//Randomizer bag synergy
+        //Find blockstate
-		if (bagInventory != null) {
+        IBlockState newBlockState = oldBlockState == null ? null : oldBlockState.mirror(net.minecraft.util.Mirror.FRONT_BACK);
-			itemStack = ((AbstractRandomizerBagItem)itemStack.getItem()).pickRandomStack(bagInventory);
-			oldBlockState = BuildModifiers.getBlockStateFromItem(itemStack, player, oldBlockPos, Direction.UP, new Vec3(0, 0, 0), hand);
-		}
 
-		//Find blockstate
+        //Store blockstate and itemstack
-		BlockState newBlockState = oldBlockState == null ? null : getVerticalMirror(oldBlockState);
+        blockStates.add(newBlockState);
+        itemStacks.add(itemStack);
 
-		//Store blockstate and itemstack
+        if (m.mirrorY) blockStateMirrorY(player, m, newBlockPos, newBlockState, bagInventory, itemStack, hand, blockStates, itemStacks);
-		blockStates.add(newBlockState);
+        if (m.mirrorZ) blockStateMirrorZ(player, m, newBlockPos, newBlockState, bagInventory, itemStack, hand, blockStates, itemStacks);
-		itemStacks.add(itemStack);
+    }
 
-		if (m.mirrorZ)
+    private static void blockStateMirrorY(EntityPlayer player, MirrorSettings m, BlockPos oldBlockPos, IBlockState oldBlockState,
-			blockStateMirrorZ(player, m, newBlockPos, newBlockState, bagInventory, itemStack, hand, blockStates, itemStacks);
+                                          IItemHandler bagInventory, ItemStack itemStack, EnumHand hand, List<IBlockState> 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());
 
-	private static void blockStateMirrorZ(Player player, MirrorSettings m, BlockPos oldBlockPos, BlockState oldBlockState,
+        //Randomizer bag synergy
-										  IItemHandler bagInventory, ItemStack itemStack, InteractionHand hand, List<BlockState> blockStates, List<ItemStack> itemStacks) {
+        if (bagInventory != null) {
-		//find mirror position
+            itemStack = ItemRandomizerBag.pickRandomStack(bagInventory);
-		double z = m.position.z + (m.position.z - oldBlockPos.getZ() - 0.5);
+            oldBlockState = BuildModifiers.getBlockStateFromItem(itemStack, player, oldBlockPos, EnumFacing.UP, new Vec3d(0, 0, 0), hand);
-		BlockPos newBlockPos = new BlockPos(oldBlockPos.getX(), oldBlockPos.getY(), z);
+        }
 
-		//Randomizer bag synergy
+        //Find blockstate
-		if (bagInventory != null) {
+        IBlockState newBlockState = oldBlockState == null ? null : getVerticalMirror(oldBlockState);
-			itemStack = ((AbstractRandomizerBagItem)itemStack.getItem()).pickRandomStack(bagInventory);
-			oldBlockState = BuildModifiers.getBlockStateFromItem(itemStack, player, oldBlockPos, Direction.UP, new Vec3(0, 0, 0), hand);
-		}
 
-		//Find blockstate
+        //Store blockstate and itemstack
-		BlockState newBlockState = oldBlockState == null ? null : oldBlockState.mirror(net.minecraft.world.level.block.Mirror.LEFT_RIGHT);
+        blockStates.add(newBlockState);
+        itemStacks.add(itemStack);
 
-		//Store blockstate and itemstack
+        if (m.mirrorZ) blockStateMirrorZ(player, m, newBlockPos, newBlockState, bagInventory, itemStack, hand, blockStates, itemStacks);
-		blockStates.add(newBlockState);
+    }
-		itemStacks.add(itemStack);
-	}
 
-	public static boolean isEnabled(MirrorSettings m, BlockPos startPos) {
+    private static void blockStateMirrorZ(EntityPlayer player, MirrorSettings m, BlockPos oldBlockPos, IBlockState oldBlockState,
-		if (m == null || !m.enabled || (!m.mirrorX && !m.mirrorY && !m.mirrorZ)) return false;
+                                          IItemHandler bagInventory, ItemStack itemStack, EnumHand hand, List<IBlockState> 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);
 
-		//within mirror distance
+        //Randomizer bag synergy
-		return !(startPos.getX() + 0.5 < m.position.x - m.radius) && !(startPos.getX() + 0.5 > m.position.x + m.radius) &&
+        if (bagInventory != null) {
-			!(startPos.getY() + 0.5 < m.position.y - m.radius) && !(startPos.getY() + 0.5 > m.position.y + m.radius) &&
+            itemStack = ItemRandomizerBag.pickRandomStack(bagInventory);
-			!(startPos.getZ() + 0.5 < m.position.z - m.radius) && !(startPos.getZ() + 0.5 > m.position.z + m.radius);
+            oldBlockState = BuildModifiers.getBlockStateFromItem(itemStack, player, oldBlockPos, EnumFacing.UP, new Vec3d(0, 0, 0), hand);
-	}
+        }
 
-	private static BlockState getVerticalMirror(BlockState blockState) {
+        //Find blockstate
-		//Stairs
+        IBlockState newBlockState = oldBlockState == null ? null : oldBlockState.mirror(net.minecraft.util.Mirror.LEFT_RIGHT);
-		if (blockState.getBlock() instanceof StairBlock) {
-			if (blockState.getValue(StairBlock.HALF) == Half.BOTTOM) {
-				return blockState.setValue(StairBlock.HALF, Half.TOP);
-			} else {
-				return blockState.setValue(StairBlock.HALF, Half.BOTTOM);
-			}
-		}
 
-		//Slabs
+        //Store blockstate and itemstack
-		if (blockState.getBlock() instanceof SlabBlock) {
+        blockStates.add(newBlockState);
-			if (blockState.getValue(SlabBlock.TYPE) == SlabType.DOUBLE) {
+        itemStacks.add(itemStack);
-				return blockState;
+    }
-			} else if (blockState.getValue(SlabBlock.TYPE) == SlabType.BOTTOM) {
-				return blockState.setValue(SlabBlock.TYPE, SlabType.TOP);
-			} else {
-				return blockState.setValue(SlabBlock.TYPE, SlabType.BOTTOM);
-			}
-		}
 
-		//Buttons, endrod, observer, piston
+    public static boolean isEnabled(MirrorSettings m, BlockPos startPos) {
-		if (blockState.getBlock() instanceof DirectionalBlock) {
+        if (m == null || !m.enabled || (!m.mirrorX && !m.mirrorY && !m.mirrorZ)) return false;
-			if (blockState.getValue(DirectionalBlock.FACING) == Direction.DOWN) {
-				return blockState.setValue(DirectionalBlock.FACING, Direction.UP);
-			} else if (blockState.getValue(DirectionalBlock.FACING) == Direction.UP) {
-				return blockState.setValue(DirectionalBlock.FACING, Direction.DOWN);
-			}
-		}
 
-		//Dispenser, dropper
+        //within mirror distance
-		if (blockState.getBlock() instanceof DispenserBlock) {
+        if (startPos.getX() + 0.5 < m.position.x - m.radius || startPos.getX() + 0.5 > m.position.x + m.radius ||
-			if (blockState.getValue(DispenserBlock.FACING) == Direction.DOWN) {
+            startPos.getY() + 0.5 < m.position.y - m.radius || startPos.getY() + 0.5 > m.position.y + m.radius ||
-				return blockState.setValue(DispenserBlock.FACING, Direction.UP);
+            startPos.getZ() + 0.5 < m.position.z - m.radius || startPos.getZ() + 0.5 > m.position.z + m.radius)
-			} else if (blockState.getValue(DispenserBlock.FACING) == Direction.UP) {
+            return false;
-				return blockState.setValue(DispenserBlock.FACING, Direction.DOWN);
-			}
-		}
 
-		return blockState;
+        return true;
-	}
+    }
 
-	public static class MirrorSettings {
+    private static IBlockState getVerticalMirror(IBlockState blockState) {
-		public boolean enabled = false;
+        //Stairs
-		public Vec3 position = new Vec3(0.5, 64.5, 0.5);
+        if (blockState.getBlock() instanceof BlockStairs) {
-		public boolean mirrorX = true, mirrorY = false, mirrorZ = false;
+            if (blockState.get(BlockStairs.HALF) == Half.BOTTOM) {
-		public int radius = 10;
+                return blockState.with(BlockStairs.HALF, Half.TOP);
-		public boolean drawLines = true, drawPlanes = true;
+            } else {
+                return blockState.with(BlockStairs.HALF, Half.BOTTOM);
+            }
+        }
 
-		public MirrorSettings() {
+        //Slabs
-		}
+        if (blockState.getBlock() instanceof BlockSlab) {
+            if (blockState.get(BlockSlab.TYPE) == SlabType.DOUBLE) {
+                return blockState;
+            } else if (blockState.get(BlockSlab.TYPE) == SlabType.BOTTOM) {
+                return blockState.with(BlockSlab.TYPE, SlabType.TOP);
+            } else {
+                return blockState.with(BlockSlab.TYPE, SlabType.BOTTOM);
+            }
+        }
 
-		public MirrorSettings(boolean mirrorEnabled, Vec3 position, boolean mirrorX, boolean mirrorY, boolean mirrorZ, int radius, boolean drawLines, boolean drawPlanes) {
+        //Buttons, endrod, observer, piston
-			this.enabled = mirrorEnabled;
+        if (blockState.getBlock() instanceof BlockDirectional) {
-			this.position = position;
+            if (blockState.get(BlockDirectional.FACING) == EnumFacing.DOWN) {
-			this.mirrorX = mirrorX;
+                return blockState.with(BlockDirectional.FACING, EnumFacing.UP);
-			this.mirrorY = mirrorY;
+            } else if (blockState.get(BlockDirectional.FACING) == EnumFacing.UP) {
-			this.mirrorZ = mirrorZ;
+                return blockState.with(BlockDirectional.FACING, EnumFacing.DOWN);
-			this.radius = radius;
+            }
-			this.drawLines = drawLines;
+        }
-			this.drawPlanes = drawPlanes;
-		}
 
-		public int getReach() {
+        //Dispenser, dropper
-			return radius * 2; //Change ModifierSettings#setReachUpgrade too
+        if (blockState.getBlock() instanceof BlockDispenser) {
-		}
+            if (blockState.get(BlockDispenser.FACING) == EnumFacing.DOWN) {
-	}
+                return blockState.with(BlockDispenser.FACING, EnumFacing.UP);
+            } else if (blockState.get(BlockDispenser.FACING) == EnumFacing.UP) {
+                return blockState.with(BlockDispenser.FACING, EnumFacing.DOWN);
+            }
+        }
+
+        return blockState;
+    }
 }

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

@@ -1,10 +1,10 @@
 package nl.requios.effortlessbuilding.buildmodifier;
 
-import net.minecraft.world.entity.player.Player;
+import net.minecraft.entity.player.EntityPlayer;
-import net.minecraft.server.level.ServerPlayer;
+import net.minecraft.entity.player.EntityPlayerMP;
 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.BuildConfig;
 import nl.requios.effortlessbuilding.EffortlessBuilding;
 import nl.requios.effortlessbuilding.capability.ModifierCapabilityManager;
@@ -13,203 +13,197 @@ import nl.requios.effortlessbuilding.network.ModifierSettingsMessage;
 import nl.requios.effortlessbuilding.network.PacketHandler;
 
 import javax.annotation.Nonnull;
+import java.util.HashMap;
+import java.util.UUID;
 
 @Mod.EventBusSubscriber
 public class ModifierSettingsManager {
 
-	//Retrieves the buildsettings of a player through the modifierCapability capability
+    //Retrieves the buildsettings of a player through the modifierCapability capability
-	//Never returns null
+    //Never returns null
-	@Nonnull
+    @Nonnull
-	public static ModifierSettings getModifierSettings(Player player) {
+    public static ModifierSettings getModifierSettings(EntityPlayer player){
+        LazyOptional<ModifierCapabilityManager.IModifierCapability> modifierCapability =
+                player.getCapability(ModifierCapabilityManager.modifierCapability, null);
 
-		LazyOptional<ModifierCapabilityManager.IModifierCapability> modifierCapability =
+        if (modifierCapability.isPresent()) {
-			player.getCapability(ModifierCapabilityManager.MODIFIER_CAPABILITY, null);
+            ModifierCapabilityManager.IModifierCapability capability = modifierCapability.orElse(null);
+            if (capability.getModifierData() == null) {
+                capability.setModifierData(new ModifierSettings());
+            }
+            return capability.getModifierData();
+        }
 
-		if (modifierCapability.isPresent()) {
+        //Player does not have modifierCapability capability
-			ModifierCapabilityManager.IModifierCapability capability = modifierCapability.orElse(null);
+        //Return dummy settings
-			if (capability.getModifierData() == null){
+        return new ModifierSettings();
-				capability.setModifierData(new ModifierSettings());
+//        throw new IllegalArgumentException("Player does not have modifierCapability capability");
-			}
+    }
-			return capability.getModifierData();
-		}
 
-//		EffortlessBuilding.logger.warn("Player does not have modifierCapability: " + player);
+    public static void setModifierSettings(EntityPlayer player, ModifierSettings modifierSettings) {
-		//Return dummy settings
+        if (player == null) {
-		return new ModifierSettings();
+            EffortlessBuilding.log("Cannot set buildsettings, player is null");
-	}
+            return;
+        }
 
-	public static void setModifierSettings(Player player, ModifierSettings modifierSettings) {
+        LazyOptional<ModifierCapabilityManager.IModifierCapability> modifierCapability =
-		if (player == null) {
+                player.getCapability(ModifierCapabilityManager.modifierCapability, null);
-			EffortlessBuilding.log("Cannot set buildsettings, player is null");
-			return;
-		}
 
-		LazyOptional<ModifierCapabilityManager.IModifierCapability> modifierCapability =
+        modifierCapability.ifPresent((capability) -> {
-			player.getCapability(ModifierCapabilityManager.MODIFIER_CAPABILITY, null);
+            capability.setModifierData(modifierSettings);
+        });
 
-		modifierCapability.ifPresent((capability) -> {
+        if (!modifierCapability.isPresent()) {
-			capability.setModifierData(modifierSettings);
+            EffortlessBuilding.log(player, "Saving buildsettings failed.");
-		});
+        }
+    }
 
-		if (!modifierCapability.isPresent()) {
+    public static String sanitize(ModifierSettings modifierSettings, EntityPlayer player) {
-			EffortlessBuilding.log(player, "Saving buildsettings failed.");
+        int maxReach = ReachHelper.getMaxReach(player);
-		}
+        String error = "";
-	}
 
-	public static String sanitize(ModifierSettings modifierSettings, Player player) {
+        //Mirror settings
-		int maxReach = ReachHelper.getMaxReach(player);
+        Mirror.MirrorSettings m = modifierSettings.getMirrorSettings();
-		String error = "";
+        if (m.radius < 1) {
+            m.radius = 1;
+            error += "Mirror size has to be at least 1. This has been corrected. ";
+        }
+        if (m.getReach() > maxReach) {
+            m.radius = maxReach / 2;
+            error += "Mirror exceeds your maximum reach of " + (maxReach / 2) + ". Radius has been set to "+ (maxReach / 2) + ". ";
+        }
 
-		//Mirror settings
+        //Array settings
-		Mirror.MirrorSettings m = modifierSettings.getMirrorSettings();
+        Array.ArraySettings a = modifierSettings.getArraySettings();
-		if (m.radius < 1) {
+        if (a.count < 0) {
-			m.radius = 1;
+            a.count = 0;
-			error += "Mirror size has to be at least 1. This has been corrected. ";
+            error += "Array count may not be negative. It has been reset to 0.";
-		}
+        }
-		if (m.getReach() > maxReach) {
-			m.radius = maxReach / 2;
-			error += "Mirror exceeds your maximum reach of " + (maxReach / 2) + ". Radius has been set to " + (maxReach / 2) + ". ";
-		}
 
-		//Array settings
+        if (a.getReach() > maxReach) {
-		Array.ArraySettings a = modifierSettings.getArraySettings();
+            a.count = 0;
-		if (a.count < 0) {
+            error += "Array exceeds your maximum reach of " + maxReach + ". Array count has been reset to 0. ";
-			a.count = 0;
+        }
-			error += "Array count may not be negative. It has been reset to 0.";
-		}
 
-		if (a.getReach() > maxReach) {
+        //Radial mirror settings
-			a.count = 0;
+        RadialMirror.RadialMirrorSettings r = modifierSettings.getRadialMirrorSettings();
-			error += "Array exceeds your maximum reach of " + maxReach + ". Array count has been reset to 0. ";
+        if (r.slices < 2) {
-		}
+            r.slices = 2;
+            error += "Radial mirror needs to have at least 2 slices. Slices has been set to 2.";
+        }
 
-		//Radial mirror settings
+        if (r.radius < 1) {
-		RadialMirror.RadialMirrorSettings r = modifierSettings.getRadialMirrorSettings();
+            r.radius = 1;
-		if (r.slices < 2) {
+            error += "Radial mirror radius has to be at least 1. This has been corrected. ";
-			r.slices = 2;
+        }
-			error += "Radial mirror needs to have at least 2 slices. Slices has been set to 2.";
+        if (r.getReach() > maxReach) {
-		}
+            r.radius = maxReach / 2;
+            error += "Radial mirror exceeds your maximum reach of " + (maxReach / 2) + ". Radius has been set to "+ (maxReach / 2) + ". ";
+        }
 
-		if (r.radius < 1) {
+        //Other
-			r.radius = 1;
+        if (modifierSettings.reachUpgrade < 0) {
-			error += "Radial mirror radius has to be at least 1. This has been corrected. ";
+            modifierSettings.reachUpgrade = 0;
-		}
+        }
-		if (r.getReach() > maxReach) {
+        if (modifierSettings.reachUpgrade > 3) {
-			r.radius = maxReach / 2;
+            modifierSettings.reachUpgrade = 3;
-			error += "Radial mirror exceeds your maximum reach of " + (maxReach / 2) + ". Radius has been set to " + (maxReach / 2) + ". ";
+        }
-		}
 
-		//Other
+        return error;
-		if (modifierSettings.reachUpgrade < 0) {
+    }
-			modifierSettings.reachUpgrade = 0;
-		}
-		if (modifierSettings.reachUpgrade > 3) {
-			modifierSettings.reachUpgrade = 3;
-		}
 
-		return error;
+    public static class ModifierSettings {
-	}
+        private Mirror.MirrorSettings mirrorSettings;
+        private Array.ArraySettings arraySettings;
+        private RadialMirror.RadialMirrorSettings radialMirrorSettings;
+        private boolean quickReplace = false;
+        private int reachUpgrade = 0;
 
-	public static void handleNewPlayer(Player player) {
+        public ModifierSettings() {
-		//Makes sure player has modifier settings (if it doesnt it will create it)
+            mirrorSettings = new Mirror.MirrorSettings();
-		getModifierSettings(player);
+            arraySettings = new Array.ArraySettings();
+            radialMirrorSettings = new RadialMirror.RadialMirrorSettings();
+        }
 
-		//Only on server
+        public ModifierSettings(Mirror.MirrorSettings mirrorSettings, Array.ArraySettings arraySettings,
-		if (!player.level.isClientSide) {
+                                RadialMirror.RadialMirrorSettings radialMirrorSettings, boolean quickReplace, int reachUpgrade) {
-			//Send to client
+            this.mirrorSettings = mirrorSettings;
-			ModifierSettingsMessage msg = new ModifierSettingsMessage(getModifierSettings(player));
+            this.arraySettings = arraySettings;
-			PacketHandler.INSTANCE.send(PacketDistributor.PLAYER.with(() -> (ServerPlayer) player), msg);
+            this.radialMirrorSettings = radialMirrorSettings;
-		}
+            this.quickReplace = quickReplace;
-	}
+            this.reachUpgrade = reachUpgrade;
+        }
 
-	public static class ModifierSettings {
+        public Mirror.MirrorSettings getMirrorSettings() {
-		private Mirror.MirrorSettings mirrorSettings;
+            if (this.mirrorSettings == null) this.mirrorSettings = new Mirror.MirrorSettings();
-		private Array.ArraySettings arraySettings;
+            return this.mirrorSettings;
-		private RadialMirror.RadialMirrorSettings radialMirrorSettings;
+        }
-		private boolean quickReplace = false;
-		private int reachUpgrade = 0;
 
-		public ModifierSettings() {
+        public void setMirrorSettings(Mirror.MirrorSettings mirrorSettings) {
-			mirrorSettings = new Mirror.MirrorSettings();
+            if (mirrorSettings == null) return;
-			arraySettings = new Array.ArraySettings();
+            this.mirrorSettings = mirrorSettings;
-			radialMirrorSettings = new RadialMirror.RadialMirrorSettings();
+        }
-		}
 
-		public ModifierSettings(Mirror.MirrorSettings mirrorSettings, Array.ArraySettings arraySettings,
+        public Array.ArraySettings getArraySettings() {
-								RadialMirror.RadialMirrorSettings radialMirrorSettings, boolean quickReplace, int reachUpgrade) {
+            if (this.arraySettings == null) this.arraySettings = new Array.ArraySettings();
-			this.mirrorSettings = mirrorSettings;
+            return this.arraySettings;
-			this.arraySettings = arraySettings;
+        }
-			this.radialMirrorSettings = radialMirrorSettings;
-			this.quickReplace = quickReplace;
-			this.reachUpgrade = reachUpgrade;
-		}
 
-		public Mirror.MirrorSettings getMirrorSettings() {
+        public void setArraySettings(Array.ArraySettings arraySettings) {
-			if (this.mirrorSettings == null) this.mirrorSettings = new Mirror.MirrorSettings();
+            if (arraySettings == null) return;
-			return this.mirrorSettings;
+            this.arraySettings = arraySettings;
-		}
+        }
 
-		public void setMirrorSettings(Mirror.MirrorSettings mirrorSettings) {
+        public RadialMirror.RadialMirrorSettings getRadialMirrorSettings() {
-			if (mirrorSettings == null) return;
+            if (this.radialMirrorSettings == null) this.radialMirrorSettings = new RadialMirror.RadialMirrorSettings();
-			this.mirrorSettings = mirrorSettings;
+            return this.radialMirrorSettings;
-		}
+        }
 
-		public Array.ArraySettings getArraySettings() {
+        public void setRadialMirrorSettings(RadialMirror.RadialMirrorSettings radialMirrorSettings) {
-			if (this.arraySettings == null) this.arraySettings = new Array.ArraySettings();
+            if (radialMirrorSettings == null) return;
-			return this.arraySettings;
+            this.radialMirrorSettings = radialMirrorSettings;
-		}
+        }
 
-		public void setArraySettings(Array.ArraySettings arraySettings) {
+        public boolean doQuickReplace() {
-			if (arraySettings == null) return;
+            return quickReplace;
-			this.arraySettings = arraySettings;
+        }
-		}
 
-		public RadialMirror.RadialMirrorSettings getRadialMirrorSettings() {
+        public void setQuickReplace(boolean quickReplace) {
-			if (this.radialMirrorSettings == null) this.radialMirrorSettings = new RadialMirror.RadialMirrorSettings();
+            this.quickReplace = quickReplace;
-			return this.radialMirrorSettings;
+        }
-		}
 
-		public void setRadialMirrorSettings(RadialMirror.RadialMirrorSettings radialMirrorSettings) {
+        public int getReachUpgrade() {
-			if (radialMirrorSettings == null) return;
+            return reachUpgrade;
-			this.radialMirrorSettings = radialMirrorSettings;
+        }
-		}
 
-		public boolean doQuickReplace() {
+        public void setReachUpgrade(int reachUpgrade) {
-			return quickReplace;
+            this.reachUpgrade = reachUpgrade;
-		}
+            //Set mirror radius to max
+            int reach = 10;
+            switch (reachUpgrade) {
+                case 0: reach = BuildConfig.reach.maxReachLevel0.get(); break;
+                case 1: reach =  BuildConfig.reach.maxReachLevel1.get(); break;
+                case 2: reach =  BuildConfig.reach.maxReachLevel2.get(); break;
+                case 3: reach =  BuildConfig.reach.maxReachLevel3.get(); break;
+            }
 
-		public void setQuickReplace(boolean quickReplace) {
+            if (this.mirrorSettings != null)
-			this.quickReplace = quickReplace;
+                this.mirrorSettings.radius = reach / 2;
-		}
+            if (this.radialMirrorSettings != null)
+                this.radialMirrorSettings.radius = reach / 2;
+        }
+    }
 
-		public int getReachUpgrade() {
+    public static void handleNewPlayer(EntityPlayer player){
-			return reachUpgrade;
+        //Makes sure player has modifier settings (if it doesnt it will create it)
-		}
+        getModifierSettings(player);
 
-		public void setReachUpgrade(int reachUpgrade) {
+        //Only on server
-			this.reachUpgrade = reachUpgrade;
+        if (!player.world.isRemote) {
-			//Set mirror radius to max
+            //Send to client
-			int reach = 10;
+            ModifierSettingsMessage msg = new ModifierSettingsMessage(getModifierSettings(player));
-			switch (reachUpgrade) {
+            PacketHandler.INSTANCE.send(PacketDistributor.PLAYER.with(() -> (EntityPlayerMP) player), msg);
-				case 0:
+        }
-					reach = BuildConfig.reach.maxReachLevel0.get();
+    }
-					break;
-				case 1:
-					reach = BuildConfig.reach.maxReachLevel1.get();
-					break;
-				case 2:
-					reach = BuildConfig.reach.maxReachLevel2.get();
-					break;
-				case 3:
-					reach = BuildConfig.reach.maxReachLevel3.get();
-					break;
-			}
-
-			if (this.mirrorSettings != null)
-				this.mirrorSettings.radius = reach / 2;
-			if (this.radialMirrorSettings != null)
-				this.radialMirrorSettings.radius = reach / 2;
-		}
-	}
 }
 

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

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

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

@@ -1,15 +1,15 @@
 package nl.requios.effortlessbuilding.buildmodifier;
 
-import net.minecraft.world.level.block.Block;
+import net.minecraft.block.Block;
-import net.minecraft.world.level.block.state.BlockState;
+import net.minecraft.block.state.IBlockState;
-import net.minecraft.world.level.block.Blocks;
+import net.minecraft.entity.player.EntityPlayer;
-import net.minecraft.world.entity.player.Player;
+import net.minecraft.init.Blocks;
-import net.minecraft.world.item.BlockItem;
+import net.minecraft.item.Item;
-import net.minecraft.world.item.ItemStack;
+import net.minecraft.item.ItemBlock;
-import net.minecraft.core.Direction;
+import net.minecraft.item.ItemStack;
-import net.minecraft.core.BlockPos;
+import net.minecraft.util.EnumFacing;
-import net.minecraft.world.phys.Vec3;
+import net.minecraft.util.math.BlockPos;
-import net.minecraft.server.level.ServerLevel;
+import net.minecraft.util.math.Vec3d;
 import nl.requios.effortlessbuilding.BuildConfig;
 import nl.requios.effortlessbuilding.EffortlessBuilding;
 import nl.requios.effortlessbuilding.helper.FixedStack;
@@ -21,26 +21,26 @@ import java.util.*;
 
 public class UndoRedo {
 
-	//Undo and redo stacks per player
+    //Undo and redo stacks per player
-	//Gets added to twice in singleplayer (server and client) if not careful. So separate stacks.
+    //Gets added to twice in singleplayer (server and client) if not careful. So separate stacks.
-	private static final Map<UUID, FixedStack<BlockSet>> undoStacksClient = new HashMap<>();
+    private static Map<UUID, FixedStack<BlockSet>> undoStacksClient = new HashMap<>();
-	private static final Map<UUID, FixedStack<BlockSet>> undoStacksServer = new HashMap<>();
+    private static Map<UUID, FixedStack<BlockSet>> undoStacksServer = new HashMap<>();
-	private static final Map<UUID, FixedStack<BlockSet>> redoStacksClient = new HashMap<>();
+    private static Map<UUID, FixedStack<BlockSet>> redoStacksClient = new HashMap<>();
-	private static final Map<UUID, FixedStack<BlockSet>> redoStacksServer = new HashMap<>();
+    private static Map<UUID, FixedStack<BlockSet>> redoStacksServer = new HashMap<>();
 
-	//add to undo stack
+    //add to undo stack
-	public static void addUndo(Player player, BlockSet blockSet) {
+    public static void addUndo(EntityPlayer player, BlockSet blockSet) {
-		Map<UUID, FixedStack<BlockSet>> undoStacks = player.level.isClientSide ? undoStacksClient : undoStacksServer;
+        Map<UUID, FixedStack<BlockSet>> undoStacks = player.world.isRemote ? undoStacksClient : undoStacksServer;
 
-		//Assert coordinates is as long as previous and new blockstate lists
+        //Assert coordinates is as long as previous and new blockstate lists
-		if (blockSet.getCoordinates().size() != blockSet.getPreviousBlockStates().size() ||
+        if (blockSet.getCoordinates().size() != blockSet.getPreviousBlockStates().size() ||
-			blockSet.getCoordinates().size() != blockSet.getNewBlockStates().size()) {
+                blockSet.getCoordinates().size() != blockSet.getNewBlockStates().size()) {
-			EffortlessBuilding.logger.error("Coordinates and blockstate lists are not equal length. Coordinates: {}. Previous blockstates: {}. New blockstates: {}.",
+            EffortlessBuilding.logger.error("Coordinates and blockstate lists are not equal length. Coordinates: {}. Previous blockstates: {}. New blockstates: {}.",
-				blockSet.getCoordinates().size(), blockSet.getPreviousBlockStates().size(), blockSet.getNewBlockStates().size());
+                    blockSet.getCoordinates().size(), blockSet.getPreviousBlockStates().size(), blockSet.getNewBlockStates().size());
-		}
+        }
 
-		//Warn if previous and new blockstate are equal
+        //Warn if previous and new blockstate are equal
-		//Can happen in a lot of valid cases
+        //Can happen in a lot of valid cases
 //        for (int i = 0; i < blockSet.getCoordinates().size(); i++) {
 //            if (blockSet.getPreviousBlockStates().get(i).equals(blockSet.getNewBlockStates().get(i))) {
 //                EffortlessBuilding.logger.warn("Previous and new blockstates are equal at index {}. Blockstate: {}.",
@@ -48,192 +48,182 @@ public class UndoRedo {
 //            }
 //        }
 
-		//If no stack exists, make one
+        //If no stack exists, make one
-		if (!undoStacks.containsKey(player.getUUID())) {
+        if (!undoStacks.containsKey(player.getUniqueID())) {
-			undoStacks.put(player.getUUID(), new FixedStack<>(new BlockSet[BuildConfig.survivalBalancers.undoStackSize.get()]));
+            undoStacks.put(player.getUniqueID(), new FixedStack<>(new BlockSet[BuildConfig.survivalBalancers.undoStackSize.get()]));
-		}
+        }
 
-		undoStacks.get(player.getUUID()).push(blockSet);
+        undoStacks.get(player.getUniqueID()).push(blockSet);
-	}
+    }
 
-	private static void addRedo(Player player, BlockSet blockSet) {
+    private static void addRedo(EntityPlayer player, BlockSet blockSet) {
-		Map<UUID, FixedStack<BlockSet>> redoStacks = player.level.isClientSide ? redoStacksClient : redoStacksServer;
+        Map<UUID, FixedStack<BlockSet>> redoStacks = player.world.isRemote ? redoStacksClient : redoStacksServer;
 
-		//(No asserts necessary, it's private)
+        //(No asserts necessary, it's private)
 
-		//If no stack exists, make one
+        //If no stack exists, make one
-		if (!redoStacks.containsKey(player.getUUID())) {
+        if (!redoStacks.containsKey(player.getUniqueID())) {
-			redoStacks.put(player.getUUID(), new FixedStack<>(new BlockSet[BuildConfig.survivalBalancers.undoStackSize.get()]));
+            redoStacks.put(player.getUniqueID(), new FixedStack<>(new BlockSet[BuildConfig.survivalBalancers.undoStackSize.get()]));
-		}
+        }
 
-		redoStacks.get(player.getUUID()).push(blockSet);
+        redoStacks.get(player.getUniqueID()).push(blockSet);
-	}
+    }
 
-	public static boolean undo(Player player) {
+    public static boolean undo(EntityPlayer player) {
-		Map<UUID, FixedStack<BlockSet>> undoStacks = player.level.isClientSide ? undoStacksClient : undoStacksServer;
+        Map<UUID, FixedStack<BlockSet>> undoStacks = player.world.isRemote ? undoStacksClient : undoStacksServer;
 
-		if (!undoStacks.containsKey(player.getUUID())) return false;
+        if (!undoStacks.containsKey(player.getUniqueID())) return false;
 
-		FixedStack<BlockSet> undoStack = undoStacks.get(player.getUUID());
+        FixedStack<BlockSet> undoStack = undoStacks.get(player.getUniqueID());
 
-		if (undoStack.isEmpty()) return false;
+        if (undoStack.isEmpty()) return false;
 
-		BlockSet blockSet = undoStack.pop();
+        BlockSet blockSet = undoStack.pop();
-		List<BlockPos> coordinates = blockSet.getCoordinates();
+        List<BlockPos> coordinates = blockSet.getCoordinates();
-		List<BlockState> previousBlockStates = blockSet.getPreviousBlockStates();
+        List<IBlockState> previousBlockStates = blockSet.getPreviousBlockStates();
-		List<BlockState> newBlockStates = blockSet.getNewBlockStates();
+        List<IBlockState> newBlockStates = blockSet.getNewBlockStates();
-		Vec3 hitVec = blockSet.getHitVec();
+        Vec3d hitVec = blockSet.getHitVec();
 
-		//Find up to date itemstacks in player inventory
+        //Find up to date itemstacks in player inventory
-		List<ItemStack> itemStacks = findItemStacksInInventory(player, previousBlockStates);
+        List<ItemStack> itemStacks = findItemStacksInInventory(player, previousBlockStates);
 
-		if (player.level.isClientSide) {
+        if (player.world.isRemote) {
-			BlockPreviewRenderer.onBlocksBroken(coordinates, itemStacks, newBlockStates, blockSet.getSecondPos(), blockSet.getFirstPos());
+            BlockPreviewRenderer.onBlocksBroken(coordinates, itemStacks, newBlockStates, blockSet.getSecondPos(), blockSet.getFirstPos());
-		} else {
+        } else {
-			//break all those blocks, reset to what they were
+            //break all those blocks, reset to what they were
-			for (int i = 0; i < coordinates.size(); i++) {
+            for (int i = 0; i < coordinates.size(); i++) {
-				BlockPos coordinate = coordinates.get(i);
+                BlockPos coordinate = coordinates.get(i);
-				ItemStack itemStack = itemStacks.get(i);
+                ItemStack itemStack = itemStacks.get(i);
 
-				if (previousBlockStates.get(i).equals(newBlockStates.get(i))) continue;
+                if (previousBlockStates.get(i).equals(newBlockStates.get(i))) continue;
 
-				//get blockstate from itemstack
+                //get blockstate from itemstack
-				BlockState previousBlockState = Blocks.AIR.defaultBlockState();
+                IBlockState previousBlockState = Blocks.AIR.getDefaultState();
-				if (itemStack.getItem() instanceof BlockItem) {
+                if (itemStack.getItem() instanceof ItemBlock) {
-					previousBlockState = ((BlockItem) itemStack.getItem()).getBlock().defaultBlockState();
+                    previousBlockState = previousBlockStates.get(i);//((ItemBlock) itemStack.getItem()).getBlock().getDefaultState();
-				}
+                }
 
-				if (player.level.isLoaded(coordinate)) {
+                if (player.world.isBlockLoaded(coordinate, true)) {
-					//check itemstack empty
+                    //check itemstack empty
-					if (itemStack.isEmpty()) {
+                    if (itemStack.isEmpty()) {
-						itemStack = findItemStackInInventory(player, previousBlockStates.get(i));
+                        itemStack = findItemStackInInventory(player, previousBlockStates.get(i));
-						//get blockstate from new itemstack
+                        //get blockstate from new itemstack
-						if (!itemStack.isEmpty() && itemStack.getItem() instanceof BlockItem) {
+                        if (!itemStack.isEmpty() && itemStack.getItem() instanceof ItemBlock) {
-							previousBlockState = ((BlockItem) itemStack.getItem()).getBlock().defaultBlockState();
+                            previousBlockState = previousBlockStates.get(i);//((ItemBlock) itemStack.getItem()).getBlock().getDefaultState();
-						} else {
+                        } else {
-							if (previousBlockStates.get(i).getBlock() != Blocks.AIR)
+                            previousBlockState = Blocks.AIR.getDefaultState();
-								EffortlessBuilding.logTranslate(player, "", previousBlockStates.get(i).getBlock().getDescriptionId(), " not found in inventory", true);
+                        }
-							previousBlockState = Blocks.AIR.defaultBlockState();
+                    }
-						}
+                    if (itemStack.isEmpty()) SurvivalHelper.breakBlock(player.world, player, coordinate, true);
-					}
+                    //if previousBlockState is air, placeBlock will set it to air
-					if (itemStack.isEmpty()) SurvivalHelper.breakBlock(player.level, player, coordinate, true);
+                    SurvivalHelper.placeBlock(player.world, player, coordinate, previousBlockState, itemStack, EnumFacing.UP, hitVec, true, false, false);
-					//if previousBlockState is air, placeBlock will set it to air
+                }
-					SurvivalHelper.placeBlock(player.level, player, coordinate, previousBlockState, itemStack, Direction.UP, hitVec, true, false, false);
+            }
-				}
+        }
-			}
-		}
 
-		//add to redo
+        //add to redo
-		addRedo(player, blockSet);
+        addRedo(player, blockSet);
 
-		return true;
+        return true;
-	}
+    }
 
-	public static boolean redo(Player player) {
+    public static boolean redo(EntityPlayer player) {
-		Map<UUID, FixedStack<BlockSet>> redoStacks = player.level.isClientSide ? redoStacksClient : redoStacksServer;
+        Map<UUID, FixedStack<BlockSet>> redoStacks = player.world.isRemote ? redoStacksClient : redoStacksServer;
 
-		if (!redoStacks.containsKey(player.getUUID())) return false;
+        if (!redoStacks.containsKey(player.getUniqueID())) return false;
 
-		FixedStack<BlockSet> redoStack = redoStacks.get(player.getUUID());
+        FixedStack<BlockSet> redoStack = redoStacks.get(player.getUniqueID());
 
-		if (redoStack.isEmpty()) return false;
+        if (redoStack.isEmpty()) return false;
 
-		BlockSet blockSet = redoStack.pop();
+        BlockSet blockSet = redoStack.pop();
-		List<BlockPos> coordinates = blockSet.getCoordinates();
+        List<BlockPos> coordinates = blockSet.getCoordinates();
-		List<BlockState> previousBlockStates = blockSet.getPreviousBlockStates();
+        List<IBlockState> previousBlockStates = blockSet.getPreviousBlockStates();
-		List<BlockState> newBlockStates = blockSet.getNewBlockStates();
+        List<IBlockState> newBlockStates = blockSet.getNewBlockStates();
-		Vec3 hitVec = blockSet.getHitVec();
+        Vec3d hitVec = blockSet.getHitVec();
 
-		//Find up to date itemstacks in player inventory
+        //Find up to date itemstacks in player inventory
-		List<ItemStack> itemStacks = findItemStacksInInventory(player, newBlockStates);
+        List<ItemStack> itemStacks = findItemStacksInInventory(player, newBlockStates);
 
-		if (player.level.isClientSide) {
+        if (player.world.isRemote) {
-			BlockPreviewRenderer.onBlocksPlaced(coordinates, itemStacks, newBlockStates, blockSet.getFirstPos(), blockSet.getSecondPos());
+            BlockPreviewRenderer.onBlocksPlaced(coordinates, itemStacks, newBlockStates, blockSet.getFirstPos(), blockSet.getSecondPos());
-		} else {
+        } else {
-			//place blocks
+            //place blocks
-			for (int i = 0; i < coordinates.size(); i++) {
+            for (int i = 0; i < coordinates.size(); i++) {
-				BlockPos coordinate = coordinates.get(i);
+                BlockPos coordinate = coordinates.get(i);
-				ItemStack itemStack = itemStacks.get(i);
+                ItemStack itemStack = itemStacks.get(i);
 
-				if (previousBlockStates.get(i).equals(newBlockStates.get(i))) continue;
+                if (previousBlockStates.get(i).equals(newBlockStates.get(i))) continue;
 
-				//get blockstate from itemstack
+                //get blockstate from itemstack
-				BlockState newBlockState = Blocks.AIR.defaultBlockState();
+                IBlockState newBlockState = Blocks.AIR.getDefaultState();
-				if (itemStack.getItem() instanceof BlockItem) {
+                if (itemStack.getItem() instanceof ItemBlock) {
-					newBlockState = ((BlockItem) itemStack.getItem()).getBlock().defaultBlockState();
+                    newBlockState = newBlockStates.get(i);//((ItemBlock) itemStack.getItem()).getBlock().getDefaultState();
-				}
+                }
 
-				if (player.level.isLoaded(coordinate)) {
+                if (player.world.isBlockLoaded(coordinate, true)) {
-					//check itemstack empty
+                    //check itemstack empty
-					if (itemStack.isEmpty()) {
+                    if (itemStack.isEmpty()) {
-						itemStack = findItemStackInInventory(player, newBlockStates.get(i));
+                        itemStack = findItemStackInInventory(player, newBlockStates.get(i));
-						//get blockstate from new itemstack
+                        //get blockstate from new itemstack
-						if (!itemStack.isEmpty() && itemStack.getItem() instanceof BlockItem) {
+                        if (!itemStack.isEmpty() && itemStack.getItem() instanceof ItemBlock) {
-							newBlockState = ((BlockItem) itemStack.getItem()).getBlock().defaultBlockState();
+                            newBlockState = newBlockStates.get(i);//((ItemBlock) itemStack.getItem()).getBlock().getDefaultState();
-						} else {
+                        } else {
-							if (newBlockStates.get(i).getBlock() != Blocks.AIR)
+                            newBlockState = Blocks.AIR.getDefaultState();
-								EffortlessBuilding.logTranslate(player, "", newBlockStates.get(i).getBlock().getDescriptionId(), " not found in inventory", true);
+                        }
-							newBlockState = Blocks.AIR.defaultBlockState();
+                    }
-						}
+                    if (itemStack.isEmpty()) SurvivalHelper.breakBlock(player.world, player, coordinate, true);
-					}
+                    SurvivalHelper.placeBlock(player.world, player, coordinate, newBlockState, itemStack, EnumFacing.UP, hitVec, true, false, false);
-					if (itemStack.isEmpty()) SurvivalHelper.breakBlock(player.level, player, coordinate, true);
+                }
-					SurvivalHelper.placeBlock(player.level, player, coordinate, newBlockState, itemStack, Direction.UP, hitVec, true, false, false);
+            }
-				}
+        }
-			}
-		}
 
-		//add to undo
+        //add to undo
-		addUndo(player, blockSet);
+        addUndo(player, blockSet);
 
-		return true;
+        return true;
-	}
+    }
 
-	public static void clear(Player player) {
+    public static void clear(EntityPlayer player) {
-		Map<UUID, FixedStack<BlockSet>> undoStacks = player.level.isClientSide ? undoStacksClient : undoStacksServer;
+        Map<UUID, FixedStack<BlockSet>> undoStacks = player.world.isRemote ? undoStacksClient : undoStacksServer;
-		Map<UUID, FixedStack<BlockSet>> redoStacks = player.level.isClientSide ? redoStacksClient : redoStacksServer;
+        Map<UUID, FixedStack<BlockSet>> redoStacks = player.world.isRemote ? redoStacksClient : redoStacksServer;
-		if (undoStacks.containsKey(player.getUUID())) {
+        if (undoStacks.containsKey(player.getUniqueID())) {
-			undoStacks.get(player.getUUID()).clear();
+            undoStacks.get(player.getUniqueID()).clear();
-		}
+        }
-		if (redoStacks.containsKey(player.getUUID())) {
+        if (redoStacks.containsKey(player.getUniqueID())) {
-			redoStacks.get(player.getUUID()).clear();
+            redoStacks.get(player.getUniqueID()).clear();
-		}
+        }
-	}
+    }
 
-	private static List<ItemStack> findItemStacksInInventory(Player player, List<BlockState> blockStates) {
+    private static List<ItemStack> findItemStacksInInventory(EntityPlayer player, List<IBlockState> blockStates) {
-		List<ItemStack> itemStacks = new ArrayList<>(blockStates.size());
+        List<ItemStack> itemStacks = new ArrayList<>(blockStates.size());
-		for (BlockState blockState : blockStates) {
+        for (IBlockState blockState : blockStates) {
-			itemStacks.add(findItemStackInInventory(player, blockState));
+            itemStacks.add(findItemStackInInventory(player, blockState));
-		}
+        }
-		return itemStacks;
+        return itemStacks;
-	}
+    }
 
-	private static ItemStack findItemStackInInventory(Player player, BlockState blockState) {
+    private static ItemStack findItemStackInInventory(EntityPlayer player, IBlockState blockState) {
-		ItemStack itemStack = ItemStack.EMPTY;
+        ItemStack itemStack = ItemStack.EMPTY;
-		if (blockState == null) return itemStack;
+        if (blockState == null) return itemStack;
 
-		//First try previousBlockStates
+        //First try previousBlockStates
-		//TODO try to find itemstack with right blockstate first
+        //TODO try to find itemstack with right blockstate first
-		// then change line 103 back (get state from item)
+        // then change line 103 back (get state from item)
-		itemStack = InventoryHelper.findItemStackInInventory(player, blockState.getBlock());
+        itemStack = InventoryHelper.findItemStackInInventory(player, blockState.getBlock());
 
+        //then anything it drops
+        if (itemStack.isEmpty()) {
+            Item itemDropped = blockState.getBlock().getItemDropped(blockState, player.world, BlockPos.ORIGIN, 10).asItem();
+            if (itemDropped instanceof ItemBlock) {
+                Block block = ((ItemBlock) itemDropped).getBlock();
+                itemStack = InventoryHelper.findItemStackInInventory(player, block);
+            }
+        }
 
-		//then anything it drops
+        //then air
-		if (itemStack.isEmpty()) {
+        //(already empty)
-			//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);
-				for (ItemStack itemStackDropped : itemsDropped) {
-					if (itemStackDropped.getItem() instanceof BlockItem) {
-						Block block = ((BlockItem) itemStackDropped.getItem()).getBlock();
-						itemStack = InventoryHelper.findItemStackInInventory(player, block);
-					}
-				}
-			}
-		}
 
-		//then air
+        return itemStack;
-		//(already empty)
+    }
-
-		return itemStack;
-	}
 }

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

@@ -1,37 +1,35 @@
 package nl.requios.effortlessbuilding.capability;
 
-import net.minecraft.nbt.CompoundTag;
+import net.minecraft.nbt.NBTTagCompound;
-import net.minecraft.core.Direction;
+import net.minecraft.util.EnumFacing;
 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.items.CapabilityItemHandler;
 import net.minecraftforge.items.IItemHandler;
 import net.minecraftforge.items.ItemStackHandler;
+import nl.requios.effortlessbuilding.item.ItemRandomizerBag;
 
 import javax.annotation.Nonnull;
 import javax.annotation.Nullable;
 
-public class ItemHandlerCapabilityProvider implements ICapabilitySerializable<CompoundTag> {
+public class ItemHandlerCapabilityProvider implements ICapabilitySerializable<NBTTagCompound> {
-	IItemHandler itemHandler;
+    IItemHandler itemHandler = new ItemStackHandler(ItemRandomizerBag.INV_SIZE);
 
-	public ItemHandlerCapabilityProvider(int size) {
+    @Nonnull
-		itemHandler = new ItemStackHandler(size);
+    @Override
-	}
+    public <T> LazyOptional<T> getCapability(@Nonnull Capability<T> cap, @Nullable EnumFacing side) {
+        return CapabilityItemHandler.ITEM_HANDLER_CAPABILITY.orEmpty(cap, LazyOptional.of(() -> itemHandler));
+    }
 
-	@Nonnull
+    @Override
-	@Override
+    public NBTTagCompound serializeNBT() {
-	public <T> LazyOptional<T> getCapability(@Nonnull Capability<T> cap, @Nullable Direction side) {
+        return ((ItemStackHandler) itemHandler).serializeNBT();
-		return CapabilityItemHandler.ITEM_HANDLER_CAPABILITY.orEmpty(cap, LazyOptional.of(() -> itemHandler));
+    }
-	}
 
-	@Override
+    @Override
-	public CompoundTag serializeNBT() {
+    public void deserializeNBT(NBTTagCompound nbt) {
-		return ((ItemStackHandler) itemHandler).serializeNBT();
+        ((ItemStackHandler) itemHandler).deserializeNBT(nbt);
-	}
+    }
-
-	@Override
-	public void deserializeNBT(CompoundTag 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.INBTBase;
-import net.minecraft.nbt.Tag;
+import net.minecraft.nbt.NBTTagCompound;
-import net.minecraft.core.Direction;
+import net.minecraft.util.EnumFacing;
-import net.minecraftforge.common.capabilities.*;
+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,96 +15,89 @@ import nl.requios.effortlessbuilding.buildmode.BuildModes;
 import javax.annotation.Nonnull;
 import javax.annotation.Nullable;
 
-import nl.requios.effortlessbuilding.buildmode.ModeSettingsManager.ModeSettings;
+import static 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.
+    public interface IModeCapability {
-	@SubscribeEvent
+        ModeSettings getModeData();
-	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);
-		clone.ifPresent(cloneModeCapability ->
-			original.ifPresent(originalModeCapability ->
-				cloneModeCapability.setModeData(originalModeCapability.getModeData())));
-	}
 
-	public interface IModeCapability {
+        void setModeData(ModeSettings modeSettings);
-		ModeSettings getModeData();
+    }
 
-		void setModeData(ModeSettings modeSettings);
+    public static class ModeCapability implements IModeCapability {
-	}
+        private ModeSettings modeSettings;
 
-	public static class ModeCapability implements IModeCapability {
+        @Override
-		private ModeSettings modeSettings;
+        public ModeSettings getModeData() {
+            return modeSettings;
+        }
 
-		@Override
+        @Override
-		public ModeSettings getModeData() {
+        public void setModeData(ModeSettings modeSettings) {
-			return modeSettings;
+            this.modeSettings = modeSettings;
-		}
+        }
+    }
 
-		@Override
+    public static class Storage implements Capability.IStorage<IModeCapability> {
-		public void setModeData(ModeSettings modeSettings) {
+        @Override
-			this.modeSettings = modeSettings;
+        public INBTBase writeNBT(Capability<IModeCapability> capability, IModeCapability instance, EnumFacing side) {
-		}
+            NBTTagCompound compound = new NBTTagCompound();
-	}
+            ModeSettings modeSettings = instance.getModeData();
+            if (modeSettings == null) modeSettings = new ModeSettings();
 
-	public static class Provider extends CapabilityProvider<Provider> implements ICapabilitySerializable<Tag> {
+            //compound.setInteger("buildMode", modeSettings.getBuildMode().ordinal());
 
-		private IModeCapability instance = new ModeCapability();
+            //TODO add mode settings
-		private LazyOptional<IModeCapability> modeCapabilityOptional = LazyOptional.of(() -> instance);
 
-		public Provider() {
+            return compound;
-			super(Provider.class);
+        }
-			gatherCapabilities();
-		}
 
-		@Nonnull
+        @Override
-		@Override
+        public void readNBT(Capability<IModeCapability> capability, IModeCapability instance, EnumFacing side, INBTBase nbt) {
-		public <T> LazyOptional<T> getCapability(@Nonnull Capability<T> cap, @Nullable Direction side) {
+            NBTTagCompound compound = (NBTTagCompound) nbt;
-			if (cap == MODE_CAPABILITY) return modeCapabilityOptional.cast();
-			return LazyOptional.empty();
-		}
 
-		@Override
+            //BuildModes.BuildModeEnum buildMode = BuildModes.BuildModeEnum.values()[compound.getInteger("buildMode")];
-		public void invalidateCaps() {
-			super.invalidateCaps();
-			modeCapabilityOptional.invalidate();
-		}
 
-		@Override
+            //TODO add mode settings
-		public void reviveCaps() {
-			super.reviveCaps();
-			modeCapabilityOptional = LazyOptional.of(() -> instance);
-		}
 
-		@Override
+            ModeSettings modeSettings = new ModeSettings(BuildModes.BuildModeEnum.NORMAL);
-		public Tag serializeNBT() {
+            instance.setModeData(modeSettings);
-			CompoundTag compound = new CompoundTag();
+        }
-			ModeSettings modeSettings = instance.getModeData();
+    }
-			if (modeSettings == null) modeSettings = new ModeSettings();
 
-			//compound.putInteger("buildMode", modeSettings.getBuildMode().ordinal());
+    public static class Provider implements ICapabilitySerializable<INBTBase> {
+        IModeCapability inst = modeCapability.getDefaultInstance();
 
-			//TODO add mode settings
+        @Nonnull
+        @Override
+        public <T> LazyOptional<T> getCapability(@Nonnull Capability<T> cap, @Nullable EnumFacing side) {
+            return modeCapability.orEmpty(cap, LazyOptional.of(() -> inst));
+        }
 
-			return compound;
+        @Override
-		}
+        public INBTBase serializeNBT() {
+            return modeCapability.getStorage().writeNBT(modeCapability, inst, null);
+        }
 
-		@Override
+        @Override
-		public void deserializeNBT(Tag nbt) {
+        public void deserializeNBT(INBTBase nbt) {
-			CompoundTag compound = (CompoundTag) nbt;
+            modeCapability.getStorage().readNBT(modeCapability, inst, null, nbt);
+        }
 
-			//BuildModes.BuildModeEnum buildMode = BuildModes.BuildModeEnum.values()[compound.getInteger("buildMode")];
+    }
 
-			//TODO add mode settings
+    // Allows for the capability to persist after death.
-
+    @SubscribeEvent
-			ModeSettings modeSettings = new ModeSettings(BuildModes.BuildModeEnum.NORMAL);
+    public static void clonePlayer(PlayerEvent.Clone event) {
-			instance.setModeData(modeSettings);
+        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())));
+    }
 }

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

@@ -1,16 +1,18 @@
 package nl.requios.effortlessbuilding.capability;
 
-import net.minecraft.nbt.CompoundTag;
+import net.minecraft.nbt.INBTBase;
-import net.minecraft.nbt.Tag;
+import net.minecraft.nbt.NBTTagCompound;
-import net.minecraft.core.Direction;
+import net.minecraft.util.EnumFacing;
-import net.minecraft.core.BlockPos;
+import net.minecraft.util.math.BlockPos;
-import net.minecraft.world.phys.Vec3;
+import net.minecraft.util.math.Vec3d;
-import net.minecraftforge.common.capabilities.*;
+import net.minecraftforge.common.capabilities.Capability;
-import net.minecraftforge.common.util.INBTSerializable;
+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;
 import net.minecraftforge.fml.common.Mod;
+import nl.requios.effortlessbuilding.EffortlessBuilding;
 import nl.requios.effortlessbuilding.buildmodifier.Array;
 import nl.requios.effortlessbuilding.buildmodifier.Mirror;
 import nl.requios.effortlessbuilding.buildmodifier.RadialMirror;
@@ -18,169 +20,166 @@ import nl.requios.effortlessbuilding.buildmodifier.RadialMirror;
 import javax.annotation.Nonnull;
 import javax.annotation.Nullable;
 
-import nl.requios.effortlessbuilding.buildmodifier.ModifierSettingsManager.ModifierSettings;
+import java.util.concurrent.Callable;
+
+import static nl.requios.effortlessbuilding.buildmodifier.ModifierSettingsManager.*;
 
 @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.
+    public interface IModifierCapability {
-	@SubscribeEvent
+        ModifierSettings getModifierData();
-	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);
-		clone.ifPresent(cloneModifierCapability ->
-			original.ifPresent(originalModifierCapability ->
-				cloneModifierCapability.setModifierData(originalModifierCapability.getModifierData())));
-	}
 
-	public interface IModifierCapability {
+        void setModifierData(ModifierSettings modifierSettings);
-		ModifierSettings getModifierData();
+    }
 
-		void setModifierData(ModifierSettings modifierSettings);
+    public static class ModifierCapability implements IModifierCapability {
-	}
+        private ModifierSettings modifierSettings;
 
-	public static class ModifierCapability implements IModifierCapability {
+        @Override
-		private ModifierSettings modifierSettings;
+        public ModifierSettings getModifierData() {
+            return modifierSettings;
+        }
 
-		@Override
+        @Override
-		public ModifierSettings getModifierData() {
+        public void setModifierData(ModifierSettings modifierSettings) {
-			return modifierSettings;
+            this.modifierSettings = modifierSettings;
-		}
+        }
+    }
 
-		@Override
+    public static class Storage implements Capability.IStorage<IModifierCapability> {
-		public void setModifierData(ModifierSettings modifierSettings) {
+        @Override
-			this.modifierSettings = modifierSettings;
+        public INBTBase writeNBT(Capability<IModifierCapability> capability, IModifierCapability instance, EnumFacing side) {
-		}
+            NBTTagCompound compound = new NBTTagCompound();
-	}
+            ModifierSettings modifierSettings = instance.getModifierData();
+            if (modifierSettings == null) modifierSettings = new ModifierSettings();
 
-	public static class Provider extends CapabilityProvider<Provider> implements INBTSerializable<Tag> {
+            //MIRROR
+            Mirror.MirrorSettings m = modifierSettings.getMirrorSettings();
+            if (m == null) m = new Mirror.MirrorSettings();
+            compound.setBoolean("mirrorEnabled", m.enabled);
+            compound.setDouble("mirrorPosX", m.position.x);
+            compound.setDouble("mirrorPosY", m.position.y);
+            compound.setDouble("mirrorPosZ", m.position.z);
+            compound.setBoolean("mirrorX", m.mirrorX);
+            compound.setBoolean("mirrorY", m.mirrorY);
+            compound.setBoolean("mirrorZ", m.mirrorZ);
+            compound.setInt("mirrorRadius", m.radius);
+            compound.setBoolean("mirrorDrawLines", m.drawLines);
+            compound.setBoolean("mirrorDrawPlanes", m.drawPlanes);
 
-		private final IModifierCapability instance = new ModifierCapability();
+            //ARRAY
-		private LazyOptional<IModifierCapability> modifierCapabilityOptional = LazyOptional.of(() -> instance);
+            Array.ArraySettings a = modifierSettings.getArraySettings();
+            if (a == null) a = new Array.ArraySettings();
+            compound.setBoolean("arrayEnabled", a.enabled);
+            compound.setInt("arrayOffsetX", a.offset.getX());
+            compound.setInt("arrayOffsetY", a.offset.getY());
+            compound.setInt("arrayOffsetZ", a.offset.getZ());
+            compound.setInt("arrayCount", a.count);
 
-		public Provider() {
+            compound.setInt("reachUpgrade", modifierSettings.getReachUpgrade());
-			super(Provider.class);
-			gatherCapabilities();
-		}
 
-		@Nonnull
+            //compound.setBoolean("quickReplace", buildSettings.doQuickReplace()); dont save quickreplace
-		@Override
-		public <T> LazyOptional<T> getCapability(@Nonnull Capability<T> cap, @Nullable Direction side) {
-			if (cap == MODIFIER_CAPABILITY) return modifierCapabilityOptional.cast();
-			return LazyOptional.empty();
-		}
 
-		@Override
+            //RADIAL MIRROR
-		public void invalidateCaps() {
+            RadialMirror.RadialMirrorSettings r = modifierSettings.getRadialMirrorSettings();
-			super.invalidateCaps();
+            if (r == null) r = new RadialMirror.RadialMirrorSettings();
-			modifierCapabilityOptional.invalidate();
+            compound.setBoolean("radialMirrorEnabled", r.enabled);
-		}
+            compound.setDouble("radialMirrorPosX", r.position.x);
+            compound.setDouble("radialMirrorPosY", r.position.y);
+            compound.setDouble("radialMirrorPosZ", r.position.z);
+            compound.setInt("radialMirrorSlices", r.slices);
+            compound.setBoolean("radialMirrorAlternate", r.alternate);
+            compound.setInt("radialMirrorRadius", r.radius);
+            compound.setBoolean("radialMirrorDrawLines", r.drawLines);
+            compound.setBoolean("radialMirrorDrawPlanes", r.drawPlanes);
 
-		@Override
+            return compound;
-		public void reviveCaps() {
+        }
-			super.reviveCaps();
-			modifierCapabilityOptional = LazyOptional.of(() -> instance);
-		}
 
-		@Override
+        @Override
-		public Tag serializeNBT() {
+        public void readNBT(Capability<IModifierCapability> capability, IModifierCapability instance, EnumFacing side, INBTBase nbt) {
-			CompoundTag compound = new CompoundTag();
+            NBTTagCompound compound = (NBTTagCompound) nbt;
-			ModifierSettings modifierSettings = instance.getModifierData();
-			if (modifierSettings == null) modifierSettings = new ModifierSettings();
 
-			//MIRROR
+            //MIRROR
-			Mirror.MirrorSettings m = modifierSettings.getMirrorSettings();
+            boolean mirrorEnabled = compound.getBoolean("mirrorEnabled");
-			if (m == null) m = new Mirror.MirrorSettings();
+            Vec3d mirrorPosition = new Vec3d(
-			compound.putBoolean("mirrorEnabled", m.enabled);
+                    compound.getDouble("mirrorPosX"),
-			compound.putDouble("mirrorPosX", m.position.x);
+                    compound.getDouble("mirrorPosY"),
-			compound.putDouble("mirrorPosY", m.position.y);
+                    compound.getDouble("mirrorPosZ"));
-			compound.putDouble("mirrorPosZ", m.position.z);
+            boolean mirrorX = compound.getBoolean("mirrorX");
-			compound.putBoolean("mirrorX", m.mirrorX);
+            boolean mirrorY = compound.getBoolean("mirrorY");
-			compound.putBoolean("mirrorY", m.mirrorY);
+            boolean mirrorZ = compound.getBoolean("mirrorZ");
-			compound.putBoolean("mirrorZ", m.mirrorZ);
+            int mirrorRadius = compound.getInt("mirrorRadius");
-			compound.putInt("mirrorRadius", m.radius);
+            boolean mirrorDrawLines = compound.getBoolean("mirrorDrawLines");
-			compound.putBoolean("mirrorDrawLines", m.drawLines);
+            boolean mirrorDrawPlanes = compound.getBoolean("mirrorDrawPlanes");
-			compound.putBoolean("mirrorDrawPlanes", m.drawPlanes);
+            Mirror.MirrorSettings mirrorSettings = new Mirror.MirrorSettings(mirrorEnabled, mirrorPosition, mirrorX, mirrorY, mirrorZ, mirrorRadius, mirrorDrawLines, mirrorDrawPlanes);
 
-			//ARRAY
+            //ARRAY
-			Array.ArraySettings a = modifierSettings.getArraySettings();
+            boolean arrayEnabled = compound.getBoolean("arrayEnabled");
-			if (a == null) a = new Array.ArraySettings();
+            BlockPos arrayOffset = new BlockPos(
-			compound.putBoolean("arrayEnabled", a.enabled);
+                    compound.getInt("arrayOffsetX"),
-			compound.putInt("arrayOffsetX", a.offset.getX());
+                    compound.getInt("arrayOffsetY"),
-			compound.putInt("arrayOffsetY", a.offset.getY());
+                    compound.getInt("arrayOffsetZ"));
-			compound.putInt("arrayOffsetZ", a.offset.getZ());
+            int arrayCount = compound.getInt("arrayCount");
-			compound.putInt("arrayCount", a.count);
+            Array.ArraySettings arraySettings = new Array.ArraySettings(arrayEnabled, arrayOffset, arrayCount);
 
-			compound.putInt("reachUpgrade", modifierSettings.getReachUpgrade());
+            int reachUpgrade = compound.getInt("reachUpgrade");
 
-			//compound.putBoolean("quickReplace", buildSettings.doQuickReplace()); dont save quickreplace
+            //boolean quickReplace = compound.getBoolean("quickReplace"); //dont load quickreplace
 
-			//RADIAL MIRROR
+            //RADIAL MIRROR
-			RadialMirror.RadialMirrorSettings r = modifierSettings.getRadialMirrorSettings();
+            boolean radialMirrorEnabled = compound.getBoolean("radialMirrorEnabled");
-			if (r == null) r = new RadialMirror.RadialMirrorSettings();
+            Vec3d radialMirrorPosition = new Vec3d(
-			compound.putBoolean("radialMirrorEnabled", r.enabled);
+                    compound.getDouble("radialMirrorPosX"),
-			compound.putDouble("radialMirrorPosX", r.position.x);
+                    compound.getDouble("radialMirrorPosY"),
-			compound.putDouble("radialMirrorPosY", r.position.y);
+                    compound.getDouble("radialMirrorPosZ"));
-			compound.putDouble("radialMirrorPosZ", r.position.z);
+            int radialMirrorSlices = compound.getInt("radialMirrorSlices");
-			compound.putInt("radialMirrorSlices", r.slices);
+            boolean radialMirrorAlternate = compound.getBoolean("radialMirrorAlternate");
-			compound.putBoolean("radialMirrorAlternate", r.alternate);
+            int radialMirrorRadius = compound.getInt("radialMirrorRadius");
-			compound.putInt("radialMirrorRadius", r.radius);
+            boolean radialMirrorDrawLines = compound.getBoolean("radialMirrorDrawLines");
-			compound.putBoolean("radialMirrorDrawLines", r.drawLines);
+            boolean radialMirrorDrawPlanes = compound.getBoolean("radialMirrorDrawPlanes");
-			compound.putBoolean("radialMirrorDrawPlanes", r.drawPlanes);
+            RadialMirror.RadialMirrorSettings radialMirrorSettings = new RadialMirror.RadialMirrorSettings(radialMirrorEnabled, radialMirrorPosition,
+                    radialMirrorSlices, radialMirrorAlternate, radialMirrorRadius, radialMirrorDrawLines, radialMirrorDrawPlanes);
 
-			return compound;
+            ModifierSettings modifierSettings = new ModifierSettings(mirrorSettings, arraySettings, radialMirrorSettings, false, reachUpgrade);
-		}
+            instance.setModifierData(modifierSettings);
+        }
+    }
 
-		@Override
+    public static class Provider implements ICapabilitySerializable<INBTBase> {
-		public void deserializeNBT(Tag nbt) {
-			CompoundTag compound = (CompoundTag) nbt;
 
-			//MIRROR
+        IModifierCapability inst = modifierCapability.getDefaultInstance();
-			boolean mirrorEnabled = compound.getBoolean("mirrorEnabled");
-			Vec3 mirrorPosition = new Vec3(
-					compound.getDouble("mirrorPosX"),
-					compound.getDouble("mirrorPosY"),
-					compound.getDouble("mirrorPosZ"));
-			boolean mirrorX = compound.getBoolean("mirrorX");
-			boolean mirrorY = compound.getBoolean("mirrorY");
-			boolean mirrorZ = compound.getBoolean("mirrorZ");
-			int mirrorRadius = compound.getInt("mirrorRadius");
-			boolean mirrorDrawLines = compound.getBoolean("mirrorDrawLines");
-			boolean mirrorDrawPlanes = compound.getBoolean("mirrorDrawPlanes");
-			Mirror.MirrorSettings mirrorSettings = new Mirror.MirrorSettings(mirrorEnabled, mirrorPosition, mirrorX, mirrorY, mirrorZ, mirrorRadius, mirrorDrawLines, mirrorDrawPlanes);
 
-			//ARRAY
+        @Nonnull
-			boolean arrayEnabled = compound.getBoolean("arrayEnabled");
+        @Override
-			BlockPos arrayOffset = new BlockPos(
+        public <T> LazyOptional<T> getCapability(@Nonnull Capability<T> cap, @Nullable EnumFacing side) {
-					compound.getInt("arrayOffsetX"),
+            return modifierCapability.orEmpty(cap, LazyOptional.of(() -> inst));
-					compound.getInt("arrayOffsetY"),
+        }
-					compound.getInt("arrayOffsetZ"));
-			int arrayCount = compound.getInt("arrayCount");
-			Array.ArraySettings arraySettings = new Array.ArraySettings(arrayEnabled, arrayOffset, arrayCount);
 
-			int reachUpgrade = compound.getInt("reachUpgrade");
+        @Override
+        public INBTBase serializeNBT() {
+            return modifierCapability.getStorage().writeNBT(modifierCapability, inst, null);
+        }
 
-			//boolean quickReplace = compound.getBoolean("quickReplace"); //dont load quickreplace
+        @Override
+        public void deserializeNBT(INBTBase nbt) {
+            modifierCapability.getStorage().readNBT(modifierCapability, inst, null, nbt);
+        }
 
-			//RADIAL MIRROR
+    }
-			boolean radialMirrorEnabled = compound.getBoolean("radialMirrorEnabled");
-			Vec3 radialMirrorPosition = new Vec3(
-					compound.getDouble("radialMirrorPosX"),
-					compound.getDouble("radialMirrorPosY"),
-					compound.getDouble("radialMirrorPosZ"));
-			int radialMirrorSlices = compound.getInt("radialMirrorSlices");
-			boolean radialMirrorAlternate = compound.getBoolean("radialMirrorAlternate");
-			int radialMirrorRadius = compound.getInt("radialMirrorRadius");
-			boolean radialMirrorDrawLines = compound.getBoolean("radialMirrorDrawLines");
-			boolean radialMirrorDrawPlanes = compound.getBoolean("radialMirrorDrawPlanes");
-			RadialMirror.RadialMirrorSettings radialMirrorSettings = new RadialMirror.RadialMirrorSettings(radialMirrorEnabled, radialMirrorPosition,
-					radialMirrorSlices, radialMirrorAlternate, radialMirrorRadius, radialMirrorDrawLines, radialMirrorDrawPlanes);
 
-			ModifierSettings modifierSettings = new ModifierSettings(mirrorSettings, arraySettings, radialMirrorSettings, false, reachUpgrade);
-			instance.setModifierData(modifierSettings);
-		}
 
-	}
+    // Allows for the capability to persist after death.
+    @SubscribeEvent
+    public static void clonePlayer(PlayerEvent.Clone event) {
+        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())));
+    }
 }

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

@@ -0,0 +1,44 @@
+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.EntityPlayerMP;
+import net.minecraft.util.text.TextComponentString;
+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;
+import nl.requios.effortlessbuilding.network.RequestLookAtMessage;
+
+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().asPlayer(), IntegerArgumentType.getInteger(context, "level"));
+        }))).then(Commands.literal("get").executes((context -> {
+            return getReachLevel(context.getSource().asPlayer());
+        }))));
+    }
+
+    private static int setReachLevel(EntityPlayerMP 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 TextComponentString("Reach level of " + player.getName().getString() + " set to " + modifierSettings.getReachUpgrade()));
+
+        return 1;
+    }
+
+    private static int getReachLevel(EntityPlayerMP 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,63 +1,133 @@
 package nl.requios.effortlessbuilding.compatibility;
 
-import net.minecraft.world.level.block.state.BlockState;
+import net.minecraft.block.state.IBlockState;
-import net.minecraft.world.item.BlockItem;
+import net.minecraft.entity.player.EntityPlayer;
-import net.minecraft.world.item.Item;
+import net.minecraft.item.Item;
-import net.minecraft.world.item.ItemStack;
+import net.minecraft.item.ItemBlock;
+import net.minecraft.item.ItemStack;
+import net.minecraft.util.EnumHand;
+import net.minecraftforge.common.util.LazyOptional;
+import net.minecraftforge.items.CapabilityItemHandler;
 import net.minecraftforge.items.IItemHandler;
-import nl.requios.effortlessbuilding.item.AbstractRandomizerBagItem;
+import nl.requios.effortlessbuilding.EffortlessBuilding;
+import nl.requios.effortlessbuilding.item.ItemRandomizerBag;
 
 public class CompatHelper {
+    //TODO 1.13 compatibility
+//    // Get a handle to the dank null item instance. This will remain null if the mod doesn't load
+//    // and all checks will fail, so it works.
+//    @GameRegistry.ObjectHolder("danknull:dank_null")
+//    public static final Item dankNullItem = null;
+//
+//    public static IChiselsAndBitsProxy chiselsAndBitsProxy;
+//
+    public static void setup() {
+        //TODO 1.13 compatibility
+//        if (Loader.isModLoaded("chiselsandbits")) {
+//            // reflection to avoid hard dependency
+//            try {
+//                chiselsAndBitsProxy = Class.forName("nl.requios.effortlessbuilding.compatibility.ActiveChiselsAndBitsProxy").asSubclass(ActiveChiselsAndBitsProxy.class).newInstance();
+//            } catch (InstantiationException | IllegalAccessException | ClassNotFoundException e) {
+//                e.printStackTrace();
+//            }
+//        } else {
+//            chiselsAndBitsProxy = new DummyChiselsAndBitsProxy();
+//        }
+    }
 
-	public static void setup() {
+    // Check if the item given is a proxy for blocks. For now, we check for the randomizer bag,
+    // /dank/null, or plain old blocks.
+    public static boolean isItemBlockProxy(ItemStack stack) {
+        Item item = stack.getItem();
+        if (item instanceof ItemBlock)
+            return true;
+        if ((item instanceof ItemRandomizerBag))
+            return true;
+        //TODO 1.13 compatibility
+//        if (item == dankNullItem)
+//            return true;
+        return false;
+    }
 
-	}
+    // Get the block to be placed by this proxy. For the /dank/null, it's the slot stack
+    // pointed to by nbt integer selectedIndex.
+    public static ItemStack getItemBlockFromStack(ItemStack proxy) {
+        Item proxyItem = proxy.getItem();
 
-	// Check if the item given is a proxy for blocks. For now, we check for the randomizer bag,
+        if (proxyItem instanceof ItemBlock)
-	// /dank/null, or plain old blocks.
+            return proxy;
-	public static boolean isItemBlockProxy(ItemStack stack) {
-		Item item = stack.getItem();
-		if (item instanceof BlockItem)
-			return true;
-		return item instanceof AbstractRandomizerBagItem;
-	}
 
-	// Get the block to be placed by this proxy. For the /dank/null, it's the slot stack
+        //Randomizer Bag
-	// pointed to by nbt integer selectedIndex.
+        if (proxyItem instanceof ItemRandomizerBag) {
-	public static ItemStack getItemBlockFromStack(ItemStack proxy) {
+            ItemStack itemStack = proxy;
-		Item proxyItem = proxy.getItem();
+            while (!(itemStack.getItem() instanceof ItemBlock || itemStack.isEmpty())) {
+                if (itemStack.getItem() instanceof ItemRandomizerBag)
+                    itemStack = ItemRandomizerBag.pickRandomStack(ItemRandomizerBag.getBagInventory(itemStack));
+            }
+            return itemStack;
+        }
 
-		if (proxyItem instanceof BlockItem)
+        //TODO 1.13 compatibility
-			return proxy;
+        //Dank Null
+//        if (proxyItem == dankNullItem) {
+//            int index = 0;
+//            if (proxy.hasTagCompound() && proxy.getTagCompound().hasKey("selectedIndex"))
+//                index = proxy.getTagCompound().getInteger("selectedIndex");
+//            return proxy.getCapability(CapabilityItemHandler.ITEM_HANDLER_CAPABILITY, null).getStackInSlot(index);
+//        }
 
-		//Randomizer Bag
+        return ItemStack.EMPTY;
-		if (proxyItem instanceof AbstractRandomizerBagItem) {
+    }
-			ItemStack itemStack = proxy;
-			while (!(itemStack.getItem() instanceof BlockItem || itemStack.isEmpty())) {
-				if (itemStack.getItem() instanceof AbstractRandomizerBagItem) {
-					AbstractRandomizerBagItem randomizerBagItem = (AbstractRandomizerBagItem) itemStack.getItem();
-					itemStack = randomizerBagItem.pickRandomStack(randomizerBagItem.getBagInventory(itemStack));
-				}
-			}
-			return itemStack;
-		}
 
-		return ItemStack.EMPTY;
+    public static ItemStack getItemBlockByState(ItemStack stack, IBlockState state) {
-	}
+        if (state == null) return ItemStack.EMPTY;
 
-	public static ItemStack getItemBlockByState(ItemStack stack, BlockState state) {
+        Item blockItem = Item.getItemFromBlock(state.getBlock());
-		if (state == null) return ItemStack.EMPTY;
+        if (stack.getItem() instanceof ItemBlock)
+            return stack;
+        else if (stack.getItem() instanceof ItemRandomizerBag) {
+            IItemHandler bagInventory = ItemRandomizerBag.getBagInventory(stack);
+            return ItemRandomizerBag.findStack(bagInventory, blockItem);
+        }
+        //TODO 1.13 compatibility
+//        else if (stack.getItem() == dankNullItem) {
+//            int index = itemHandlerSlotForItem(stack, blockItem);
+//            if (index >= 0)
+//                return stack.getCapability(CapabilityItemHandler.ITEM_HANDLER_CAPABILITY, null).getStackInSlot(index);
+//        }
+        return ItemStack.EMPTY;
+    }
 
-		Item blockItem = Item.byBlock(state.getBlock());
+    // Handle IItemHandler slot stacks not being modifiable. We must call IItemHandler#extractItem,
-		if (stack.getItem() instanceof BlockItem)
+    // because the ItemStack returned by IItemHandler#getStackInSlot isn't modifiable.
-			return stack;
+    public static void shrinkStack(ItemStack origStack, ItemStack curStack, EntityPlayer player) {
-		else if (stack.getItem() instanceof AbstractRandomizerBagItem) {
+        //TODO 1.13 compatibility, offhand support
-			AbstractRandomizerBagItem randomizerBagItem = (AbstractRandomizerBagItem) stack.getItem();
+        //Hacky way to get the origstack, because given origStack is itemblock stack and never proxy
-			IItemHandler bagInventory = randomizerBagItem.getBagInventory(stack);
+//        origStack = player.getHeldItem(EnumHand.MAIN_HAND);
-			return randomizerBagItem.findStack(bagInventory, blockItem);
-		}
 
-		return ItemStack.EMPTY;
+//        if (origStack.getItem() == dankNullItem) {
-	}
+//            int index = itemHandlerSlotForItem(origStack, curStack.getItem());
+//            origStack.getCapability(CapabilityItemHandler.ITEM_HANDLER_CAPABILITY, null).extractItem(index, 1, false);
+//        } else
+            curStack.shrink(1);
+    }
+
+    private static int itemHandlerSlotForItem(ItemStack stack, Item blockItem) {
+        LazyOptional<IItemHandler> itemHandlerLazyOptional = stack.getCapability(CapabilityItemHandler.ITEM_HANDLER_CAPABILITY, null);
+        IItemHandler handler = itemHandlerLazyOptional.orElse(null);
+
+        if (handler == null) {
+            EffortlessBuilding.logger.warn("Itemblock proxy has no item handler capability!");
+            return -1;
+        }
+
+        for (int i = 0; i < handler.getSlots(); i++) {
+            ItemStack ref = handler.getStackInSlot(i);
+            if (ref.getItem() instanceof ItemBlock)
+                if (ref.getItem() == blockItem)
+                    return i;
+        }
+        return -1;
+    }
 
 }

src/main/java/nl/requios/effortlessbuilding/gui/DiamondRandomizerBagContainer.java

@@ -1,148 +0,0 @@
-package nl.requios.effortlessbuilding.gui;
-
-import net.minecraft.network.FriendlyByteBuf;
-import net.minecraft.world.InteractionHand;
-import net.minecraft.world.entity.player.Inventory;
-import net.minecraft.world.entity.player.Player;
-import net.minecraft.world.inventory.AbstractContainerMenu;
-import net.minecraft.world.inventory.ClickType;
-import net.minecraft.world.inventory.MenuType;
-import net.minecraft.world.inventory.Slot;
-import net.minecraft.world.item.ItemStack;
-import net.minecraftforge.items.IItemHandler;
-import net.minecraftforge.items.ItemStackHandler;
-import net.minecraftforge.items.SlotItemHandler;
-import nl.requios.effortlessbuilding.EffortlessBuilding;
-import nl.requios.effortlessbuilding.item.DiamondRandomizerBagItem;
-
-public class DiamondRandomizerBagContainer extends AbstractContainerMenu {
-
-	private static final int INV_START = DiamondRandomizerBagItem.INV_SIZE,
-			INV_END = INV_START + 26,
-			HOTBAR_START = INV_END + 1,
-			HOTBAR_END = HOTBAR_START + 8;
-	private final IItemHandler bagInventory;
-
-	public DiamondRandomizerBagContainer(MenuType<?> type, int id){
-		super(type, id);
-		bagInventory = null;
-	}
-
-	//Client
-	public DiamondRandomizerBagContainer(int id, Inventory playerInventory, FriendlyByteBuf packetBuffer) {
-		this(id, playerInventory);
-	}
-
-	//Server?
-	public DiamondRandomizerBagContainer(int containerId, Inventory playerInventory) {
-		this(containerId, playerInventory, new ItemStackHandler(DiamondRandomizerBagItem.INV_SIZE));
-	}
-
-	public DiamondRandomizerBagContainer(int containerId, Inventory playerInventory, IItemHandler inventory) {
-		super(EffortlessBuilding.DIAMOND_RANDOMIZER_BAG_CONTAINER.get(), containerId);
-		bagInventory = inventory;
-
-		for (int i = 0; i < 3; ++i) {
-			for (int j = 0; j < 9; ++j) {
-				this.addSlot(new SlotItemHandler(bagInventory, j + i * 9, 8 + j * 18, 18 + i * 18));
-			}
-		}
-
-		// add player inventory slots
-		for (int i = 0; i < 3; ++i) {
-			for (int j = 0; j < 9; ++j) {
-				addSlot(new Slot(playerInventory, j + i * 9 + 9, 8 + j * 18, 84 + i * 18));
-			}
-		}
-
-		// add hotbar slots
-		for (int i = 0; i < 9; ++i) {
-			addSlot(new Slot(playerInventory, i, 8 + i * 18, 142));
-		}
-	}
-
-    @Override
-	public boolean stillValid(Player playerIn) {
-		return true;
-	}
-
-	@Override
-	public Slot getSlot(int parSlotIndex) {
-		if (parSlotIndex >= slots.size())
-			parSlotIndex = slots.size() - 1;
-		return super.getSlot(parSlotIndex);
-	}
-
-	@Override
-	public ItemStack quickMoveStack(Player playerIn, int slotIndex) {
-		ItemStack itemstack = ItemStack.EMPTY;
-		Slot slot = this.slots.get(slotIndex);
-
-		if (slot != null && slot.hasItem()) {
-			ItemStack itemstack1 = slot.getItem();
-			itemstack = itemstack1.copy();
-
-			// If item is in our custom inventory
-			if (slotIndex < INV_START) {
-				// try to place in player inventory / action bar
-				if (!this.moveItemStackTo(itemstack1, INV_START, HOTBAR_END + 1, true)) {
-					return ItemStack.EMPTY;
-				}
-
-				slot.onQuickCraft(itemstack1, itemstack);
-			}
-			// Item is in inventory / hotbar, try to place in custom inventory or armor slots
-			else {
-				/**
-				 * Implementation number 1: Shift-click into your custom inventory
-				 */
-				if (slotIndex >= INV_START) {
-					// place in custom inventory
-					if (!this.moveItemStackTo(itemstack1, 0, INV_START, false)) {
-						return ItemStack.EMPTY;
-					}
-				}
-			}
-
-			if (itemstack1.getCount() == 0) {
-				slot.set(ItemStack.EMPTY);
-			} else {
-				slot.setChanged();
-			}
-
-			if (itemstack1.getCount() == itemstack.getCount()) {
-				return ItemStack.EMPTY;
-			}
-
-			slot.onTake(playerIn, itemstack1);
-		}
-
-		return itemstack;
-	}
-
-	/**
-	 * You should override this method to prevent the player from moving the stack that
-	 * opened the inventory, otherwise if the player moves it, the inventory will not
-	 * be able to save properly
-	 */
-	@Override
-	public void clicked(int slot, int dragType, ClickType clickTypeIn, Player player) {
-		// this will prevent the player from interacting with the item that opened the inventory:
-		if (slot >= 0 && getSlot(slot) != null && getSlot(slot).getItem().equals(player.getItemInHand(InteractionHand.MAIN_HAND))) {
-			//Do nothing;
-			return;
-		}
-		super.clicked(slot, dragType, clickTypeIn, player);
-	}
-
-	/**
-	 * Callback for when the crafting gui is closed.
-	 */
-	@Override
-	public void removed(Player player) {
-		super.removed(player);
-		if (!player.level.isClientSide) {
-			broadcastChanges();
-		}
-	}
-}

src/main/java/nl/requios/effortlessbuilding/gui/DiamondRandomizerBagScreen.java

@@ -1,49 +0,0 @@
-package nl.requios.effortlessbuilding.gui;
-
-import com.mojang.blaze3d.systems.RenderSystem;
-import com.mojang.blaze3d.vertex.PoseStack;
-import net.minecraft.client.gui.screens.inventory.AbstractContainerScreen;
-import net.minecraft.network.chat.Component;
-import net.minecraft.resources.ResourceLocation;
-import net.minecraft.world.entity.player.Inventory;
-import net.minecraftforge.api.distmarker.Dist;
-import net.minecraftforge.api.distmarker.OnlyIn;
-import nl.requios.effortlessbuilding.EffortlessBuilding;
-
-import javax.annotation.ParametersAreNonnullByDefault;
-
-@OnlyIn(Dist.CLIENT)
-@ParametersAreNonnullByDefault
-public class DiamondRandomizerBagScreen extends AbstractContainerScreen<DiamondRandomizerBagContainer> {
-	private Inventory inventory;
-
-	private static final ResourceLocation guiTextures = new ResourceLocation(EffortlessBuilding.MODID, "textures/gui/container/diamondrandomizerbag.png");
-
-	public DiamondRandomizerBagScreen(DiamondRandomizerBagContainer randomizerBagContainer, Inventory playerInventory, Component title) {
-		super(randomizerBagContainer, playerInventory, title);
-		this.inventory = playerInventory;
-		imageHeight = 167;
-	}
-
-	@Override
-	public void render(PoseStack ms, int mouseX, int mouseY, float partialTicks) {
-		renderBackground(ms);
-		super.render(ms, mouseX, mouseY, partialTicks);
-		this.renderTooltip(ms, mouseX, mouseY);
-	}
-
-	@Override
-	protected void renderLabels(PoseStack ms, int mouseX, int mouseY) {
-		this.font.draw(ms, this.title, 8, 6, 0x404040);
-		this.font.draw(ms, this.playerInventoryTitle, 8, imageHeight - 96 + 2, 0x404040);
-	}
-
-	@Override
-	protected void renderBg(PoseStack ms, float partialTicks, int mouseX, int mouseY) {
-		RenderSystem.setShaderColor(1.0F, 1.0F, 1.0F, 1f);
-		RenderSystem.setShaderTexture(0, guiTextures);
-		int marginHorizontal = (width - imageWidth) / 2;
-		int marginVertical = (height - imageHeight) / 2;
-		blit(ms, marginHorizontal, marginVertical, 0, 0, imageWidth, imageHeight);
-	}
-}

src/main/java/nl/requios/effortlessbuilding/gui/GoldenRandomizerBagContainer.java

@@ -1,146 +0,0 @@
-package nl.requios.effortlessbuilding.gui;
-
-import net.minecraft.network.FriendlyByteBuf;
-import net.minecraft.world.InteractionHand;
-import net.minecraft.world.entity.player.Inventory;
-import net.minecraft.world.entity.player.Player;
-import net.minecraft.world.inventory.AbstractContainerMenu;
-import net.minecraft.world.inventory.ClickType;
-import net.minecraft.world.inventory.MenuType;
-import net.minecraft.world.inventory.Slot;
-import net.minecraft.world.item.ItemStack;
-import net.minecraftforge.items.IItemHandler;
-import net.minecraftforge.items.ItemStackHandler;
-import net.minecraftforge.items.SlotItemHandler;
-import nl.requios.effortlessbuilding.EffortlessBuilding;
-import nl.requios.effortlessbuilding.item.GoldenRandomizerBagItem;
-
-public class GoldenRandomizerBagContainer extends AbstractContainerMenu {
-
-	private static final int INV_START = GoldenRandomizerBagItem.INV_SIZE,
-			INV_END = INV_START + 26,
-			HOTBAR_START = INV_END + 1,
-			HOTBAR_END = HOTBAR_START + 8;
-	private final IItemHandler bagInventory;
-
-	public GoldenRandomizerBagContainer(MenuType<?> type, int id){
-		super(type, id);
-		bagInventory = null;
-	}
-
-	//Client
-	public GoldenRandomizerBagContainer(int id, Inventory playerInventory, FriendlyByteBuf packetBuffer) {
-		this(id, playerInventory);
-	}
-
-	//Server?
-	public GoldenRandomizerBagContainer(int containerId, Inventory playerInventory) {
-		this(containerId, playerInventory, new ItemStackHandler(GoldenRandomizerBagItem.INV_SIZE));
-	}
-
-	public GoldenRandomizerBagContainer(int containerId, Inventory playerInventory, IItemHandler inventory) {
-		super(EffortlessBuilding.GOLDEN_RANDOMIZER_BAG_CONTAINER.get(), containerId);
-		bagInventory = inventory;
-
-		for (int i = 0; i < GoldenRandomizerBagItem.INV_SIZE; ++i) {
-			this.addSlot(new SlotItemHandler(bagInventory, i, 8 + (18 * i), 20));
-		}
-
-		// add player inventory slots
-		for (int i = 0; i < 3; ++i) {
-			for (int j = 0; j < 9; ++j) {
-				addSlot(new Slot(playerInventory, j + i * 9 + 9, 8 + j * 18, 51 + i * 18));
-			}
-		}
-
-		// add hotbar slots
-		for (int i = 0; i < 9; ++i) {
-			addSlot(new Slot(playerInventory, i, 8 + i * 18, 109));
-		}
-	}
-
-    @Override
-	public boolean stillValid(Player playerIn) {
-		return true;
-	}
-
-	@Override
-	public Slot getSlot(int parSlotIndex) {
-		if (parSlotIndex >= slots.size())
-			parSlotIndex = slots.size() - 1;
-		return super.getSlot(parSlotIndex);
-	}
-
-	@Override
-	public ItemStack quickMoveStack(Player playerIn, int slotIndex) {
-		ItemStack itemstack = ItemStack.EMPTY;
-		Slot slot = this.slots.get(slotIndex);
-
-		if (slot != null && slot.hasItem()) {
-			ItemStack itemstack1 = slot.getItem();
-			itemstack = itemstack1.copy();
-
-			// If item is in our custom inventory
-			if (slotIndex < INV_START) {
-				// try to place in player inventory / action bar
-				if (!this.moveItemStackTo(itemstack1, INV_START, HOTBAR_END + 1, true)) {
-					return ItemStack.EMPTY;
-				}
-
-				slot.onQuickCraft(itemstack1, itemstack);
-			}
-			// Item is in inventory / hotbar, try to place in custom inventory or armor slots
-			else {
-				/**
-				 * Implementation number 1: Shift-click into your custom inventory
-				 */
-				if (slotIndex >= INV_START) {
-					// place in custom inventory
-					if (!this.moveItemStackTo(itemstack1, 0, INV_START, false)) {
-						return ItemStack.EMPTY;
-					}
-				}
-			}
-
-			if (itemstack1.getCount() == 0) {
-				slot.set(ItemStack.EMPTY);
-			} else {
-				slot.setChanged();
-			}
-
-			if (itemstack1.getCount() == itemstack.getCount()) {
-				return ItemStack.EMPTY;
-			}
-
-			slot.onTake(playerIn, itemstack1);
-		}
-
-		return itemstack;
-	}
-
-	/**
-	 * You should override this method to prevent the player from moving the stack that
-	 * opened the inventory, otherwise if the player moves it, the inventory will not
-	 * be able to save properly
-	 */
-	@Override
-	public void clicked(int slot, int dragType, ClickType clickTypeIn, Player player) {
-		// this will prevent the player from interacting with the item that opened the inventory:
-		if (slot >= 0 && getSlot(slot) != null && getSlot(slot).getItem().equals(player.getItemInHand(InteractionHand.MAIN_HAND))) {
-			//Do nothing;
-			return;
-		}
-		super.clicked(slot, dragType, clickTypeIn, player);
-	}
-
-	/**
-	 * Callback for when the crafting gui is closed.
-	 */
-	@Override
-	public void removed(Player player) {
-		super.removed(player);
-		if (!player.level.isClientSide) {
-			broadcastChanges();
-		}
-	}
-}

src/main/java/nl/requios/effortlessbuilding/gui/GoldenRandomizerBagScreen.java

@@ -1,49 +0,0 @@
-package nl.requios.effortlessbuilding.gui;
-
-import com.mojang.blaze3d.systems.RenderSystem;
-import com.mojang.blaze3d.vertex.PoseStack;
-import net.minecraft.client.gui.screens.inventory.AbstractContainerScreen;
-import net.minecraft.network.chat.Component;
-import net.minecraft.resources.ResourceLocation;
-import net.minecraft.world.entity.player.Inventory;
-import net.minecraftforge.api.distmarker.Dist;
-import net.minecraftforge.api.distmarker.OnlyIn;
-import nl.requios.effortlessbuilding.EffortlessBuilding;
-
-import javax.annotation.ParametersAreNonnullByDefault;
-
-@OnlyIn(Dist.CLIENT)
-@ParametersAreNonnullByDefault
-public class GoldenRandomizerBagScreen extends AbstractContainerScreen<GoldenRandomizerBagContainer> {
-	private Inventory inventory;
-
-	private static final ResourceLocation guiTextures = new ResourceLocation(EffortlessBuilding.MODID, "textures/gui/container/goldenrandomizerbag.png");
-
-	public GoldenRandomizerBagScreen(GoldenRandomizerBagContainer randomizerBagContainer, Inventory playerInventory, Component title) {
-		super(randomizerBagContainer, playerInventory, title);
-		this.inventory = playerInventory;
-		imageHeight = 134;
-	}
-
-	@Override
-	public void render(PoseStack ms, int mouseX, int mouseY, float partialTicks) {
-		renderBackground(ms);
-		super.render(ms, mouseX, mouseY, partialTicks);
-		this.renderTooltip(ms, mouseX, mouseY);
-	}
-
-	@Override
-	protected void renderLabels(PoseStack ms, int mouseX, int mouseY) {
-		this.font.draw(ms, this.title, 8, 6, 0x404040);
-		this.font.draw(ms, this.playerInventoryTitle, 8, imageHeight - 96 + 2, 0x404040);
-	}
-
-	@Override
-	protected void renderBg(PoseStack ms, float partialTicks, int mouseX, int mouseY) {
-		RenderSystem.setShaderColor(1.0F, 1.0F, 1.0F, 1f);
-		RenderSystem.setShaderTexture(0, guiTextures);
-		int marginHorizontal = (width - imageWidth) / 2;
-		int marginVertical = (height - imageHeight) / 2;
-		blit(ms, marginHorizontal, marginVertical, 0, 0, imageWidth, imageHeight);
-	}
-}

src/main/java/nl/requios/effortlessbuilding/gui/RandomizerBagContainer.java

@@ -1,146 +1,130 @@
 package nl.requios.effortlessbuilding.gui;
 
-import net.minecraft.world.entity.player.Player;
+import net.minecraft.entity.player.EntityPlayer;
-import net.minecraft.world.entity.player.Inventory;
+import net.minecraft.entity.player.InventoryPlayer;
-import net.minecraft.world.inventory.ClickType;
+import net.minecraft.inventory.ClickType;
-import net.minecraft.world.inventory.AbstractContainerMenu;
+import net.minecraft.inventory.Container;
-import net.minecraft.world.inventory.MenuType;
+import net.minecraft.inventory.Slot;
-import net.minecraft.world.inventory.Slot;
+import net.minecraft.item.ItemStack;
-import net.minecraft.world.item.ItemStack;
+import net.minecraft.util.EnumHand;
-import net.minecraft.network.FriendlyByteBuf;
-import net.minecraft.world.InteractionHand;
 import net.minecraftforge.items.IItemHandler;
-import net.minecraftforge.items.ItemStackHandler;
 import net.minecraftforge.items.SlotItemHandler;
-import nl.requios.effortlessbuilding.EffortlessBuilding;
+import nl.requios.effortlessbuilding.item.ItemRandomizerBag;
-import nl.requios.effortlessbuilding.item.RandomizerBagItem;
 
-public class RandomizerBagContainer extends AbstractContainerMenu {
+public class RandomizerBagContainer extends Container {
 
-	private static final int INV_START = RandomizerBagItem.INV_SIZE,
+    private final IItemHandler bagInventory;
-			INV_END = INV_START + 26,
+    private final int sizeInventory;
-			HOTBAR_START = INV_END + 1,
-			HOTBAR_END = HOTBAR_START + 8;
-	private final IItemHandler bagInventory;
 
-	public RandomizerBagContainer(MenuType<?> type, int id){
+    private static final int INV_START = ItemRandomizerBag.INV_SIZE, INV_END = INV_START + 26,
-		super(type, id);
+            HOTBAR_START = INV_END + 1, HOTBAR_END = HOTBAR_START + 8;
-		bagInventory = null;
-	}
 
-	//Client
+    public RandomizerBagContainer(InventoryPlayer parInventoryPlayer, IItemHandler parIInventory) {
-	public RandomizerBagContainer(int id, Inventory playerInventory, FriendlyByteBuf packetBuffer) {
+        bagInventory = parIInventory;
-		this(id, playerInventory);
+        sizeInventory = bagInventory.getSlots();
-	}
+        for (int i = 0; i < sizeInventory; ++i) {
+            this.addSlot(new SlotItemHandler(bagInventory, i, 44 + (18 * i), 20));
+        }
 
-	//Server?
+        // add player inventory slots
-	public RandomizerBagContainer(int containerId, Inventory playerInventory) {
+        int i;
-		this(containerId, playerInventory, new ItemStackHandler(RandomizerBagItem.INV_SIZE));
+        for (i = 0; i < 3; ++i) {
-	}
+            for (int j = 0; j < 9; ++j) {
+                addSlot(new Slot(parInventoryPlayer, j + i * 9 + 9, 8 + j * 18, 51 + i * 18));
+            }
+        }
 
-	public RandomizerBagContainer(int containerId, Inventory playerInventory, IItemHandler inventory) {
+        // add hotbar slots
-		super(EffortlessBuilding.RANDOMIZER_BAG_CONTAINER.get(), containerId);
+        for (i = 0; i < 9; ++i) {
-		bagInventory = inventory;
+            addSlot(new Slot(parInventoryPlayer, i, 8 + i * 18, 109));
-
+        }
-		for (int i = 0; i < RandomizerBagItem.INV_SIZE; ++i) {
+    }
-			this.addSlot(new SlotItemHandler(bagInventory, i, 44 + (18 * i), 20));
-		}
-
-		// add player inventory slots
-		for (int i = 0; i < 3; ++i) {
-			for (int j = 0; j < 9; ++j) {
-				addSlot(new Slot(playerInventory, j + i * 9 + 9, 8 + j * 18, 51 + i * 18));
-			}
-		}
-
-		// add hotbar slots
-		for (int i = 0; i < 9; ++i) {
-			addSlot(new Slot(playerInventory, i, 8 + i * 18, 109));
-		}
-	}
 
     @Override
-	public boolean stillValid(Player playerIn) {
+    public boolean canInteractWith(EntityPlayer playerIn) {
-		return true;
+        return true;
-	}
+    }
 
-	@Override
+    @Override
-	public Slot getSlot(int parSlotIndex) {
+    public Slot getSlot(int parSlotIndex)
-		if (parSlotIndex >= slots.size())
+    {
-			parSlotIndex = slots.size() - 1;
+        if(parSlotIndex >= inventorySlots.size())
-		return super.getSlot(parSlotIndex);
+            parSlotIndex = inventorySlots.size() - 1;
-	}
+        return super.getSlot(parSlotIndex);
+    }
 
-	@Override
+    @Override
-	public ItemStack quickMoveStack(Player playerIn, int slotIndex) {
+    public ItemStack transferStackInSlot(EntityPlayer playerIn, int slotIndex) {
-		ItemStack itemstack = ItemStack.EMPTY;
+        ItemStack itemstack = ItemStack.EMPTY;
-		Slot slot = this.slots.get(slotIndex);
+        Slot slot = this.inventorySlots.get(slotIndex);
 
-		if (slot != null && slot.hasItem()) {
+        if (slot != null && slot.getHasStack()) {
-			ItemStack itemstack1 = slot.getItem();
+            ItemStack itemstack1 = slot.getStack();
-			itemstack = itemstack1.copy();
+            itemstack = itemstack1.copy();
 
-			// If item is in our custom inventory
+            // If item is in our custom inventory
-			if (slotIndex < INV_START) {
+            if (slotIndex < INV_START) {
-				// try to place in player inventory / action bar
+                // try to place in player inventory / action bar
-				if (!this.moveItemStackTo(itemstack1, INV_START, HOTBAR_END + 1, true)) {
+                if (!this.mergeItemStack(itemstack1, INV_START, HOTBAR_END + 1, true)) {
-					return ItemStack.EMPTY;
+                    return ItemStack.EMPTY;
-				}
+                }
 
-				slot.onQuickCraft(itemstack1, itemstack);
+                slot.onSlotChange(itemstack1, itemstack);
-			}
+            }
-			// Item is in inventory / hotbar, try to place in custom inventory or armor slots
+            // Item is in inventory / hotbar, try to place in custom inventory or armor slots
-			else {
+            else {
-				/**
+                /**
-				 * Implementation number 1: Shift-click into your custom inventory
+                 * Implementation number 1: Shift-click into your custom inventory
-				 */
+                 */
-				if (slotIndex >= INV_START) {
+                if (slotIndex >= INV_START) {
-					// place in custom inventory
+                    // place in custom inventory
-					if (!this.moveItemStackTo(itemstack1, 0, INV_START, false)) {
+                    if (!this.mergeItemStack(itemstack1, 0, INV_START, false)) {
-						return ItemStack.EMPTY;
+                        return ItemStack.EMPTY;
-					}
+                    }
-				}
+                }
-			}
 
-			if (itemstack1.getCount() == 0) {
+            }
-				slot.set(ItemStack.EMPTY);
-			} else {
-				slot.setChanged();
-			}
 
-			if (itemstack1.getCount() == itemstack.getCount()) {
+            if (itemstack1.getCount() == 0) {
-				return ItemStack.EMPTY;
+                slot.putStack(ItemStack.EMPTY);
-			}
+            } else {
+                slot.onSlotChanged();
+            }
 
-			slot.onTake(playerIn, itemstack1);
+            if (itemstack1.getCount() == itemstack.getCount()) {
-		}
+                return ItemStack.EMPTY;
+            }
 
-		return itemstack;
+            slot.onTake(playerIn, itemstack1);
-	}
+        }
 
-	/**
+        return itemstack;
-	 * You should override this method to prevent the player from moving the stack that
+    }
-	 * opened the inventory, otherwise if the player moves it, the inventory will not
-	 * be able to save properly
-	 */
-	@Override
-	public void clicked(int slot, int dragType, ClickType clickTypeIn, Player player) {
-		// this will prevent the player from interacting with the item that opened the inventory:
-		if (slot >= 0 && getSlot(slot) != null && getSlot(slot).getItem().equals(player.getItemInHand(InteractionHand.MAIN_HAND))) {
-			//Do nothing;
-			return;
-		}
-		super.clicked(slot, dragType, clickTypeIn, player);
-	}
 
-	/**
+    /**
-	 * Callback for when the crafting gui is closed.
+     * You should override this method to prevent the player from moving the stack that
-	 */
+     * opened the inventory, otherwise if the player moves it, the inventory will not
-	@Override
+     * be able to save properly
-	public void removed(Player player) {
+     */
-		super.removed(player);
+    @Override
-		if (!player.level.isClientSide) {
+    public ItemStack slotClick(int slot, int dragType, ClickType clickTypeIn, EntityPlayer player) {
-			broadcastChanges();
+        // this will prevent the player from interacting with the item that opened the inventory:
-		}
+        if (slot >= 0 && getSlot(slot) != null && getSlot(slot).getStack().equals(player.getHeldItem(EnumHand.MAIN_HAND))) {
-	}
+            return ItemStack.EMPTY;
+        }
+        return super.slotClick(slot, dragType, clickTypeIn, player);
+    }
+
+    /**
+     * Callback for when the crafting gui is closed.
+     */
+    @Override
+    public void onContainerClosed(EntityPlayer player)
+    {
+        super.onContainerClosed(player);
+        if(!player.world.isRemote)
+        {
+            detectAndSendChanges();
+        }
+    }
 }

src/main/java/nl/requios/effortlessbuilding/gui/RandomizerBagGuiContainer.java

@@ -0,0 +1,49 @@
+package nl.requios.effortlessbuilding.gui;
+
+import net.minecraft.client.gui.inventory.GuiContainer;
+import net.minecraft.client.renderer.GlStateManager;
+import net.minecraft.entity.player.InventoryPlayer;
+import net.minecraft.util.ResourceLocation;
+import net.minecraftforge.api.distmarker.Dist;
+import net.minecraftforge.api.distmarker.OnlyIn;
+import net.minecraftforge.items.IItemHandler;
+import nl.requios.effortlessbuilding.EffortlessBuilding;
+
+@OnlyIn(Dist.CLIENT)
+public class RandomizerBagGuiContainer extends GuiContainer {
+    private static final ResourceLocation guiTextures =
+            new ResourceLocation(EffortlessBuilding.MODID, "textures/gui/container/randomizerbag.png");
+    private final InventoryPlayer inventoryPlayer;
+    private final IItemHandler inventoryBag;
+
+    public RandomizerBagGuiContainer(InventoryPlayer inventoryPlayer, IItemHandler inventoryBag) {
+        super(new RandomizerBagContainer(inventoryPlayer, inventoryBag));
+        this.inventoryPlayer = inventoryPlayer;
+        this.inventoryBag = inventoryBag;
+
+        ySize = 134;
+    }
+
+    @Override
+    public void render(int mouseX, int mouseY, float partialTicks) {
+        drawDefaultBackground();
+        super.render(mouseX, mouseY, partialTicks);
+        this.renderHoveredToolTip(mouseX, mouseY);
+    }
+
+    @Override
+    protected void drawGuiContainerForegroundLayer(int mouseX, int mouseY) {
+        String s = "Randomizer Bag";
+        fontRenderer.drawString(s, 8, 6, 0x404040);
+        fontRenderer.drawString(inventoryPlayer.getDisplayName().getUnformattedComponentText(), 8, ySize - 96 + 2, 0x404040);
+    }
+
+    @Override
+    protected void drawGuiContainerBackgroundLayer(float partialTicks, int mouseX, int mouseY) {
+        GlStateManager.color3f(1.0F, 1.0F, 1.0F);
+        mc.getTextureManager().bindTexture(guiTextures);
+        int marginHorizontal = (width - xSize) / 2;
+        int marginVertical = (height - ySize) / 2;
+        drawTexturedModalRect(marginHorizontal, marginVertical, 0, 0, xSize, ySize);
+    }
+}

src/main/java/nl/requios/effortlessbuilding/gui/RandomizerBagGuiHandler.java

@@ -0,0 +1,112 @@
+package nl.requios.effortlessbuilding.gui;
+
+import net.minecraft.client.Minecraft;
+import net.minecraft.client.entity.EntityPlayerSP;
+import net.minecraft.client.gui.GuiScreen;
+import net.minecraft.entity.player.EntityPlayer;
+import net.minecraft.entity.player.InventoryPlayer;
+import net.minecraft.inventory.Container;
+import net.minecraft.util.EnumHand;
+import net.minecraft.util.ResourceLocation;
+import net.minecraft.util.text.ITextComponent;
+import net.minecraft.util.text.TextComponentString;
+import net.minecraft.world.IInteractionObject;
+import net.minecraft.world.World;
+import net.minecraftforge.api.distmarker.Dist;
+import net.minecraftforge.api.distmarker.OnlyIn;
+import net.minecraftforge.common.util.LazyOptional;
+import net.minecraftforge.fml.common.network.IGuiHandler;
+import net.minecraftforge.fml.network.FMLPlayMessages;
+import net.minecraftforge.items.CapabilityItemHandler;
+import net.minecraftforge.items.IItemHandler;
+import nl.requios.effortlessbuilding.EffortlessBuilding;
+import nl.requios.effortlessbuilding.capability.ItemHandlerCapabilityProvider;
+import nl.requios.effortlessbuilding.item.ItemRandomizerBag;
+
+import javax.annotation.Nullable;
+
+public class RandomizerBagGuiHandler implements /*IGuiHandler, */IInteractionObject {
+//    @Nullable
+//    @Override
+//    public Object getServerGuiElement(int ID, EntityPlayer player, World world, int x, int y, int z) {
+//        if (ID == EffortlessBuilding.RANDOMIZER_BAG_GUI) {
+//            // Use the player's held item to create the container
+//            LazyOptional<IItemHandler> capabilityOptional = player.getHeldItemMainhand().getCapability(CapabilityItemHandler.ITEM_HANDLER_CAPABILITY, null);
+//
+//            if (!capabilityOptional.isPresent()) {
+//                capabilityOptional = player.getHeldItemOffhand().getCapability(CapabilityItemHandler.ITEM_HANDLER_CAPABILITY, null);
+//            }
+//
+//            return new RandomizerBagContainer(player.inventory, capabilityOptional.orElse(null));
+//        }
+//        return null;
+//    }
+//
+//    @Nullable
+//    @Override
+//    @OnlyIn(Dist.CLIENT)
+//    public Object getClientGuiElement(int ID, EntityPlayer player, World world, int x, int y, int z) {
+//        if (ID == EffortlessBuilding.RANDOMIZER_BAG_GUI) {
+//            // Use the player's held item to create the client-side gui container
+//            LazyOptional<IItemHandler> capabilityOptional = player.getHeldItemMainhand().getCapability(CapabilityItemHandler.ITEM_HANDLER_CAPABILITY, null);
+//
+//            if (!capabilityOptional.isPresent()) {
+//                capabilityOptional = player.getHeldItemOffhand().getCapability(CapabilityItemHandler.ITEM_HANDLER_CAPABILITY, null);
+//            }
+//
+//            return new RandomizerBagGuiContainer(player.inventory, capabilityOptional.orElse(null));
+//        }
+//        return null;
+//    }
+
+    @OnlyIn(Dist.CLIENT)
+    public static GuiScreen openGui(FMLPlayMessages.OpenContainer openContainer) {
+        if (openContainer.getId().equals(EffortlessBuilding.RANDOMIZER_BAG_GUI)) {
+            EntityPlayerSP player = Minecraft.getInstance().player;
+            if (player.getHeldItem(EnumHand.MAIN_HAND).getItem() instanceof ItemRandomizerBag) {
+                IItemHandler itemHandler = player.getHeldItem(EnumHand.MAIN_HAND).getCapability(CapabilityItemHandler.ITEM_HANDLER_CAPABILITY).orElse(null);
+                if (itemHandler != null) {
+                    return new RandomizerBagGuiContainer(player.inventory, itemHandler);
+                }
+            }
+        }
+        return null;
+    }
+
+    @Override
+    public Container createContainer(InventoryPlayer inventory, EntityPlayer player) {
+        if (player.getHeldItem(EnumHand.MAIN_HAND).getItem() instanceof ItemRandomizerBag) {
+            IItemHandler itemHandler = player.getHeldItem(EnumHand.MAIN_HAND).getCapability(CapabilityItemHandler.ITEM_HANDLER_CAPABILITY).orElse(null);
+            if (itemHandler != null) {
+                return new RandomizerBagContainer(inventory, itemHandler);
+            }
+        }
+        return null;
+    }
+
+    @Override
+    public String getGuiID() {
+        return EffortlessBuilding.RANDOMIZER_BAG_GUI.toString();
+    }
+
+    @Override
+    public ITextComponent getName() {
+        return new TextComponentString("Randomizer Bag");
+    }
+
+    @Override
+    public boolean hasCustomName() {
+        return false;
+    }
+
+    @Override
+    public ITextComponent getDisplayName() {
+        return new TextComponentString("Randomizer Bag");
+    }
+
+    @Nullable
+    @Override
+    public ITextComponent getCustomName() {
+        return null;
+    }
+}

src/main/java/nl/requios/effortlessbuilding/gui/RandomizerBagScreen.java

@@ -1,49 +0,0 @@
-package nl.requios.effortlessbuilding.gui;
-
-import com.mojang.blaze3d.vertex.PoseStack;
-import com.mojang.blaze3d.systems.RenderSystem;
-import net.minecraft.client.gui.screens.inventory.AbstractContainerScreen;
-import net.minecraft.world.entity.player.Inventory;
-import net.minecraft.resources.ResourceLocation;
-import net.minecraft.network.chat.Component;
-import net.minecraftforge.api.distmarker.Dist;
-import net.minecraftforge.api.distmarker.OnlyIn;
-import nl.requios.effortlessbuilding.EffortlessBuilding;
-
-import javax.annotation.ParametersAreNonnullByDefault;
-
-@OnlyIn(Dist.CLIENT)
-@ParametersAreNonnullByDefault
-public class RandomizerBagScreen extends AbstractContainerScreen<RandomizerBagContainer> {
-	private Inventory inventory;
-
-	private static final ResourceLocation guiTextures = new ResourceLocation(EffortlessBuilding.MODID, "textures/gui/container/randomizerbag.png");
-
-	public RandomizerBagScreen(RandomizerBagContainer randomizerBagContainer, Inventory playerInventory, Component title) {
-		super(randomizerBagContainer, playerInventory, title);
-		this.inventory = playerInventory;
-		imageHeight = 134;
-	}
-
-	@Override
-	public void render(PoseStack ms, int mouseX, int mouseY, float partialTicks) {
-		renderBackground(ms);
-		super.render(ms, mouseX, mouseY, partialTicks);
-		this.renderTooltip(ms, mouseX, mouseY);
-	}
-
-	@Override
-	protected void renderLabels(PoseStack ms, int mouseX, int mouseY) {
-		this.font.draw(ms, this.title, 8, 6, 0x404040);
-		this.font.draw(ms, this.playerInventoryTitle, 8, imageHeight - 96 + 2, 0x404040);
-	}
-
-	@Override
-	protected void renderBg(PoseStack ms, float partialTicks, int mouseX, int mouseY) {
-		RenderSystem.setShaderColor(1.0F, 1.0F, 1.0F, 1f);
-		RenderSystem.setShaderTexture(0, guiTextures);
-		int marginHorizontal = (width - imageWidth) / 2;
-		int marginVertical = (height - imageHeight) / 2;
-		blit(ms, marginHorizontal, marginVertical, 0, 0, imageWidth, imageHeight);
-	}
-}

src/main/java/nl/requios/effortlessbuilding/gui/buildmode/PlayerSettingsGui.java

@@ -1,305 +0,0 @@
-package nl.requios.effortlessbuilding.gui.buildmode;
-
-import com.mojang.blaze3d.vertex.*;
-import com.mojang.blaze3d.platform.GlStateManager;
-import com.mojang.blaze3d.systems.RenderSystem;
-import net.minecraft.MethodsReturnNonnullByDefault;
-import net.minecraft.client.Minecraft;
-import net.minecraft.client.resources.sounds.SimpleSoundInstance;
-import net.minecraft.client.gui.screens.Screen;
-import net.minecraft.client.gui.components.Button;
-import net.minecraft.client.gui.components.ObjectSelectionList;
-import net.minecraft.sounds.SoundEvents;
-import net.minecraft.util.Mth;
-import net.minecraft.network.chat.Component;
-import net.minecraftforge.api.distmarker.Dist;
-import net.minecraftforge.api.distmarker.OnlyIn;
-import net.minecraftforge.client.gui.widget.ExtendedButton;
-import net.minecraftforge.client.gui.widget.ForgeSlider;
-import nl.requios.effortlessbuilding.EffortlessBuilding;
-
-import javax.annotation.ParametersAreNonnullByDefault;
-
-@ParametersAreNonnullByDefault
-@MethodsReturnNonnullByDefault
-public class PlayerSettingsGui extends Screen {
-
-	protected int left, right, top, bottom;
-	protected boolean showShaderList = false;
-	private Button shaderTypeButton;
-	private ShaderTypeList shaderTypeList;
-	private Button closeButton;
-
-	public PlayerSettingsGui() {
-		super(Component.translatable("effortlessbuilding.screen.player_settings"));
-	}
-
-	@Override
-	protected void init() {
-		left = this.width / 2 - 140;
-		right = this.width / 2 + 140;
-		top = this.height / 2 - 100;
-		bottom = this.height / 2 + 100;
-
-		int yy = top;
-		shaderTypeList = new ShaderTypeList(this.minecraft);
-		addWidget(shaderTypeList);
-		//TODO set selected name
-		Component currentShaderName = ShaderType.DISSOLVE_BLUE.name;
-		shaderTypeButton = new ExtendedButton(right - 180, yy, 180, 20, currentShaderName, (button) -> {
-			showShaderList = !showShaderList;
-		});
-		addRenderableOnly(shaderTypeButton);
-
-		yy += 50;
-		ForgeSlider slider = new ForgeSlider(right - 200, yy, 200, 20, Component.empty(), Component.empty(), 0.5, 2.0, 1.0, true);
-		addRenderableOnly(slider);
-
-		closeButton = new ExtendedButton(left + 50, bottom - 20, 180, 20, Component.literal("Done"), (button) -> this.minecraft.player.closeContainer());
-		addRenderableOnly(closeButton);
-	}
-
-	@Override
-	public void tick() {
-		super.tick();
-	}
-
-	@Override
-	public void render(PoseStack ms, int mouseX, int mouseY, float partialTicks) {
-		this.renderBackground(ms);
-
-		int yy = top;
-		font.draw(ms, "Shader type", left, yy + 5, 0xFFFFFF);
-
-		yy += 50;
-		font.draw(ms, "Shader speed", left, yy + 5, 0xFFFFFF);
-
-		super.render(ms, mouseX, mouseY, partialTicks);
-
-		if (showShaderList)
-			this.shaderTypeList.render(ms, mouseX, mouseY, partialTicks);
-	}
-
-	@Override
-	public boolean mouseClicked(double mouseX, double mouseY, int mouseButton) {
-		super.mouseClicked(mouseX, mouseY, mouseButton);
-		if (showShaderList) {
-			if (!shaderTypeList.isMouseOver(mouseX, mouseY) && !shaderTypeButton.isMouseOver(mouseX, mouseY))
-				showShaderList = false;
-		}
-		return true;
-	}
-
-	@Override
-	public void removed() {
-		ShaderTypeList.ShaderTypeEntry selectedShader = shaderTypeList.getSelected();
-		//TODO save and remove
-	}
-
-	public enum ShaderType {
-		DISSOLVE_BLUE("Dissolve Blue"),
-		DISSOLVE_ORANGE("Dissolve Orange");
-
-		public Component name;
-
-		ShaderType(Component name) {
-			this.name = name;
-		}
-
-		ShaderType(String name) {
-			this.name = Component.literal(name);
-		}
-	}
-
-	//Inspired by LanguageScreen
-	@OnlyIn(Dist.CLIENT)
-	class ShaderTypeList extends ObjectSelectionList<PlayerSettingsGui.ShaderTypeList.ShaderTypeEntry> {
-
-		public ShaderTypeList(Minecraft mcIn) {
-			super(mcIn, 180, 140, top + 20, top + 100, 18);
-			this.setLeftPos(right - width);
-
-			for (int i = 0; i < 40; i++) {
-
-				for (ShaderType shaderType : ShaderType.values()) {
-					ShaderTypeEntry shaderTypeEntry = new ShaderTypeEntry(shaderType);
-					addEntry(shaderTypeEntry);
-					//TODO setSelected to this if appropriate
-				}
-
-			}
-
-			if (this.getSelected() != null) {
-				this.centerScrollOn(this.getSelected());
-			}
-		}
-
-		@Override
-		public int getRowWidth() {
-			return width;
-		}
-
-		@Override
-		public void setSelected(PlayerSettingsGui.ShaderTypeList.ShaderTypeEntry selected) {
-			super.setSelected(selected);
-			Minecraft.getInstance().getSoundManager().play(SimpleSoundInstance.forUI(SoundEvents.UI_BUTTON_CLICK, 1.0F));
-			EffortlessBuilding.log("Selected shader " + selected.shaderType.name);
-			shaderTypeButton.setMessage(selected.shaderType.name);
-//            showShaderList = false;
-		}
-
-		@Override
-		public boolean mouseClicked(double p_mouseClicked_1_, double p_mouseClicked_3_, int p_mouseClicked_5_) {
-			if (!showShaderList) return false;
-			return super.mouseClicked(p_mouseClicked_1_, p_mouseClicked_3_, p_mouseClicked_5_);
-		}
-
-		@Override
-		public boolean mouseReleased(double p_mouseReleased_1_, double p_mouseReleased_3_, int p_mouseReleased_5_) {
-			if (!showShaderList) return false;
-			return super.mouseReleased(p_mouseReleased_1_, p_mouseReleased_3_, p_mouseReleased_5_);
-		}
-
-		@Override
-		public boolean mouseDragged(double p_mouseDragged_1_, double p_mouseDragged_3_, int p_mouseDragged_5_, double p_mouseDragged_6_, double p_mouseDragged_8_) {
-			if (!showShaderList) return false;
-			return super.mouseDragged(p_mouseDragged_1_, p_mouseDragged_3_, p_mouseDragged_5_, p_mouseDragged_6_, p_mouseDragged_8_);
-		}
-
-		@Override
-		public boolean mouseScrolled(double p_mouseScrolled_1_, double p_mouseScrolled_3_, double p_mouseScrolled_5_) {
-			if (!showShaderList) return false;
-			return super.mouseScrolled(p_mouseScrolled_1_, p_mouseScrolled_3_, p_mouseScrolled_5_);
-		}
-
-		@Override
-		public boolean isMouseOver(double p_isMouseOver_1_, double p_isMouseOver_3_) {
-			if (!showShaderList) return false;
-			return super.isMouseOver(p_isMouseOver_1_, p_isMouseOver_3_);
-		}
-
-		protected boolean isFocused() {
-			return PlayerSettingsGui.this.getFocused() == this;
-		}
-
-		@Override
-		protected int getScrollbarPosition() {
-			return right - 6;
-		}
-
-		//From AbstractSelectionList, disabled parts
-		@Override
-		public void render(PoseStack ms, int p_render_1_, int p_render_2_, float p_render_3_) {
-			this.renderBackground(ms);
-			int i = this.getScrollbarPosition();
-			int j = i + 6;
-			Tesselator tessellator = Tesselator.getInstance();
-			BufferBuilder bufferbuilder = tessellator.getBuilder();
-//            this.minecraft.getTextureManager().bindTexture(AbstractGui.BACKGROUND_LOCATION);
-			RenderSystem.enableBlend();
-			RenderSystem.blendFuncSeparate(GlStateManager.SourceFactor.SRC_ALPHA, GlStateManager.DestFactor.ONE_MINUS_SRC_ALPHA, GlStateManager.SourceFactor.ZERO, GlStateManager.DestFactor.ONE);
-			RenderSystem.setShaderColor(1.0F, 1.0F, 1.0F, 1.0F);
-			float f = 32.0F;
-			bufferbuilder.begin(VertexFormat.Mode.QUADS, DefaultVertexFormat.POSITION_COLOR);
-			bufferbuilder.vertex(this.x0, this.y1, 0.0D).color(20, 20, 20, 180).endVertex();
-			bufferbuilder.vertex(this.x1, this.y1, 0.0D).color(20, 20, 20, 180).endVertex();
-			bufferbuilder.vertex(this.x1, this.y0, 0.0D).color(20, 20, 20, 180).endVertex();
-			bufferbuilder.vertex(this.x0, this.y0, 0.0D).color(20, 20, 20, 180).endVertex();
-			tessellator.end();
-			int k = this.getRowLeft();
-			int l = this.y0 + 4 - (int) this.getScrollAmount();
-			if (this.renderHeader) {
-				this.renderHeader(ms, k, l, tessellator);
-			}
-
-			this.renderList(ms, p_render_1_, p_render_2_, p_render_3_);
-			RenderSystem.disableDepthTest();
-//            this.renderHoleBackground(0, this.y0, 255, 255);
-//            this.renderHoleBackground(this.y1, this.height, 255, 255);
-			RenderSystem.enableBlend();
-			RenderSystem.blendFuncSeparate(GlStateManager.SourceFactor.SRC_ALPHA, GlStateManager.DestFactor.ONE_MINUS_SRC_ALPHA, GlStateManager.SourceFactor.ZERO, GlStateManager.DestFactor.ONE);
-			RenderSystem.disableTexture();
-//            int i1 = 4;
-//            bufferbuilder.begin(7, DefaultVertexFormats.POSITION_TEX_COLOR);
-//            bufferbuilder.pos((double)this.x0, (double)(this.y0 + 4), 0.0D).tex(0.0F, 1.0F).color(0, 0, 0, 0).endVertex();
-//            bufferbuilder.pos((double)this.x1, (double)(this.y0 + 4), 0.0D).tex(1.0F, 1.0F).color(0, 0, 0, 0).endVertex();
-//            bufferbuilder.pos((double)this.x1, (double)this.y0, 0.0D).tex(1.0F, 0.0F).color(0, 0, 0, 255).endVertex();
-//            bufferbuilder.pos((double)this.x0, (double)this.y0, 0.0D).tex(0.0F, 0.0F).color(0, 0, 0, 255).endVertex();
-//            tessellator.draw();
-//            bufferbuilder.begin(7, DefaultVertexFormats.POSITION_TEX_COLOR);
-//            bufferbuilder.pos((double)this.x0, (double)this.y1, 0.0D).tex(0.0F, 1.0F).color(0, 0, 0, 255).endVertex();
-//            bufferbuilder.pos((double)this.x1, (double)this.y1, 0.0D).tex(1.0F, 1.0F).color(0, 0, 0, 255).endVertex();
-//            bufferbuilder.pos((double)this.x1, (double)(this.y1 - 4), 0.0D).tex(1.0F, 0.0F).color(0, 0, 0, 0).endVertex();
-//            bufferbuilder.pos((double)this.x0, (double)(this.y1 - 4), 0.0D).tex(0.0F, 0.0F).color(0, 0, 0, 0).endVertex();
-//            tessellator.draw();
-
-			//SCROLLBAR
-			int j1 = this.getMaxScroll();
-			if (j1 > 0) {
-				int k1 = (int) ((float) ((this.y1 - this.y0) * (this.y1 - this.y0)) / (float) this.getMaxPosition());
-				k1 = Mth.clamp(k1, 32, this.y1 - this.y0 - 8);
-				int l1 = (int) this.getScrollAmount() * (this.y1 - this.y0 - k1) / j1 + this.y0;
-				if (l1 < this.y0) {
-					l1 = this.y0;
-				}
-
-				bufferbuilder.begin(VertexFormat.Mode.QUADS, DefaultVertexFormat.POSITION_TEX_COLOR);
-				bufferbuilder.vertex(i, this.y1, 0.0D).uv(0.0F, 1.0F).color(0, 0, 0, 255).endVertex();
-				bufferbuilder.vertex(j, this.y1, 0.0D).uv(1.0F, 1.0F).color(0, 0, 0, 255).endVertex();
-				bufferbuilder.vertex(j, this.y0, 0.0D).uv(1.0F, 0.0F).color(0, 0, 0, 255).endVertex();
-				bufferbuilder.vertex(i, this.y0, 0.0D).uv(0.0F, 0.0F).color(0, 0, 0, 255).endVertex();
-				tessellator.end();
-				bufferbuilder.begin(VertexFormat.Mode.QUADS, DefaultVertexFormat.POSITION_TEX_COLOR);
-				bufferbuilder.vertex(i, l1 + k1, 0.0D).uv(0.0F, 1.0F).color(128, 128, 128, 255).endVertex();
-				bufferbuilder.vertex(j, l1 + k1, 0.0D).uv(1.0F, 1.0F).color(128, 128, 128, 255).endVertex();
-				bufferbuilder.vertex(j, l1, 0.0D).uv(1.0F, 0.0F).color(128, 128, 128, 255).endVertex();
-				bufferbuilder.vertex(i, l1, 0.0D).uv(0.0F, 0.0F).color(128, 128, 128, 255).endVertex();
-				tessellator.end();
-				bufferbuilder.begin(VertexFormat.Mode.QUADS, DefaultVertexFormat.POSITION_TEX_COLOR);
-				bufferbuilder.vertex(i, l1 + k1 - 1, 0.0D).uv(0.0F, 1.0F).color(192, 192, 192, 255).endVertex();
-				bufferbuilder.vertex(j - 1, l1 + k1 - 1, 0.0D).uv(1.0F, 1.0F).color(192, 192, 192, 255).endVertex();
-				bufferbuilder.vertex(j - 1, l1, 0.0D).uv(1.0F, 0.0F).color(192, 192, 192, 255).endVertex();
-				bufferbuilder.vertex(i, l1, 0.0D).uv(0.0F, 0.0F).color(192, 192, 192, 255).endVertex();
-				tessellator.end();
-			}
-
-//            this.renderDecorations(p_render_1_, p_render_2_);
-			RenderSystem.enableTexture();
-			RenderSystem.disableBlend();
-		}
-
-		public int getMaxScroll() {
-			return Math.max(0, this.getMaxPosition() - (this.y1 - this.y0 - 4));
-		}
-
-		@OnlyIn(Dist.CLIENT)
-		public class ShaderTypeEntry extends ObjectSelectionList.Entry<ShaderTypeEntry> {
-			private final ShaderType shaderType;
-
-			public ShaderTypeEntry(ShaderType shaderType) {
-				this.shaderType = shaderType;
-			}
-
-			@Override
-			public void render(PoseStack ms, int itemIndex, int rowTop, int rowLeft, int rowWidth, int rowHeight, int mouseX, int mouseY, boolean hovered, float partialTicks) {
-				if (rowTop + 10 > ShaderTypeList.this.y0 && rowTop + rowHeight - 5 < ShaderTypeList.this.y1)
-					drawString(ms, font, shaderType.name, ShaderTypeList.this.x0 + 8, rowTop + 4, 0xFFFFFF);
-			}
-
-			@Override
-			public boolean mouseClicked(double p_mouseClicked_1_, double p_mouseClicked_3_, int p_mouseClicked_5_) {
-				if (p_mouseClicked_5_ == 0) {
-					setSelected(this);
-					return true;
-				} else {
-					return false;
-				}
-			}
-
-			@Override
-			public Component getNarration() {
-				return null;
-			}
-		}
-	}
-}

src/main/java/nl/requios/effortlessbuilding/gui/buildmode/RadialMenu.java

@@ -1,524 +1,478 @@
 package nl.requios.effortlessbuilding.gui.buildmode;
 
-import com.mojang.blaze3d.vertex.*;
+import java.util.ArrayList;
-import com.mojang.blaze3d.systems.RenderSystem;
+import java.util.concurrent.TimeUnit;
-import com.mojang.math.Vector4f;
+
-import net.minecraft.MethodsReturnNonnullByDefault;
+import net.minecraft.client.resources.I18n;
-import net.minecraft.client.Minecraft;
+import net.minecraft.client.settings.KeyBinding;
-import net.minecraft.client.gui.screens.Screen;
+import net.minecraft.util.text.TextFormatting;
-import net.minecraft.client.player.LocalPlayer;
-import net.minecraft.client.renderer.GameRenderer;
-import net.minecraft.client.resources.language.I18n;
-import net.minecraft.client.KeyMapping;
-import net.minecraft.client.resources.sounds.SimpleSoundInstance;
-import net.minecraft.core.Direction;
-import net.minecraft.ChatFormatting;
-import net.minecraft.network.chat.Component;
-import net.minecraft.resources.ResourceLocation;
-import net.minecraft.sounds.SoundEvents;
-import net.minecraft.sounds.SoundSource;
-import net.minecraft.util.RandomSource;
 import nl.requios.effortlessbuilding.EffortlessBuilding;
 import nl.requios.effortlessbuilding.buildmode.ModeOptions;
 import nl.requios.effortlessbuilding.buildmode.ModeSettingsManager;
-import nl.requios.effortlessbuilding.network.ModeActionMessage;
-import nl.requios.effortlessbuilding.network.ModeSettingsMessage;
-import nl.requios.effortlessbuilding.network.PacketHandler;
 import nl.requios.effortlessbuilding.proxy.ClientProxy;
 import org.apache.commons.lang3.text.WordUtils;
 import org.lwjgl.opengl.GL11;
 
-import javax.annotation.ParametersAreNonnullByDefault;
+import com.google.common.base.Stopwatch;
-import java.util.ArrayList;
 
+import net.minecraft.client.Minecraft;
+import net.minecraft.client.gui.GuiScreen;
+import net.minecraft.client.renderer.BufferBuilder;
+import net.minecraft.client.renderer.GlStateManager;
+import net.minecraft.client.renderer.Tessellator;
+import net.minecraft.client.renderer.texture.TextureAtlasSprite;
+import net.minecraft.client.renderer.vertex.DefaultVertexFormats;
+import net.minecraft.util.EnumFacing;
+import net.minecraftforge.client.model.ModelLoader;
+
+import static nl.requios.effortlessbuilding.buildmode.BuildModes.*;
 import static nl.requios.effortlessbuilding.buildmode.ModeOptions.*;
 
-import nl.requios.effortlessbuilding.buildmode.BuildModes.BuildModeEnum;
-import nl.requios.effortlessbuilding.buildmode.ModeOptions.ActionEnum;
-import nl.requios.effortlessbuilding.buildmode.ModeOptions.OptionEnum;
-
 /**
- * Initially from Chisels and Bits by AlgorithmX2
+ * From Chisels and Bits by AlgorithmX2
  * https://github.com/AlgorithmX2/Chisels-and-Bits/blob/1.12/src/main/java/mod/chiselsandbits/client/gui/ChiselsAndBitsMenu.java
  */
+public class RadialMenu extends GuiScreen {
 
-@ParametersAreNonnullByDefault
+    private final float TIME_SCALE = 0.01f;
-@MethodsReturnNonnullByDefault
+    public static final RadialMenu instance = new RadialMenu();
-public class RadialMenu extends Screen {
 
-	public static final RadialMenu instance = new RadialMenu();
+    private float visibility = 0.0f;
+    private Stopwatch lastChange = Stopwatch.createStarted();
+    public BuildModeEnum switchTo = null;
+    public ActionEnum doAction = null;
+    public boolean actionUsed = false;
 
-	private final Vector4f radialButtonColor = new Vector4f(0f, 0f, 0f, .5f);
+    private float clampVis(final float f) {
-	private final Vector4f sideButtonColor = new Vector4f(.5f, .5f, .5f, .5f);
+        return Math.max( 0.0f, Math.min( 1.0f, f ) );
-	private final Vector4f highlightColor = new Vector4f(.6f, .8f, 1f, .6f);
+    }
-	private final Vector4f selectedColor = new Vector4f(0f, .5f, 1f, .5f);
-	private final Vector4f highlightSelectedColor = new Vector4f(0.2f, .7f, 1f, .7f);
 
-	private final int whiteTextColor = 0xffffffff;
+    public void raiseVisibility() {
-	private final int watermarkTextColor = 0x88888888;
+        visibility = clampVis( visibility + lastChange.elapsed( TimeUnit.MILLISECONDS ) * TIME_SCALE );
-	private final int descriptionTextColor = 0xdd888888;
+        lastChange = Stopwatch.createStarted();
-	private final int optionTextColor = 0xeeeeeeff;
+    }
-
-	private final double ringInnerEdge = 30;
-	private final double ringOuterEdge = 65;
-	private final double categoryLineWidth = 1;
-	private final double textDistance = 75;
-	private final double buttonDistance = 105;
-	private final float fadeSpeed = 0.3f;
-	private final int descriptionHeight = 100;
-
-	public BuildModeEnum switchTo = null;
-	public ActionEnum doAction = null;
-	public boolean performedActionUsingMouse;
-
-	private float visibility;
-
-	public RadialMenu() {
-		super(Component.translatable("effortlessbuilding.screen.radial_menu"));
-	}
-
-	public boolean isVisible() {
-		return Minecraft.getInstance().screen instanceof RadialMenu;
-	}
 
-	@Override
+    public void decreaseVisibility() {
-	protected void init() {
+        visibility = clampVis( visibility - lastChange.elapsed( TimeUnit.MILLISECONDS ) * TIME_SCALE );
-		super.init();
+        lastChange = Stopwatch.createStarted();
-		performedActionUsingMouse = false;
+    }
-		visibility = 0f;
-	}
 
-	@Override
+    public void setVisibility(float visibility) {
-	public void tick() {
+        this.visibility = visibility;
-		super.tick();
+    }
-
+
-		if (!ClientProxy.isKeybindDown(2)) {
+    public boolean isVisible() {
-			onClose();
+        return visibility > 0.001;
-		}
+    }
-	}
+
-
+    public void configure(final int scaledWidth, final int scaledHeight ) {
-	@Override
+        mc = Minecraft.getInstance();
-	public void render(PoseStack ms, final int mouseX, final int mouseY, final float partialTicks) {
+        fontRenderer = mc.fontRenderer;
-		BuildModeEnum currentBuildMode = ModeSettingsManager.getModeSettings(minecraft.player).getBuildMode();
+        width = scaledWidth;
-
+        height = scaledHeight;
-		ms.pushPose();
+    }
-		ms.translate(0, 0, 200);
+
-
+    private static class MenuButton {
-		visibility += fadeSpeed * partialTicks;
+
-		if (visibility > 1f) visibility = 1f;
+        public double x1, x2;
-
+        public double y1, y2;
-		final int startColor = (int) (visibility * 98) << 24;
+        public boolean highlighted;
-		final int endColor = (int) (visibility * 128) << 24;
+
-
+        public final ActionEnum action;
-		fillGradient(ms, 0, 0, width, height, startColor, endColor);
+        public String name;
-
+        public EnumFacing textSide;
-		RenderSystem.disableTexture();
+
-		RenderSystem.enableBlend();
+        public MenuButton(final String name, final ActionEnum action, final double x, final double y,
-		RenderSystem.blendFuncSeparate(GL11.GL_SRC_ALPHA, GL11.GL_ONE_MINUS_SRC_ALPHA, 1, 0);
+                final EnumFacing textSide) {
-		final Tesselator tessellator = Tesselator.getInstance();
+            this.name = I18n.format(name);
-		final BufferBuilder buffer = tessellator.getBuilder();
+            this.action = action;
-
+            x1 = x - 10;
-		buffer.begin(VertexFormat.Mode.QUADS, DefaultVertexFormat.POSITION_COLOR);
+            x2 = x + 10;
-
+            y1 = y - 10;
-		final double middleX = width / 2.0;
+            y2 = y + 10;
-		final double middleY = height / 2.0;
+            this.textSide = textSide;
-
+        }
-		//Fix for high def (retina) displays: use custom mouse coordinates
+
-		//Borrowed from GameRenderer::updateCameraAndRender
+    }
-		int mouseXX = (int) (minecraft.mouseHandler.xpos() * (double) minecraft.getWindow().getGuiScaledWidth() / (double) minecraft.getWindow().getScreenWidth());
+
-		int mouseYY = (int) (minecraft.mouseHandler.ypos() * (double) minecraft.getWindow().getGuiScaledHeight() / (double) minecraft.getWindow().getScreenHeight());
+    static class MenuRegion {
-
+
-		final double mouseXCenter = mouseXX - middleX;
+        public final BuildModeEnum mode;
-		final double mouseYCenter = mouseYY - middleY;
+        public double x1, x2;
-		double mouseRadians = Math.atan2(mouseYCenter, mouseXCenter);
+        public double y1, y2;
-
+        public boolean highlighted;
-		final double quarterCircle = Math.PI / 2.0;
+
-
+        public MenuRegion(final BuildModeEnum mode) {
-		if (mouseRadians < -quarterCircle) {
+            this.mode = mode;
-			mouseRadians = mouseRadians + Math.PI * 2;
+        }
-		}
+
-
+    }
-		final ArrayList<MenuRegion> modes = new ArrayList<MenuRegion>();
+
-		final ArrayList<MenuButton> buttons = new ArrayList<MenuButton>();
+    @Override
-
+    public void render(final int mouseX, final int mouseY, final float partialTicks) {
-		//Add build modes
+        if (!isVisible()) return;
-		for (final BuildModeEnum mode : BuildModeEnum.values()) {
+
-			modes.add(new MenuRegion(mode));
+        BuildModeEnum currentBuildMode = ModeSettingsManager.getModeSettings(Minecraft.getInstance().player).getBuildMode();
-		}
+
-
+        GlStateManager.pushMatrix();
-		//Add actions
+        GlStateManager.translatef( 0.0F, 0.0F, 200.0F );
-		buttons.add(new MenuButton(ActionEnum.UNDO.name, ActionEnum.UNDO, -buttonDistance - 26, -13, Direction.UP));
+
-		buttons.add(new MenuButton(ActionEnum.REDO.name, ActionEnum.REDO, -buttonDistance, -13, Direction.UP));
+        final int startColor = (int) ( visibility * 98 ) << 24;
-//		buttons.add(new MenuButton(ActionEnum.OPEN_PLAYER_SETTINGS.name, ActionEnum.OPEN_PLAYER_SETTINGS, -buttonDistance - 26 - 13, 13, Direction.DOWN));
+        final int endColor = (int) ( visibility * 128 ) << 24;
-		buttons.add(new MenuButton(ActionEnum.OPEN_MODIFIER_SETTINGS.name, ActionEnum.OPEN_MODIFIER_SETTINGS, -buttonDistance - 26, 13, Direction.DOWN));
+
-		buttons.add(new MenuButton(ActionEnum.REPLACE.name, ActionEnum.REPLACE, -buttonDistance, 13, Direction.DOWN));
+        drawGradientRect(0, 0, width, height, startColor, endColor);
-
+
-		//Add buildmode dependent options
+        GlStateManager.disableTexture2D();
-		OptionEnum[] options = currentBuildMode.options;
+        GlStateManager.enableBlend();
-		for (int i = 0; i < options.length; i++) {
+        GlStateManager.disableAlphaTest();
-			for (int j = 0; j < options[i].actions.length; j++) {
+        GlStateManager.blendFuncSeparate(GL11.GL_SRC_ALPHA, GL11.GL_ONE_MINUS_SRC_ALPHA, 1, 0);
-				ActionEnum action = options[i].actions[j];
+        GlStateManager.shadeModel(GL11.GL_SMOOTH);
-				buttons.add(new MenuButton(action.name, action, buttonDistance + j * 26, -13 + i * 39, Direction.DOWN));
+        final Tessellator tessellator = Tessellator.getInstance();
-			}
+        final BufferBuilder buffer = tessellator.getBuffer();
-		}
+
-
+        buffer.begin(GL11.GL_QUADS, DefaultVertexFormats.POSITION_COLOR);
-		switchTo = null;
+
-		doAction = null;
+        final double middleX = width / 2.0;
-
+        final double middleY = height / 2.0;
-		//Draw buildmode backgrounds
+
-		drawRadialButtonBackgrounds(currentBuildMode, buffer, middleX, middleY, mouseXCenter, mouseYCenter, mouseRadians,
+        final double mouseXCenter = mouseX - middleX;
-				quarterCircle, modes);
+        final double mouseYCenter = -mouseY + middleY;
-
+        double mouseRadians = Math.atan2(mouseYCenter, mouseXCenter);
-		//Draw action backgrounds
+
-		drawSideButtonBackgrounds(buffer, middleX, middleY, mouseXCenter, mouseYCenter, buttons);
+        final double ringInnerEdge = 30;
-
+        final double ringOuterEdge = 65;
-		tessellator.end();
+        final double textDistance = 75;
-		RenderSystem.disableBlend();
+        final double buttonDistance = 105;
-		RenderSystem.enableTexture();
+        final double quarterCircle = Math.PI / 2.0;
-
+
-		drawIcons(ms, middleX, middleY, modes, buttons);
+        if ( mouseRadians < -quarterCircle ) {
-
+            mouseRadians = mouseRadians + Math.PI * 2;
-		drawTexts(ms, currentBuildMode, middleX, middleY, modes, buttons, options);
+        }
-
+
-		ms.popPose();
+        final ArrayList<MenuRegion> modes = new ArrayList<MenuRegion>();
-	}
+        final ArrayList<MenuButton> buttons = new ArrayList<MenuButton>();
-
+
-	private void drawRadialButtonBackgrounds(BuildModeEnum currentBuildMode, BufferBuilder buffer, double middleX, double middleY,
+        //Add build modes
-											 double mouseXCenter, double mouseYCenter, double mouseRadians, double quarterCircle, ArrayList<MenuRegion> modes) {
+        for (final BuildModeEnum mode : BuildModeEnum.values()) {
-		if (!modes.isEmpty()) {
+            modes.add(new MenuRegion(mode));
-			final int totalModes = Math.max(3, modes.size());
+        }
-			final double fragment = Math.PI * 0.005; //gap between buttons in radians at inner edge
+
-			final double fragment2 = Math.PI * 0.0025; //gap between buttons in radians at outer edge
+        //Add actions
-			final double radiansPerObject = 2.0 * Math.PI / totalModes;
+        buttons.add(new MenuButton(ActionEnum.UNDO.name, ActionEnum.UNDO, -buttonDistance - 26, -13, EnumFacing.UP));
-
+        buttons.add(new MenuButton(ActionEnum.REDO.name, ActionEnum.REDO, -buttonDistance, -13, EnumFacing.UP));
-			for (int i = 0; i < modes.size(); i++) {
+        buttons.add(new MenuButton(ActionEnum.OPEN_MODIFIER_SETTINGS.name, ActionEnum.OPEN_MODIFIER_SETTINGS, -buttonDistance - 26, 13, EnumFacing.DOWN));
-				MenuRegion menuRegion = modes.get(i);
+        buttons.add(new MenuButton(ActionEnum.REPLACE.name, ActionEnum.REPLACE, -buttonDistance, 13, EnumFacing.DOWN));
-				final double beginRadians = i * radiansPerObject - quarterCircle;
+
-				final double endRadians = (i + 1) * radiansPerObject - quarterCircle;
+        //Add buildmode dependent options
-
+        OptionEnum[] options = currentBuildMode.options;
-				menuRegion.x1 = Math.cos(beginRadians);
+        for (int i = 0; i < options.length; i++) {
-				menuRegion.x2 = Math.cos(endRadians);
+            for (int j = 0; j < options[i].actions.length; j++) {
-				menuRegion.y1 = Math.sin(beginRadians);
+                ActionEnum action = options[i].actions[j];
-				menuRegion.y2 = Math.sin(endRadians);
+                buttons.add(new MenuButton(action.name, action, buttonDistance + j * 26, -13 + i * 39, EnumFacing.DOWN));
-
+            }
-				final double x1m1 = Math.cos(beginRadians + fragment) * ringInnerEdge;
+        }
-				final double x2m1 = Math.cos(endRadians - fragment) * ringInnerEdge;
+
-				final double y1m1 = Math.sin(beginRadians + fragment) * ringInnerEdge;
+        switchTo = null;
-				final double y2m1 = Math.sin(endRadians - fragment) * ringInnerEdge;
+        doAction = null;
-
+
-				final double x1m2 = Math.cos(beginRadians + fragment2) * ringOuterEdge;
+        //Draw buildmode backgrounds
-				final double x2m2 = Math.cos(endRadians - fragment2) * ringOuterEdge;
+        if (!modes.isEmpty()) {
-				final double y1m2 = Math.sin(beginRadians + fragment2) * ringOuterEdge;
+            final int totalModes = Math.max( 3, modes.size() );
-				final double y2m2 = Math.sin(endRadians - fragment2) * ringOuterEdge;
+            int currentMode = 0;
-
+            final double fragment = Math.PI * 0.005;
-				final boolean isSelected = currentBuildMode.ordinal() == i;
+            final double fragment2 = Math.PI * 0.0025;
-				final boolean isMouseInQuad = inTriangle(x1m1, y1m1, x2m2, y2m2, x2m1, y2m1, mouseXCenter, mouseYCenter)
+            final double perObject = 2.0 * Math.PI / totalModes;
-											  || inTriangle(x1m1, y1m1, x1m2, y1m2, x2m2, y2m2, mouseXCenter, mouseYCenter);
+
-				final boolean isHighlighted = beginRadians <= mouseRadians && mouseRadians <= endRadians && isMouseInQuad;
+            for (int i = 0; i < modes.size(); i++) {
-
+                MenuRegion menuRegion = modes.get(i);
-				Vector4f color = radialButtonColor;
+                final double beginRadians = currentMode * perObject - quarterCircle;
-				if (isSelected) color = selectedColor;
+                final double endRadians = (currentMode + 1) * perObject - quarterCircle;
-				if (isHighlighted) color = highlightColor;
+
-				if (isSelected && isHighlighted) color = highlightSelectedColor;
+                menuRegion.x1 = Math.cos(beginRadians);
-
+                menuRegion.x2 = Math.cos(endRadians);
-				if (isHighlighted) {
+                menuRegion.y1 = Math.sin(beginRadians);
-					menuRegion.highlighted = true;
+                menuRegion.y2 = Math.sin(endRadians);
-					switchTo = menuRegion.mode;
+
-				}
+                final double x1m1 = Math.cos(beginRadians + fragment) * ringInnerEdge;
-
+                final double x2m1 = Math.cos(endRadians - fragment) * ringInnerEdge;
-				buffer.vertex(middleX + x1m1, middleY + y1m1, getBlitOffset()).color(color.x(), color.y(), color.z(), color.w()).endVertex();
+                final double y1m1 = Math.sin(beginRadians + fragment) * ringInnerEdge;
-				buffer.vertex(middleX + x2m1, middleY + y2m1, getBlitOffset()).color(color.x(), color.y(), color.z(), color.w()).endVertex();
+                final double y2m1 = Math.sin(endRadians - fragment) * ringInnerEdge;
-				buffer.vertex(middleX + x2m2, middleY + y2m2, getBlitOffset()).color(color.x(), color.y(), color.z(), color.w()).endVertex();
+
-				buffer.vertex(middleX + x1m2, middleY + y1m2, getBlitOffset()).color(color.x(), color.y(), color.z(), color.w()).endVertex();
+                final double x1m2 = Math.cos(beginRadians + fragment2) * ringOuterEdge;
-
+                final double x2m2 = Math.cos(endRadians - fragment2) * ringOuterEdge;
-				//Category line
+                final double y1m2 = Math.sin(beginRadians + fragment2) * ringOuterEdge;
-				color = menuRegion.mode.category.color;
+                final double y2m2 = Math.sin(endRadians - fragment2) * ringOuterEdge;
-				final double categoryLineOuterEdge = ringInnerEdge + categoryLineWidth;
+
-
+                float r = 0.0f;
-				final double x1m3 = Math.cos(beginRadians + fragment) * categoryLineOuterEdge;
+                float g = 0.0f;
-				final double x2m3 = Math.cos(endRadians - fragment) * categoryLineOuterEdge;
+                float b = 0.0f;
-				final double y1m3 = Math.sin(beginRadians + fragment) * categoryLineOuterEdge;
+                float a = 0.5f;
-				final double y2m3 = Math.sin(endRadians - fragment) * categoryLineOuterEdge;
+
-
+                //check if current mode
-				buffer.vertex(middleX + x1m1, middleY + y1m1, getBlitOffset()).color(color.x(), color.y(), color.z(), color.w()).endVertex();
+                int buildMode = currentBuildMode.ordinal();
-				buffer.vertex(middleX + x2m1, middleY + y2m1, getBlitOffset()).color(color.x(), color.y(), color.z(), color.w()).endVertex();
+                if (buildMode == i) {
-				buffer.vertex(middleX + x2m3, middleY + y2m3, getBlitOffset()).color(color.x(), color.y(), color.z(), color.w()).endVertex();
+                    r = 0f;
-				buffer.vertex(middleX + x1m3, middleY + y1m3, getBlitOffset()).color(color.x(), color.y(), color.z(), color.w()).endVertex();
+                    g = 0.5f;
-			}
+                    b = 1f;
-		}
+                    a = 0.5f;
-	}
+                    //menuRegion.highlighted = true; //draw text
-
+                }
-	private void drawSideButtonBackgrounds(BufferBuilder buffer, double middleX, double middleY, double mouseXCenter, double mouseYCenter, ArrayList<MenuButton> buttons) {
+
-		for (final MenuButton btn : buttons) {
+                //check if mouse is over this region
-
+                final boolean isMouseInQuad = inTriangle(x1m1, y1m1, x2m2, y2m2, x2m1, y2m1, mouseXCenter, mouseYCenter)
-			final boolean isSelected =
+                                              || inTriangle(x1m1, y1m1, x1m2, y1m2, x2m2, y2m2, mouseXCenter, mouseYCenter);
-					btn.action == getBuildSpeed() ||
+
-					btn.action == getFill() ||
+                if (beginRadians <= mouseRadians && mouseRadians <= endRadians && isMouseInQuad) {
-					btn.action == getCubeFill() ||
+                    r = 0.6f;
-					btn.action == getRaisedEdge() ||
+                    g = 0.8f;
-					btn.action == getLineThickness() ||
+                    b = 1f;
-					btn.action == getCircleStart();
+                    a = 0.6f;
-
+                    menuRegion.highlighted = true;
-			final boolean isHighlighted = btn.x1 <= mouseXCenter && btn.x2 >= mouseXCenter && btn.y1 <= mouseYCenter && btn.y2 >= mouseYCenter;
+                    switchTo = menuRegion.mode;
-
+                }
-			Vector4f color = sideButtonColor;
+
-			if (isSelected) color = selectedColor;
+                buffer.pos(middleX + x1m1, middleY + y1m1, zLevel).color(r, g, b, a).endVertex();
-			if (isHighlighted) color = highlightColor;
+                buffer.pos(middleX + x2m1, middleY + y2m1, zLevel).color(r, g, b, a).endVertex();
-			if (isSelected && isHighlighted) color = highlightSelectedColor;
+                buffer.pos(middleX + x2m2, middleY + y2m2, zLevel).color(r, g, b, a).endVertex();
-
+                buffer.pos(middleX + x1m2, middleY + y1m2, zLevel).color(r, g, b, a).endVertex();
-			if (isHighlighted) {
+
-				btn.highlighted = true;
+                currentMode++;
-				doAction = btn.action;
+            }
-			}
+        }
-
+
-			buffer.vertex(middleX + btn.x1, middleY + btn.y1, getBlitOffset()).color(color.x(), color.y(), color.z(), color.w()).endVertex();
+        //Draw action backgrounds
-			buffer.vertex(middleX + btn.x1, middleY + btn.y2, getBlitOffset()).color(color.x(), color.y(), color.z(), color.w()).endVertex();
+        for (final MenuButton btn : buttons) {
-			buffer.vertex(middleX + btn.x2, middleY + btn.y2, getBlitOffset()).color(color.x(), color.y(), color.z(), color.w()).endVertex();
+            float r = 0.5f;
-			buffer.vertex(middleX + btn.x2, middleY + btn.y1, getBlitOffset()).color(color.x(), color.y(), color.z(), color.w()).endVertex();
+            float g = 0.5f;
-		}
+            float b = 0.5f;
-	}
+            float a = 0.5f;
-
+
-	private void drawIcons(PoseStack ms, double middleX, double middleY,
+            //highlight when active option
-						   ArrayList<MenuRegion> modes, ArrayList<MenuButton> buttons) {
+            if (btn.action == getBuildSpeed() ||
-		ms.pushPose();
+                btn.action == getFill() ||
-		RenderSystem.enableTexture();
+                btn.action == getCubeFill() ||
-		RenderSystem.setShader(GameRenderer::getPositionColorTexShader);
+                btn.action == getRaisedEdge() ||
-		RenderSystem.setShaderColor(1f, 1f, 1f, 1f);
+                btn.action == getLineThickness() ||
-
+                btn.action == getCircleStart()) {
-		//Draw buildmode icons
+                r = 0.0f;
-		for (final MenuRegion menuRegion : modes) {
+                g = 0.5f;
-
+                b = 1f;
-			final double x = (menuRegion.x1 + menuRegion.x2) * 0.5 * (ringOuterEdge * 0.55 + 0.45 * ringInnerEdge);
+                a = 0.6f;
-			final double y = (menuRegion.y1 + menuRegion.y2) * 0.5 * (ringOuterEdge * 0.55 + 0.45 * ringInnerEdge);
+            }
-
+
-			RenderSystem.setShaderTexture(0, new ResourceLocation(EffortlessBuilding.MODID, "textures/icons/" + menuRegion.mode.getName() + ".png"));
+            //highlight when mouse over
-			blit(ms, (int) (middleX + x - 8), (int) (middleY + y - 8), 16, 16, 0, 0, 18, 18, 18, 18);
+            if (btn.x1 <= mouseXCenter && btn.x2 >= mouseXCenter && btn.y1 <= mouseYCenter && btn.y2 >= mouseYCenter) {
-		}
+                r = 0.6f;
-
+                g = 0.8f;
-		//Draw action icons
+                b = 1f;
-		for (final MenuButton button : buttons) {
+                a = 0.6f;
-
+                btn.highlighted = true;
-			final double x = (button.x1 + button.x2) / 2 + 0.01;
+                doAction = btn.action;
-			final double y = (button.y1 + button.y2) / 2 + 0.01;
+            }
-
+
-			RenderSystem.setShaderTexture(0, new ResourceLocation(EffortlessBuilding.MODID, "textures/icons/" + button.action.name().toLowerCase() + ".png"));
+            buffer.pos(middleX + btn.x1, middleY + btn.y1, zLevel).color(r, g, b, a).endVertex();
-			blit(ms, (int) (middleX + x - 8), (int) (middleY + y - 8), 16, 16, 0, 0, 18, 18, 18, 18);
+            buffer.pos(middleX + btn.x1, middleY + btn.y2, zLevel).color(r, g, b, a).endVertex();
-		}
+            buffer.pos(middleX + btn.x2, middleY + btn.y2, zLevel).color(r, g, b, a).endVertex();
-
+            buffer.pos(middleX + btn.x2, middleY + btn.y1, zLevel).color(r, g, b, a).endVertex();
-		ms.popPose();
+        }
-	}
+
-
+        tessellator.draw();
-	private void drawTexts(PoseStack ms, BuildModeEnum currentBuildMode, double middleX, double middleY, ArrayList<MenuRegion> modes, ArrayList<MenuButton> buttons, OptionEnum[] options) {
+
-		//font.drawStringWithShadow("Actions", (int) (middleX - buttonDistance - 13) - font.getStringWidth("Actions") * 0.5f, (int) middleY - 38, 0xffffffff);
+        GlStateManager.shadeModel(GL11.GL_FLAT);
-
+
-		//Draw option strings
+        GlStateManager.translatef(0f, 0f, 5f);
-		for (int i = 0; i < currentBuildMode.options.length; i++) {
+        GlStateManager.enableTexture2D();
-			OptionEnum option = options[i];
+        GlStateManager.color3f(1f, 1f, 1f);
-			font.drawShadow(ms, I18n.get(option.name), (int) (middleX + buttonDistance - 9), (int) middleY - 37 + i * 39, optionTextColor);
+        GlStateManager.disableBlend();
-		}
+        GlStateManager.enableAlphaTest();
-
+        GlStateManager.bindTexture(Minecraft.getInstance().getTextureMap().getGlTextureId());
-		String credits = "Effortless Building";
+
-		font.drawShadow(ms, credits, width - font.width(credits) - 4, height - 10, watermarkTextColor);
+        buffer.begin(GL11.GL_QUADS, DefaultVertexFormats.POSITION_TEX_COLOR);
-
+
-		//Draw buildmode text
+        //Draw buildmode icons
-		for (final MenuRegion menuRegion : modes) {
+        for (final MenuRegion menuRegion : modes) {
-
+
-			if (menuRegion.highlighted) {
+            final double x = (menuRegion.x1 + menuRegion.x2) * 0.5 * (ringOuterEdge * 0.6 + 0.4 * ringInnerEdge);
-				final double x = (menuRegion.x1 + menuRegion.x2) * 0.5;
+            final double y = (menuRegion.y1 + menuRegion.y2) * 0.5 * (ringOuterEdge * 0.6 + 0.4 * ringInnerEdge);
-				final double y = (menuRegion.y1 + menuRegion.y2) * 0.5;
+
-
+            final TextureAtlasSprite sprite = ClientProxy.getBuildModeIcon(menuRegion.mode);
-				int fixed_x = (int) (x * textDistance);
+
-				int fixed_y = (int) (y * textDistance) - font.lineHeight / 2;
+            final double x1 = x - 8;
-				String text = I18n.get(menuRegion.mode.getNameKey());
+            final double x2 = x + 8;
-
+            final double y1 = y - 8;
-				if (x <= -0.2) {
+            final double y2 = y + 8;
-					fixed_x -= font.width(text);
+
-				} else if (-0.2 <= x && x <= 0.2) {
+            final float f = 1f;
-					fixed_x -= font.width(text) / 2;
+            final float a = 1f;
-				}
+
-
+            final double u1 = 0;
-				font.drawShadow(ms, text, (int) middleX + fixed_x, (int) middleY + fixed_y, whiteTextColor);
+            final double u2 = 16;
-
+            final double v1 = 0;
-				//Draw description
+            final double v2 = 16;
-				text = I18n.get(menuRegion.mode.getDescriptionKey());
+
-				font.drawShadow(ms, text, (int) middleX - font.width(text) / 2f, (int) middleY + descriptionHeight, descriptionTextColor);
+            buffer.pos(middleX + x1, middleY + y1, zLevel).tex(sprite.getInterpolatedU(u1), sprite.getInterpolatedV(v1)).color(f, f, f, a).endVertex();
-			}
+            buffer.pos(middleX + x1, middleY + y2, zLevel).tex(sprite.getInterpolatedU(u1), sprite.getInterpolatedV(v2)).color(f, f, f, a).endVertex();
-		}
+            buffer.pos(middleX + x2, middleY + y2, zLevel).tex(sprite.getInterpolatedU(u2), sprite.getInterpolatedV(v2)).color(f, f, f, a).endVertex();
-
+            buffer.pos(middleX + x2, middleY + y1, zLevel).tex(sprite.getInterpolatedU(u2), sprite.getInterpolatedV(v1)).color(f, f, f, a).endVertex();
-		//Draw action text
+        }
-		for (final MenuButton button : buttons) {
+
-			if (button.highlighted) {
+        //Draw action icons
-				String text = ChatFormatting.AQUA + button.name;
+        for (final MenuButton button : buttons) {
-
+
-				//Add keybind in brackets
+            final float f = 1f;
-				String keybind = findKeybind(button, currentBuildMode);
+            final float a = 1f;
-				String keybindFormatted = "";
+
-				if (!keybind.isEmpty())
+            final double u1 = 0;
-					keybindFormatted = ChatFormatting.GRAY + "(" + WordUtils.capitalizeFully(keybind) + ")";
+            final double u2 = 16;
-
+            final double v1 = 0;
-				if (button.textSide == Direction.WEST) {
+            final double v2 = 16;
-
+
-					font.draw(ms, text, (int) (middleX + button.x1 - 8) - font.width(text),
+            final TextureAtlasSprite sprite = ClientProxy.getModeOptionIcon(button.action);
-							(int) (middleY + button.y1 + 6), whiteTextColor);
+
-
+            final double btnmiddleX = (button.x1 + button.x2) / 2 + 0.01;
-				} else if (button.textSide == Direction.EAST) {
+            final double btnmiddleY = (button.y1 + button.y2) / 2 + 0.01;
-
+            final double btnx1 = btnmiddleX - 8;
-					font.draw(ms, text, (int) (middleX + button.x2 + 8),
+            final double btnx2 = btnmiddleX + 8;
-							(int) (middleY + button.y1 + 6), whiteTextColor);
+            final double btny1 = btnmiddleY - 8;
-
+            final double btny2 = btnmiddleY + 8;
-				} else if (button.textSide == Direction.UP || button.textSide == Direction.NORTH) {
+
-
+            buffer.pos(middleX + btnx1, middleY + btny1, zLevel).tex(sprite.getInterpolatedU(u1), sprite.getInterpolatedV(v1)).color(f, f, f, a).endVertex();
-					font.draw(ms, keybindFormatted, (int) (middleX + (button.x1 + button.x2) * 0.5 - font.width(keybindFormatted) * 0.5),
+            buffer.pos(middleX + btnx1, middleY + btny2, zLevel).tex(sprite.getInterpolatedU(u1), sprite.getInterpolatedV(v2)).color(f, f, f, a).endVertex();
-							(int) (middleY + button.y1 - 26), whiteTextColor);
+            buffer.pos(middleX + btnx2, middleY + btny2, zLevel).tex(sprite.getInterpolatedU(u2), sprite.getInterpolatedV(v2)).color(f, f, f, a).endVertex();
-
+            buffer.pos(middleX + btnx2, middleY + btny1, zLevel).tex(sprite.getInterpolatedU(u2), sprite.getInterpolatedV(v1)).color(f, f, f, a).endVertex();
-					font.draw(ms, text, (int) (middleX + (button.x1 + button.x2) * 0.5 - font.width(text) * 0.5),
+        }
-							(int) (middleY + button.y1 - 14), whiteTextColor);
+
-
+        tessellator.draw();
-				} else if (button.textSide == Direction.DOWN || button.textSide == Direction.SOUTH) {
+
-
+        //Draw strings
-					font.draw(ms, text, (int) (middleX + (button.x1 + button.x2) * 0.5 - font.width(text) * 0.5),
+        //fontRenderer.drawStringWithShadow("Actions", (int) (middleX - buttonDistance - 13) - fontRenderer.getStringWidth("Actions") * 0.5f, (int) middleY - 38, 0xffffffff);
-							(int) (middleY + button.y1 + 26), whiteTextColor);
+
-
+        //Draw option strings
-					font.draw(ms, keybindFormatted, (int) (middleX + (button.x1 + button.x2) * 0.5 - font.width(keybindFormatted) * 0.5),
+        for (int i = 0; i < currentBuildMode.options.length; i++) {
-							(int) (middleY + button.y1 + 38), whiteTextColor);
+            OptionEnum option = options[i];
-
+            fontRenderer.drawStringWithShadow(I18n.format(option.name), (int) (middleX + buttonDistance - 9), (int) middleY - 37 + i * 39, 0xeeeeeeff);
-				}
+        }
-
+
-			}
+        String credits = "Effortless Building";
-		}
+        fontRenderer.drawStringWithShadow(credits, width - fontRenderer.getStringWidth(credits) - 4, height - 10, 0x88888888);
-	}
+
-
+        //Draw buildmode text
-	private String findKeybind(MenuButton button, BuildModeEnum currentBuildMode){
+        for (final MenuRegion menuRegion : modes) {
-		String result = "";
+
-		int keybindingIndex = -1;
+            if (menuRegion.highlighted) {
-		if (button.action == ActionEnum.UNDO) keybindingIndex = 3;
+                final double x = (menuRegion.x1 + menuRegion.x2) * 0.5;
-		if (button.action == ActionEnum.REDO) keybindingIndex = 4;
+                final double y = (menuRegion.y1 + menuRegion.y2) * 0.5;
-		if (button.action == ActionEnum.REPLACE) keybindingIndex = 1;
+
-		if (button.action == ActionEnum.OPEN_MODIFIER_SETTINGS) keybindingIndex = 0;
+                int fixed_x = (int) (x * textDistance);
-
+                final int fixed_y = (int) (y * textDistance) - fontRenderer.FONT_HEIGHT / 2;
-		if (keybindingIndex != -1) {
+                final String text = I18n.format(menuRegion.mode.name);
-			KeyMapping keyMap = ClientProxy.keyBindings[keybindingIndex];
+
-
+                if ( x <= -0.2 ) {
-			if (!keyMap.getKeyModifier().name().equals("none")) {
+                    fixed_x -= fontRenderer.getStringWidth(text);
-				result = keyMap.getKeyModifier().name() + " ";
+                } else if ( -0.2 <= x && x <= 0.2 ) {
-			}
+                    fixed_x -= fontRenderer.getStringWidth(text) / 2;
-			result += I18n.get(keyMap.getKey().getName());
+                }
-		}
+
-
+                fontRenderer.drawStringWithShadow(text, (int) middleX + fixed_x, (int) middleY + fixed_y, 0xffffffff);
-		if (currentBuildMode.options.length > 0) {
+            }
-			//Add (ctrl) to first two actions of first option
+        }
-			if (button.action == currentBuildMode.options[0].actions[0]
+
-				|| button.action == currentBuildMode.options[0].actions[1]) {
+        //Draw action text
-				result = I18n.get(ClientProxy.keyBindings[5].getKey().getName());
+        for (final MenuButton button : buttons) {
-				if (result.equals("Left Control")) result = "Ctrl";
+            if (button.highlighted) {
-			}
+                String text = TextFormatting.AQUA + button.name;
-		}
+                int wrap = 120;
-		return result;
+                String keybind = "";
-	}
+                String keybindFormatted = "";
-
+
-	private boolean inTriangle(final double x1, final double y1, final double x2, final double y2,
+                //Add keybind in brackets
-							   final double x3, final double y3, final double x, final double y) {
+                if (button.action == ActionEnum.UNDO) {
-		final double ab = (x1 - x) * (y2 - y) - (x2 - x) * (y1 - y);
+                    keybind = ClientProxy.keyBindings[4].getKey().getName();
-		final double bc = (x2 - x) * (y3 - y) - (x3 - x) * (y2 - y);
+                }
-		final double ca = (x3 - x) * (y1 - y) - (x1 - x) * (y3 - y);
+                if (button.action == ActionEnum.REDO) {
-		return sign(ab) == sign(bc) && sign(bc) == sign(ca);
+                    keybind = ClientProxy.keyBindings[5].getKey().getName();
-	}
+                }
-
+                if (button.action == ActionEnum.REPLACE) {
-	private int sign(final double n) {
+                    keybind = ClientProxy.keyBindings[1].getKey().getName();
-		return n > 0 ? 1 : -1;
+                }
-	}
+                if (button.action == ActionEnum.OPEN_MODIFIER_SETTINGS) {
-
+                    keybind = ClientProxy.keyBindings[0].getKey().getName();
-	@Override
+                }
-	public boolean isPauseScreen() {
+                if (currentBuildMode.options.length > 0) {
-		return false;
+                    //Add (ctrl) to first two actions of first option
-	}
+                    if (button.action == currentBuildMode.options[0].actions[0]
-
+                        || button.action == currentBuildMode.options[0].actions[1]) {
-	@Override
+                        keybind = ClientProxy.keyBindings[6].getKey().getName();
-	public boolean mouseClicked(double mouseX, double mouseY, int mouseButton) {
+                        if (keybind.equals("Left Control")) keybind = "Ctrl";
-		performAction(true);
+                    }
-
+                }
-		return super.mouseClicked(mouseX, mouseY, mouseButton);
+                if (!keybind.isEmpty()) keybindFormatted = TextFormatting.GRAY + "(" + WordUtils.capitalizeFully(keybind) + ")";
-	}
+
-
+                if (button.textSide == EnumFacing.WEST) {
-	@Override
+
-	public void onClose() {
+                    fontRenderer.drawSplitString( text, (int) (middleX + button.x1 - 8 ) - fontRenderer.getStringWidth(text),
-		super.onClose();
+                            (int) (middleY + button.y1 + 6), wrap, 0xffffffff);
-		//After onClose so it can open another screen
+
-		if (!performedActionUsingMouse) performAction(false);
+                } else if (button.textSide == EnumFacing.EAST) {
-	}
+
-
+                    fontRenderer.drawSplitString(text, (int) (middleX + button.x2 + 8),
-	private void performAction(boolean fromMouseClick) {
+                            (int) (middleY + button.y1 + 6 ), wrap, 0xffffffff);
-		LocalPlayer player = Minecraft.getInstance().player;
+
-
+                } else if (button.textSide == EnumFacing.UP || button.textSide == EnumFacing.NORTH) {
-		ModeSettingsManager.ModeSettings modeSettings = ModeSettingsManager.getModeSettings(player);
+
-
+                    fontRenderer.drawSplitString( keybindFormatted, (int) (middleX + (button.x1 + button.x2) * 0.5 - fontRenderer.getStringWidth(keybindFormatted) * 0.5),
-		if (switchTo != null) {
+                            (int) (middleY + button.y1 - 26), wrap,0xffffffff);
-			playRadialMenuSound();
+
-
+                    fontRenderer.drawSplitString( text, (int) (middleX + (button.x1 + button.x2) * 0.5 - fontRenderer.getStringWidth(text) * 0.5),
-			modeSettings.setBuildMode(switchTo);
+                            (int) (middleY + button.y1 - 14), wrap,0xffffffff);
-			ModeSettingsManager.setModeSettings(player, modeSettings);
+
-			PacketHandler.INSTANCE.sendToServer(new ModeSettingsMessage(modeSettings));
+                } else if (button.textSide == EnumFacing.DOWN || button.textSide == EnumFacing.SOUTH) {
-
+
-			EffortlessBuilding.log(player, I18n.get(modeSettings.getBuildMode().getNameKey()), true);
+                    fontRenderer.drawSplitString(text, (int) (middleX + (button.x1 + button.x2) * 0.5 - fontRenderer.getStringWidth(text) * 0.5),
-
+                            (int) (middleY + button.y1 + 26), wrap, 0xffffffff);
-			if (fromMouseClick) performedActionUsingMouse = true;
+
-		}
+                    fontRenderer.drawSplitString(keybindFormatted, (int) (middleX + (button.x1 + button.x2) * 0.5 - fontRenderer.getStringWidth(keybindFormatted) * 0.5),
-
+                            (int) (middleY + button.y1 + 38), wrap, 0xffffffff);
-		//Perform button action
+
-		ModeOptions.ActionEnum action = doAction;
+                }
-		if (action != null) {
+
-			playRadialMenuSound();
+            }
-
+        }
-			ModeOptions.performAction(player, action);
+
-			PacketHandler.INSTANCE.sendToServer(new ModeActionMessage(action));
+        GlStateManager.popMatrix();
-
+    }
-			if (fromMouseClick) performedActionUsingMouse = true;
+
-		}
+    private boolean inTriangle(final double x1, final double y1, final double x2, final double y2,
-	}
+                               final double x3, final double y3, final double x, final double y ) {
-
+        final double ab = (x1 - x) * (y2 - y) - (x2 - x) * (y1 - y);
-	public static void playRadialMenuSound() {
+        final double bc = (x2 - x) * (y3 - y) - (x3 - x) * (y2 - y);
-		final float volume = 0.1f;
+        final double ca = (x3 - x) * (y1 - y) - (x1 - x) * (y3 - y);
-		if (volume >= 0.0001f) {
+        return sign(ab) == sign(bc) && sign(bc) == sign(ca);
-			SimpleSoundInstance sound = new SimpleSoundInstance(SoundEvents.UI_BUTTON_CLICK, SoundSource.MASTER, volume,
+    }
-					1.0f, RandomSource.create(), Minecraft.getInstance().player.blockPosition());
+
-			Minecraft.getInstance().getSoundManager().play(sound);
+    private int sign(final double n) {
-		}
+        return n > 0 ? 1 : -1;
-	}
+    }
-
+
-	private static class MenuButton {
+    /**
-
+     * Called when the mouse is clicked. Args : mouseX, mouseY, clickedButton
-		public final ActionEnum action;
+     */
-		public double x1, x2;
+    @Override
-		public double y1, y2;
+    public boolean mouseClicked(double mouseX, double mouseY, int mouseButton) {
-		public boolean highlighted;
+        EffortlessBuilding.log("mouse clicked");
-		public String name;
+
-		public Direction textSide;
+//        KeyBinding.updateKeyBindState();
-
+//        KeyBinding.setKeyBindState(ClientProxy.keyBindings[3].getKeyCode(), true);
-		public MenuButton(final String name, final ActionEnum action, final double x, final double y,
+
-						  final Direction textSide) {
+//        if (mouseButton == 0) {
-			this.name = I18n.get(name);
+//            this.mc.displayGuiScreen(null);
-			this.action = action;
+//
-			x1 = x - 10;
+//            if (this.mc.currentScreen == null) {
-			x2 = x + 10;
+//                this.mc.setIngameFocus();
-			y1 = y - 10;
+//            }
-			y2 = y + 10;
+//        }
-			this.textSide = textSide;
+        return super.mouseClicked(mouseX, mouseY, mouseButton);
-		}
+    }
-
-	}
-
-	static class MenuRegion {
-
-		public final BuildModeEnum mode;
-		public double x1, x2;
-		public double y1, y2;
-		public boolean highlighted;
-
-		public MenuRegion(final BuildModeEnum mode) {
-			this.mode = mode;
-		}
-
-	}
 
 }
 

src/main/java/nl/requios/effortlessbuilding/gui/buildmodifier/ArraySettingsGui.java

@@ -1,201 +1,204 @@
 package nl.requios.effortlessbuilding.gui.buildmodifier;
 
-import com.mojang.blaze3d.vertex.PoseStack;
+import net.minecraft.client.gui.GuiButton;
-import net.minecraft.client.gui.components.Widget;
+import net.minecraft.client.gui.GuiScreen;
-import net.minecraft.client.gui.screens.Screen;
+import net.minecraft.util.math.BlockPos;
-import net.minecraft.core.BlockPos;
+import net.minecraft.util.text.TextFormatting;
-import net.minecraft.network.chat.Component;
-import net.minecraft.ChatFormatting;
 import net.minecraftforge.api.distmarker.Dist;
 import net.minecraftforge.api.distmarker.OnlyIn;
+import net.minecraftforge.fml.client.config.GuiCheckBox;
 import nl.requios.effortlessbuilding.EffortlessBuilding;
 import nl.requios.effortlessbuilding.buildmodifier.Array;
 import nl.requios.effortlessbuilding.buildmodifier.ModifierSettingsManager;
-import nl.requios.effortlessbuilding.gui.elements.GuiCheckBoxFixed;
 import nl.requios.effortlessbuilding.gui.elements.GuiCollapsibleScrollEntry;
 import nl.requios.effortlessbuilding.gui.elements.GuiNumberField;
 import nl.requios.effortlessbuilding.gui.elements.GuiScrollPane;
 import nl.requios.effortlessbuilding.helper.ReachHelper;
 
+import java.io.IOException;
 import java.util.ArrayList;
 import java.util.List;
 
 @OnlyIn(Dist.CLIENT)
 public class ArraySettingsGui extends GuiCollapsibleScrollEntry {
 
-	protected List<GuiNumberField> arrayNumberFieldList = new ArrayList<>();
+    protected List<GuiNumberField> arrayNumberFieldList = new ArrayList<>();
 
-	private GuiCheckBoxFixed buttonArrayEnabled;
+    private GuiCheckBox buttonArrayEnabled;
-	private GuiNumberField textArrayOffsetX, textArrayOffsetY, textArrayOffsetZ, textArrayCount;
+    private GuiNumberField textArrayOffsetX, textArrayOffsetY, textArrayOffsetZ, textArrayCount;
 
-	public ArraySettingsGui(GuiScrollPane scrollPane) {
+    public ArraySettingsGui(GuiScrollPane scrollPane) {
-		super(scrollPane);
+        super(scrollPane);
-	}
+    }
 
-	@Override
+    @Override
-	public void init(List<Widget> renderables) {
+    public int initGui(int id, List<GuiButton> buttons) {
-		super.init(renderables);
+        id = super.initGui(id, buttons);
 
-		int y = top;
+        int y = top;
-		buttonArrayEnabled = new GuiCheckBoxFixed(left - 15 + 8, y, "", false) {
+        buttonArrayEnabled = new GuiCheckBox(id++, left - 15 + 8, y, "", false) {
-			@Override
+            @Override
-			public void onClick(double mouseX, double mouseY) {
+            public void onClick(double mouseX, double mouseY) {
-				super.onClick(mouseX, mouseY);
+                super.onClick(mouseX, mouseY);
-				setCollapsed(!buttonArrayEnabled.isChecked());
+                setCollapsed(!buttonArrayEnabled.isChecked());
-			}
+            }
-		};
+        };
-		renderables.add(buttonArrayEnabled);
+        buttons.add(buttonArrayEnabled);
 
-		y = top + 20;
+        y = top + 20;
-		textArrayOffsetX = new GuiNumberField(font, renderables, left + 70, y, 50, 18);
+        textArrayOffsetX = new GuiNumberField(id++, id++, id++, fontRenderer, buttons, left + 70, y, 50, 18);
-		textArrayOffsetX.setNumber(0);
+        textArrayOffsetX.setNumber(0);
-		textArrayOffsetX.setTooltip(Component.literal("How much each copy is shifted."));
+        textArrayOffsetX.setTooltip("How much each copy is shifted.");
-		arrayNumberFieldList.add(textArrayOffsetX);
+        arrayNumberFieldList.add(textArrayOffsetX);
 
-		textArrayOffsetY = new GuiNumberField(font, renderables, left + 140, y, 50, 18);
+        textArrayOffsetY = new GuiNumberField(id++, id++, id++, fontRenderer, buttons, left + 140, y, 50, 18);
-		textArrayOffsetY.setNumber(0);
+        textArrayOffsetY.setNumber(0);
-		textArrayOffsetY.setTooltip(Component.literal("How much each copy is shifted."));
+        textArrayOffsetY.setTooltip("How much each copy is shifted.");
-		arrayNumberFieldList.add(textArrayOffsetY);
+        arrayNumberFieldList.add(textArrayOffsetY);
 
-		textArrayOffsetZ = new GuiNumberField(font, renderables, left + 210, y, 50, 18);
+        textArrayOffsetZ = new GuiNumberField(id++, id++, id++, fontRenderer, buttons, left + 210, y, 50, 18);
-		textArrayOffsetZ.setNumber(0);
+        textArrayOffsetZ.setNumber(0);
-		textArrayOffsetZ.setTooltip(Component.literal("How much each copy is shifted."));
+        textArrayOffsetZ.setTooltip("How much each copy is shifted.");
-		arrayNumberFieldList.add(textArrayOffsetZ);
+        arrayNumberFieldList.add(textArrayOffsetZ);
 
-		y = top + 50;
+        y = top + 50;
-		textArrayCount = new GuiNumberField(font, renderables, left + 55, y, 50, 18);
+        textArrayCount = new GuiNumberField(id++, id++, id++, fontRenderer, buttons, left + 55, y, 50, 18);
-		textArrayCount.setNumber(5);
+        textArrayCount.setNumber(5);
-		textArrayCount.setTooltip(Component.literal("How many copies should be made."));
+        textArrayCount.setTooltip("How many copies should be made.");
-		arrayNumberFieldList.add(textArrayCount);
+        arrayNumberFieldList.add(textArrayCount);
 
-		ModifierSettingsManager.ModifierSettings modifierSettings = ModifierSettingsManager.getModifierSettings(mc.player);
+        ModifierSettingsManager.ModifierSettings modifierSettings = ModifierSettingsManager.getModifierSettings(mc.player);
-		if (modifierSettings != null) {
+        if (modifierSettings != null) {
-			Array.ArraySettings a = modifierSettings.getArraySettings();
+            Array.ArraySettings a = modifierSettings.getArraySettings();
-			buttonArrayEnabled.setIsChecked(a.enabled);
+            buttonArrayEnabled.setIsChecked(a.enabled);
-			textArrayOffsetX.setNumber(a.offset.getX());
+            textArrayOffsetX.setNumber(a.offset.getX());
-			textArrayOffsetY.setNumber(a.offset.getY());
+            textArrayOffsetY.setNumber(a.offset.getY());
-			textArrayOffsetZ.setNumber(a.offset.getZ());
+            textArrayOffsetZ.setNumber(a.offset.getZ());
-			textArrayCount.setNumber(a.count);
+            textArrayCount.setNumber(a.count);
-		}
+        }
 
-		setCollapsed(!buttonArrayEnabled.isChecked());
+        setCollapsed(!buttonArrayEnabled.isChecked());
-	}
 
-	public void updateScreen() {
+        return id;
-		arrayNumberFieldList.forEach(GuiNumberField::update);
+    }
-	}
 
-	@Override
+    public void updateScreen() {
-	public void drawEntry(PoseStack ms, int slotIndex, int x, int y, int listWidth, int slotHeight, int mouseX, int mouseY,
+        arrayNumberFieldList.forEach(GuiNumberField::update);
-						  boolean isSelected, float partialTicks) {
+    }
-		int yy = y;
-		int offset = 8;
 
-		buttonArrayEnabled.render(ms, mouseX, mouseY, partialTicks);
+    @Override
-		if (buttonArrayEnabled.isChecked()) {
+    public void drawEntry(int slotIndex, int x, int y, int listWidth, int slotHeight, int mouseX, int mouseY,
-			buttonArrayEnabled.y = yy;
+                          boolean isSelected, float partialTicks) {
-			font.draw(ms, "Array enabled", left + offset, yy + 2, 0xFFFFFF);
+        int yy = y;
+        int offset = 8;
 
-			yy = y + 20;
+        buttonArrayEnabled.render(mouseX, mouseY, partialTicks);
-			font.draw(ms, "Offset", left + offset, yy + 5, 0xFFFFFF);
+        if (buttonArrayEnabled.isChecked()) {
-			font.draw(ms, "X", left + 50 + offset, yy + 5, 0xFFFFFF);
+            buttonArrayEnabled.y = yy;
-			textArrayOffsetX.y = yy;
+            fontRenderer.drawString("Array enabled", left + offset, yy + 2, 0xFFFFFF);
-			font.draw(ms, "Y", left + 120 + offset, yy + 5, 0xFFFFFF);
-			textArrayOffsetY.y = yy;
-			font.draw(ms, "Z", left + 190 + offset, yy + 5, 0xFFFFFF);
-			textArrayOffsetZ.y = yy;
 
-			yy = y + 50;
+            yy = y + 20;
-			font.draw(ms, "Count", left + offset, yy + 5, 0xFFFFFF);
+            fontRenderer.drawString("Offset", left + offset, yy + 5, 0xFFFFFF);
-			textArrayCount.y = yy;
+            fontRenderer.drawString("X", left + 50 + offset, yy + 5, 0xFFFFFF);
+            textArrayOffsetX.y = yy;
+            fontRenderer.drawString("Y", left + 120 + offset, yy + 5, 0xFFFFFF);
+            textArrayOffsetY.y = yy;
+            fontRenderer.drawString("Z", left + 190 + offset, yy + 5, 0xFFFFFF);
+            textArrayOffsetZ.y = yy;
 
-			int currentReach = Math.max(-1, getArrayReach());
+            yy = y + 50;
-			int maxReach = ReachHelper.getMaxReach(mc.player);
+            fontRenderer.drawString("Count", left + offset, yy + 5, 0xFFFFFF);
-			ChatFormatting reachColor = isCurrentReachValid(currentReach, maxReach) ? ChatFormatting.GRAY : ChatFormatting.RED;
+            textArrayCount.y = yy;
-			String reachText = "Reach: " + reachColor + currentReach + ChatFormatting.GRAY + "/" + ChatFormatting.GRAY + maxReach;
-			font.draw(ms, reachText, left + 176 + offset, yy + 5, 0xFFFFFF);
 
-			arrayNumberFieldList.forEach(numberField -> numberField.drawNumberField(ms, mouseX, mouseY, partialTicks));
+            int currentReach = Math.max(-1, getArrayReach());
-		} else {
+            int maxReach = ReachHelper.getMaxReach(mc.player);
-			buttonArrayEnabled.y = yy;
+            TextFormatting reachColor = isCurrentReachValid(currentReach, maxReach) ? TextFormatting.GRAY : TextFormatting.RED;
-			font.draw(ms, "Array disabled", left + offset, yy + 2, 0x999999);
+            String reachText = "Reach: " + reachColor + currentReach + TextFormatting.GRAY + "/" + TextFormatting.GRAY + maxReach;
-		}
+            fontRenderer.drawString(reachText, left + 176 + offset, yy + 5, 0xFFFFFF);
 
-	}
+            arrayNumberFieldList.forEach(numberField -> numberField.drawNumberField(mouseX, mouseY, partialTicks));
+        } else {
+            buttonArrayEnabled.y = yy;
+            fontRenderer.drawString("Array disabled", left + offset, yy + 2, 0x999999);
+        }
 
-	public void drawTooltip(PoseStack ms, Screen guiScreen, int mouseX, int mouseY) {
+    }
-		//Draw tooltips last
-		if (buttonArrayEnabled.isChecked()) {
-			arrayNumberFieldList.forEach(numberField -> numberField.drawTooltip(ms, scrollPane.parent, mouseX, mouseY));
-		}
-	}
 
-	@Override
+    public void drawTooltip(GuiScreen guiScreen, int mouseX, int mouseY) {
-	public boolean charTyped(char typedChar, int keyCode) {
+        //Draw tooltips last
-		super.charTyped(typedChar, keyCode);
+        if (buttonArrayEnabled.isChecked())
-		for (GuiNumberField numberField : arrayNumberFieldList) {
+        {
-			numberField.charTyped(typedChar, keyCode);
+            arrayNumberFieldList.forEach(numberField -> numberField.drawTooltip(scrollPane.parent, mouseX, mouseY));
-		}
+        }
-		return true;
+    }
-	}
 
-	@Override
+    @Override
-	public boolean mousePressed(int slotIndex, int mouseX, int mouseY, int mouseEvent, int relativeX, int relativeY) {
+    public boolean charTyped(char typedChar, int keyCode) {
-		arrayNumberFieldList.forEach(numberField -> numberField.mouseClicked(mouseX, mouseY, mouseEvent));
+        super.charTyped(typedChar, keyCode);
+        for (GuiNumberField numberField : arrayNumberFieldList) {
+            numberField.charTyped(typedChar, keyCode);
+        }
+        return true;
+    }
 
-		boolean insideArrayEnabledLabel = mouseX >= left && mouseX < right && relativeY >= -2 && relativeY < 12;
+    @Override
+    public boolean mousePressed(int slotIndex, int mouseX, int mouseY, int mouseEvent, int relativeX, int relativeY) {
+        arrayNumberFieldList.forEach(numberField -> numberField.mouseClicked(mouseX, mouseY, mouseEvent));
 
-		if (insideArrayEnabledLabel) {
+        boolean insideArrayEnabledLabel = mouseX >= left && mouseX < right && relativeY >= -2 && relativeY < 12;
-			buttonArrayEnabled.playDownSound(this.mc.getSoundManager());
-			buttonArrayEnabled.onClick(mouseX, mouseY);
-		}
 
-		return true;
+        if (insideArrayEnabledLabel) {
-	}
+            buttonArrayEnabled.playPressSound(this.mc.getSoundHandler());
+            buttonArrayEnabled.onClick(mouseX, mouseY);
+        }
 
-	public Array.ArraySettings getArraySettings() {
+        return true;
-		boolean arrayEnabled = buttonArrayEnabled.isChecked();
+    }
-		BlockPos arrayOffset = new BlockPos(0, 0, 0);
-		try {
-			arrayOffset = new BlockPos(textArrayOffsetX.getNumber(), textArrayOffsetY.getNumber(), textArrayOffsetZ.getNumber());
-		} catch (NumberFormatException | NullPointerException ex) {
-			EffortlessBuilding.log(mc.player, "Array offset not a valid number.");
-		}
 
-		int arrayCount = 5;
+    public Array.ArraySettings getArraySettings() {
-		try {
+        boolean arrayEnabled = buttonArrayEnabled.isChecked();
-			arrayCount = (int) textArrayCount.getNumber();
+        BlockPos arrayOffset = new BlockPos(0, 0, 0);
-		} catch (NumberFormatException | NullPointerException ex) {
+        try {
-			EffortlessBuilding.log(mc.player, "Array count not a valid number.");
+            arrayOffset = new BlockPos(textArrayOffsetX.getNumber(), textArrayOffsetY.getNumber(), textArrayOffsetZ.getNumber());
-		}
+        } catch (NumberFormatException | NullPointerException ex) {
+            EffortlessBuilding.log(mc.player, "Array offset not a valid number.");
+        }
 
-		return new Array.ArraySettings(arrayEnabled, arrayOffset, arrayCount);
+        int arrayCount = 5;
-	}
+        try {
+            arrayCount = (int) textArrayCount.getNumber();
+        } catch (NumberFormatException | NullPointerException ex) {
+            EffortlessBuilding.log(mc.player, "Array count not a valid number.");
+        }
 
-	@Override
+        return new Array.ArraySettings(arrayEnabled, arrayOffset, arrayCount);
-	protected String getName() {
+    }
-		return "Array";
-	}
 
-	@Override
+    @Override
-	protected int getExpandedHeight() {
+    protected String getName() {
-		return 80;
+        return "Array";
-	}
+    }
 
-	private int getArrayReach() {
+    @Override
-		try {
+    protected int getExpandedHeight() {
-			//find largest offset
+        return 80;
-			double x = Math.abs(textArrayOffsetX.getNumber());
+    }
-			double y = Math.abs(textArrayOffsetY.getNumber());
-			double z = Math.abs(textArrayOffsetZ.getNumber());
-			double largestOffset = Math.max(Math.max(x, y), z);
-			return (int) (largestOffset * textArrayCount.getNumber());
-		} catch (NumberFormatException | NullPointerException ex) {
-			return -1;
-		}
-	}
 
-	private boolean isCurrentReachValid(int currentReach, int maxReach) {
+    private int getArrayReach() {
-		return currentReach <= maxReach && currentReach > -1;
+        try
-	}
+        {
+            //find largest offset
+            double x = Math.abs(textArrayOffsetX.getNumber());
+            double y = Math.abs(textArrayOffsetY.getNumber());
+            double z = Math.abs(textArrayOffsetZ.getNumber());
+            double largestOffset = Math.max(Math.max(x, y), z);
+            return (int) (largestOffset * textArrayCount.getNumber());
+        } catch (NumberFormatException | NullPointerException ex) {
+            return -1;
+        }
+    }
+
+    private boolean isCurrentReachValid(int currentReach, int maxReach) {
+        return currentReach <= maxReach && currentReach > -1;
+    }
 }

src/main/java/nl/requios/effortlessbuilding/gui/buildmodifier/MirrorSettingsGui.java

@@ -1,21 +1,23 @@
 package nl.requios.effortlessbuilding.gui.buildmodifier;
 
-import com.mojang.blaze3d.vertex.PoseStack;
+import net.minecraft.client.gui.GuiButton;
-import net.minecraft.client.gui.components.Widget;
+import net.minecraft.client.gui.GuiScreen;
-import net.minecraft.client.gui.screens.Screen;
+import net.minecraft.util.ResourceLocation;
-import net.minecraft.client.gui.components.Button;
+import net.minecraft.util.math.Vec3d;
-import net.minecraft.network.chat.Component;
+import net.minecraft.util.text.TextFormatting;
-import net.minecraft.resources.ResourceLocation;
-import net.minecraft.world.phys.Vec3;
-import net.minecraft.ChatFormatting;
 import net.minecraftforge.api.distmarker.Dist;
 import net.minecraftforge.api.distmarker.OnlyIn;
+import net.minecraftforge.fml.client.config.GuiCheckBox;
 import nl.requios.effortlessbuilding.EffortlessBuilding;
 import nl.requios.effortlessbuilding.buildmodifier.Mirror;
 import nl.requios.effortlessbuilding.buildmodifier.ModifierSettingsManager;
-import nl.requios.effortlessbuilding.gui.elements.*;
+import nl.requios.effortlessbuilding.gui.elements.GuiCollapsibleScrollEntry;
+import nl.requios.effortlessbuilding.gui.elements.GuiIconButton;
+import nl.requios.effortlessbuilding.gui.elements.GuiNumberField;
+import nl.requios.effortlessbuilding.gui.elements.GuiScrollPane;
 import nl.requios.effortlessbuilding.helper.ReachHelper;
 
+import java.io.IOException;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
@@ -24,261 +26,280 @@ import java.util.List;
 @OnlyIn(Dist.CLIENT)
 public class MirrorSettingsGui extends GuiCollapsibleScrollEntry {
 
-	protected static final ResourceLocation BUILDING_ICONS = new ResourceLocation(EffortlessBuilding.MODID, "textures/gui/building_icons.png");
+    protected static final ResourceLocation BUILDING_ICONS = new ResourceLocation(EffortlessBuilding.MODID, "textures/gui/building_icons.png");
 
-	protected List<Button> mirrorButtonList = new ArrayList<>();
+    protected List<GuiButton> mirrorButtonList = new ArrayList<>();
-	protected List<GuiIconButton> mirrorIconButtonList = new ArrayList<>();
+    protected List<GuiIconButton> mirrorIconButtonList = new ArrayList<>();
-	protected List<GuiNumberField> mirrorNumberFieldList = new ArrayList<>();
+    protected List<GuiNumberField> mirrorNumberFieldList = new ArrayList<>();
 
-	private GuiNumberField textMirrorPosX, textMirrorPosY, textMirrorPosZ, textMirrorRadius;
+    private GuiNumberField textMirrorPosX, textMirrorPosY, textMirrorPosZ, textMirrorRadius;
-	private GuiCheckBoxFixed buttonMirrorEnabled, buttonMirrorX, buttonMirrorY, buttonMirrorZ;
+    private GuiCheckBox buttonMirrorEnabled, buttonMirrorX, buttonMirrorY, buttonMirrorZ;
-	private GuiIconButton buttonCurrentPosition, buttonToggleOdd, buttonDrawPlanes, buttonDrawLines;
+    private GuiIconButton buttonCurrentPosition, buttonToggleOdd, buttonDrawPlanes, buttonDrawLines;
-	private boolean drawPlanes, drawLines, toggleOdd;
+    private boolean drawPlanes, drawLines, toggleOdd;
 
-	public MirrorSettingsGui(GuiScrollPane scrollPane) {
+    public MirrorSettingsGui(GuiScrollPane scrollPane) {
-		super(scrollPane);
+        super(scrollPane);
-	}
+    }
 
-	@Override
+    @Override
-	public void init(List<Widget> renderables) {
+    public int initGui(int id, List<GuiButton> buttonList) {
-		super.init(renderables);
+        id = super.initGui(id, buttonList);
 
-		int y = top - 2;
+        int y = top - 2;
-		buttonMirrorEnabled = new GuiCheckBoxFixed(left - 15 + 8, y, "", false) {
+        buttonMirrorEnabled = new GuiCheckBox(id++, left - 15 + 8, y, "", false) {
-			@Override
+            @Override
-			public void onClick(double mouseX, double mouseY) {
+            public void onClick(double mouseX, double mouseY) {
-				super.onClick(mouseX, mouseY);
+                super.onClick(mouseX, mouseY);
-				setCollapsed(!buttonMirrorEnabled.isChecked());
+                setCollapsed(!buttonMirrorEnabled.isChecked());
-			}
+            }
-		};
+        };
-		renderables.add(buttonMirrorEnabled);
+        buttonList.add(buttonMirrorEnabled);
 
-		y = top + 18;
+        y = top + 18;
-		textMirrorPosX = new GuiNumberField(font, renderables, left + 58, y, 62, 18);
+        textMirrorPosX = new GuiNumberField(id++, id++, id++, fontRenderer, buttonList, left + 58, y, 62, 18);
-		textMirrorPosX.setNumber(0);
+        textMirrorPosX.setNumber(0);
-		textMirrorPosX.setTooltip(
+        textMirrorPosX.setTooltip(
-			Arrays.asList(Component.literal("The position of the mirror."), Component.literal("For odd numbered builds add 0.5.").withStyle(ChatFormatting.GRAY)));
+                Arrays.asList("The position of the mirror.", TextFormatting.GRAY + "For odd numbered builds add 0.5."));
-		mirrorNumberFieldList.add(textMirrorPosX);
+        mirrorNumberFieldList.add(textMirrorPosX);
 
-		textMirrorPosY = new GuiNumberField(font, renderables, left + 138, y, 62, 18);
+        textMirrorPosY = new GuiNumberField(id++, id++, id++, fontRenderer, buttonList, left + 138, y, 62, 18);
-		textMirrorPosY.setNumber(64);
+        textMirrorPosY.setNumber(64);
-		textMirrorPosY.setTooltip(Arrays.asList(Component.literal("The position of the mirror."), Component.literal("For odd numbered builds add 0.5.").withStyle(ChatFormatting.GRAY)));
+        textMirrorPosY.setTooltip(Arrays.asList("The position of the mirror.", TextFormatting.GRAY + "For odd numbered builds add 0.5."));
-		mirrorNumberFieldList.add(textMirrorPosY);
+        mirrorNumberFieldList.add(textMirrorPosY);
 
-		textMirrorPosZ = new GuiNumberField(font, renderables, left + 218, y, 62, 18);
+        textMirrorPosZ = new GuiNumberField(id++, id++, id++, fontRenderer, buttonList, left + 218, y, 62, 18);
-		textMirrorPosZ.setNumber(0);
+        textMirrorPosZ.setNumber(0);
-		textMirrorPosZ.setTooltip(Arrays.asList(Component.literal("The position of the mirror."), Component.literal("For odd numbered builds add 0.5.").withStyle(ChatFormatting.GRAY)));
+        textMirrorPosZ.setTooltip(Arrays.asList("The position of the mirror.", TextFormatting.GRAY + "For odd numbered builds add 0.5."));
-		mirrorNumberFieldList.add(textMirrorPosZ);
+        mirrorNumberFieldList.add(textMirrorPosZ);
 
-		y = top + 50;
+        y = top + 50;
-		buttonMirrorX = new GuiCheckBoxFixed(left + 60, y, " X", true);
+        buttonMirrorX = new GuiCheckBox(id++, left + 60, y, " X", true);
-		mirrorButtonList.add(buttonMirrorX);
+        mirrorButtonList.add(buttonMirrorX);
 
-		buttonMirrorY = new GuiCheckBoxFixed(left + 100, y, " Y", false);
+        buttonMirrorY = new GuiCheckBox(id++, left + 100, y, " Y", false);
-		mirrorButtonList.add(buttonMirrorY);
+        mirrorButtonList.add(buttonMirrorY);
 
-		buttonMirrorZ = new GuiCheckBoxFixed(left + 140, y, " Z", false);
+        buttonMirrorZ = new GuiCheckBox(id++, left + 140, y, " Z", false);
-		mirrorButtonList.add(buttonMirrorZ);
+        mirrorButtonList.add(buttonMirrorZ);
 
-		y = top + 47;
+        y = top + 47;
-		textMirrorRadius = new GuiNumberField(font, renderables, left + 218, y, 62, 18);
+        textMirrorRadius = new GuiNumberField(id++, id++, id++, fontRenderer, buttonList, left + 218, y, 62, 18);
-		textMirrorRadius.setNumber(50);
+        textMirrorRadius.setNumber(50);
-		//TODO change to diameter (remove /2)
+        //TODO change to diameter (remove /2)
-		textMirrorRadius.setTooltip(Arrays.asList(Component.literal("How far the mirror reaches in any direction."),
+        textMirrorRadius.setTooltip(Arrays.asList("How far the mirror reaches in any direction.",
-			Component.literal("Max: ").withStyle(ChatFormatting.GRAY).append(Component.literal(String.valueOf(ReachHelper.getMaxReach(mc.player) / 2)).withStyle(ChatFormatting.GOLD)),
+                TextFormatting.GRAY + "Max: " + TextFormatting.GOLD + ReachHelper.getMaxReach(mc.player) / 2,
-			Component.literal("Upgradeable in survival with reach upgrades.").withStyle(ChatFormatting.GRAY)));
+                TextFormatting.GRAY + "Upgradeable in survival with reach upgrades."));
-		mirrorNumberFieldList.add(textMirrorRadius);
+        mirrorNumberFieldList.add(textMirrorRadius);
 
-		y = top + 72;
+        y = top + 72;
-		buttonCurrentPosition = new GuiIconButton(left + 5, y, 0, 0, BUILDING_ICONS, button -> {
+        buttonCurrentPosition = new GuiIconButton(id++, left + 5, y, 0, 0, BUILDING_ICONS) {
-			Vec3 pos = new Vec3(Math.floor(mc.player.getX()) + 0.5, Math.floor(mc.player.getY()) + 0.5, Math.floor(mc.player.getZ()) + 0.5);
+            @Override
-			textMirrorPosX.setNumber(pos.x);
+            public void onClick(double mouseX, double mouseY) {
-			textMirrorPosY.setNumber(pos.y);
+                super.onClick(mouseX, mouseY);
-			textMirrorPosZ.setNumber(pos.z);
+                Vec3d pos = new Vec3d(Math.floor(mc.player.posX) + 0.5, Math.floor(mc.player.posY) + 0.5, Math.floor(mc.player.posZ) + 0.5);
-		});
+                textMirrorPosX.setNumber(pos.x);
-		buttonCurrentPosition.setTooltip(Component.literal("Set mirror position to current player position"));
+                textMirrorPosY.setNumber(pos.y);
-		mirrorIconButtonList.add(buttonCurrentPosition);
+                textMirrorPosZ.setNumber(pos.z);
+            }
+        };
+        buttonCurrentPosition.setTooltip("Set mirror position to current player position");
+        mirrorIconButtonList.add(buttonCurrentPosition);
 
-		buttonToggleOdd = new GuiIconButton(left + 35, y, 0, 20, BUILDING_ICONS, button -> {
+        buttonToggleOdd = new GuiIconButton(id++, left + 35, y, 0, 20, BUILDING_ICONS) {
-			toggleOdd = !toggleOdd;
+            @Override
-			buttonToggleOdd.setUseAlternateIcon(toggleOdd);
+            public void onClick(double mouseX, double mouseY) {
-			if (toggleOdd) {
+                super.onClick(mouseX, mouseY);
-				buttonToggleOdd.setTooltip(Arrays.asList(Component.literal("Set mirror position to corner of block"), Component.literal("for even numbered builds")));
+                toggleOdd = !toggleOdd;
-				textMirrorPosX.setNumber(textMirrorPosX.getNumber() + 0.5);
+                buttonToggleOdd.setUseAlternateIcon(toggleOdd);
-				textMirrorPosY.setNumber(textMirrorPosY.getNumber() + 0.5);
+                if (toggleOdd) {
-				textMirrorPosZ.setNumber(textMirrorPosZ.getNumber() + 0.5);
+                    buttonToggleOdd.setTooltip(Arrays.asList("Set mirror position to corner of block", "for even numbered builds"));
-			} else {
+                    textMirrorPosX.setNumber(textMirrorPosX.getNumber() + 0.5);
-				buttonToggleOdd.setTooltip(Arrays.asList(Component.literal("Set mirror position to middle of block"), Component.literal("for odd numbered builds")));
+                    textMirrorPosY.setNumber(textMirrorPosY.getNumber() + 0.5);
-				textMirrorPosX.setNumber(Math.floor(textMirrorPosX.getNumber()));
+                    textMirrorPosZ.setNumber(textMirrorPosZ.getNumber() + 0.5);
-				textMirrorPosY.setNumber(Math.floor(textMirrorPosY.getNumber()));
+                } else {
-				textMirrorPosZ.setNumber(Math.floor(textMirrorPosZ.getNumber()));
+                    buttonToggleOdd.setTooltip(Arrays.asList("Set mirror position to middle of block", "for odd numbered builds"));
-			}
+                    textMirrorPosX.setNumber(Math.floor(textMirrorPosX.getNumber()));
-		});
+                    textMirrorPosY.setNumber(Math.floor(textMirrorPosY.getNumber()));
-		buttonToggleOdd.setTooltip(Arrays.asList(Component.literal("Set mirror position to middle of block"), Component.literal("for odd numbered builds")));
+                    textMirrorPosZ.setNumber(Math.floor(textMirrorPosZ.getNumber()));
-		mirrorIconButtonList.add(buttonToggleOdd);
+                }
+            }
+        };
+        buttonToggleOdd.setTooltip(Arrays.asList("Set mirror position to middle of block", "for odd numbered builds"));
+        mirrorIconButtonList.add(buttonToggleOdd);
 
-		buttonDrawLines = new GuiIconButton(left + 65, y, 0, 40, BUILDING_ICONS, button -> {
+        buttonDrawLines = new GuiIconButton(id++, left + 65, y, 0, 40, BUILDING_ICONS) {
-			drawLines = !drawLines;
+            @Override
-			buttonDrawLines.setUseAlternateIcon(drawLines);
+            public void onClick(double mouseX, double mouseY) {
-			buttonDrawLines.setTooltip(Component.literal(drawLines ? "Hide lines" : "Show lines"));
+                super.onClick(mouseX, mouseY);
-		});
+                drawLines = !drawLines;
-		buttonDrawLines.setTooltip(Component.literal("Show lines"));
+                buttonDrawLines.setUseAlternateIcon(drawLines);
-		mirrorIconButtonList.add(buttonDrawLines);
+                buttonDrawLines.setTooltip(drawLines ? "Hide lines" : "Show lines");
+            }
+        };
+        buttonDrawLines.setTooltip("Show lines");
+        mirrorIconButtonList.add(buttonDrawLines);
 
-		buttonDrawPlanes = new GuiIconButton(left + 95, y, 0, 60, BUILDING_ICONS, button -> {
+        buttonDrawPlanes = new GuiIconButton(id++, left + 95, y, 0, 60, BUILDING_ICONS) {
-			drawPlanes = !drawPlanes;
+            @Override
-			buttonDrawPlanes.setUseAlternateIcon(drawPlanes);
+            public void onClick(double mouseX, double mouseY) {
-			buttonDrawPlanes.setTooltip(Component.literal(drawPlanes ? "Hide area" : "Show area"));
+                super.onClick(mouseX, mouseY);
-		});
+                drawPlanes = !drawPlanes;
-		buttonDrawPlanes.setTooltip(Component.literal("Show area"));
+                buttonDrawPlanes.setUseAlternateIcon(drawPlanes);
-		mirrorIconButtonList.add(buttonDrawPlanes);
+                buttonDrawPlanes.setTooltip(drawPlanes ? "Hide area" : "Show area");
+            }
+        };
+        buttonDrawPlanes.setTooltip("Show area");
+        mirrorIconButtonList.add(buttonDrawPlanes);
 
-		ModifierSettingsManager.ModifierSettings modifierSettings = ModifierSettingsManager.getModifierSettings(mc.player);
+        ModifierSettingsManager.ModifierSettings modifierSettings = ModifierSettingsManager.getModifierSettings(mc.player);
-		if (modifierSettings != null) {
+        if (modifierSettings != null) {
-			Mirror.MirrorSettings m = modifierSettings.getMirrorSettings();
+            Mirror.MirrorSettings m = modifierSettings.getMirrorSettings();
-			buttonMirrorEnabled.setIsChecked(m.enabled);
+            buttonMirrorEnabled.setIsChecked(m.enabled);
-			textMirrorPosX.setNumber(m.position.x);
+            textMirrorPosX.setNumber(m.position.x);
-			textMirrorPosY.setNumber(m.position.y);
+            textMirrorPosY.setNumber(m.position.y);
-			textMirrorPosZ.setNumber(m.position.z);
+            textMirrorPosZ.setNumber(m.position.z);
-			buttonMirrorX.setIsChecked(m.mirrorX);
+            buttonMirrorX.setIsChecked(m.mirrorX);
-			buttonMirrorY.setIsChecked(m.mirrorY);
+            buttonMirrorY.setIsChecked(m.mirrorY);
-			buttonMirrorZ.setIsChecked(m.mirrorZ);
+            buttonMirrorZ.setIsChecked(m.mirrorZ);
-			textMirrorRadius.setNumber(m.radius);
+            textMirrorRadius.setNumber(m.radius);
-			drawLines = m.drawLines;
+            drawLines = m.drawLines;
-			drawPlanes = m.drawPlanes;
+            drawPlanes = m.drawPlanes;
-			buttonDrawLines.setUseAlternateIcon(drawLines);
+            buttonDrawLines.setUseAlternateIcon(drawLines);
-			buttonDrawPlanes.setUseAlternateIcon(drawPlanes);
+            buttonDrawPlanes.setUseAlternateIcon(drawPlanes);
-			buttonDrawLines.setTooltip(Component.literal(drawLines ? "Hide lines" : "Show lines"));
+            buttonDrawLines.setTooltip(drawLines ? "Hide lines" : "Show lines");
-			buttonDrawPlanes.setTooltip(Component.literal(drawPlanes ? "Hide area" : "Show area"));
+            buttonDrawPlanes.setTooltip(drawPlanes ? "Hide area" : "Show area");
-			if (textMirrorPosX.getNumber() == Math.floor(textMirrorPosX.getNumber())) {
+            if (textMirrorPosX.getNumber() == Math.floor(textMirrorPosX.getNumber())) {
-				toggleOdd = false;
+                toggleOdd = false;
-				buttonToggleOdd.setTooltip(Arrays.asList(Component.literal("Set mirror position to middle of block"), Component.literal("for odd numbered builds")));
+                buttonToggleOdd.setTooltip(Arrays.asList("Set mirror position to middle of block", "for odd numbered builds"));
-			} else {
+            } else {
-				toggleOdd = true;
+                toggleOdd = true;
-				buttonToggleOdd.setTooltip(Arrays.asList(Component.literal("Set mirror position to corner of block"), Component.literal("for even numbered builds")));
+                buttonToggleOdd.setTooltip(Arrays.asList("Set mirror position to corner of block", "for even numbered builds"));
-			}
+            }
-			buttonToggleOdd.setUseAlternateIcon(toggleOdd);
+            buttonToggleOdd.setUseAlternateIcon(toggleOdd);
-		}
+        }
 
-		renderables.addAll(mirrorButtonList);
+        buttonList.addAll(mirrorButtonList);
-		renderables.addAll(mirrorIconButtonList);
+        buttonList.addAll(mirrorIconButtonList);
 
-		setCollapsed(!buttonMirrorEnabled.isChecked());
+        setCollapsed(!buttonMirrorEnabled.isChecked());
-	}
 
-	@Override
+        return id;
-	public void updateScreen() {
+    }
-		super.updateScreen();
-		mirrorNumberFieldList.forEach(GuiNumberField::update);
-	}
 
-	@Override
+    @Override
-	public void drawEntry(PoseStack ms, int slotIndex, int x, int y, int listWidth, int slotHeight, int mouseX, int mouseY,
+    public void updateScreen() {
-						  boolean isSelected, float partialTicks) {
+        super.updateScreen();
+        mirrorNumberFieldList.forEach(GuiNumberField::update);
+    }
 
-		int yy = y;
+    @Override
-		int offset = 8;
+    public void drawEntry(int slotIndex, int x, int y, int listWidth, int slotHeight, int mouseX, int mouseY,
+                          boolean isSelected, float partialTicks) {
         
-		buttonMirrorEnabled.render(ms, mouseX, mouseY, partialTicks);
+        int yy = y;
-		if (buttonMirrorEnabled.isChecked()) {
+        int offset = 8;
-			buttonMirrorEnabled.y = yy;
-			font.draw(ms, "Mirror enabled", left + offset, yy + 2, 0xFFFFFF);
 
-			yy = y + 18;
+        buttonMirrorEnabled.render(mouseX, mouseY, partialTicks);
-			font.draw(ms, "Position", left + offset, yy + 5, 0xFFFFFF);
+        if (buttonMirrorEnabled.isChecked()) {
-			font.draw(ms, "X", left + 40 + offset, yy + 5, 0xFFFFFF);
+            buttonMirrorEnabled.y = yy;
-			textMirrorPosX.y = yy;
+            fontRenderer.drawString("Mirror enabled", left + offset, yy + 2, 0xFFFFFF);
-			font.draw(ms, "Y", left + 120 + offset, yy + 5, 0xFFFFFF);
-			textMirrorPosY.y = yy;
-			font.draw(ms, "Z", left + 200 + offset, yy + 5, 0xFFFFFF);
-			textMirrorPosZ.y = yy;
 
-			yy = y + 50;
+            yy = y + 18;
-			font.draw(ms, "Direction", left + offset, yy + 2, 0xFFFFFF);
+            fontRenderer.drawString("Position", left + offset, yy + 5, 0xFFFFFF);
-			buttonMirrorX.y = yy;
+            fontRenderer.drawString("X", left + 40 + offset, yy + 5, 0xFFFFFF);
-			buttonMirrorY.y = yy;
+            textMirrorPosX.y = yy;
-			buttonMirrorZ.y = yy;
+            fontRenderer.drawString("Y", left + 120 + offset, yy + 5, 0xFFFFFF);
-			font.draw(ms, "Radius", left + 176 + offset, yy + 2, 0xFFFFFF);
+            textMirrorPosY.y = yy;
-			textMirrorRadius.y = yy - 3;
+            fontRenderer.drawString("Z", left + 200 + offset, yy + 5, 0xFFFFFF);
+            textMirrorPosZ.y = yy;
 
-			yy = y + 72;
+            yy = y + 50;
-			buttonCurrentPosition.y = yy;
+            fontRenderer.drawString("Direction", left + offset, yy + 2, 0xFFFFFF);
-			buttonToggleOdd.y = yy;
+            buttonMirrorX.y = yy;
-			buttonDrawLines.y = yy;
+            buttonMirrorY.y = yy;
-			buttonDrawPlanes.y = yy;
+            buttonMirrorZ.y = yy;
+            fontRenderer.drawString("Radius", left + 176 + offset, yy + 2, 0xFFFFFF);
+            textMirrorRadius.y = yy - 3;
 
-			mirrorButtonList.forEach(button -> button.render(ms, mouseX, mouseY, partialTicks));
+            yy = y + 72;
-			mirrorIconButtonList.forEach(button -> button.render(ms, mouseX, mouseY, partialTicks));
+            buttonCurrentPosition.y = yy;
-			mirrorNumberFieldList.forEach(numberField -> numberField.drawNumberField(ms, mouseX, mouseY, partialTicks));
+            buttonToggleOdd.y = yy;
-		} else {
+            buttonDrawLines.y = yy;
-			buttonMirrorEnabled.y = yy;
+            buttonDrawPlanes.y = yy;
-			font.draw(ms, "Mirror disabled", left + offset, yy + 2, 0x999999);
-		}
 
-	}
+            mirrorButtonList.forEach(button -> button.render(mouseX, mouseY, partialTicks));
+            mirrorIconButtonList.forEach(button -> button.render(mouseX, mouseY, partialTicks));
+            mirrorNumberFieldList.forEach(numberField -> numberField.drawNumberField(mouseX, mouseY, partialTicks));
+        } else {
+            buttonMirrorEnabled.y = yy;
+            fontRenderer.drawString("Mirror disabled", left + offset, yy + 2, 0x999999);
+        }
 
-	public void drawTooltip(PoseStack ms, Screen guiScreen, int mouseX, int mouseY) {
+    }
-		//Draw tooltips last
-		if (buttonMirrorEnabled.isChecked()) {
-			mirrorIconButtonList.forEach(iconButton -> iconButton.drawTooltip(ms, scrollPane.parent, mouseX, mouseY));
-			mirrorNumberFieldList.forEach(numberField -> numberField.drawTooltip(ms, scrollPane.parent, mouseX, mouseY));
-		}
-	}
 
-	@Override
+    public void drawTooltip(GuiScreen guiScreen, int mouseX, int mouseY) {
-	public boolean charTyped(char typedChar, int keyCode) {
+        //Draw tooltips last
-		super.charTyped(typedChar, keyCode);
+        if (buttonMirrorEnabled.isChecked())
-		for (GuiNumberField numberField : mirrorNumberFieldList) {
+        {
-			numberField.charTyped(typedChar, keyCode);
+            mirrorIconButtonList.forEach(iconButton -> iconButton.drawTooltip(scrollPane.parent, mouseX, mouseY));
-		}
+            mirrorNumberFieldList.forEach(numberField -> numberField.drawTooltip(scrollPane.parent, mouseX, mouseY));
-		return true;
+        }
-	}
+    }
 
-	@Override
+    @Override
-	public boolean mousePressed(int slotIndex, int mouseX, int mouseY, int mouseEvent, int relativeX, int relativeY) {
+    public boolean charTyped(char typedChar, int keyCode) {
-		mirrorNumberFieldList.forEach(numberField -> numberField.mouseClicked(mouseX, mouseY, mouseEvent));
+        super.charTyped(typedChar, keyCode);
+        for (GuiNumberField numberField : mirrorNumberFieldList) {
+            numberField.charTyped(typedChar, keyCode);
+        }
+        return true;
+    }
 
-		boolean insideMirrorEnabledLabel = mouseX >= left && mouseX < right && relativeY >= -2 && relativeY < 12;
+    @Override
+    public boolean mousePressed(int slotIndex, int mouseX, int mouseY, int mouseEvent, int relativeX, int relativeY) {
+        mirrorNumberFieldList.forEach(numberField -> numberField.mouseClicked(mouseX, mouseY, mouseEvent));
 
-		if (insideMirrorEnabledLabel) {
+        boolean insideMirrorEnabledLabel = mouseX >= left && mouseX < right && relativeY >= -2 && relativeY < 12;
-			buttonMirrorEnabled.playDownSound(this.mc.getSoundManager());
-			buttonMirrorEnabled.onClick(mouseX, mouseY);
-		}
 
-		return true;
+        if (insideMirrorEnabledLabel) {
-	}
+            buttonMirrorEnabled.playPressSound(this.mc.getSoundHandler());
+            buttonMirrorEnabled.onClick(mouseX, mouseY);
+        }
 
-	public Mirror.MirrorSettings getMirrorSettings() {
+        return true;
-		boolean mirrorEnabled = buttonMirrorEnabled.isChecked();
+    }
 
-		Vec3 mirrorPos = new Vec3(0, 64, 0);
+    public Mirror.MirrorSettings getMirrorSettings() {
-		try {
+        boolean mirrorEnabled = buttonMirrorEnabled.isChecked();
-			mirrorPos = new Vec3(textMirrorPosX.getNumber(), textMirrorPosY.getNumber(), textMirrorPosZ.getNumber());
-		} catch (NumberFormatException | NullPointerException ex) {
-			EffortlessBuilding.log(mc.player, "Mirror position not a valid number.");
-		}
 
-		boolean mirrorX = buttonMirrorX.isChecked();
+        Vec3d mirrorPos = new Vec3d(0, 64, 0);
-		boolean mirrorY = buttonMirrorY.isChecked();
+        try {
-		boolean mirrorZ = buttonMirrorZ.isChecked();
+            mirrorPos = new Vec3d(textMirrorPosX.getNumber(), textMirrorPosY.getNumber(), textMirrorPosZ.getNumber());
+        } catch (NumberFormatException | NullPointerException ex) {
+            EffortlessBuilding.log(mc.player, "Mirror position not a valid number.");
+        }
 
-		int mirrorRadius = 50;
+        boolean mirrorX = buttonMirrorX.isChecked();
-		try {
+        boolean mirrorY = buttonMirrorY.isChecked();
-			mirrorRadius = (int) textMirrorRadius.getNumber();
+        boolean mirrorZ = buttonMirrorZ.isChecked();
-		} catch (NumberFormatException | NullPointerException ex) {
-			EffortlessBuilding.log(mc.player, "Mirror radius not a valid number.");
-		}
 
-		return new Mirror.MirrorSettings(mirrorEnabled, mirrorPos, mirrorX, mirrorY, mirrorZ, mirrorRadius, drawLines, drawPlanes);
+        int mirrorRadius = 50;
-	}
+        try {
+            mirrorRadius = (int) textMirrorRadius.getNumber();
+        } catch (NumberFormatException | NullPointerException ex) {
+            EffortlessBuilding.log(mc.player, "Mirror radius not a valid number.");
+        }
 
-	@Override
+        return new Mirror.MirrorSettings(mirrorEnabled, mirrorPos, mirrorX, mirrorY, mirrorZ, mirrorRadius, drawLines, drawPlanes);
-	protected String getName() {
+    }
-		return "Mirror";
-	}
 
-	@Override
+    @Override
-	protected int getExpandedHeight() {
+    protected String getName() {
-		return 100;
+        return "Mirror";
-	}
+    }
+
+    @Override
+    protected int getExpandedHeight() {
+        return 100;
+    }
 }

src/main/java/nl/requios/effortlessbuilding/gui/buildmodifier/ModifierSettingsGui.java

@@ -1,10 +1,8 @@
 package nl.requios.effortlessbuilding.gui.buildmodifier;
 
-import com.mojang.blaze3d.vertex.PoseStack;
 import net.minecraft.client.Minecraft;
-import net.minecraft.client.gui.screens.Screen;
+import net.minecraft.client.gui.GuiButton;
-import net.minecraft.client.gui.components.Button;
+import net.minecraft.client.gui.GuiScreen;
-import net.minecraft.network.chat.Component;
 import net.minecraftforge.api.distmarker.Dist;
 import net.minecraftforge.api.distmarker.OnlyIn;
 import nl.requios.effortlessbuilding.EffortlessBuilding;
@@ -17,139 +15,133 @@ import nl.requios.effortlessbuilding.network.ModifierSettingsMessage;
 import nl.requios.effortlessbuilding.network.PacketHandler;
 import nl.requios.effortlessbuilding.proxy.ClientProxy;
 
+import java.io.IOException;
+
 @OnlyIn(Dist.CLIENT)
-public class ModifierSettingsGui extends Screen {
+public class ModifierSettingsGui extends GuiScreen {
 
-	private GuiScrollPane scrollPane;
+    private GuiScrollPane scrollPane;
-	private Button buttonClose;
+    private GuiButton buttonClose;
 
-	private MirrorSettingsGui mirrorSettingsGui;
+    private MirrorSettingsGui mirrorSettingsGui;
-	private ArraySettingsGui arraySettingsGui;
+    private ArraySettingsGui arraySettingsGui;
-	private RadialMirrorSettingsGui radialMirrorSettingsGui;
+    private RadialMirrorSettingsGui radialMirrorSettingsGui;
 
-	public ModifierSettingsGui() {
+    @Override
-		super(Component.translatable("effortlessbuilding.screen.modifier_settings"));
+    //Create buttons and labels and add them to buttonList/labelList
-	}
+    public void initGui() {
+        int id = 0;
 
-	@Override
+        scrollPane = new GuiScrollPane(this, fontRenderer, 8, height - 30);
-	//Create buttons and labels and add them to buttonList/labelList
-	protected void init() {
 
-		scrollPane = new GuiScrollPane(this, font, 8, height - 30);
+        mirrorSettingsGui = new MirrorSettingsGui(scrollPane);
+        scrollPane.AddListEntry(mirrorSettingsGui);
 
-		mirrorSettingsGui = new MirrorSettingsGui(scrollPane);
+        arraySettingsGui = new ArraySettingsGui(scrollPane);
-		scrollPane.AddListEntry(mirrorSettingsGui);
+        scrollPane.AddListEntry(arraySettingsGui);
 
-		arraySettingsGui = new ArraySettingsGui(scrollPane);
+        radialMirrorSettingsGui = new RadialMirrorSettingsGui(scrollPane);
-		scrollPane.AddListEntry(arraySettingsGui);
+        scrollPane.AddListEntry(radialMirrorSettingsGui);
 
-		radialMirrorSettingsGui = new RadialMirrorSettingsGui(scrollPane);
+        id = scrollPane.initGui(id, buttons);
-		scrollPane.AddListEntry(radialMirrorSettingsGui);
 
-		scrollPane.init(renderables);
+        //Close button
+        int y = height - 26;
+        buttonClose = new GuiButton(id++, width / 2 - 100, y, "Close") {
+            @Override
+            public void onClick(double mouseX, double mouseY) {
+                super.onClick(mouseX, mouseY);
+                mc.player.closeScreen();
+            }
+        };
+        buttons.add(buttonClose);
 
-		//Close button
+    }
-		int y = height - 26;
-		buttonClose = new Button(width / 2 - 100, y, 200, 20, Component.literal("Close"), (button) -> {
-			Minecraft.getInstance().player.closeContainer();
-		});
-		addRenderableOnly(buttonClose);
-	}
 
-	@Override
+    @Override
-	//Process general logic, i.e. hide buttons
+    //Process general logic, i.e. hide buttons
-	public void tick() {
+    public void tick() {
-		scrollPane.updateScreen();
+        scrollPane.updateScreen();
 
-		handleMouseInput();
+        handleMouseInput();
-	}
+    }
 
-	@Override
+    @Override
-	//Set colors using GL11, use the fontObj field to display text
+    //Set colors using GL11, use the fontRendererObj field to display text
-	//Use drawTexturedModalRect() to transfers areas of a texture resource to the screen
+    //Use drawTexturedModalRect() to transfers areas of a texture resource to the screen
-	public void render(PoseStack ms, int mouseX, int mouseY, float partialTicks) {
+    public void render(int mouseX, int mouseY, float partialTicks) {
-		this.renderBackground(ms);
+        this.drawDefaultBackground();
 
-		scrollPane.render(ms, mouseX, mouseY, partialTicks);
+        scrollPane.drawScreen(mouseX, mouseY, partialTicks);
 
-		buttonClose.render(ms, mouseX, mouseY, partialTicks);
+        buttonClose.render(mouseX, mouseY, partialTicks);
 
-		scrollPane.drawTooltip(ms, this, mouseX, mouseY);
+        scrollPane.drawTooltip(this, mouseX, mouseY);
-	}
+    }
 
 
-	@Override
+    @Override
-	public boolean charTyped(char typedChar, int keyCode) {
+    public boolean charTyped(char typedChar, int keyCode) {
-		super.charTyped(typedChar, keyCode);
+        super.charTyped(typedChar, keyCode);
-		scrollPane.charTyped(typedChar, keyCode);
+        scrollPane.charTyped(typedChar, keyCode);
-		return false;
+        if (keyCode == ClientProxy.keyBindings[0].getKey().getKeyCode()) {
-	}
+            mc.player.closeScreen();
+        }
+        return false;
+    }
 
-	@Override
+    @Override
-	public boolean keyPressed(int keyCode, int p_96553_, int p_96554_) {
+    public boolean mouseClicked(double mouseX, double mouseY, int mouseButton) {
-		if (keyCode == ClientProxy.keyBindings[0].getKey().getValue()) {
+        super.mouseClicked(mouseX, mouseY, mouseButton);
-			minecraft.player.closeContainer();
+        buttons.forEach(button -> button.mouseClicked(mouseX, mouseY, mouseButton));
-			return true;
+        return scrollPane.mouseClicked(mouseX, mouseY, mouseButton);
-		}
+    }
 
-		return super.keyPressed(keyCode, p_96553_, p_96554_);
+    @Override
-	}
+    public boolean mouseReleased(double mouseX, double mouseY, int state) {
+        if (state != 0 || !scrollPane.mouseReleased(mouseX, mouseY, state))
+        {
+            return super.mouseReleased(mouseX, mouseY, state);
+        }
+        return false;
+    }
 
-	@Override
+    public void handleMouseInput() {
-	public boolean mouseClicked(double mouseX, double mouseY, int mouseButton) {
+        //super.handleMouseInput();
-		super.mouseClicked(mouseX, mouseY, mouseButton);
+        scrollPane.handleMouseInput();
-		renderables.forEach(renderable -> {
-			if (renderable instanceof Button) {
-				Button button = (Button) renderable;
-				button.mouseClicked(mouseX, mouseY, mouseButton);
-			}
-		});
-		return scrollPane.mouseClicked(mouseX, mouseY, mouseButton);
-	}
 
-	@Override
+        //Scrolling numbers
-	public boolean mouseReleased(double mouseX, double mouseY, int state) {
-		if (state != 0 || !scrollPane.mouseReleased(mouseX, mouseY, state)) {
-			return super.mouseReleased(mouseX, mouseY, state);
-		}
-		return false;
-	}
-
-	public void handleMouseInput() {
-		//super.handleMouseInput();
-		scrollPane.handleMouseInput();
-
-		//Scrolling numbers
 //        int mouseX = Mouse.getEventX() * this.width / this.mc.displayWidth;
 //        int mouseY = this.height - Mouse.getEventY() * this.height / this.mc.displayHeight - 1;
 //        numberFieldList.forEach(numberField -> numberField.handleMouseInput(mouseX, mouseY));
-	}
+    }
 
-	@Override
+    @Override
-	public void removed() {
+    public void onGuiClosed() {
-		scrollPane.onGuiClosed();
+        scrollPane.onGuiClosed();
 
-		//save everything
+        //save everything
-		Mirror.MirrorSettings m = mirrorSettingsGui.getMirrorSettings();
+        Mirror.MirrorSettings m = mirrorSettingsGui.getMirrorSettings();
-		Array.ArraySettings a = arraySettingsGui.getArraySettings();
+        Array.ArraySettings a = arraySettingsGui.getArraySettings();
-		RadialMirror.RadialMirrorSettings r = radialMirrorSettingsGui.getRadialMirrorSettings();
+        RadialMirror.RadialMirrorSettings r = radialMirrorSettingsGui.getRadialMirrorSettings();
 
-		ModifierSettingsManager.ModifierSettings modifierSettings = ModifierSettingsManager.getModifierSettings(minecraft.player);
+        ModifierSettingsManager.ModifierSettings modifierSettings = ModifierSettingsManager.getModifierSettings(mc.player);
-		if (modifierSettings == null) modifierSettings = new ModifierSettingsManager.ModifierSettings();
+        if (modifierSettings == null) modifierSettings = new ModifierSettingsManager.ModifierSettings();
-		modifierSettings.setMirrorSettings(m);
+        modifierSettings.setMirrorSettings(m);
-		modifierSettings.setArraySettings(a);
+        modifierSettings.setArraySettings(a);
-		modifierSettings.setRadialMirrorSettings(r);
+        modifierSettings.setRadialMirrorSettings(r);
 
-		//Sanitize
+        //Sanitize
-		String error = ModifierSettingsManager.sanitize(modifierSettings, minecraft.player);
+        String error = ModifierSettingsManager.sanitize(modifierSettings, mc.player);
-		if (!error.isEmpty()) EffortlessBuilding.log(minecraft.player, error);
+        if (!error.isEmpty()) EffortlessBuilding.log(mc.player, error);
 
-		ModifierSettingsManager.setModifierSettings(minecraft.player, modifierSettings);
+        ModifierSettingsManager.setModifierSettings(mc.player, modifierSettings);
 
-		//Send to server
+        //Send to server
-		PacketHandler.INSTANCE.sendToServer(new ModifierSettingsMessage(modifierSettings));
+        PacketHandler.INSTANCE.sendToServer(new ModifierSettingsMessage(modifierSettings));
 
-		Minecraft.getInstance().mouseHandler.grabMouse();
+        //TODO fix not being able to scroll after this gui has opened
-	}
+        Minecraft.getInstance().mouseHelper.grabMouse();
+    }
 
 }

src/main/java/nl/requios/effortlessbuilding/gui/buildmodifier/RadialMirrorSettingsGui.java

@@ -1,21 +1,23 @@
 package nl.requios.effortlessbuilding.gui.buildmodifier;
 
-import com.mojang.blaze3d.vertex.PoseStack;
+import net.minecraft.client.gui.GuiButton;
-import net.minecraft.client.gui.components.Widget;
+import net.minecraft.client.gui.GuiScreen;
-import net.minecraft.client.gui.screens.Screen;
+import net.minecraft.util.ResourceLocation;
-import net.minecraft.client.gui.components.Button;
+import net.minecraft.util.math.Vec3d;
-import net.minecraft.network.chat.Component;
+import net.minecraft.util.text.TextFormatting;
-import net.minecraft.resources.ResourceLocation;
-import net.minecraft.world.phys.Vec3;
-import net.minecraft.ChatFormatting;
 import net.minecraftforge.api.distmarker.Dist;
 import net.minecraftforge.api.distmarker.OnlyIn;
+import net.minecraftforge.fml.client.config.GuiCheckBox;
 import nl.requios.effortlessbuilding.EffortlessBuilding;
 import nl.requios.effortlessbuilding.buildmodifier.ModifierSettingsManager;
 import nl.requios.effortlessbuilding.buildmodifier.RadialMirror;
-import nl.requios.effortlessbuilding.gui.elements.*;
+import nl.requios.effortlessbuilding.gui.elements.GuiCollapsibleScrollEntry;
+import nl.requios.effortlessbuilding.gui.elements.GuiIconButton;
+import nl.requios.effortlessbuilding.gui.elements.GuiNumberField;
+import nl.requios.effortlessbuilding.gui.elements.GuiScrollPane;
 import nl.requios.effortlessbuilding.helper.ReachHelper;
 
+import java.io.IOException;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
@@ -24,266 +26,285 @@ import java.util.List;
 @OnlyIn(Dist.CLIENT)
 public class RadialMirrorSettingsGui extends GuiCollapsibleScrollEntry {
 
-	protected static final ResourceLocation BUILDING_ICONS = new ResourceLocation(EffortlessBuilding.MODID, "textures/gui/building_icons.png");
+    protected static final ResourceLocation BUILDING_ICONS = new ResourceLocation(EffortlessBuilding.MODID, "textures/gui/building_icons.png");
 
-	protected List<Button> radialMirrorButtonList = new ArrayList<>();
+    protected List<GuiButton> radialMirrorButtonList = new ArrayList<>();
-	protected List<GuiIconButton> radialMirrorIconButtonList = new ArrayList<>();
+    protected List<GuiIconButton> radialMirrorIconButtonList = new ArrayList<>();
-	protected List<GuiNumberField> radialMirrorNumberFieldList = new ArrayList<>();
+    protected List<GuiNumberField> radialMirrorNumberFieldList = new ArrayList<>();
 
-	private GuiNumberField textRadialMirrorPosX, textRadialMirrorPosY, textRadialMirrorPosZ, textRadialMirrorSlices, textRadialMirrorRadius;
+    private GuiNumberField textRadialMirrorPosX, textRadialMirrorPosY, textRadialMirrorPosZ, textRadialMirrorSlices, textRadialMirrorRadius;
-	private GuiCheckBoxFixed buttonRadialMirrorEnabled, buttonRadialMirrorAlternate;
+    private GuiCheckBox buttonRadialMirrorEnabled, buttonRadialMirrorAlternate;
-	private GuiIconButton buttonCurrentPosition, buttonToggleOdd, buttonDrawPlanes, buttonDrawLines;
+    private GuiIconButton buttonCurrentPosition, buttonToggleOdd, buttonDrawPlanes, buttonDrawLines;
-	private boolean drawPlanes, drawLines, toggleOdd;
+    private boolean drawPlanes, drawLines, toggleOdd;
 
-	public RadialMirrorSettingsGui(GuiScrollPane scrollPane) {
+    public RadialMirrorSettingsGui(GuiScrollPane scrollPane) {
-		super(scrollPane);
+        super(scrollPane);
-	}
+    }
 
-	@Override
+    @Override
-	public void init(List<Widget> renderables) {
+    public int initGui(int id, List<GuiButton> buttonList) {
-		super.init(renderables);
+        id = super.initGui(id, buttonList);
 
-		int y = top - 2;
+        int y = top - 2;
-		buttonRadialMirrorEnabled = new GuiCheckBoxFixed(left - 15 + 8, y, "", false) {
+        buttonRadialMirrorEnabled = new GuiCheckBox(id++, left - 15 + 8, y, "", false) {
-			@Override
+            @Override
-			public void onClick(double mouseX, double mouseY) {
+            public void onClick(double mouseX, double mouseY) {
-				super.onClick(mouseX, mouseY);
+                super.onClick(mouseX, mouseY);
-				setCollapsed(!buttonRadialMirrorEnabled.isChecked());
+                setCollapsed(!buttonRadialMirrorEnabled.isChecked());
-			}
+            }
-		};
+        };
-		renderables.add(buttonRadialMirrorEnabled);
+        buttonList.add(buttonRadialMirrorEnabled);
 
-		y = top + 18;
+        y = top + 18;
-		textRadialMirrorPosX = new GuiNumberField(font, renderables, left + 58, y, 62, 18);
+        textRadialMirrorPosX = new GuiNumberField(id++, id++, id++, fontRenderer, buttonList, left + 58, y, 62, 18);
-		textRadialMirrorPosX.setNumber(0);
+        textRadialMirrorPosX.setNumber(0);
-		textRadialMirrorPosX.setTooltip(
+        textRadialMirrorPosX.setTooltip(
-			Arrays.asList(Component.literal("The position of the radial mirror."), Component.literal("For odd numbered builds add 0.5.").withStyle(ChatFormatting.GRAY)));
+                Arrays.asList("The position of the radial mirror.", TextFormatting.GRAY + "For odd numbered builds add 0.5."));
-		radialMirrorNumberFieldList.add(textRadialMirrorPosX);
+        radialMirrorNumberFieldList.add(textRadialMirrorPosX);
 
-		textRadialMirrorPosY = new GuiNumberField(font, renderables, left + 138, y, 62, 18);
+        textRadialMirrorPosY = new GuiNumberField(id++, id++, id++, fontRenderer, buttonList, left + 138, y, 62, 18);
-		textRadialMirrorPosY.setNumber(64);
+        textRadialMirrorPosY.setNumber(64);
-		textRadialMirrorPosY.setTooltip(Arrays.asList(Component.literal("The position of the radial mirror."), Component.literal("For odd numbered builds add 0.5.").withStyle(ChatFormatting.GRAY)));
+        textRadialMirrorPosY.setTooltip(Arrays.asList("The position of the radial mirror.", TextFormatting.GRAY + "For odd numbered builds add 0.5."));
-		radialMirrorNumberFieldList.add(textRadialMirrorPosY);
+        radialMirrorNumberFieldList.add(textRadialMirrorPosY);
 
-		textRadialMirrorPosZ = new GuiNumberField(font, renderables, left + 218, y, 62, 18);
+        textRadialMirrorPosZ = new GuiNumberField(id++, id++, id++, fontRenderer, buttonList, left + 218, y, 62, 18);
-		textRadialMirrorPosZ.setNumber(0);
+        textRadialMirrorPosZ.setNumber(0);
-		textRadialMirrorPosZ.setTooltip(Arrays.asList(Component.literal("The position of the radial mirror."), Component.literal("For odd numbered builds add 0.5.").withStyle(ChatFormatting.GRAY)));
+        textRadialMirrorPosZ.setTooltip(Arrays.asList("The position of the radial mirror.", TextFormatting.GRAY + "For odd numbered builds add 0.5."));
-		radialMirrorNumberFieldList.add(textRadialMirrorPosZ);
+        radialMirrorNumberFieldList.add(textRadialMirrorPosZ);
 
-		y = top + 47;
+        y = top + 47;
-		textRadialMirrorSlices = new GuiNumberField(font, renderables, left + 55, y, 50, 18);
+        textRadialMirrorSlices = new GuiNumberField(id++, id++, id++, fontRenderer, buttonList, left + 55, y, 50, 18);
-		textRadialMirrorSlices.setNumber(4);
+        textRadialMirrorSlices.setNumber(4);
-		textRadialMirrorSlices.setTooltip(Arrays.asList(Component.literal("The number of repeating slices."), Component.literal("Minimally 2.").withStyle(ChatFormatting.GRAY)));
+        textRadialMirrorSlices.setTooltip(Arrays.asList("The number of repeating slices.", TextFormatting.GRAY + "Minimally 2."));
-		radialMirrorNumberFieldList.add(textRadialMirrorSlices);
+        radialMirrorNumberFieldList.add(textRadialMirrorSlices);
 
-		textRadialMirrorRadius = new GuiNumberField(font, renderables, left + 218, y, 62, 18);
+        textRadialMirrorRadius = new GuiNumberField(id++, id++, id++, fontRenderer, buttonList, left + 218, y, 62, 18);
-		textRadialMirrorRadius.setNumber(50);
+        textRadialMirrorRadius.setNumber(50);
-		//TODO change to diameter (remove /2)
+        //TODO change to diameter (remove /2)
-		textRadialMirrorRadius.setTooltip(Arrays.asList(Component.literal("How far the radial mirror reaches from its center position."),
+        textRadialMirrorRadius.setTooltip(Arrays.asList("How far the radial mirror reaches from its center position.",
-			Component.literal("Max: ").withStyle(ChatFormatting.GRAY).append(Component.literal(String.valueOf(ReachHelper.getMaxReach(mc.player) / 2)).withStyle(ChatFormatting.GOLD)),
+                TextFormatting.GRAY + "Max: " + TextFormatting.GOLD + ReachHelper.getMaxReach(mc.player) / 2,
-			Component.literal("Upgradeable in survival with reach upgrades.").withStyle(ChatFormatting.GRAY)));
+                TextFormatting.GRAY + "Upgradeable in survival with reach upgrades."));
-		radialMirrorNumberFieldList.add(textRadialMirrorRadius);
+        radialMirrorNumberFieldList.add(textRadialMirrorRadius);
 
-		y = top + 72;
+        y = top + 72;
-		buttonCurrentPosition = new GuiIconButton(left + 5, y, 0, 0, BUILDING_ICONS, button -> {
+        buttonCurrentPosition = new GuiIconButton(id++, left + 5, y, 0, 0, BUILDING_ICONS) {
-			Vec3 pos = new Vec3(Math.floor(mc.player.getX()) + 0.5, Math.floor(mc.player.getY()) + 0.5, Math.floor(mc.player.getZ()) + 0.5);
+            @Override
-			textRadialMirrorPosX.setNumber(pos.x);
+            public void onClick(double mouseX, double mouseY) {
-			textRadialMirrorPosY.setNumber(pos.y);
+                super.onClick(mouseX, mouseY);
-			textRadialMirrorPosZ.setNumber(pos.z);
+                Vec3d pos = new Vec3d(Math.floor(mc.player.posX) + 0.5, Math.floor(mc.player.posY) + 0.5, Math.floor(mc.player.posZ) + 0.5);
-		});
+                textRadialMirrorPosX.setNumber(pos.x);
-		buttonCurrentPosition.setTooltip(Component.literal("Set radial mirror position to current player position"));
+                textRadialMirrorPosY.setNumber(pos.y);
-		radialMirrorIconButtonList.add(buttonCurrentPosition);
+                textRadialMirrorPosZ.setNumber(pos.z);
+            }
+        };
+        buttonCurrentPosition.setTooltip("Set radial mirror position to current player position");
+        radialMirrorIconButtonList.add(buttonCurrentPosition);
 
-		buttonToggleOdd = new GuiIconButton(left + 35, y, 0, 20, BUILDING_ICONS, button -> {
+        buttonToggleOdd = new GuiIconButton(id++, left + 35, y, 0, 20, BUILDING_ICONS) {
-			toggleOdd = !toggleOdd;
+            @Override
-			buttonToggleOdd.setUseAlternateIcon(toggleOdd);
+            public void onClick(double mouseX, double mouseY) {
-			if (toggleOdd) {
+                super.onClick(mouseX, mouseY);
-				buttonToggleOdd.setTooltip(Arrays.asList(Component.literal("Set mirror position to corner of block"), Component.literal("for even numbered builds")));
+                toggleOdd = !toggleOdd;
-				textRadialMirrorPosX.setNumber(textRadialMirrorPosX.getNumber() + 0.5);
+                buttonToggleOdd.setUseAlternateIcon(toggleOdd);
-				textRadialMirrorPosY.setNumber(textRadialMirrorPosY.getNumber() + 0.5);
+                if (toggleOdd) {
-				textRadialMirrorPosZ.setNumber(textRadialMirrorPosZ.getNumber() + 0.5);
+                    buttonToggleOdd.setTooltip(Arrays.asList("Set mirror position to corner of block", "for even numbered builds"));
-			} else {
+                    textRadialMirrorPosX.setNumber(textRadialMirrorPosX.getNumber() + 0.5);
-				buttonToggleOdd.setTooltip(Arrays.asList(Component.literal("Set mirror position to middle of block"), Component.literal("for odd numbered builds")));
+                    textRadialMirrorPosY.setNumber(textRadialMirrorPosY.getNumber() + 0.5);
-				textRadialMirrorPosX.setNumber(Math.floor(textRadialMirrorPosX.getNumber()));
+                    textRadialMirrorPosZ.setNumber(textRadialMirrorPosZ.getNumber() + 0.5);
-				textRadialMirrorPosY.setNumber(Math.floor(textRadialMirrorPosY.getNumber()));
+                } else {
-				textRadialMirrorPosZ.setNumber(Math.floor(textRadialMirrorPosZ.getNumber()));
+                    buttonToggleOdd.setTooltip(Arrays.asList("Set mirror position to middle of block", "for odd numbered builds"));
-			}
+                    textRadialMirrorPosX.setNumber(Math.floor(textRadialMirrorPosX.getNumber()));
-		});
+                    textRadialMirrorPosY.setNumber(Math.floor(textRadialMirrorPosY.getNumber()));
-		buttonToggleOdd.setTooltip(Arrays.asList(Component.literal("Set radial mirror position to middle of block"), Component.literal("for odd numbered builds")));
+                    textRadialMirrorPosZ.setNumber(Math.floor(textRadialMirrorPosZ.getNumber()));
-		radialMirrorIconButtonList.add(buttonToggleOdd);
+                }
+            }
+        };
+        buttonToggleOdd.setTooltip(Arrays.asList("Set radial mirror position to middle of block", "for odd numbered builds"));
+        radialMirrorIconButtonList.add(buttonToggleOdd);
 
-		buttonDrawLines = new GuiIconButton(left + 65, y, 0, 40, BUILDING_ICONS, button -> {
+        buttonDrawLines = new GuiIconButton(id++, left + 65, y, 0, 40, BUILDING_ICONS) {
-			drawLines = !drawLines;
+            @Override
-			buttonDrawLines.setUseAlternateIcon(drawLines);
+            public void onClick(double mouseX, double mouseY) {
-			buttonDrawLines.setTooltip(Component.literal(drawLines ? "Hide lines" : "Show lines"));
+                super.onClick(mouseX, mouseY);
-		});
+                drawLines = !drawLines;
-		buttonDrawLines.setTooltip(Component.literal("Show lines"));
+                buttonDrawLines.setUseAlternateIcon(drawLines);
-		radialMirrorIconButtonList.add(buttonDrawLines);
+                buttonDrawLines.setTooltip(drawLines ? "Hide lines" : "Show lines");
+            }
+        };
+        buttonDrawLines.setTooltip("Show lines");
+        radialMirrorIconButtonList.add(buttonDrawLines);
 
-		buttonDrawPlanes = new GuiIconButton(left + 95, y, 0, 60, BUILDING_ICONS, button -> {
+        buttonDrawPlanes = new GuiIconButton(id++, left + 95, y, 0, 60, BUILDING_ICONS) {
-			drawPlanes = !drawPlanes;
+            @Override
-			buttonDrawPlanes.setUseAlternateIcon(drawPlanes);
+            public void onClick(double mouseX, double mouseY) {
-			buttonDrawPlanes.setTooltip(Component.literal(drawPlanes ? "Hide area" : "Show area"));
+                super.onClick(mouseX, mouseY);
-		});
+                drawPlanes = !drawPlanes;
-		buttonDrawPlanes.setTooltip(Component.literal("Show area"));
+                buttonDrawPlanes.setUseAlternateIcon(drawPlanes);
-		radialMirrorIconButtonList.add(buttonDrawPlanes);
+                buttonDrawPlanes.setTooltip(drawPlanes ? "Hide area" : "Show area");
+            }
+        };
+        buttonDrawPlanes.setTooltip("Show area");
+        radialMirrorIconButtonList.add(buttonDrawPlanes);
 
-		y = top + 76;
+        y = top + 76;
-		buttonRadialMirrorAlternate = new GuiCheckBoxFixed(left + 140, y, " Alternate", false);
+        buttonRadialMirrorAlternate = new GuiCheckBox(id++, left + 140, y, " Alternate", false);
-		radialMirrorButtonList.add(buttonRadialMirrorAlternate);
+        radialMirrorButtonList.add(buttonRadialMirrorAlternate);
 
-		ModifierSettingsManager.ModifierSettings modifierSettings = ModifierSettingsManager.getModifierSettings(mc.player);
+        ModifierSettingsManager.ModifierSettings modifierSettings = ModifierSettingsManager.getModifierSettings(mc.player);
-		if (modifierSettings != null) {
+        if (modifierSettings != null) {
-			RadialMirror.RadialMirrorSettings r = modifierSettings.getRadialMirrorSettings();
+            RadialMirror.RadialMirrorSettings r = modifierSettings.getRadialMirrorSettings();
-			buttonRadialMirrorEnabled.setIsChecked(r.enabled);
+            buttonRadialMirrorEnabled.setIsChecked(r.enabled);
-			textRadialMirrorPosX.setNumber(r.position.x);
+            textRadialMirrorPosX.setNumber(r.position.x);
-			textRadialMirrorPosY.setNumber(r.position.y);
+            textRadialMirrorPosY.setNumber(r.position.y);
-			textRadialMirrorPosZ.setNumber(r.position.z);
+            textRadialMirrorPosZ.setNumber(r.position.z);
-			textRadialMirrorSlices.setNumber(r.slices);
+            textRadialMirrorSlices.setNumber(r.slices);
-			buttonRadialMirrorAlternate.setIsChecked(r.alternate);
+            buttonRadialMirrorAlternate.setIsChecked(r.alternate);
-			textRadialMirrorRadius.setNumber(r.radius);
+            textRadialMirrorRadius.setNumber(r.radius);
-			drawLines = r.drawLines;
+            drawLines = r.drawLines;
-			drawPlanes = r.drawPlanes;
+            drawPlanes = r.drawPlanes;
-			buttonDrawLines.setUseAlternateIcon(drawLines);
+            buttonDrawLines.setUseAlternateIcon(drawLines);
-			buttonDrawPlanes.setUseAlternateIcon(drawPlanes);
+            buttonDrawPlanes.setUseAlternateIcon(drawPlanes);
-			buttonDrawLines.setTooltip(Component.literal(drawLines ? "Hide lines" : "Show lines"));
+            buttonDrawLines.setTooltip(drawLines ? "Hide lines" : "Show lines");
-			buttonDrawPlanes.setTooltip(Component.literal(drawPlanes ? "Hide area" : "Show area"));
+            buttonDrawPlanes.setTooltip(drawPlanes ? "Hide area" : "Show area");
-			if (textRadialMirrorPosX.getNumber() == Math.floor(textRadialMirrorPosX.getNumber())) {
+            if (textRadialMirrorPosX.getNumber() == Math.floor(textRadialMirrorPosX.getNumber())) {
-				toggleOdd = false;
+                toggleOdd = false;
-				buttonToggleOdd.setTooltip(Arrays.asList(Component.literal("Set radial mirror position to middle of block"), Component.literal("for odd numbered builds")));
+                buttonToggleOdd.setTooltip(Arrays.asList("Set radial mirror position to middle of block", "for odd numbered builds"));
-			} else {
+            } else {
-				toggleOdd = true;
+                toggleOdd = true;
-				buttonToggleOdd.setTooltip(Arrays.asList(Component.literal("Set radial mirror position to corner of block"), Component.literal("for even numbered builds")));
+                buttonToggleOdd.setTooltip(Arrays.asList("Set radial mirror position to corner of block", "for even numbered builds"));
-			}
+            }
-			buttonToggleOdd.setUseAlternateIcon(toggleOdd);
+            buttonToggleOdd.setUseAlternateIcon(toggleOdd);
-		}
+        }
 
-		renderables.addAll(radialMirrorButtonList);
+        buttonList.addAll(radialMirrorButtonList);
-		renderables.addAll(radialMirrorIconButtonList);
+        buttonList.addAll(radialMirrorIconButtonList);
 
-		setCollapsed(!buttonRadialMirrorEnabled.isChecked());
+        setCollapsed(!buttonRadialMirrorEnabled.isChecked());
-	}
 
-	public void updateScreen() {
+        return id;
-		radialMirrorNumberFieldList.forEach(GuiNumberField::update);
+    }
-	}
+
+    public void updateScreen() {
+        radialMirrorNumberFieldList.forEach(GuiNumberField::update);
+    }
 
     
-	@Override
+    @Override
-	public void drawEntry(PoseStack ms, int slotIndex, int x, int y, int listWidth, int slotHeight, int mouseX, int mouseY,
+    public void drawEntry(int slotIndex, int x, int y, int listWidth, int slotHeight, int mouseX, int mouseY,
-						  boolean isSelected, float partialTicks) {
+                          boolean isSelected, float partialTicks) {
 
-		int yy = y;
+        int yy = y;
-		int offset = 8;
+        int offset = 8;
 
-		buttonRadialMirrorEnabled.render(ms, mouseX, mouseY, partialTicks);
+        buttonRadialMirrorEnabled.render(mouseX, mouseY, partialTicks);
-		if (buttonRadialMirrorEnabled.isChecked()) {
+        if (buttonRadialMirrorEnabled.isChecked()) {
-			buttonRadialMirrorEnabled.y = yy;
+            buttonRadialMirrorEnabled.y = yy;
-			font.draw(ms, "Radial mirror enabled", left + offset, yy + 2, 0xFFFFFF);
+            fontRenderer.drawString("Radial mirror enabled", left + offset, yy + 2, 0xFFFFFF);
 
-			yy = y + 18;
+            yy = y + 18;
-			font.draw(ms, "Position", left + offset, yy + 5, 0xFFFFFF);
+            fontRenderer.drawString("Position", left + offset, yy + 5, 0xFFFFFF);
-			font.draw(ms, "X", left + 40 + offset, yy + 5, 0xFFFFFF);
+            fontRenderer.drawString("X", left + 40 + offset, yy + 5, 0xFFFFFF);
-			textRadialMirrorPosX.y = yy;
+            textRadialMirrorPosX.y = yy;
-			font.draw(ms, "Y", left + 120 + offset, yy + 5, 0xFFFFFF);
+            fontRenderer.drawString("Y", left + 120 + offset, yy + 5, 0xFFFFFF);
-			textRadialMirrorPosY.y = yy;
+            textRadialMirrorPosY.y = yy;
-			font.draw(ms, "Z", left + 200 + offset, yy + 5, 0xFFFFFF);
+            fontRenderer.drawString("Z", left + 200 + offset, yy + 5, 0xFFFFFF);
-			textRadialMirrorPosZ.y = yy;
+            textRadialMirrorPosZ.y = yy;
 
-			yy = y + 50;
+            yy = y + 50;
-			font.draw(ms, "Slices", left + offset, yy + 2, 0xFFFFFF);
+            fontRenderer.drawString("Slices", left + offset, yy + 2, 0xFFFFFF);
-			textRadialMirrorSlices.y = yy - 3;
+            textRadialMirrorSlices.y = yy - 3;
-			font.draw(ms, "Radius", left + 176 + offset, yy + 2, 0xFFFFFF);
+            fontRenderer.drawString("Radius", left + 176 + offset, yy + 2, 0xFFFFFF);
-			textRadialMirrorRadius.y = yy - 3;
+            textRadialMirrorRadius.y = yy - 3;
 
-			yy = y + 72;
+            yy = y + 72;
-			buttonCurrentPosition.y = yy;
+            buttonCurrentPosition.y = yy;
-			buttonToggleOdd.y = yy;
+            buttonToggleOdd.y = yy;
-			buttonDrawLines.y = yy;
+            buttonDrawLines.y = yy;
-			buttonDrawPlanes.y = yy;
+            buttonDrawPlanes.y = yy;
 
-			yy = y + 76;
+            yy = y + 76;
-			buttonRadialMirrorAlternate.y = yy;
+            buttonRadialMirrorAlternate.y = yy;
 
-			radialMirrorButtonList.forEach(button -> button.render(ms, mouseX, mouseY, partialTicks));
+            radialMirrorButtonList.forEach(button -> button.render(mouseX, mouseY, partialTicks));
-			radialMirrorIconButtonList.forEach(button -> button.render(ms, mouseX, mouseY, partialTicks));
+            radialMirrorIconButtonList.forEach(button -> button.render(mouseX, mouseY, partialTicks));
-			radialMirrorNumberFieldList
+            radialMirrorNumberFieldList
-				.forEach(numberField -> numberField.drawNumberField(ms, mouseX, mouseY, partialTicks));
+                    .forEach(numberField -> numberField.drawNumberField(mouseX, mouseY, partialTicks));
-		} else {
+        } else {
-			buttonRadialMirrorEnabled.y = yy;
+            buttonRadialMirrorEnabled.y = yy;
-			font.draw(ms, "Radial mirror disabled", left + offset, yy + 2, 0x999999);
+            fontRenderer.drawString("Radial mirror disabled", left + offset, yy + 2, 0x999999);
-		}
+        }
 
-	}
+    }
 
-	public void drawTooltip(PoseStack ms, Screen guiScreen, int mouseX, int mouseY) {
+    public void drawTooltip(GuiScreen guiScreen, int mouseX, int mouseY) {
-		//Draw tooltips last
+        //Draw tooltips last
-		if (buttonRadialMirrorEnabled.isChecked()) {
+        if (buttonRadialMirrorEnabled.isChecked())
-			radialMirrorIconButtonList.forEach(iconButton -> iconButton.drawTooltip(ms, scrollPane.parent, mouseX, mouseY));
+        {
-			radialMirrorNumberFieldList.forEach(numberField -> numberField.drawTooltip(ms, scrollPane.parent, mouseX, mouseY));
+            radialMirrorIconButtonList.forEach(iconButton -> iconButton.drawTooltip(scrollPane.parent, mouseX, mouseY));
-		}
+            radialMirrorNumberFieldList.forEach(numberField -> numberField.drawTooltip(scrollPane.parent, mouseX, mouseY));
-	}
+        }
+    }
 
-	@Override
+    @Override
-	public boolean charTyped(char typedChar, int keyCode) {
+    public boolean charTyped(char typedChar, int keyCode) {
-		super.charTyped(typedChar, keyCode);
+        super.charTyped(typedChar, keyCode);
-		for (GuiNumberField numberField : radialMirrorNumberFieldList) {
+        for (GuiNumberField numberField : radialMirrorNumberFieldList) {
-			numberField.charTyped(typedChar, keyCode);
+            numberField.charTyped(typedChar, keyCode);
-		}
+        }
-		return true;
+        return true;
-	}
+    }
 
-	@Override
+    @Override
-	public boolean mousePressed(int slotIndex, int mouseX, int mouseY, int mouseEvent, int relativeX, int relativeY) {
+    public boolean mousePressed(int slotIndex, int mouseX, int mouseY, int mouseEvent, int relativeX, int relativeY) {
-		radialMirrorNumberFieldList.forEach(numberField -> numberField.mouseClicked(mouseX, mouseY, mouseEvent));
+        radialMirrorNumberFieldList.forEach(numberField -> numberField.mouseClicked(mouseX, mouseY, mouseEvent));
 
-		boolean insideRadialMirrorEnabledLabel = mouseX >= left && mouseX < right && relativeY >= -2 && relativeY < 12;
+        boolean insideRadialMirrorEnabledLabel = mouseX >= left && mouseX < right && relativeY >= -2 && relativeY < 12;
 
-		if (insideRadialMirrorEnabledLabel) {
+        if (insideRadialMirrorEnabledLabel) {
-			buttonRadialMirrorEnabled.playDownSound(this.mc.getSoundManager());
+            buttonRadialMirrorEnabled.playPressSound(this.mc.getSoundHandler());
-			buttonRadialMirrorEnabled.onClick(mouseX, mouseY);
+            buttonRadialMirrorEnabled.onClick(mouseX, mouseY);
-		}
+        }
 
-		return true;
+        return true;
-	}
+    }
 
-	public RadialMirror.RadialMirrorSettings getRadialMirrorSettings() {
+    public RadialMirror.RadialMirrorSettings getRadialMirrorSettings() {
-		boolean radialMirrorEnabled = buttonRadialMirrorEnabled.isChecked();
+        boolean radialMirrorEnabled = buttonRadialMirrorEnabled.isChecked();
 
-		Vec3 radialMirrorPos = new Vec3(0, 64, 0);
+        Vec3d radialMirrorPos = new Vec3d(0, 64, 0);
-		try {
+        try {
-			radialMirrorPos = new Vec3(textRadialMirrorPosX.getNumber(), textRadialMirrorPosY.getNumber(), textRadialMirrorPosZ
+            radialMirrorPos = new Vec3d(textRadialMirrorPosX.getNumber(), textRadialMirrorPosY.getNumber(), textRadialMirrorPosZ
-				.getNumber());
+                    .getNumber());
-		} catch (NumberFormatException | NullPointerException ex) {
+        } catch (NumberFormatException | NullPointerException ex) {
-			EffortlessBuilding.log(mc.player, "Radial mirror position not a valid number.");
+            EffortlessBuilding.log(mc.player, "Radial mirror position not a valid number.");
-		}
+        }
 
-		int radialMirrorSlices = 4;
+        int radialMirrorSlices = 4;
-		try {
+        try {
-			radialMirrorSlices = (int) textRadialMirrorSlices.getNumber();
+            radialMirrorSlices = (int) textRadialMirrorSlices.getNumber();
-		} catch (NumberFormatException | NullPointerException ex) {
+        } catch (NumberFormatException | NullPointerException ex) {
-			EffortlessBuilding.log(mc.player, "Radial mirror slices not a valid number.");
+            EffortlessBuilding.log(mc.player, "Radial mirror slices not a valid number.");
-		}
+        }
 
-		boolean radialMirrorAlternate = buttonRadialMirrorAlternate.isChecked();
+        boolean radialMirrorAlternate = buttonRadialMirrorAlternate.isChecked();
 
-		int radialMirrorRadius = 50;
+        int radialMirrorRadius = 50;
-		try {
+        try {
-			radialMirrorRadius = (int) textRadialMirrorRadius.getNumber();
+            radialMirrorRadius = (int) textRadialMirrorRadius.getNumber();
-		} catch (NumberFormatException | NullPointerException ex) {
+        } catch (NumberFormatException | NullPointerException ex) {
-			EffortlessBuilding.log(mc.player, "Mirror radius not a valid number.");
+            EffortlessBuilding.log(mc.player, "Mirror radius not a valid number.");
-		}
+        }
 
-		return new RadialMirror.RadialMirrorSettings(radialMirrorEnabled, radialMirrorPos, radialMirrorSlices, radialMirrorAlternate, radialMirrorRadius, drawLines, drawPlanes);
+        return new RadialMirror.RadialMirrorSettings(radialMirrorEnabled, radialMirrorPos, radialMirrorSlices, radialMirrorAlternate, radialMirrorRadius, drawLines, drawPlanes);
-	}
+    }
 
-	@Override
+    @Override
-	protected String getName() {
+    protected String getName() {
-		return "Radial mirror";
+        return "Radial mirror";
-	}
+    }
 
-	@Override
+    @Override
-	protected int getExpandedHeight() {
+    protected int getExpandedHeight() {
-		return 100;
+        return 100;
-	}
+    }
 }

src/main/java/nl/requios/effortlessbuilding/gui/elements/GuiCheckBoxFixed.java

@@ -1,62 +0,0 @@
-package nl.requios.effortlessbuilding.gui.elements;
-
-import com.mojang.blaze3d.vertex.PoseStack;
-import net.minecraft.client.Minecraft;
-import net.minecraft.client.gui.components.Button;
-import net.minecraft.network.chat.Component;
-import net.minecraftforge.client.gui.ScreenUtils;
-
-import javax.annotation.ParametersAreNonnullByDefault;
-
-/**
- * This class provides a checkbox style control.
- */
-@ParametersAreNonnullByDefault
-public class GuiCheckBoxFixed extends Button {
-	private final int boxWidth;
-	private boolean isChecked;
-
-	public GuiCheckBoxFixed(int xPos, int yPos, String displayString, boolean isChecked) {
-		super(xPos, yPos, Minecraft.getInstance().font.width(displayString) + 2 + 11, 11, Component.literal(displayString), b -> {
-		});
-		this.isChecked = isChecked;
-		this.boxWidth = 11;
-		this.height = 11;
-		this.width = this.boxWidth + 2 + Minecraft.getInstance().font.width(displayString);
-	}
-
-	@Override
-	public void renderButton(PoseStack ms, int mouseX, int mouseY, float partial) {
-		if (this.visible) {
-			Minecraft mc = Minecraft.getInstance();
-			this.isHovered = mouseX >= this.x && mouseY >= this.y && mouseX < this.x + this.boxWidth && mouseY < this.y + this.height;
-			ScreenUtils.blitWithBorder(ms, WIDGETS_LOCATION, this.x, this.y, 0, 46, this.boxWidth, this.height, 200, 20, 2, 3, 2, 2, this.getBlitOffset());
-			this.renderBg(ms, mc, mouseX, mouseY);
-			int color = 14737632;
-
-			if (packedFGColor != 0) {
-				color = packedFGColor;
-			} else if (!this.active) {
-				color = 10526880;
-			}
-
-			if (this.isChecked)
-				drawCenteredString(ms, mc.font, "x", this.x + this.boxWidth / 2 + 1, this.y + 1, 14737632);
-
-			drawString(ms, mc.font, getMessage(), this.x + this.boxWidth + 2, this.y + 2, color);
-		}
-	}
-
-	@Override
-	public void onPress() {
-		this.isChecked = !this.isChecked;
-	}
-
-	public boolean isChecked() {
-		return this.isChecked;
-	}
-
-	public void setIsChecked(boolean isChecked) {
-		this.isChecked = isChecked;
-	}
-}

src/main/java/nl/requios/effortlessbuilding/gui/elements/GuiCollapsibleScrollEntry.java

@@ -1,90 +1,93 @@
 package nl.requios.effortlessbuilding.gui.elements;
 
-import com.mojang.blaze3d.vertex.PoseStack;
 import net.minecraft.client.Minecraft;
-import net.minecraft.client.gui.Font;
+import net.minecraft.client.gui.FontRenderer;
-import net.minecraft.client.gui.components.Widget;
+import net.minecraft.client.gui.GuiButton;
-import net.minecraft.client.gui.screens.Screen;
+import net.minecraft.client.gui.GuiScreen;
-import net.minecraft.client.gui.components.AbstractWidget;
+import net.minecraft.client.gui.IGuiEventListener;
 import net.minecraftforge.api.distmarker.Dist;
 import net.minecraftforge.api.distmarker.OnlyIn;
 
+import java.io.IOException;
 import java.util.List;
 
 @OnlyIn(Dist.CLIENT)
 public abstract class GuiCollapsibleScrollEntry implements GuiScrollPane.IScrollEntry {
 
-	public GuiScrollPane scrollPane;
+    public GuiScrollPane scrollPane;
-	protected Font font;
+    protected FontRenderer fontRenderer;
-	protected Minecraft mc;
+    protected Minecraft mc;
 
-	protected boolean isCollapsed = true;
+    protected boolean isCollapsed = true;
-	protected int left, right, top, bottom;
+    protected int left, right, top, bottom;
 
-	public GuiCollapsibleScrollEntry(GuiScrollPane scrollPane) {
+    public GuiCollapsibleScrollEntry(GuiScrollPane scrollPane) {
-		this.scrollPane = scrollPane;
+        this.scrollPane = scrollPane;
-		this.font = scrollPane.font;
+        this.fontRenderer = scrollPane.fontRenderer;
-		this.mc = Minecraft.getInstance();
+        this.mc = scrollPane.parent.mc;
-	}
+    }
 
-	@Override
+    @Override
-	public void init(List<Widget> renderables) {
+    public int initGui(int id, List<GuiButton> buttonList) {
-		left = scrollPane.getWidth() / 2 - 140;
-		right = scrollPane.getWidth() / 2 + 140;
-		top = scrollPane.getHeight() / 2 - 100;
-		bottom = scrollPane.getHeight() / 2 + 100;
-	}
 
-	@Override
+        left = scrollPane.width / 2 - 140;
-	public void updateScreen() {
+        right = scrollPane.width / 2 + 140;
-	}
+        top = scrollPane.height / 2 - 100;
+        bottom = scrollPane.height / 2 + 100;
 
-	@Override
+        return id;
-	public void drawTooltip(PoseStack ms, Screen guiScreen, int mouseX, int mouseY) {
+    }
-	}
 
-	@Override
+    @Override
-	public void updatePosition(int slotIndex, int x, int y, float partialTicks) {
+    public void updateScreen() {
+    }
 
-	}
+    @Override
+    public void drawTooltip(GuiScreen guiScreen, int mouseX, int mouseY) {
+    }
 
-	@Override
+    @Override
-	public boolean charTyped(char eventChar, int eventKey) {
+    public void updatePosition(int slotIndex, int x, int y, float partialTicks) {
-		return false;
-	}
 
-	@Override
+    }
-	public boolean mousePressed(int slotIndex, int mouseX, int mouseY, int mouseEvent, int relativeX, int relativeY) {
-		return false;
-	}
 
-	@Override
+    @Override
-	public void mouseReleased(int slotIndex, int x, int y, int mouseEvent, int relativeX, int relativeY) {
+    public boolean charTyped(char eventChar, int eventKey) {
+        return false;
+    }
 
-	}
+    @Override
+    public boolean mousePressed(int slotIndex, int mouseX, int mouseY, int mouseEvent, int relativeX, int relativeY) {
+        return false;
+    }
 
-	@Override
+    @Override
-	public void onGuiClosed() {
+    public void mouseReleased(int slotIndex, int x, int y, int mouseEvent, int relativeX, int relativeY) {
-	}
 
-	@Override
+    }
-	public int getHeight() {
-		return isCollapsed ? getCollapsedHeight() : getExpandedHeight();
-	}
 
-	public void setCollapsed(boolean collapsed) {
+    @Override
-		this.isCollapsed = collapsed;
+    public void onGuiClosed() {
-	}
+    }
 
-	protected String getName() {
+    @Override
-		return "Collapsible scroll entry";
+    public int getHeight() {
-	}
+        return isCollapsed ? getCollapsedHeight() : getExpandedHeight();
+    }
 
-	protected int getCollapsedHeight() {
+    public void setCollapsed(boolean collapsed) {
-		return 24;
+        this.isCollapsed = collapsed;
-	}
+    }
 
-	protected int getExpandedHeight() {
+    protected String getName() {
-		return 100;
+        return "Collapsible scroll entry";
-	}
+    }
+
+    protected int getCollapsedHeight() {
+        return 24;
+    }
+
+    protected int getExpandedHeight() {
+        return 100;
+    }
 }

src/main/java/nl/requios/effortlessbuilding/gui/elements/GuiIconButton.java

@@ -1,79 +1,78 @@
 package nl.requios.effortlessbuilding.gui.elements;
 
-import com.mojang.blaze3d.systems.RenderSystem;
+import net.minecraft.client.Minecraft;
-import com.mojang.blaze3d.vertex.PoseStack;
+import net.minecraft.client.gui.GuiButton;
-import net.minecraft.client.gui.screens.Screen;
+import net.minecraft.client.gui.GuiScreen;
-import net.minecraft.client.gui.components.Button;
+import net.minecraft.util.ResourceLocation;
-import net.minecraft.resources.ResourceLocation;
-import net.minecraft.network.chat.Component;
 import net.minecraftforge.api.distmarker.Dist;
 import net.minecraftforge.api.distmarker.OnlyIn;
 
-import javax.annotation.ParametersAreNonnullByDefault;
 import java.util.ArrayList;
-import java.util.Collections;
+import java.util.Arrays;
 import java.util.List;
 
 @OnlyIn(Dist.CLIENT)
-@ParametersAreNonnullByDefault
+public class GuiIconButton extends GuiButton {
-public class GuiIconButton extends Button {
 
-	private final ResourceLocation resourceLocation;
+    private final ResourceLocation resourceLocation;
-	private final int iconX, iconY, iconWidth, iconHeight, iconAltX, iconAltY;
+    private final int iconX, iconY, iconWidth, iconHeight, iconAltX, iconAltY;
-	List<Component> tooltip = new ArrayList<>();
+    List<String> tooltip = new ArrayList<>();
-	private boolean useAltIcon = false;
+    private boolean useAltIcon = false;
 
-	public GuiIconButton(int x, int y, int iconX, int iconY, ResourceLocation resourceLocation, Button.OnPress onPress) {
+    public GuiIconButton(int buttonId, int x, int y, int iconX, int iconY, ResourceLocation resourceLocation) {
-		this(x, y, 20, 20, iconX, iconY, 20, 20, 20, 0, resourceLocation, onPress);
+        this(buttonId, x, y, 20, 20, iconX, iconY, 20, 20, 20, 0, resourceLocation);
-	}
+    }
 
-	public GuiIconButton(int x, int y, int width, int height, int iconX, int iconY, int iconWidth, int iconHeight, int iconAltX, int iconAltY, ResourceLocation resourceLocation, Button.OnPress onPress) {
+    public GuiIconButton(int buttonId, int x, int y, int width, int height, int iconX, int iconY, int iconWidth, int iconHeight, int iconAltX, int iconAltY, ResourceLocation resourceLocation) {
-		super(x, y, width, height, Component.empty(), onPress);
+        super(buttonId, x, y, width, height, "");
-		this.iconX = iconX;
+        this.iconX = iconX;
-		this.iconY = iconY;
+        this.iconY = iconY;
-		this.iconWidth = iconWidth;
+        this.iconWidth = iconWidth;
-		this.iconHeight = iconHeight;
+        this.iconHeight = iconHeight;
-		this.iconAltX = iconAltX;
+        this.iconAltX = iconAltX;
-		this.iconAltY = iconAltY;
+        this.iconAltY = iconAltY;
-		this.resourceLocation = resourceLocation;
+        this.resourceLocation = resourceLocation;
-	}
+    }
 
-	public void setTooltip(Component tooltip) {
+    public void setTooltip(String tooltip) {
-		setTooltip(Collections.singletonList(tooltip));
+        setTooltip(Arrays.asList(tooltip));
-	}
+    }
 
-	public void setTooltip(List<Component> tooltip) {
+    public void setTooltip(List<String> tooltip) {
-		this.tooltip = tooltip;
+        this.tooltip = tooltip;
-	}
+    }
 
-	public void setUseAlternateIcon(boolean useAlternateIcon) {
+    public void setUseAlternateIcon(boolean useAlternateIcon) {
-		this.useAltIcon = useAlternateIcon;
+        this.useAltIcon = useAlternateIcon;
-	}
+    }
 
-	@Override
+    @Override
-	public void render(PoseStack ms, int mouseX, int mouseY, float partialTicks) {
+    public void render(int mouseX, int mouseY, float partialTicks) {
-		super.render(ms, mouseX, mouseY, partialTicks);
+        super.render(mouseX, mouseY, partialTicks);
-		if (this.visible) {
+        if (this.visible)
-			this.isHovered = mouseX >= this.x && mouseY >= this.y && mouseX < this.x + this.width && mouseY < this.y + this.height;
+        {
-			RenderSystem.setShaderTexture(0, this.resourceLocation);
+            this.hovered = mouseX >= this.x && mouseY >= this.y && mouseX < this.x + this.width && mouseY < this.y + this.height;
-			int currentIconX = this.iconX;
+            Minecraft.getInstance().getTextureManager().bindTexture(this.resourceLocation);
-			int currentIconY = this.iconY;
+            int currentIconX = this.iconX;
+            int currentIconY = this.iconY;
 
-			if (useAltIcon) {
+            if (useAltIcon)
-				currentIconX += iconAltX;
+            {
-				currentIconY += iconAltY;
+                currentIconX += iconAltX;
-			}
+                currentIconY += iconAltY;
+            }
 
-			//Draws a textured rectangle at the current z-value. Used to be drawTexturedModalRect in Gui.
+            this.drawTexturedModalRect(this.x, this.y, currentIconX, currentIconY, this.iconWidth, this.iconHeight);
-			this.blit(ms, this.x, this.y, currentIconX, currentIconY, this.iconWidth, this.iconHeight);
+        }
-		}
+    }
-	}
 
-	public void drawTooltip(PoseStack ms, Screen screen, int mouseX, int mouseY) {
+    public void drawTooltip(GuiScreen guiScreen, int mouseX, int mouseY) {
-		boolean flag = mouseX >= x && mouseX < x + width && mouseY >= y && mouseY < y + height;
+        boolean flag = mouseX >= x && mouseX < x + width && mouseY >= y && mouseY < y + height;
 
-		if (flag) {
+        if (flag) {
-			screen.renderComponentTooltip(ms, tooltip, mouseX - 10, mouseY + 25);
+            List<String> textLines = new ArrayList<>();
-		}
+            textLines.addAll(tooltip);
-	}
+            guiScreen.drawHoveringText(textLines, mouseX - 10, mouseY + 25);
+        }
+    }
 }

src/main/java/nl/requios/effortlessbuilding/gui/elements/GuiNumberField.java

@@ -1,160 +1,151 @@
 package nl.requios.effortlessbuilding.gui.elements;
 
-import com.mojang.blaze3d.vertex.PoseStack;
+import net.minecraft.client.Minecraft;
-import net.minecraft.MethodsReturnNonnullByDefault;
+import net.minecraft.client.gui.*;
-import net.minecraft.client.gui.GuiComponent;
+import net.minecraft.util.text.TextFormatting;
-import net.minecraft.client.gui.Font;
-import net.minecraft.client.gui.components.Widget;
-import net.minecraft.client.gui.screens.Screen;
-import net.minecraft.client.gui.components.EditBox;
-import net.minecraft.client.gui.components.Button;
-import net.minecraft.network.chat.Component;
-import net.minecraft.ChatFormatting;
 import net.minecraftforge.api.distmarker.Dist;
 import net.minecraftforge.api.distmarker.OnlyIn;
 
-import javax.annotation.ParametersAreNonnullByDefault;
+import java.io.IOException;
-import java.awt.*;
 import java.text.DecimalFormat;
 import java.text.ParseException;
 import java.util.ArrayList;
-import java.util.Collections;
+import java.util.Arrays;
 import java.util.List;
 
 @OnlyIn(Dist.CLIENT)
-@ParametersAreNonnullByDefault
+public class GuiNumberField extends Gui {
-@MethodsReturnNonnullByDefault
-public class GuiNumberField extends GuiComponent {
 
-	public int x, y, width, height;
+    public int x, y, width, height;
-	public int buttonWidth = 10;
+    public int buttonWidth = 10;
 
-	protected EditBox textField;
+    protected GuiTextField textField;
-	protected Button minusButton, plusButton;
+    protected GuiButton minusButton, plusButton;
 
-	List<Component> tooltip = new ArrayList<>();
+    List<String> tooltip = new ArrayList<>();
 
-	public GuiNumberField(Font font, List<Widget> renderables, int x, int y, int width, int height) {
+    public GuiNumberField(int id1, int id2, int id3, FontRenderer fontRenderer,
-		this.x = x;
+                          List<GuiButton> buttonList, int x, int y, int width, int height) {
-		this.y = y;
+        this.x = x;
-		this.width = width;
+        this.y = y;
-		this.height = height;
+        this.width = width;
+        this.height = height;
 
-		textField = new EditBox(font, x + buttonWidth + 1, y + 1, width - 2 * buttonWidth - 2, height - 2, Component.empty());
+        textField = new GuiTextField(id1, fontRenderer, x + buttonWidth + 1, y + 1, width - 2 * buttonWidth - 2, height - 2);
-		minusButton = new Button(x, y - 1, buttonWidth, height + 2, Component.literal("-"), button -> {
+        minusButton = new GuiButton(id2, x, y - 1, buttonWidth, height + 2, "-") {
-			float valueChanged = 1f;
+            @Override
-			if (Screen.hasControlDown()) valueChanged = 5f;
+            public void onClick(double mouseX, double mouseY) {
-			if (Screen.hasShiftDown()) valueChanged = 10f;
+                float valueChanged = 1f;
+                if (GuiScreen.isCtrlKeyDown()) valueChanged = 5f;
+                if (GuiScreen.isShiftKeyDown()) valueChanged = 10f;
 
-			setNumber(getNumber() - valueChanged);
+                setNumber(getNumber() - valueChanged);
-		});
+            }
-		plusButton = new Button(x + width - buttonWidth, y - 1, buttonWidth, height + 2, Component.literal("+"), button -> {
+        };
-			float valueChanged = 1f;
+        plusButton  = new GuiButton(id3, x + width - buttonWidth, y - 1, buttonWidth, height + 2, "+") {
-			if (Screen.hasControlDown()) valueChanged = 5f;
+            @Override
-			if (Screen.hasShiftDown()) valueChanged = 10f;
+            public void onClick(double mouseX, double mouseY) {
+                float valueChanged = 1f;
+                if (GuiScreen.isCtrlKeyDown()) valueChanged = 5f;
+                if (GuiScreen.isShiftKeyDown()) valueChanged = 10f;
 
-			setNumber(getNumber() + valueChanged);
+                setNumber(getNumber() + valueChanged);
-		});
+            }
+        };
 
-		renderables.add(minusButton);
+        buttonList.add(minusButton);
-		renderables.add(plusButton);
+        buttonList.add(plusButton);
-	}
+    }
 
-	public double getNumber() {
+    public void setNumber(double number) {
-		if (textField.getValue().isEmpty()) return 0;
+        textField.setText(DecimalFormat.getInstance().format(number));
-		try {
+    }
-			return DecimalFormat.getInstance().parse(textField.getValue()).doubleValue();
-		} catch (ParseException e) {
-			return 0;
-		}
-	}
 
-	public void setNumber(double number) {
+    public double getNumber() {
-		textField.setValue(DecimalFormat.getInstance().format(number));
+        if (textField.getText().isEmpty()) return 0;
-	}
+        try {
+            return DecimalFormat.getInstance().parse(textField.getText()).doubleValue();
+        } catch (ParseException e) {
+            return 0;
+        }
+    }
 
-	public void setTooltip(Component tooltip) {
+    public void setTooltip(String tooltip) {
-		setTooltip(Collections.singletonList(tooltip));
+        setTooltip(Arrays.asList(tooltip));
-	}
+    }
 
-	public void setTooltip(List<Component> tooltip) {
+    public void setTooltip(List<String> tooltip) {
-		this.tooltip = tooltip;
+        this.tooltip = tooltip;
-	}
+    }
 
-	public boolean mouseClicked(double mouseX, double mouseY, int mouseButton) {
+    public boolean mouseClicked(double mouseX, double mouseY, int mouseButton) {
-		boolean result = textField.mouseClicked(mouseX, mouseY, mouseButton);
+        boolean result = textField.mouseClicked(mouseX, mouseY, mouseButton);
 
-		//Check if clicked inside textfield
+        //Check if clicked inside textfield
-		boolean flag = mouseX >= x + buttonWidth && mouseX < x + width - buttonWidth && mouseY >= y && mouseY < y + height;
+        boolean flag = mouseX >= x + buttonWidth && mouseX < x + width - buttonWidth && mouseY >= y && mouseY < y + height;
 
-		//Rightclicked inside textfield
+        //Rightclicked inside textfield
-		if (flag && mouseButton == 1) {
+        if (flag && mouseButton == 1) {
-			textField.setValue("");
+            textField.setText("");
-			textField.setFocus(true);
+            textField.setFocused(true);
-			result = true;
+            result = true;
-		}
+        }
 
-		return result;
+        return result;
-	}
+    }
 
-	public void drawNumberField(PoseStack ms, int mouseX, int mouseY, float partialTicks) {
+    public void drawNumberField(int mouseX, int mouseY, float partialTicks) {
-		textField.y = y + 1;
+        textField.y = y + 1;
-		minusButton.y = y - 1;
+        minusButton.y = y - 1;
-		plusButton.y = y - 1;
+        plusButton.y = y - 1;
 
-		textField.render(ms, mouseX, mouseY, partialTicks);
+        textField.drawTextField(mouseX, mouseY, partialTicks);
-		minusButton.render(ms, mouseX, mouseY, partialTicks);
+        minusButton.render(mouseX, mouseY, partialTicks);
-		plusButton.render(ms, mouseX, mouseY, partialTicks);
+        plusButton.render(mouseX, mouseY, partialTicks);
-	}
+    }
 
-	public void drawTooltip(PoseStack ms, Screen screen, int mouseX, int mouseY) {
+    public void drawTooltip(GuiScreen guiScreen, int mouseX, int mouseY) {
-		boolean insideTextField = mouseX >= x + buttonWidth && mouseX < x + width - buttonWidth && mouseY >= y && mouseY < y + height;
+        boolean insideTextField = mouseX >= x + buttonWidth && mouseX < x + width - buttonWidth && mouseY >= y && mouseY < y + height;
-		boolean insideMinusButton = mouseX >= x && mouseX < x + buttonWidth && mouseY >= y && mouseY < y + height;
+        boolean insideMinusButton = mouseX >= x && mouseX < x + buttonWidth && mouseY >= y && mouseY < y + height;
-		boolean insidePlusButton = mouseX >= x + width - buttonWidth && mouseX < x + width && mouseY >= y && mouseY < y + height;
+        boolean insidePlusButton = mouseX >= x + width - buttonWidth && mouseX < x + width && mouseY >= y && mouseY < y + height;
 
-		// List<String> textLines = new ArrayList<>();
+        List<String> textLines = new ArrayList<>();
 
-		List<Component> textLines = new ArrayList<>();
+        if (insideTextField) {
-
+            if (!tooltip.isEmpty())
-
+                textLines.addAll(tooltip);
-		if (insideTextField) {
-			textLines.addAll(tooltip);
 //            textLines.add(TextFormatting.GRAY + "Tip: try scrolling.");
-		}
+        }
 
-		if (insideMinusButton) {
+        if (insideMinusButton) {
-			textLines.add(Component.literal("Hold ").append(Component.literal("shift ").withStyle(ChatFormatting.AQUA)).append("for ")
+            textLines.add("Hold " + TextFormatting.AQUA + "shift " + TextFormatting.RESET + "for " + TextFormatting.RED + "10");
-				.append(Component.literal("10").withStyle(ChatFormatting.RED)));
+            textLines.add("Hold " + TextFormatting.AQUA + "ctrl " + TextFormatting.RESET + "for " + TextFormatting.RED + "5");
-			textLines.add(Component.literal("Hold ").append(Component.literal("ctrl ").withStyle(ChatFormatting.AQUA)).append("for ")
+        }
-				.append(Component.literal("5").withStyle(ChatFormatting.RED)));
-		}
 
-		if (insidePlusButton) {
+        if (insidePlusButton) {
-			textLines.add(Component.literal("Hold ").append(Component.literal("shift ").withStyle(ChatFormatting.DARK_GREEN)).append("for ")
+            textLines.add("Hold " + TextFormatting.AQUA + "shift " + TextFormatting.RESET + "for " + TextFormatting.DARK_GREEN + "10");
-				.append(Component.literal("10").withStyle(ChatFormatting.RED)));
+            textLines.add("Hold " + TextFormatting.AQUA + "ctrl " + TextFormatting.RESET + "for " + TextFormatting.DARK_GREEN + "5");
-			textLines.add(Component.literal("Hold ").append(Component.literal("ctrl ").withStyle(ChatFormatting.DARK_GREEN)).append("for ")
+        }
-				.append(Component.literal("5").withStyle(ChatFormatting.RED)));
-		}
 
-		screen.renderComponentTooltip(ms, textLines, mouseX - 10, mouseY + 25);
+        guiScreen.drawHoveringText(textLines, mouseX - 10, mouseY + 25);
 
-	}
+    }
 
-	public void update() {
+    public void update() {
-		textField.tick();
+        textField.tick();
-	}
+    }
 
-	public boolean charTyped(char typedChar, int keyCode) {
+    public boolean charTyped(char typedChar, int keyCode) {
-		if (!textField.isFocused()) return false;
+        if (!textField.isFocused()) return false;
 //        if (Character.isDigit(typedChar) || typedChar == '.' || typedChar == '-' || keyCode == Keyboard.KEY_BACK
 //            || keyCode == Keyboard.KEY_DELETE || keyCode == Keyboard.KEY_LEFT || keyCode == Keyboard.KEY_RIGHT
 //            || keyCode == Keyboard.KEY_UP || keyCode == Keyboard.KEY_DOWN) {
-		return textField.charTyped(typedChar, keyCode);
+            return textField.charTyped(typedChar, keyCode);
 //        }
-	}
+    }
 
-	//Scroll inside textfield to change number
+    //Scroll inside textfield to change number
-	//Disabled because entire screen can be scrolled
+    //Disabled because entire screen can be scrolled
 //    public void handleMouseInput(int mouseX, int mouseY) {
 //        boolean insideTextField = mouseX >= x + buttonWidth && mouseX < x + width - buttonWidth && mouseY >= y && mouseY < y + height;
 //

src/main/java/nl/requios/effortlessbuilding/gui/elements/GuiScrollPane.java

@@ -1,223 +1,246 @@
 package nl.requios.effortlessbuilding.gui.elements;
 
-import com.mojang.blaze3d.vertex.*;
+import net.minecraft.client.MouseHelper;
-import com.mojang.blaze3d.platform.GlStateManager;
+import net.minecraft.client.gui.*;
-import com.mojang.blaze3d.systems.RenderSystem;
+import net.minecraft.client.renderer.BufferBuilder;
-import net.minecraft.MethodsReturnNonnullByDefault;
+import net.minecraft.client.renderer.GlStateManager;
-import net.minecraft.client.Minecraft;
+import net.minecraft.client.renderer.Tessellator;
-import net.minecraft.client.gui.Font;
+import net.minecraft.client.renderer.vertex.DefaultVertexFormats;
-import net.minecraft.client.gui.components.Widget;
+import net.minecraft.util.Util;
-import net.minecraft.client.gui.components.events.GuiEventListener;
+import net.minecraft.util.math.MathHelper;
-import net.minecraft.client.gui.screens.Screen;
-import net.minecraft.client.gui.components.AbstractWidget;
-import net.minecraft.util.Mth;
 import net.minecraftforge.api.distmarker.Dist;
 import net.minecraftforge.api.distmarker.OnlyIn;
+import net.minecraftforge.client.event.GuiScreenEvent;
 import net.minecraftforge.common.MinecraftForge;
+import net.minecraftforge.eventbus.api.SubscribeEvent;
+import net.minecraftforge.fml.common.Mod;
+import net.minecraftforge.fml.common.gameevent.TickEvent;
+import org.lwjgl.glfw.GLFW;
+import sun.security.ssl.Debug;
 
-import javax.annotation.ParametersAreNonnullByDefault;
+import java.io.IOException;
 import java.util.ArrayList;
 import java.util.List;
 
 @OnlyIn(Dist.CLIENT)
-@MethodsReturnNonnullByDefault
+public class GuiScrollPane extends GuiSlot {
-@ParametersAreNonnullByDefault
-public class GuiScrollPane extends SlotGui {
 
-	public Screen parent;
+    public GuiScreen parent;
-	public Font font;
+    public FontRenderer fontRenderer;
-	private final List<IScrollEntry> listEntries;
+    private List<IScrollEntry> listEntries;
-	private float scrollMultiplier = 1f;
+    private float scrollMultiplier = 1f;
 
-	private int mouseX;
+    private int mouseX;
-	private int mouseY;
+    private int mouseY;
 
-	public GuiScrollPane(Screen parent, Font font, int top, int bottom) {
+    public GuiScrollPane(GuiScreen parent, FontRenderer fontRenderer, int top, int bottom) {
-		super(Minecraft.getInstance(), parent.width, parent.height, top, bottom, 100);
+        super(parent.mc, parent.width, parent.height, top, bottom, 100);
-		this.parent = parent;
+        this.parent = parent;
-		this.font = font;
+        this.fontRenderer = fontRenderer;
-		this.renderSelection = false;
+        this.setShowSelectionBox(false);
-		listEntries = new ArrayList<>();
+        listEntries = new ArrayList<>();
-		MinecraftForge.EVENT_BUS.register(this);
+        MinecraftForge.EVENT_BUS.register(this);
-	}
+    }
 
-	public IScrollEntry getListEntry(int index) {
+    public IScrollEntry getListEntry(int index) {
-		return listEntries.get(index);
+        return listEntries.get(index);
-	}
+    }
 
-	public void AddListEntry(IScrollEntry listEntry) {
+    public void AddListEntry(IScrollEntry listEntry){
-		listEntries.add(listEntry);
+        listEntries.add(listEntry);
-	}
+    }
 
-	@Override
+    @Override
-	protected int getItemCount() {
+    protected int getSize() {
-		return listEntries.size();
+        return listEntries.size();
-	}
+    }
 
-	@Override
+    @Override
-	protected boolean isSelectedItem(int slotIndex) {
+    protected boolean isSelected(int slotIndex) {
-		return false;
+        return false;
-	}
+    }
 
-	@Override
+    @Override
-	protected int getScrollbarPosition() {
+    protected int getScrollBarX() {
-		//return width / 2 + 140 + 10;
+        //return width / 2 + 140 + 10;
-		return width - 15;
+        return width - 15;
-	}
+    }
 
-	@Override
+    @Override
-	public int getRowWidth() {
+    public int getListWidth() {
-		return 280;
+        return 280;
-	}
+    }
 
-	//Removed background
+    //Removed background
-	@Override
+    @Override
-	public void render(PoseStack ms, int mouseXIn, int mouseYIn, float partialTicks) {
+    public void drawScreen(int mouseXIn, int mouseYIn, float partialTicks)
-		if (this.visible) {
+    {
-			this.mouseX = mouseXIn;
+        if (this.visible)
-			this.mouseY = mouseYIn;
+        {
-			this.renderBackground();
+            this.mouseX = mouseXIn;
-			int scrollbarLeft = this.getScrollbarPosition();
+            this.mouseY = mouseYIn;
-			int scrollbarRight = scrollbarLeft + 6;
+            int scrollBarLeft = this.getScrollBarX();
-			this.capYPosition();
+            int scrollBarRight = scrollBarLeft + 6;
+            this.bindAmountScrolled();
+            GlStateManager.disableLighting();
+            GlStateManager.disableFog();
 
-			Tesselator tessellator = Tesselator.getInstance();
+            Tessellator tessellator = Tessellator.getInstance();
-			BufferBuilder bufferbuilder = tessellator.getBuilder();
+            BufferBuilder bufferbuilder = tessellator.getBuffer();
+            int insideLeft = this.left + this.width / 2 - this.getListWidth() / 2 + 2;
+            int insideTop = this.top + 4 - (int)this.amountScrolled;
 
-			int insideLeft = this.x0 + this.width / 2 - this.getRowWidth() / 2 + 2;
+            if (this.hasListHeader) {
-			int insideTop = this.y0 + 4 - (int) this.yo;
+                this.drawListHeader(insideLeft, insideTop, tessellator);
-			if (this.renderHeader) {
+            }
-				this.renderHeader(insideLeft, insideTop, tessellator);
-			}
 
-			//All entries
+            //All entries
-			this.renderList(ms, insideLeft, insideTop, mouseXIn, mouseYIn, partialTicks);
+            this.drawSelectionBox(insideLeft, insideTop, mouseXIn, mouseYIn, partialTicks);
-			RenderSystem.disableDepthTest();
+            GlStateManager.disableDepthTest();
 
-			//Dirt overlays on top and bottom
+            //Dirt overlays on top and bottom
-//            this.renderHoleBackground(0, this.y0, 255, 255);
+//            this.overlayBackground(0, this.top, 255, 255);
-//            this.renderHoleBackground(this.y1, this.height, 255, 255);
+//            this.overlayBackground(this.bottom, this.height, 255, 255);
 
-			RenderSystem.enableBlend();
+            GlStateManager.enableBlend();
-			RenderSystem.blendFuncSeparate(GlStateManager.SourceFactor.SRC_ALPHA, GlStateManager.DestFactor.ONE_MINUS_SRC_ALPHA, GlStateManager.SourceFactor.ZERO, GlStateManager.DestFactor.ONE);
+            GlStateManager.blendFuncSeparate(GlStateManager.SourceFactor.SRC_ALPHA, GlStateManager.DestFactor.ONE_MINUS_SRC_ALPHA, GlStateManager.SourceFactor.ZERO, GlStateManager.DestFactor.ONE);
-			RenderSystem.disableTexture();
+            GlStateManager.disableAlphaTest();
+            GlStateManager.shadeModel(7425);
+            GlStateManager.disableTexture2D();
 
-			//top
+//            //top fade
 //            bufferbuilder.begin(7, DefaultVertexFormats.POSITION_TEX_COLOR);
-//            bufferbuilder.pos((double)this.x0, (double)(this.y0 + 4), 0.0D).tex(0.0D, 1.0D).color(0, 0, 0, 0).endVertex();
+//            bufferbuilder.pos((double)this.left, (double)(this.top + 5), 0.0D).tex(0.0D, 1.0D).color(100, 100, 100, 0).endVertex();
-//            bufferbuilder.pos((double)this.x1, (double)(this.y0 + 4), 0.0D).tex(1.0D, 1.0D).color(0, 0, 0, 0).endVertex();
+//            bufferbuilder.pos((double)this.right, (double)(this.top + 5), 0.0D).tex(1.0D, 1.0D).color(100, 100, 100, 0).endVertex();
-//            bufferbuilder.pos((double)this.x1, (double)this.y0, 0.0D).tex(1.0D, 0.0D).color(0, 0, 0, 255).endVertex();
+//            bufferbuilder.pos((double)this.right, (double)this.top, 0.0D).tex(1.0D, 0.0D).color(100, 100, 100, 100).endVertex();
-//            bufferbuilder.pos((double)this.x0, (double)this.y0, 0.0D).tex(0.0D, 0.0D).color(0, 0, 0, 255).endVertex();
+//            bufferbuilder.pos((double)this.left, (double)this.top, 0.0D).tex(0.0D, 0.0D).color(100, 100, 100, 100).endVertex();
 //            tessellator.draw();
 
-			//bottom
+//            //top line
 //            bufferbuilder.begin(7, DefaultVertexFormats.POSITION_TEX_COLOR);
-//            bufferbuilder.pos((double)this.x0, (double)this.y1, 0.0D).tex(0.0D, 1.0D).color(0, 0, 0, 255).endVertex();
+//            bufferbuilder.pos((double)this.left, (double)this.top, 0.0D).tex(0.0D, 1.0D).color(20, 20, 20, 255).endVertex();
-//            bufferbuilder.pos((double)this.x1, (double)this.y1, 0.0D).tex(1.0D, 1.0D).color(0, 0, 0, 255).endVertex();
+//            bufferbuilder.pos((double)this.right, (double)this.top, 0.0D).tex(1.0D, 1.0D).color(20, 20, 20, 255).endVertex();
-//            bufferbuilder.pos((double)this.x1, (double)(this.y1 - 4), 0.0D).tex(1.0D, 0.0D).color(0, 0, 0, 0).endVertex();
+//            bufferbuilder.pos((double)this.right, (double)(this.top - 1), 0.0D).tex(1.0D, 0.0D).color(20, 20, 20, 255).endVertex();
-//            bufferbuilder.pos((double)this.x0, (double)(this.y1 - 4), 0.0D).tex(0.0D, 0.0D).color(0, 0, 0, 0).endVertex();
+//            bufferbuilder.pos((double)this.left, (double)(this.top - 1), 0.0D).tex(0.0D, 0.0D).color(20, 20, 20, 255).endVertex();
 //            tessellator.draw();
 
-			//Draw scrollbar
+//            //bottom fade
-			int maxScroll = this.getMaxScroll();
+//            bufferbuilder.begin(7, DefaultVertexFormats.POSITION_TEX_COLOR);
-			if (maxScroll > 0) {
+//            bufferbuilder.pos((double)this.left, (double)this.bottom, 0.0D).tex(0.0D, 1.0D).color(10, 10, 10, 100).endVertex();
-				int k1 = (int) ((float) ((this.y1 - this.y0) * (this.y1 - this.y0)) / (float) this.getMaxPosition());
+//            bufferbuilder.pos((double)this.right, (double)this.bottom, 0.0D).tex(1.0D, 1.0D).color(10, 10, 10, 100).endVertex();
-				k1 = Mth.clamp(k1, 32, this.y1 - this.y0 - 8);
+//            bufferbuilder.pos((double)this.right, (double)(this.bottom - 5), 0.0D).tex(1.0D, 0.0D).color(10, 10, 10, 0).endVertex();
-				int l1 = (int) this.yo * (this.y1 - this.y0 - k1) / maxScroll + this.y0;
+//            bufferbuilder.pos((double)this.left, (double)(this.bottom - 5), 0.0D).tex(0.0D, 0.0D).color(10, 10, 10, 0).endVertex();
-				if (l1 < this.y0) {
+//            tessellator.draw();
-					l1 = this.y0;
-				}
 
-				bufferbuilder.begin(VertexFormat.Mode.QUADS, DefaultVertexFormat.POSITION_TEX_COLOR);
+//            //bottom line
-				bufferbuilder.vertex(scrollbarLeft, this.y1, 0.0F).uv(0.0F, 1.0F).color(0, 0, 0, 255).endVertex();
+//            bufferbuilder.begin(7, DefaultVertexFormats.POSITION_TEX_COLOR);
-				bufferbuilder.vertex(scrollbarRight, this.y1, 0.0F).uv(1.0F, 1.0F).color(0, 0, 0, 255).endVertex();
+//            bufferbuilder.pos((double)this.left, (double)(this.bottom + 1), 0.0D).tex(0.0D, 1.0D).color(20, 20, 20, 255).endVertex();
-				bufferbuilder.vertex(scrollbarRight, this.y0, 0.0F).uv(1.0F, 0.0F).color(0, 0, 0, 255).endVertex();
+//            bufferbuilder.pos((double)this.right, (double)(this.bottom + 1), 0.0D).tex(1.0D, 1.0D).color(20, 20, 20, 255).endVertex();
-				bufferbuilder.vertex(scrollbarLeft, this.y0, 0.0F).uv(0.0F, 0.0F).color(0, 0, 0, 255).endVertex();
+//            bufferbuilder.pos((double)this.right, (double)this.bottom, 0.0D).tex(1.0D, 0.0D).color(20, 20, 20, 255).endVertex();
-				tessellator.end();
+//            bufferbuilder.pos((double)this.left, (double)this.bottom, 0.0D).tex(0.0D, 0.0D).color(20, 20, 20, 255).endVertex();
-				bufferbuilder.begin(VertexFormat.Mode.QUADS, DefaultVertexFormat.POSITION_TEX_COLOR);
+//            tessellator.draw();
-				bufferbuilder.vertex(scrollbarLeft, l1 + k1, 0.0F).uv(0.0F, 1.0F).color(128, 128, 128, 255).endVertex();
-				bufferbuilder.vertex(scrollbarRight, l1 + k1, 0.0F).uv(1.0F, 1.0F).color(128, 128, 128, 255).endVertex();
-				bufferbuilder.vertex(scrollbarRight, l1, 0.0F).uv(1.0F, 0.0F).color(128, 128, 128, 255).endVertex();
-				bufferbuilder.vertex(scrollbarLeft, l1, 0.0F).uv(0.0F, 0.0F).color(128, 128, 128, 255).endVertex();
-				tessellator.end();
-				bufferbuilder.begin(VertexFormat.Mode.QUADS, DefaultVertexFormat.POSITION_TEX_COLOR);
-				bufferbuilder.vertex(scrollbarLeft, l1 + k1 - 1, 0.0F).uv(0.0F, 1.0F).color(192, 192, 192, 255).endVertex();
-				bufferbuilder.vertex(scrollbarRight - 1, l1 + k1 - 1, 0.0F).uv(1.0F, 1.0F).color(192, 192, 192, 255).endVertex();
-				bufferbuilder.vertex(scrollbarRight - 1, l1, 0.0F).uv(1.0F, 0.0F).color(192, 192, 192, 255).endVertex();
-				bufferbuilder.vertex(scrollbarLeft, l1, 0.0F).uv(0.0F, 0.0F).color(192, 192, 192, 255).endVertex();
-				tessellator.end();
-			}
 
-			//this.renderDecorations(mouseXIn, mouseYIn);
+            //Draw scrollbar
-			RenderSystem.enableTexture();
+            int maxScroll = this.getMaxScroll();
-			RenderSystem.disableBlend();
+            if (maxScroll > 0)
-		}
+            {
-	}
+                int k1 = (this.bottom - this.top) * (this.bottom - this.top) / this.getContentHeight();
+                k1 = MathHelper.clamp(k1, 32, this.bottom - this.top - 8);
+                int l1 = (int)this.amountScrolled * (this.bottom - this.top - k1) / maxScroll + this.top;
 
-	//SLOTHEIGHT MODIFICATIONS
+                if (l1 < this.top)
-	//SlotHeight is still relied on for determining how much to scroll
+                {
-	@Override
+                    l1 = this.top;
-	protected int getMaxPosition() {
+                }
-		//Add every entry height
-		int height = this.headerHeight;
-		for (IScrollEntry entry : listEntries) {
-			height += entry.getHeight();
-		}
-		return height;
-	}
 
-	@Override
+                bufferbuilder.begin(7, DefaultVertexFormats.POSITION_TEX_COLOR);
-	protected void renderBackground() {
+                bufferbuilder.pos((double)scrollBarLeft, (double)this.bottom, 0.0D).tex(0.0D, 1.0D).color(0, 0, 0, 255).endVertex();
+                bufferbuilder.pos((double)scrollBarRight, (double)this.bottom, 0.0D).tex(1.0D, 1.0D).color(0, 0, 0, 255).endVertex();
+                bufferbuilder.pos((double)scrollBarRight, (double)this.top, 0.0D).tex(1.0D, 0.0D).color(0, 0, 0, 255).endVertex();
+                bufferbuilder.pos((double)scrollBarLeft, (double)this.top, 0.0D).tex(0.0D, 0.0D).color(0, 0, 0, 255).endVertex();
+                tessellator.draw();
 
-	}
+                bufferbuilder.begin(7, DefaultVertexFormats.POSITION_TEX_COLOR);
+                bufferbuilder.pos((double)scrollBarLeft, (double)(l1 + k1), 0.0D).tex(0.0D, 1.0D).color(128, 128, 128, 255).endVertex();
+                bufferbuilder.pos((double)scrollBarRight, (double)(l1 + k1), 0.0D).tex(1.0D, 1.0D).color(128, 128, 128, 255).endVertex();
+                bufferbuilder.pos((double)scrollBarRight, (double)l1, 0.0D).tex(1.0D, 0.0D).color(128, 128, 128, 255).endVertex();
+                bufferbuilder.pos((double)scrollBarLeft, (double)l1, 0.0D).tex(0.0D, 0.0D).color(128, 128, 128, 255).endVertex();
+                tessellator.draw();
 
-	@Override
+                bufferbuilder.begin(7, DefaultVertexFormats.POSITION_TEX_COLOR);
-	protected void renderItem(PoseStack ms, int slotIndex, int xPos, int yPos, int heightIn, int mouseXIn, int mouseYIn, float partialTicks) {
+                bufferbuilder.pos((double)scrollBarLeft, (double)(l1 + k1 - 1), 0.0D).tex(0.0D, 1.0D).color(192, 192, 192, 255).endVertex();
-		this.getListEntry(slotIndex).drawEntry(ms, slotIndex, xPos, yPos, this.getRowWidth(), heightIn, mouseXIn, mouseYIn,
+                bufferbuilder.pos((double)(scrollBarRight - 1), (double)(l1 + k1 - 1), 0.0D).tex(1.0D, 1.0D).color(192, 192, 192, 255).endVertex();
-			this.getSlotIndexFromScreenCoords(mouseXIn, mouseYIn) == slotIndex, partialTicks);
+                bufferbuilder.pos((double)(scrollBarRight - 1), (double)l1, 0.0D).tex(1.0D, 0.0D).color(192, 192, 192, 255).endVertex();
-	}
+                bufferbuilder.pos((double)scrollBarLeft, (double)l1, 0.0D).tex(0.0D, 0.0D).color(192, 192, 192, 255).endVertex();
+                tessellator.draw();
+            }
 
-	public int getMaxPosition(int count) {
+            GlStateManager.enableTexture2D();
-		//Add all count entry heights
+            GlStateManager.shadeModel(7424);
-		int height = this.headerHeight;
+            GlStateManager.enableAlphaTest();
-		for (int i = 0; i < count; i++) {
+            GlStateManager.disableBlend();
-			IScrollEntry entry = listEntries.get(i);
+        }
-			height += entry.getHeight();
+    }
-		}
-		return height;
-	}
 
-	public int getSlotIndexFromScreenCoords(double posX, double posY) {
+    //SLOTHEIGHT MODIFICATIONS
-		int left = this.x0 + (this.width - this.getRowWidth()) / 2;
+    //SlotHeight is still relied on for determining how much to scroll
-		int right = this.x0 + (this.width + this.getRowWidth()) / 2;
+    @Override
-		double relativeMouseY = getRelativeMouseY(mouseY, 0);
+    protected int getContentHeight() {
+        //Add every entry height
+        int height = this.headerPadding;
+        for (IScrollEntry entry : listEntries) {
+            height += entry.getHeight();
+        }
+        return height;
+    }
 
-		//Iterate over every entry until relativeMouseY falls within its height
+    @Override
-		for (int i = 0; i < listEntries.size(); i++) {
+    protected void drawBackground() {
-			IScrollEntry entry = listEntries.get(i);
-			if (relativeMouseY <= entry.getHeight())
-				return posX < this.getScrollbarPosition() && posX >= left && posX <= right && i >= 0 &&
-					relativeMouseY >= 0 && i < this.getItemCount() ? i : -1;
-			relativeMouseY -= entry.getHeight();
-		}
-		return -1;
-	}
 
-	@Override
+    }
-	public List<? extends GuiEventListener> children() {
-		return null;
-	}
 
-	@Override
+    @Override
-	public boolean mouseClicked(double mouseX, double mouseY, int button) {
+    protected void drawSlot(int slotIndex, int xPos, int yPos, int heightIn, int mouseXIn, int mouseYIn, float partialTicks) {
-		int selectedSlot = this.getSlotIndexFromScreenCoords(mouseX, mouseY);
+        this.getListEntry(slotIndex).drawEntry(slotIndex, xPos, yPos, this.getListWidth(), heightIn, mouseXIn, mouseYIn,
-		double relativeX = getRelativeMouseX(mouseX);
+                this.getSlotIndexFromScreenCoords(mouseXIn, mouseYIn) == slotIndex, partialTicks);
+    }
 
-		//Always pass through mouseclicked, to be able to unfocus textfields
+    public int getContentHeight(int count) {
-		for (int i = 0; i < this.listEntries.size(); i++) {
+        //Add all count entry heights
-			double relativeY = getRelativeMouseY(mouseY, i);
+        int height = this.headerPadding;
-			this.getListEntry(i).mousePressed(selectedSlot, (int) mouseX, (int) mouseY, button, (int) relativeX, (int) relativeY);
+        for (int i = 0; i < count; i++) {
-		}
+            IScrollEntry entry = listEntries.get(i);
+            height += entry.getHeight();
+        }
+        return height;
+    }
+
+    public int getSlotIndexFromScreenCoords(double posX, double posY) {
+        int left = this.left + (this.width - this.getListWidth()) / 2;
+        int right = this.left + (this.width + this.getListWidth()) / 2;
+        double relativeMouseY = getRelativeMouseY(mouseY, 0);
+
+        //Iterate over every entry until relativeMouseY falls within its height
+        for (int i = 0; i < listEntries.size(); i++) {
+            IScrollEntry entry = listEntries.get(i);
+            if (relativeMouseY <= entry.getHeight())
+                return posX < this.getScrollBarX() && posX >= left && posX <= right && i >= 0 &&
+                       relativeMouseY >= 0 && i < this.getSize() ? i : -1;
+            relativeMouseY -= entry.getHeight();
+        }
+        return -1;
+    }
+
+    @Override
+    protected boolean mouseClicked(int index, int button, double mouseX, double mouseY) {
+        int selectedSlot = this.getSlotIndexFromScreenCoords(mouseX, mouseY);
+        double relativeX = getRelativeMouseX(mouseX);
+
+        //Always pass through mouseclicked, to be able to unfocus textfields
+        for (int i = 0; i < this.listEntries.size(); i++) {
+            double relativeY = getRelativeMouseY(mouseY, i);
+            this.getListEntry(i).mousePressed(selectedSlot, (int) mouseX, (int) mouseY, button, (int) relativeX, (int) relativeY);
+        }
 
 
 //        if (this.isMouseYWithinSlotBounds(mouseY))
@@ -237,230 +260,244 @@ public class GuiScrollPane extends SlotGui {
 //            }
 //        }
 
-		return false;
+        return false;
-	}
+    }
 
-	@Override
+    @Override
-	public boolean mouseReleased(double mouseX, double mouseY, int button) {
+    public boolean mouseReleased(double p_mouseReleased_1_, double p_mouseReleased_3_, int p_mouseReleased_5_) {
-		for (int i = 0; i < this.getItemCount(); ++i) {
+        for (int i = 0; i < this.getSize(); ++i)
-			double relativeX = getRelativeMouseX(mouseX);
+        {
-			double relativeY = getRelativeMouseY(mouseY, i);
+            double relativeX = getRelativeMouseX(mouseX);
-			this.getListEntry(i).mouseReleased(i, (int) mouseX, (int) mouseY, button, (int) relativeX, (int) relativeY);
+            double relativeY = getRelativeMouseY(mouseY, i);
-		}
+            this.getListEntry(i).mouseReleased(i, (int) p_mouseReleased_1_, (int) p_mouseReleased_3_, p_mouseReleased_5_, (int) relativeX, (int) relativeY);
+        }
 
-		this.visible = true;
+        this.visible = true;
-		return false;
+        return false;
-	}
+    }
 
-	public void handleMouseInput() {
+    public void handleMouseInput() {
-		if (this.isMouseInList(this.mouseX, this.mouseY)) {
+        if (this.isMouseInList(this.mouseX, this.mouseY)) {
-			if (minecraft.mouseHandler.isLeftPressed() && this.mouseY >= this.y0 &&
+            if (mc.mouseHelper.isLeftDown() && this.mouseY >= this.top &&
-				this.mouseY <= this.y1) {
+                this.mouseY <= this.bottom) {
-				int i = this.x0 + (this.width - this.getRowWidth()) / 2;
+                int i = this.left + (this.width - this.getListWidth()) / 2;
-				int j = this.x0 + (this.width + this.getRowWidth()) / 2;
+                int j = this.left + (this.width + this.getListWidth()) / 2;
-				int slotIndex = getSlotIndexFromScreenCoords(this.mouseX, this.mouseY);
+                int slotIndex = getSlotIndexFromScreenCoords(this.mouseX, this.mouseY);
-				double relativeMouseY = getRelativeMouseY(mouseY, slotIndex);
+                double relativeMouseY = getRelativeMouseY(mouseY, slotIndex);
 
-				if (slotIndex > -1) {
+                if (slotIndex > -1) {
-					this.mouseClicked(this.mouseX, this.mouseY, 0);
+                    this.mouseClicked(slotIndex, 0, this.mouseX, this.mouseY);
-				} else if (this.mouseX >= i && this.mouseX <= j && relativeMouseY < 0) {
+                    this.selectedElement = slotIndex;
-					this.clickedHeader(this.mouseX - i, this.mouseY - this.y0 + (int) this.yo - 4);
+                } else if (this.mouseX >= i && this.mouseX <= j && relativeMouseY < 0) {
-				}
+                    this.clickedHeader(this.mouseX - i, this.mouseY - this.top + (int) this.amountScrolled - 4);
-			}
+                }
+            }
 
-			if (minecraft.mouseHandler.isLeftPressed() && this.isVisible()) {
+            if (mc.mouseHelper.isLeftDown() && this.isVisible()) {
-				if (this.yDrag == -1) {
+                if (this.initialClickY == -1) {
-					boolean flag1 = true;
+                    boolean flag1 = true;
 
-					if (this.mouseY >= this.y0 && this.mouseY <= this.y1) {
+                    if (this.mouseY >= this.top && this.mouseY <= this.bottom) {
-						int i2 = this.x0 + (this.width - this.getRowWidth()) / 2;
+                        int i2 = this.left + (this.width - this.getListWidth()) / 2;
-						int j2 = this.x0 + (this.width + this.getRowWidth()) / 2;
+                        int j2 = this.left + (this.width + this.getListWidth()) / 2;
-						int slotIndex = getSlotIndexFromScreenCoords(this.mouseX, this.mouseY);
+                        int slotIndex = getSlotIndexFromScreenCoords(this.mouseX, this.mouseY);
-						double relativeMouseY = getRelativeMouseY(mouseY, slotIndex);
+                        double relativeMouseY = getRelativeMouseY(mouseY, slotIndex);
 
-						if (slotIndex > -1) {
+                        if (slotIndex > -1) {
-							this.mouseClicked(slotIndex, this.mouseX, this.mouseY);
+                            //TODO 1.13 use flag
-						} else if (this.mouseX >= i2 && this.mouseX <= j2 && relativeMouseY < 0) {
+                            boolean flag = slotIndex == this.selectedElement &&
-							this.clickedHeader(this.mouseX - i2,
+                                           Util.milliTime() - this.lastClicked < 250L;
-								this.mouseY - this.y0 + (int) this.yo - 4);
+                            this.mouseClicked(slotIndex, this.mouseX, this.mouseY);
-							flag1 = false;
+                            this.selectedElement = slotIndex;
-						}
+                            this.lastClicked = Util.milliTime();
+                        } else if (this.mouseX >= i2 && this.mouseX <= j2 && relativeMouseY < 0) {
+                            this.clickedHeader(this.mouseX - i2,
+                                    this.mouseY - this.top + (int) this.amountScrolled - 4);
+                            flag1 = false;
+                        }
 
-						int i3 = this.getScrollbarPosition();
+                        int i3 = this.getScrollBarX();
-						int j1 = i3 + 6;
+                        int j1 = i3 + 6;
 
-						if (this.mouseX >= i3 && this.mouseX <= j1) {
+                        if (this.mouseX >= i3 && this.mouseX <= j1) {
-							this.scrollMultiplier = -1.0F;
+                            this.scrollMultiplier = -1.0F;
-							int maxScroll = this.getMaxScroll();
+                            int maxScroll = this.getMaxScroll();
 
-							if (maxScroll < 1) {
+                            if (maxScroll < 1) {
-								maxScroll = 1;
+                                maxScroll = 1;
-							}
+                            }
 
-							int l1 = (int) ((float) ((this.y1 - this.y0) * (this.y1 - this.y0)) /
+                            int l1 = (int) ((float) ((this.bottom - this.top) * (this.bottom - this.top)) /
-								(float) this.getMaxPosition());
+                                            (float) this.getContentHeight());
-							l1 = Mth.clamp(l1, 32, this.y1 - this.y0 - 8);
+                            l1 = MathHelper.clamp(l1, 32, this.bottom - this.top - 8);
-							this.scrollMultiplier /= (float) (this.y1 - this.y0 - l1) / (float) maxScroll;
+                            this.scrollMultiplier /= (float) (this.bottom - this.top - l1) / (float) maxScroll;
-						} else {
+                        } else {
-							this.scrollMultiplier = 1.0F;
+                            this.scrollMultiplier = 1.0F;
-						}
+                        }
 
-						if (flag1) {
+                        if (flag1) {
-							this.yDrag = this.mouseY;
+                            this.initialClickY = this.mouseY;
-						} else {
+                        } else {
-							this.yDrag = -2;
+                            this.initialClickY = -2;
-						}
+                        }
-					} else {
+                    } else {
-						this.yDrag = -2;
+                        this.initialClickY = -2;
-					}
+                    }
-				} else if (this.yDrag >= 0) {
+                } else if (this.initialClickY >= 0) {
-					this.yo -= (float) (this.mouseY - this.yDrag) * this.scrollMultiplier;
+                    this.amountScrolled -= (float) (this.mouseY - this.initialClickY) * this.scrollMultiplier;
-					this.yDrag = this.mouseY;
+                    this.initialClickY = this.mouseY;
-				}
+                }
-			} else {
+            } else {
-				this.yDrag = -1;
+                this.initialClickY = -1;
-			}
+            }
 
-		}
+        }
-	}
+    }
 
-	//Draw in center if it fits
+    //Through forge event instead of through the parent, because the parent no longer has scroll functionality in 1.13
-	@Override
+    @SubscribeEvent
-	protected void renderList(PoseStack ms, int insideLeft, int insideTop, int mouseXIn, int mouseYIn, float partialTicks) {
+    public void mouseScrolled(GuiScreenEvent.MouseScrollEvent.Pre event) {
-		int itemCount = this.getItemCount();
+        double scrollDelta = event.getScrollDelta();
-		Tesselator tessellator = Tesselator.getInstance();
+        if (scrollDelta != 0) {
-		BufferBuilder bufferbuilder = tessellator.getBuilder();
+            if (scrollDelta > 0) {
+                scrollDelta = -1;
+            } else if (scrollDelta < 0) {
+                scrollDelta = 1;
+            }
 
-		//Find y to start with
+            this.amountScrolled += (float) (scrollDelta * this.slotHeight / 2);
-		int y = this.headerHeight + insideTop;
+        }
-		int contentHeight = getMaxPosition();
+    }
-		int insideHeight = this.y1 - this.y0 - 4;
 
-		if (contentHeight < insideHeight) {
+    //Draw in center if it fits
-			//it fits, so we can center it vertically
+    @Override
-			y += (insideHeight - contentHeight) / 2;
+    protected void drawSelectionBox(int insideLeft, int insideTop, int mouseXIn, int mouseYIn, float partialTicks)
-		}
+    {
+        int size = this.getSize();
+        Tessellator tessellator = Tessellator.getInstance();
+        BufferBuilder bufferbuilder = tessellator.getBuffer();
 
-		//Draw all entries
+        //Find y to start with
-		for (int i = 0; i < itemCount; ++i) {
+        int y = this.headerPadding + insideTop;
-			int entryHeight = listEntries.get(i).getHeight();
+        int contentHeight = getContentHeight();
-			int entryHeight2 = entryHeight - 4;
+        int insideHeight = this.bottom - this.top - 4;
 
-			if (y > this.y1 || y + entryHeight2 < this.y0) {
+        if (contentHeight < insideHeight) {
-				this.updateItemPosition(i, insideLeft, y, partialTicks);
+            //it fits, so we can center it vertically
-			}
+            y += (insideHeight - contentHeight) / 2;
+        }
 
-			if (this.renderSelection && this.isSelectedItem(i)) {
+        //Draw all entries
-				int i1 = this.x0 + this.width / 2 - this.getRowWidth() / 2;
+        for (int i = 0; i < size; ++i)
-				int j1 = this.x0 + this.width / 2 + this.getRowWidth() / 2;
+        {
-				RenderSystem.disableTexture();
+            int entryHeight = listEntries.get(i).getHeight();
-				float f = this.isFocused() ? 1.0F : 0.5F;
+            int entryHeight2 = entryHeight - 4;
-				RenderSystem.setShaderColor(f, f, f, 1.0F);
-				bufferbuilder.begin(VertexFormat.Mode.QUADS, DefaultVertexFormat.POSITION);
-				bufferbuilder.vertex(i1, y + entryHeight2 + 2, 0.0D).endVertex();
-				bufferbuilder.vertex(j1, y + entryHeight2 + 2, 0.0D).endVertex();
-				bufferbuilder.vertex(j1, y - 2, 0.0D).endVertex();
-				bufferbuilder.vertex(i1, y - 2, 0.0D).endVertex();
-				tessellator.end();
-				RenderSystem.setShaderColor(0.0F, 0.0F, 0.0F, 1.0F);
-				bufferbuilder.begin(VertexFormat.Mode.QUADS, DefaultVertexFormat.POSITION);
-				bufferbuilder.vertex(i1 + 1, y + entryHeight2 + 1, 0.0D).endVertex();
-				bufferbuilder.vertex(j1 - 1, y + entryHeight2 + 1, 0.0D).endVertex();
-				bufferbuilder.vertex(j1 - 1, y - 1, 0.0D).endVertex();
-				bufferbuilder.vertex(i1 + 1, y - 1, 0.0D).endVertex();
-				tessellator.end();
-				RenderSystem.enableTexture();
-			}
 
-			this.renderItem(ms, i, insideLeft, y, entryHeight2, mouseXIn, mouseYIn, partialTicks);
+            if (y > this.bottom || y + entryHeight2 < this.top)
-			y += entryHeight;
+            {
-		}
+                this.updateItemPos(i, insideLeft, y, partialTicks);
-	}
+            }
 
-	private double getRelativeMouseX(double mouseX) {
+            if (this.showSelectionBox && this.isSelected(i))
-		int j = this.x0 + this.width / 2 - this.getRowWidth() / 2 + 2;
+            {
-		return mouseX - j;
+                int i1 = this.left + this.width / 2 - this.getListWidth() / 2;
-	}
+                int j1 = this.left + this.width / 2 + this.getListWidth() / 2;
+                GlStateManager.color4f(1.0F, 1.0F, 1.0F, 1.0F);
+                GlStateManager.disableTexture2D();
+                bufferbuilder.begin(7, DefaultVertexFormats.POSITION_TEX_COLOR);
+                bufferbuilder.pos((double)i1, (double)(y + entryHeight2 + 2), 0.0D).tex(0.0D, 1.0D).color(128, 128, 128, 255).endVertex();
+                bufferbuilder.pos((double)j1, (double)(y + entryHeight2 + 2), 0.0D).tex(1.0D, 1.0D).color(128, 128, 128, 255).endVertex();
+                bufferbuilder.pos((double)j1, (double)(y - 2), 0.0D).tex(1.0D, 0.0D).color(128, 128, 128, 255).endVertex();
+                bufferbuilder.pos((double)i1, (double)(y - 2), 0.0D).tex(0.0D, 0.0D).color(128, 128, 128, 255).endVertex();
+                bufferbuilder.pos((double)(i1 + 1), (double)(y + entryHeight2 + 1), 0.0D).tex(0.0D, 1.0D).color(0, 0, 0, 255).endVertex();
+                bufferbuilder.pos((double)(j1 - 1), (double)(y + entryHeight2 + 1), 0.0D).tex(1.0D, 1.0D).color(0, 0, 0, 255).endVertex();
+                bufferbuilder.pos((double)(j1 - 1), (double)(y - 1), 0.0D).tex(1.0D, 0.0D).color(0, 0, 0, 255).endVertex();
+                bufferbuilder.pos((double)(i1 + 1), (double)(y - 1), 0.0D).tex(0.0D, 0.0D).color(0, 0, 0, 255).endVertex();
+                tessellator.draw();
+                GlStateManager.enableTexture2D();
+            }
 
-	private double getRelativeMouseY(double mouseY, int contentIndex) {
+            this.drawSlot(i, insideLeft, y, entryHeight2, mouseXIn, mouseYIn, partialTicks);
-		int k = this.y0 + 4 - this.getScroll() + getMaxPosition(contentIndex) + this.headerHeight;
+            y += entryHeight;
-		double relativeMouseY = mouseY - k;
+        }
+    }
 
-		//Content might be centered, adjust relative mouse y accordingly
+    private double getRelativeMouseX(double mouseX) {
-		int contentHeight = getMaxPosition();
+        int j = this.left + this.width / 2 - this.getListWidth() / 2 + 2;
-		int insideHeight = this.y1 - this.y0 - 4;
+        return mouseX - j;
+    }
 
-		if (contentHeight < insideHeight) {
+    private double getRelativeMouseY(double mouseY, int contentIndex) {
-			//it fits, so we can center it vertically
+        int k = this.top + 4 - this.getAmountScrolled() + getContentHeight(contentIndex) + this.headerPadding;
-			relativeMouseY -= (insideHeight - contentHeight) / 2f;
+        double relativeMouseY = mouseY - k;
-		}
-		return relativeMouseY;
-	}
 
-	//PASSTHROUGHS
+        //Content might be centered, adjust relative mouse y accordingly
-	public void init(List<Widget> renderables) {
+        int contentHeight = getContentHeight();
-		for (IScrollEntry entry : this.listEntries) {
+        int insideHeight = this.bottom - this.top - 4;
-			entry.init(renderables);
-		}
-	}
 
-	public void updateScreen() {
+        if (contentHeight < insideHeight) {
-		for (IScrollEntry entry : this.listEntries)
+            //it fits, so we can center it vertically
-			entry.updateScreen();
+            relativeMouseY -= (insideHeight - contentHeight) / 2;
-	}
+        }
+        return relativeMouseY;
+    }
 
-	public void drawTooltip(PoseStack ms, Screen guiScreen, int mouseX, int mouseY) {
+    //PASSTHROUGHS
-		for (IScrollEntry entry : this.listEntries)
+    public int initGui(int id, List<GuiButton> buttonList) {
-			entry.drawTooltip(ms, guiScreen, mouseX, mouseY);
+        for (IScrollEntry entry : this.listEntries) {
-	}
+            id = entry.initGui(id, buttonList);
+        }
+        return id;
+    }
 
-	@Override
+    public void updateScreen() {
-	public boolean charTyped(char eventChar, int eventKey) {
+        for (IScrollEntry entry : this.listEntries)
-		for (IScrollEntry entry : this.listEntries)
+            entry.updateScreen();
-			entry.charTyped(eventChar, eventKey);
+    }
-		return false;
-	}
 
-	public void onGuiClosed() {
+    public void drawTooltip(GuiScreen guiScreen, int mouseX, int mouseY) {
-		for (IScrollEntry entry : this.listEntries)
+        for (IScrollEntry entry : this.listEntries)
-			entry.onGuiClosed();
+            entry.drawTooltip(guiScreen, mouseX, mouseY);
-	}
+    }
 
-	//Make protected values available
+    @Override
-	public int getWidth() {
+    public boolean charTyped(char eventChar, int eventKey) {
-		return width;
+        for (IScrollEntry entry : this.listEntries)
-	}
+            entry.charTyped(eventChar, eventKey);
+        return false;
+    }
 
-	public int getHeight() {
+    public void onGuiClosed() {
-		return height;
+        for (IScrollEntry entry : this.listEntries)
-	}
+            entry.onGuiClosed();
+    }
 
-	public interface IScrollEntry {
+    public interface IScrollEntry {
-		void init(List<Widget> renderables);
+        int initGui(int id, List<GuiButton> buttonList);
 
-		void updateScreen();
+        void updateScreen();
 
-		void drawTooltip(PoseStack ms, Screen guiScreen, int mouseX, int mouseY);
+        void drawTooltip(GuiScreen guiScreen, int mouseX, int mouseY);
 
-		boolean charTyped(char eventChar, int eventKey);
+        boolean charTyped(char eventChar, int eventKey);
 
-		void onGuiClosed();
+        void onGuiClosed();
 
-		int getHeight();
+        int getHeight();
 
-		void updatePosition(int slotIndex, int x, int y, float partialTicks);
+        void updatePosition(int slotIndex, int x, int y, float partialTicks);
 
-		void drawEntry(PoseStack ms, int slotIndex, int x, int y, int listWidth, int slotHeight, int mouseX, int mouseY, boolean isSelected, float partialTicks);
+        void drawEntry(int slotIndex, int x, int y, int listWidth, int slotHeight, int mouseX, int mouseY, boolean isSelected, float partialTicks);
 
-		/**
+        /**
-		 * Called when the mouse is clicked within this entry. Returning true means that something within this entry was
+         * Called when the mouse is clicked within this entry. Returning true means that something within this entry was
-		 * clicked and the list should not be dragged.
+         * clicked and the list should not be dragged.
-		 */
+         */
-		boolean mousePressed(int slotIndex, int mouseX, int mouseY, int mouseEvent, int relativeX, int relativeY);
+        boolean mousePressed(int slotIndex, int mouseX, int mouseY, int mouseEvent, int relativeX, int relativeY);
 
-		/**
+        /**
-		 * Fired when the mouse button is released. Arguments: index, x, y, mouseEvent, relativeX, relativeY
+         * Fired when the mouse button is released. Arguments: index, x, y, mouseEvent, relativeX, relativeY
-		 */
+         */
-		void mouseReleased(int slotIndex, int x, int y, int mouseEvent, int relativeX, int relativeY);
+        void mouseReleased(int slotIndex, int x, int y, int mouseEvent, int relativeX, int relativeY);
-	}
+    }
 }

src/main/java/nl/requios/effortlessbuilding/gui/elements/SlotGui.java

@@ -1,260 +0,0 @@
-package nl.requios.effortlessbuilding.gui.elements;
-
-import com.mojang.blaze3d.vertex.*;
-import com.mojang.blaze3d.systems.RenderSystem;
-import net.minecraft.MethodsReturnNonnullByDefault;
-import net.minecraft.client.Minecraft;
-import net.minecraft.client.gui.components.events.AbstractContainerEventHandler;
-import net.minecraft.client.gui.components.events.GuiEventListener;
-import net.minecraft.client.gui.components.Widget;
-import net.minecraft.util.Mth;
-import net.minecraftforge.api.distmarker.Dist;
-import net.minecraftforge.api.distmarker.OnlyIn;
-
-import javax.annotation.ParametersAreNonnullByDefault;
-import java.util.Collections;
-import java.util.List;
-
-@OnlyIn(Dist.CLIENT)
-@ParametersAreNonnullByDefault
-@MethodsReturnNonnullByDefault
-@SuppressWarnings("deprecation")
-public abstract class SlotGui extends AbstractContainerEventHandler implements Widget {
-	protected final Minecraft minecraft;
-	protected final int itemHeight;
-	protected int width;
-	protected int height;
-	protected int y0;
-	protected int y1;
-	protected int x1;
-	protected int x0;
-	protected int yDrag = -2;
-	protected double yo;
-	protected boolean visible = true;
-	protected boolean renderSelection = true;
-	protected boolean renderHeader;
-	protected int headerHeight;
-	private boolean scrolling;
-
-	public SlotGui(Minecraft mcIn, int width, int height, int topIn, int bottomIn, int slotHeightIn) {
-		this.minecraft = mcIn;
-		this.width = width;
-		this.height = height;
-		this.y0 = topIn;
-		this.y1 = bottomIn;
-		this.itemHeight = slotHeightIn;
-		this.x0 = 0;
-		this.x1 = width;
-	}
-
-	public boolean isVisible() {
-		return this.visible;
-	}
-
-	protected abstract int getItemCount();
-
-	public List<? extends GuiEventListener> children() {
-		return Collections.emptyList();
-	}
-
-	protected boolean selectItem(int p_selectItem_1_, int p_selectItem_2_, double p_selectItem_3_, double p_selectItem_5_) {
-		return true;
-	}
-
-	protected abstract boolean isSelectedItem(int p_isSelectedItem_1_);
-
-	protected int getMaxPosition() {
-		return this.getItemCount() * this.itemHeight + this.headerHeight;
-	}
-
-	protected abstract void renderBackground();
-
-	protected void updateItemPosition(int p_updateItemPosition_1_, int p_updateItemPosition_2_, int p_updateItemPosition_3_, float p_updateItemPosition_4_) {
-	}
-
-	protected abstract void renderItem(PoseStack ms, int p_renderItem_1_, int p_renderItem_2_, int p_renderItem_3_, int p_renderItem_4_, int p_renderItem_5_, int p_renderItem_6_, float p_renderItem_7_);
-
-	protected void renderHeader(int p_renderHeader_1_, int p_renderHeader_2_, Tesselator p_renderHeader_3_) {
-	}
-
-	protected void clickedHeader(int p_clickedHeader_1_, int p_clickedHeader_2_) {
-	}
-
-	public int getItemAtPosition(double p_getItemAtPosition_1_, double p_getItemAtPosition_3_) {
-		int i = this.x0 + this.width / 2 - this.getRowWidth() / 2;
-		int j = this.x0 + this.width / 2 + this.getRowWidth() / 2;
-		int k = Mth.floor(p_getItemAtPosition_3_ - (double) this.y0) - this.headerHeight + (int) this.yo - 4;
-		int l = k / this.itemHeight;
-		return p_getItemAtPosition_1_ < (double) this.getScrollbarPosition() && p_getItemAtPosition_1_ >= (double) i && p_getItemAtPosition_1_ <= (double) j && l >= 0 && k >= 0 && l < this.getItemCount() ? l : -1;
-	}
-
-	protected void capYPosition() {
-		this.yo = Mth.clamp(this.yo, 0.0D, this.getMaxScroll());
-	}
-
-	public int getMaxScroll() {
-		return Math.max(0, this.getMaxPosition() - (this.y1 - this.y0 - 4));
-	}
-
-	public int getScroll() {
-		return (int) this.yo;
-	}
-
-	public boolean isMouseInList(double p_isMouseInList_1_, double p_isMouseInList_3_) {
-		return p_isMouseInList_3_ >= (double) this.y0 && p_isMouseInList_3_ <= (double) this.y1 && p_isMouseInList_1_ >= (double) this.x0 && p_isMouseInList_1_ <= (double) this.x1;
-	}
-
-	public abstract void render(PoseStack ms, int p_render_1_, int p_render_2_, float p_render_3_);
-
-	protected void updateScrollingState(double p_updateScrollingState_1_, double p_updateScrollingState_3_, int p_updateScrollingState_5_) {
-		this.scrolling = p_updateScrollingState_5_ == 0 && p_updateScrollingState_1_ >= (double) this.getScrollbarPosition() && p_updateScrollingState_1_ < (double) (this.getScrollbarPosition() + 6);
-	}
-
-	public boolean mouseClicked(double p_mouseClicked_1_, double p_mouseClicked_3_, int p_mouseClicked_5_) {
-		this.updateScrollingState(p_mouseClicked_1_, p_mouseClicked_3_, p_mouseClicked_5_);
-		if (this.isVisible() && this.isMouseInList(p_mouseClicked_1_, p_mouseClicked_3_)) {
-			int i = this.getItemAtPosition(p_mouseClicked_1_, p_mouseClicked_3_);
-			if (i == -1 && p_mouseClicked_5_ == 0) {
-				this.clickedHeader((int) (p_mouseClicked_1_ - (double) (this.x0 + this.width / 2 - this.getRowWidth() / 2)), (int) (p_mouseClicked_3_ - (double) this.y0) + (int) this.yo - 4);
-				return true;
-			} else if (i != -1 && this.selectItem(i, p_mouseClicked_5_, p_mouseClicked_1_, p_mouseClicked_3_)) {
-				if (this.children().size() > i) {
-					this.setFocused(this.children().get(i));
-				}
-
-				this.setDragging(true);
-				return true;
-			} else {
-				return this.scrolling;
-			}
-		} else {
-			return false;
-		}
-	}
-
-	public boolean mouseReleased(double p_mouseReleased_1_, double p_mouseReleased_3_, int p_mouseReleased_5_) {
-		if (this.getFocused() != null) {
-			this.getFocused().mouseReleased(p_mouseReleased_1_, p_mouseReleased_3_, p_mouseReleased_5_);
-		}
-
-		return false;
-	}
-
-	public boolean mouseDragged(double p_mouseDragged_1_, double p_mouseDragged_3_, int p_mouseDragged_5_, double p_mouseDragged_6_, double p_mouseDragged_8_) {
-		if (super.mouseDragged(p_mouseDragged_1_, p_mouseDragged_3_, p_mouseDragged_5_, p_mouseDragged_6_, p_mouseDragged_8_)) {
-			return true;
-		} else if (this.isVisible() && p_mouseDragged_5_ == 0 && this.scrolling) {
-			if (p_mouseDragged_3_ < (double) this.y0) {
-				this.yo = 0.0D;
-			} else if (p_mouseDragged_3_ > (double) this.y1) {
-				this.yo = this.getMaxScroll();
-			} else {
-				double d0 = this.getMaxScroll();
-				if (d0 < 1.0D) {
-					d0 = 1.0D;
-				}
-
-				int i = (int) ((float) ((this.y1 - this.y0) * (this.y1 - this.y0)) / (float) this.getMaxPosition());
-				i = Mth.clamp(i, 32, this.y1 - this.y0 - 8);
-				double d1 = d0 / (double) (this.y1 - this.y0 - i);
-				if (d1 < 1.0D) {
-					d1 = 1.0D;
-				}
-
-				this.yo += p_mouseDragged_8_ * d1;
-				this.capYPosition();
-			}
-
-			return true;
-		} else {
-			return false;
-		}
-	}
-
-	public boolean mouseScrolled(double p_mouseScrolled_1_, double p_mouseScrolled_3_, double p_mouseScrolled_5_) {
-		if (!this.isVisible()) {
-			return false;
-		} else {
-			this.yo -= p_mouseScrolled_5_ * (double) this.itemHeight / 2.0D;
-			return true;
-		}
-	}
-
-	public boolean keyPressed(int p_keyPressed_1_, int p_keyPressed_2_, int p_keyPressed_3_) {
-		if (!this.isVisible()) {
-			return false;
-		} else if (super.keyPressed(p_keyPressed_1_, p_keyPressed_2_, p_keyPressed_3_)) {
-			return true;
-		} else if (p_keyPressed_1_ == 264) {
-			this.moveSelection(1);
-			return true;
-		} else if (p_keyPressed_1_ == 265) {
-			this.moveSelection(-1);
-			return true;
-		} else {
-			return false;
-		}
-	}
-
-	protected void moveSelection(int p_moveSelection_1_) {
-	}
-
-	public boolean charTyped(char p_charTyped_1_, int p_charTyped_2_) {
-		return this.isVisible() && super.charTyped(p_charTyped_1_, p_charTyped_2_);
-	}
-
-	public boolean isMouseOver(double p_isMouseOver_1_, double p_isMouseOver_3_) {
-		return this.isMouseInList(p_isMouseOver_1_, p_isMouseOver_3_);
-	}
-
-	public int getRowWidth() {
-		return 220;
-	}
-
-	protected void renderList(PoseStack ms, int p_renderList_1_, int p_renderList_2_, int p_renderList_3_, int p_renderList_4_, float p_renderList_5_) {
-		int i = this.getItemCount();
-		Tesselator tessellator = Tesselator.getInstance();
-		BufferBuilder bufferbuilder = tessellator.getBuilder();
-
-		for (int j = 0; j < i; ++j) {
-			int k = p_renderList_2_ + j * this.itemHeight + this.headerHeight;
-			int l = this.itemHeight - 4;
-			if (k > this.y1 || k + l < this.y0) {
-				this.updateItemPosition(j, p_renderList_1_, k, p_renderList_5_);
-			}
-
-			if (this.renderSelection && this.isSelectedItem(j)) {
-				int i1 = this.x0 + this.width / 2 - this.getRowWidth() / 2;
-				int j1 = this.x0 + this.width / 2 + this.getRowWidth() / 2;
-				RenderSystem.disableTexture();
-				float f = this.isFocused() ? 1.0F : 0.5F;
-				RenderSystem.setShaderColor(f, f, f, 1.0F);
-				bufferbuilder.begin(VertexFormat.Mode.QUADS, DefaultVertexFormat.POSITION);
-				bufferbuilder.vertex(i1, k + l + 2, 0.0D).endVertex();
-				bufferbuilder.vertex(j1, k + l + 2, 0.0D).endVertex();
-				bufferbuilder.vertex(j1, k - 2, 0.0D).endVertex();
-				bufferbuilder.vertex(i1, k - 2, 0.0D).endVertex();
-				tessellator.end();
-				RenderSystem.setShaderColor(0.0F, 0.0F, 0.0F, 1.0F);
-				bufferbuilder.begin(VertexFormat.Mode.QUADS, DefaultVertexFormat.POSITION);
-				bufferbuilder.vertex(i1 + 1, k + l + 1, 0.0D).endVertex();
-				bufferbuilder.vertex(j1 - 1, k + l + 1, 0.0D).endVertex();
-				bufferbuilder.vertex(j1 - 1, k - 1, 0.0D).endVertex();
-				bufferbuilder.vertex(i1 + 1, k - 1, 0.0D).endVertex();
-				tessellator.end();
-				RenderSystem.enableTexture();
-			}
-
-			this.renderItem(ms, j, p_renderList_1_, k, l, p_renderList_3_, p_renderList_4_, p_renderList_5_);
-		}
-
-	}
-
-	protected boolean isFocused() {
-		return false;
-	}
-
-	protected int getScrollbarPosition() {
-		return this.width / 2 + 124;
-	}
-}

src/main/java/nl/requios/effortlessbuilding/helper/FixedStack.java

@@ -1,52 +1,54 @@
 package nl.requios.effortlessbuilding.helper;
 
+import nl.requios.effortlessbuilding.EffortlessBuilding;
+
 //Stack with fixed size. Removes (overwrites) oldest element on push.
 public class FixedStack<T> {
-	private final T[] stack;
+    private T[] stack;
-	private final int size;
+    private int size;
-	private int top;
+    private int top;
-	private int filled = 0; //how many valid items are in the stack
+    private int filled = 0; //how many valid items are in the stack
 
-	public FixedStack(T[] stack) {
+    public FixedStack(T[] stack) {
-		this.stack = stack;
+        this.stack = stack;
-		this.top = 0;
+        this.top = 0;
-		this.size = stack.length;
+        this.size = stack.length;
-	}
+    }
 
-	public void push(T object) {
+    public void push(T object) {
-		if (top == stack.length)
+        if (top == stack.length)
-			top = 0;
+            top = 0;
 
-		stack[top] = object;
+        stack[top] = object;
-		top++;
+        top++;
 
-		if (filled < size)
+        if (filled < size)
-			filled++;
+            filled++;
-	}
+    }
 
-	public T pop() {
+    public T pop() {
-		if (filled <= 0) return null;
+        if (filled <= 0) return null;
 
-		if (top - 1 < 0)
+        if (top - 1 < 0)
-			top = size;
+            top = size;
 
-		top--;
+        top--;
-		T object = stack[top];
+        T object = stack[top];
-		filled--;
+        filled--;
 
-		return object;
+        return object;
-	}
+    }
 
-	public void clear() {
+    public void clear() {
-		top = 0;
+        top = 0;
-		filled = 0;
+        filled = 0;
-	}
+    }
 
-	public int size() {
+    public int size() {
-		return size;
+        return size;
-	}
+    }
 
-	public boolean isEmpty() {
+    public boolean isEmpty() {
-		return filled <= 0;
+        return filled <= 0;
-	}
+    }
 }

src/main/java/nl/requios/effortlessbuilding/helper/InventoryHelper.java

@@ -1,30 +1,31 @@
 package nl.requios.effortlessbuilding.helper;
 
-import net.minecraft.world.level.block.Block;
+import net.minecraft.block.Block;
-import net.minecraft.world.entity.player.Player;
+import net.minecraft.block.state.IBlockState;
-import net.minecraft.world.item.BlockItem;
+import net.minecraft.entity.player.EntityPlayer;
-import net.minecraft.world.item.ItemStack;
+import net.minecraft.item.ItemBlock;
+import net.minecraft.item.ItemStack;
 
 public class InventoryHelper {
 
-	public static ItemStack findItemStackInInventory(Player player, Block block) {
+    public static ItemStack findItemStackInInventory(EntityPlayer player, Block block) {
-		for (ItemStack invStack : player.getInventory().items) {
+        for (ItemStack invStack : player.inventory.mainInventory) {
-			if (!invStack.isEmpty() && invStack.getItem() instanceof BlockItem &&
+            if (!invStack.isEmpty() && invStack.getItem() instanceof ItemBlock &&
-				((BlockItem) invStack.getItem()).getBlock().equals(block)) {
+                ((ItemBlock) invStack.getItem()).getBlock().equals(block)) {
-				return invStack;
+                return invStack;
-			}
+            }
-		}
+        }
-		return ItemStack.EMPTY;
+        return ItemStack.EMPTY;
-	}
+    }
 
-	public static int findTotalBlocksInInventory(Player player, Block block) {
+    public static int findTotalBlocksInInventory(EntityPlayer player, Block block) {
-		int total = 0;
+        int total = 0;
-		for (ItemStack invStack : player.getInventory().items) {
+        for (ItemStack invStack : player.inventory.mainInventory) {
-			if (!invStack.isEmpty() && invStack.getItem() instanceof BlockItem &&
+            if (!invStack.isEmpty() && invStack.getItem() instanceof ItemBlock &&
-				((BlockItem) invStack.getItem()).getBlock().equals(block)) {
+                ((ItemBlock) invStack.getItem()).getBlock().equals(block)) {
-				total += invStack.getCount();
+                total += invStack.getCount();
-			}
+            }
-		}
+        }
-		return total;
+        return total;
-	}
+    }
 }

src/main/java/nl/requios/effortlessbuilding/helper/ReachConditionFactory.java

@@ -0,0 +1,14 @@
+package nl.requios.effortlessbuilding.helper;
+
+import com.google.gson.JsonObject;
+import net.minecraftforge.common.crafting.IConditionSerializer;
+import nl.requios.effortlessbuilding.BuildConfig;
+
+import java.util.function.BooleanSupplier;
+
+public class ReachConditionFactory implements IConditionSerializer {
+    @Override
+    public BooleanSupplier parse(JsonObject json) {
+        return () -> BuildConfig.reach.enableReachUpgrades.get();
+    }
+}

src/main/java/nl/requios/effortlessbuilding/helper/ReachHelper.java

@@ -1,54 +1,50 @@
 package nl.requios.effortlessbuilding.helper;
 
-import net.minecraft.world.entity.player.Player;
+import net.minecraft.entity.player.EntityPlayer;
-import net.minecraft.util.Mth;
+import net.minecraft.util.math.MathHelper;
 import nl.requios.effortlessbuilding.BuildConfig;
 import nl.requios.effortlessbuilding.buildmodifier.ModifierSettingsManager;
 
 public class ReachHelper {
-	public static int getMaxReach(Player player) {
+    public static int getMaxReach(EntityPlayer player) {
-		if (player.isCreative()) return BuildConfig.reach.maxReachCreative.get();
+        if (player.isCreative()) return BuildConfig.reach.maxReachCreative.get();
 
-		if (!BuildConfig.reach.enableReachUpgrades.get()) return BuildConfig.reach.maxReachLevel3.get();
+        if (!BuildConfig.reach.enableReachUpgrades.get()) return BuildConfig.reach.maxReachLevel3.get();
 
-		//Check buildsettings for reachUpgrade
+        //Check buildsettings for reachUpgrade
-		int reachUpgrade = ModifierSettingsManager.getModifierSettings(player).getReachUpgrade();
+        int reachUpgrade = ModifierSettingsManager.getModifierSettings(player).getReachUpgrade();
-		switch (reachUpgrade) {
+        switch (reachUpgrade) {
-			case 0:
+            case 0: return BuildConfig.reach.maxReachLevel0.get();
-				return BuildConfig.reach.maxReachLevel0.get();
+            case 1: return BuildConfig.reach.maxReachLevel1.get();
-			case 1:
+            case 2: return BuildConfig.reach.maxReachLevel2.get();
-				return BuildConfig.reach.maxReachLevel1.get();
+            case 3: return BuildConfig.reach.maxReachLevel3.get();
-			case 2:
+        }
-				return BuildConfig.reach.maxReachLevel2.get();
+        return BuildConfig.reach.maxReachLevel0.get();
-			case 3:
+    }
-				return BuildConfig.reach.maxReachLevel3.get();
-		}
-		return BuildConfig.reach.maxReachLevel0.get();
-	}
 
-	public static int getPlacementReach(Player player) {
+    public static int getPlacementReach(EntityPlayer player) {
-		return getMaxReach(player) / 4;
+        return getMaxReach(player) / 4;
-	}
+    }
 
-	public static int getMaxBlocksPlacedAtOnce(Player player) {
+    public static int getMaxBlocksPlacedAtOnce(EntityPlayer player) {
-		if (player.isCreative()) return 1000000;
+        if (player.isCreative()) return 1000000;
-		return Mth.ceil(Math.pow(getMaxReach(player), 1.6));
+        return MathHelper.ceil(Math.pow(getMaxReach(player), 1.6));
-		//Level 0: 121
+        //Level 0: 121
-		//Level 1: 523
+        //Level 1: 523
-		//Level 2: 1585
+        //Level 2: 1585
-		//Level 3: 4805
+        //Level 3: 4805
-	}
+    }
 
-	public static int getMaxBlocksPerAxis(Player player) {
+    public static int getMaxBlocksPerAxis(EntityPlayer player) {
-		if (player.isCreative()) return 2000;
+        if (player.isCreative()) return 2000;
-		return Mth.ceil(getMaxReach(player) * 0.3);
+        return MathHelper.ceil(getMaxReach(player) * 0.3);
-		//Level 0: 6
+        //Level 0: 6
-		//Level 1: 15
+        //Level 1: 15
-		//Level 2: 30
+        //Level 2: 30
-		//Level 3: 60
+        //Level 3: 60
-	}
+    }
 
-	public static boolean canBreakFar(Player player) {
+    public static boolean canBreakFar(EntityPlayer player) {
-		return player.isCreative();
+        return player.isCreative() || BuildConfig.survivalBalancers.breakFar.get();
-	}
+    }
 }

src/main/java/nl/requios/effortlessbuilding/helper/SurvivalHelper.java

@@ -1,92 +1,98 @@
 package nl.requios.effortlessbuilding.helper;
 
-import net.minecraft.advancements.CriteriaTriggers;
+import net.minecraft.block.Block;
-import net.minecraft.core.BlockPos;
+import net.minecraft.block.BlockSlab;
-import net.minecraft.core.Direction;
+import net.minecraft.block.SoundType;
-import net.minecraft.core.Registry;
+import net.minecraft.block.material.Material;
-import net.minecraft.server.level.ServerPlayer;
+import net.minecraft.block.state.BlockWorldState;
-import net.minecraft.sounds.SoundSource;
+import net.minecraft.block.state.IBlockState;
-import net.minecraft.tags.BlockTags;
+import net.minecraft.entity.Entity;
-import net.minecraft.world.InteractionHand;
+import net.minecraft.entity.player.EntityPlayer;
-import net.minecraft.world.entity.Entity;
+import net.minecraft.init.Blocks;
-import net.minecraft.world.entity.player.Player;
+import net.minecraft.item.BlockItemUseContext;
-import net.minecraft.world.item.BlockItem;
+import net.minecraft.item.ItemBlock;
-import net.minecraft.world.item.ItemStack;
+import net.minecraft.item.ItemStack;
-import net.minecraft.world.level.Level;
+import net.minecraft.util.EnumActionResult;
-import net.minecraft.world.level.block.Block;
+import net.minecraft.util.EnumFacing;
-import net.minecraft.world.level.block.Blocks;
+import net.minecraft.util.EnumHand;
-import net.minecraft.world.level.block.SlabBlock;
+import net.minecraft.util.SoundCategory;
-import net.minecraft.world.level.block.SoundType;
+import net.minecraft.util.math.BlockPos;
-import net.minecraft.world.level.block.state.BlockState;
+import net.minecraft.util.math.Vec3d;
-import net.minecraft.world.level.block.state.pattern.BlockInWorld;
+import net.minecraft.util.math.shapes.VoxelShape;
-import net.minecraft.world.level.material.Material;
+import net.minecraft.world.World;
-import net.minecraft.world.phys.Vec3;
+import net.minecraftforge.common.ToolType;
-import net.minecraft.world.phys.shapes.VoxelShape;
-import net.minecraftforge.event.ForgeEventFactory;
 import nl.requios.effortlessbuilding.BuildConfig;
+import nl.requios.effortlessbuilding.EffortlessBuilding;
 import nl.requios.effortlessbuilding.buildmodifier.ModifierSettingsManager;
 import nl.requios.effortlessbuilding.compatibility.CompatHelper;
 
+import javax.annotation.Nonnull;
 import javax.annotation.Nullable;
 
 public class SurvivalHelper {
 
-	//Used for all placing of blocks in this mod.
+    //Used for all placing of blocks in this mod.
-	//Checks if area is loaded, if player has the right permissions, if existing block can be replaced (drops it if so) and consumes an item from the stack.
+    //Checks if area is loaded, if player has the right permissions, if existing block can be replaced (drops it if so) and consumes an item from the stack.
-	//Based on ItemBlock#onItemUse
+    //Based on ItemBlock#onItemUse
-	public static boolean placeBlock(Level world, Player player, BlockPos pos, BlockState blockState,
+    public static boolean placeBlock(World world, EntityPlayer player, BlockPos pos, IBlockState blockState,
-									 ItemStack origstack, Direction facing, Vec3 hitVec, boolean skipPlaceCheck,
+                                     ItemStack origstack, EnumFacing facing, Vec3d hitVec, boolean skipPlaceCheck,
-									 boolean skipCollisionCheck, boolean playSound) {
+                                     boolean skipCollisionCheck, boolean playSound) {
-		if (!world.isLoaded(pos)) return false;
+        if (!world.isBlockLoaded(pos, true)) return false;
-		ItemStack itemstack = origstack;
+        ItemStack itemstack = origstack;
 
-		if (blockState.isAir() || itemstack.isEmpty()) {
+        if (blockState.getBlock().isAir(blockState, world, pos) || itemstack.isEmpty()) {
-			dropBlock(world, player, pos);
+            dropBlock(world, player, pos);
-			world.removeBlock(pos, false);
+            world.removeBlock(pos);
-			return true;
+            return true;
-		}
+        }
 
-		//Randomizer bag, other proxy item synergy
+        //Randomizer bag, other proxy item synergy
-		//Preliminary compatibility code for other items that hold blocks
+        //Preliminary compatibility code for other items that hold blocks
-		if (CompatHelper.isItemBlockProxy(itemstack))
+        if (CompatHelper.isItemBlockProxy(itemstack))
-			itemstack = CompatHelper.getItemBlockByState(itemstack, blockState);
+            itemstack = CompatHelper.getItemBlockByState(itemstack, blockState);
 
-		if (!(itemstack.getItem() instanceof BlockItem))
+        if (!(itemstack.getItem() instanceof ItemBlock))
-			return false;
+            return false;
-		Block block = ((BlockItem) itemstack.getItem()).getBlock();
+        Block block = ((ItemBlock) itemstack.getItem()).getBlock();
 
 
-		//More manual with ItemBlock#placeBlockAt
+        //More manual with ItemBlock#placeBlockAt
-		if (skipPlaceCheck || canPlace(world, player, pos, blockState, itemstack, skipCollisionCheck, facing.getOpposite())) {
+        if (skipPlaceCheck || canPlace(world, player, pos, blockState, itemstack, skipCollisionCheck, facing.getOpposite())) {
-			//Drop existing block
+            //Drop existing block
-			dropBlock(world, player, pos);
+            dropBlock(world, player, pos);
 
-			//TryPlace sets block with offset and reduces itemstack count in creative, so we copy only parts of it
+            //TryPlace sets block with offset, so we only do world.setBlockState now
+            //Remember count of itemstack before tryPlace, and set it back after.
+            //TryPlace reduces stack even in creative so it is not usable here.
+//            int origCount = itemstack.getCount();
 //            BlockItemUseContext blockItemUseContext = new BlockItemUseContext(world, player, itemstack, pos, facing, (float) hitVec.x, (float) hitVec.y, (float) hitVec.z);
 //            EnumActionResult result = ((ItemBlock) itemstack.getItem()).tryPlace(blockItemUseContext);
-			if (!world.setBlock(pos, blockState, 3)) return false;
+//            itemstack.setCount(origCount);
-			BlockItem.updateCustomBlockEntityTag(world, player, pos, itemstack); //Actually BlockItem::onBlockPlaced but that is protected
-			block.setPlacedBy(world, pos, blockState, player, itemstack);
-			if (player instanceof ServerPlayer) {
-				CriteriaTriggers.PLACED_BLOCK.trigger((ServerPlayer) player, pos, itemstack);
-			}
 
-			BlockState afterState = world.getBlockState(pos);
+            //Set our (rotated) blockstate
+            world.setBlockState(pos, blockState, 3);
+//            blockState.onBlockAdded(world, pos, blockState);
+//            block.onBlockPlacedBy(world, pos, blockState, player, itemstack);
+//            world.notifyBlockUpdate(pos, blockState, world.getBlockState(pos), 3);
 
-			if (playSound) {
+//            if (result != EnumActionResult.SUCCESS) return false;
-				SoundType soundtype = afterState.getBlock().getSoundType(afterState, world, pos, player);
-				world.playSound(null, pos, soundtype.getPlaceSound(), SoundSource.BLOCKS, (soundtype.getVolume() + 1.0F) / 2.0F, soundtype.getPitch() * 0.8F);
-			}
 
-			if (!player.isCreative() && Block.byItem(itemstack.getItem()) == block) {
+            IBlockState afterState = world.getBlockState(pos);
-				itemstack.shrink(1);
-			}
 
-			return true;
+            if (playSound) {
-		}
+                SoundType soundtype = afterState.getBlock().getSoundType(afterState, world, pos, player);
-		return false;
+                world.playSound(null, pos, soundtype.getPlaceSound(), SoundCategory.BLOCKS, (soundtype.getVolume() + 1.0F) / 2.0F, soundtype.getPitch() * 0.8F);
+            }
 
-		//Using ItemBlock#onItemUse
+            if (!player.isCreative() && Block.getBlockFromItem(itemstack.getItem()) == block) {
+                CompatHelper.shrinkStack(origstack, itemstack, player);
+            }
+
+            return true;
+        }
+        return false;
+
+        //Using ItemBlock#onItemUse
 //        EnumActionResult result;
 //        PlayerInteractEvent.RightClickBlock event = ForgeHooks.onRightClickBlock(player, EnumHand.MAIN_HAND, pos, facing, net.minecraftforge.common.ForgeHooks.rayTraceEyeHitVec(player, ReachHelper.getPlacementReach(player)));
 //        if (player.isCreative())
@@ -109,40 +115,40 @@ public class SurvivalHelper {
 //            return false;
 //        }
 
-	}
+    }
 
-	//Used for all breaking of blocks in this mod.
+    //Used for all breaking of blocks in this mod.
-	//Checks if area is loaded, if appropriate tool is used in survival mode, and drops the block directly into the players inventory
+    //Checks if area is loaded, if appropriate tool is used in survival mode, and drops the block directly into the players inventory
-	public static boolean breakBlock(Level world, Player player, BlockPos pos, boolean skipChecks) {
+    public static boolean breakBlock(World world, EntityPlayer player, BlockPos pos, boolean skipChecks) {
-		if (!world.isLoaded(pos) && !world.isEmptyBlock(pos)) return false;
+        if (!world.isBlockLoaded(pos, false)) return false;
 
-		//Check if can break
+        //Check if can break
-		if (skipChecks || canBreak(world, player, pos)) {
+        if (skipChecks || canBreak(world, player, pos)) {
 //            player.addStat(StatList.getBlockStats(world.getNewBlockState(pos).getBlock()));
 //            player.addExhaustion(0.005F);
 
-			//Drop existing block
+            //Drop existing block
-			dropBlock(world, player, pos);
+            dropBlock(world, player, pos);
 
-			//Damage tool
+            //Damage tool
-			player.getMainHandItem().mineBlock(world, world.getBlockState(pos), pos, player);
+            player.getHeldItemMainhand().onBlockDestroyed(world, world.getBlockState(pos), pos, player);
 
-			world.removeBlock(pos, false);
+            world.removeBlock(pos);
-			return true;
+            return true;
-		}
+        }
-		return false;
+        return false;
-	}
+    }
 
-	//Gives items directly to player
+    //Gives items directly to player
-	public static void dropBlock(Level world, Player player, BlockPos pos) {
+    public static void dropBlock(World world, EntityPlayer player, BlockPos pos){
-		if (player.isCreative()) return;
+        if (player.isCreative()) return;
 
-		BlockState blockState = world.getBlockState(pos);
+        IBlockState blockState = world.getBlockState(pos);
-		Block block = blockState.getBlock();
+        Block block = blockState.getBlock();
 
-		block.playerDestroy(world, player, pos, blockState, world.getBlockEntity(pos), player.getMainHandItem());
+        block.harvestBlock(world, player, pos, blockState, world.getTileEntity(pos), player.getHeldItemMainhand());
 
-		//TODO drop items in inventory instead of world
+        //TODO drop items in inventory instead of world
 
 //        List<ItemStack> drops = new ArrayList<>();
 //
@@ -170,137 +176,166 @@ public class SurvivalHelper {
 //        {
 //            ItemHandlerHelper.giveItemToPlayer(player, drop);
 //        }
-	}
+    }
 
-	/**
+    /**
-	 * Check if player can place a block.
+     * Check if player can place a block.
-	 * Turn randomizer bag into itemstack inside before.
+     * Turn randomizer bag into itemstack inside before.
-	 *
+     * @param world
-	 * @param world
+     * @param player
-	 * @param player
+     * @param pos
-	 * @param pos
+     * @param newBlockState the blockstate that is going to be placed
-	 * @param newBlockState      the blockstate that is going to be placed
+     * @param itemStack the itemstack used for placing
-	 * @param itemStack          the itemstack used for placing
+     * @param skipCollisionCheck skips collision check with entities
-	 * @param skipCollisionCheck skips collision check with entities
+     * @param sidePlacedOn
-	 * @param sidePlacedOn
+     * @return Whether the player may place the block at pos with itemstack
-	 * @return Whether the player may place the block at pos with itemstack
+     */
-	 */
+    public static boolean canPlace(World world, EntityPlayer player, BlockPos pos, IBlockState newBlockState, ItemStack itemStack, boolean skipCollisionCheck, EnumFacing sidePlacedOn) {
-	public static boolean canPlace(Level world, Player player, BlockPos pos, BlockState newBlockState, ItemStack itemStack, boolean skipCollisionCheck, Direction sidePlacedOn) {
 
-		//Check if itemstack is correct
+        //Check if itemstack is correct
-		if (!(itemStack.getItem() instanceof BlockItem) || Block.byItem(itemStack.getItem()) != newBlockState.getBlock()) {
+        if (!(itemStack.getItem() instanceof ItemBlock) || Block.getBlockFromItem(itemStack.getItem()) != newBlockState.getBlock()) {
 //            EffortlessBuilding.log(player, "Cannot (re)place block", true);
 //            EffortlessBuilding.log("SurvivalHelper#canPlace: itemstack " + itemStack.toString() + " does not match blockstate " + newBlockState.toString());
-			//Happens when breaking blocks, no need to notify in that case
+            //Happens when breaking blocks, no need to notify in that case
-			return false;
+            return false;
-		}
+        }
 
-		Block block = ((BlockItem) itemStack.getItem()).getBlock();
+        Block block = ((ItemBlock) itemStack.getItem()).getBlock();
 
-		return !itemStack.isEmpty() && canPlayerEdit(player, world, pos, itemStack) &&
+        return !itemStack.isEmpty() && canPlayerEdit(player, world, pos, itemStack) &&
-			mayPlace(world, block, newBlockState, pos, skipCollisionCheck, sidePlacedOn, player) &&
+               mayPlace(world, block, newBlockState, pos, skipCollisionCheck, sidePlacedOn, player) &&
-			canReplace(world, player, pos);
+               canReplace(world, player, pos);
-	}
+    }
 
-	//Can be harvested with hand? (or in creative)
+    //Can be harvested with hand? (or in creative)
-	private static boolean canReplace(Level world, Player player, BlockPos pos) {
+    private static boolean canReplace(World world, EntityPlayer player, BlockPos pos){
-		if (player.isCreative()) return true;
+        if (player.isCreative()) return true;
 
-		BlockState state = world.getBlockState(pos);
+        IBlockState state = world.getBlockState(pos);
 
-		int miningLevel = BuildConfig.survivalBalancers.quickReplaceMiningLevel.get();
+        switch (BuildConfig.survivalBalancers.quickReplaceMiningLevel.get()) {
-		switch (miningLevel) {
+            case -1: return state.getMaterial().isToolNotRequired();
-			case -1:
+            case 0: return state.getBlock().getHarvestLevel(state) <= 0;
-				return !state.requiresCorrectToolForDrops();
+            case 1: return state.getBlock().getHarvestLevel(state) <= 1;
-			case 0:
+            case 2: return state.getBlock().getHarvestLevel(state) <= 2;
-				return !state.is(BlockTags.NEEDS_STONE_TOOL) &&
+            case 3: return state.getBlock().getHarvestLevel(state) <= 3;
-					   !state.is(BlockTags.NEEDS_IRON_TOOL) &&
+        }
-					   !state.is(BlockTags.NEEDS_DIAMOND_TOOL);
-			case 1:
-				return !state.is(BlockTags.NEEDS_IRON_TOOL) &&
-					   !state.is(BlockTags.NEEDS_DIAMOND_TOOL);
-			case 2:
-				return !state.is(BlockTags.NEEDS_DIAMOND_TOOL);
-			case 3:
-			case 4:
-				return true;
-		}
 
-		return false;
+        return false;
-	}
+    }
 
-	//From Player#mayUseItemAt
+    //From EntityPlayer#canPlayerEdit
-	private static boolean canPlayerEdit(Player player, Level world, BlockPos pos, ItemStack stack) {
+    private static boolean canPlayerEdit(EntityPlayer player, World world, BlockPos pos, ItemStack stack)
-		if (!world.mayInteract(player, pos)) return false;
+    {
+        if (!world.isBlockModifiable(player, pos)) return false;
 
-		if (player.getAbilities().mayBuild) {
+        if (player.abilities.allowEdit)
-			//True in creative and survival mode
+        {
-			return true;
+            //True in creative and survival mode
-		} else {
+            return true;
-			//Adventure mode
+        }
-			BlockInWorld blockinworld = new BlockInWorld(world, pos, false);
+        else
-			return stack.hasAdventureModePlaceTagForBlock(world.registryAccess().registryOrThrow(Registry.BLOCK_REGISTRY), blockinworld);
+        {
-		}
+            //Adventure mode
-	}
+            BlockWorldState blockworldstate = new BlockWorldState(world, pos, false);
+            return stack.canPlaceOn(world.getTags(), blockworldstate);
 
-	//From World#mayPlace
+        }
-	private static boolean mayPlace(Level world, Block blockIn, BlockState newBlockState, BlockPos pos, boolean skipCollisionCheck, Direction sidePlacedOn, @Nullable Entity placer) {
+    }
-		BlockState iblockstate1 = world.getBlockState(pos);
-		VoxelShape voxelShape = skipCollisionCheck ? null : blockIn.defaultBlockState().getCollisionShape(world, pos);
 
-		if (voxelShape != null && !world.isUnobstructed(placer, voxelShape)) {
+    //From World#mayPlace
-			return false;
+    private static boolean mayPlace(World world, Block blockIn, IBlockState newBlockState, BlockPos pos, boolean skipCollisionCheck, EnumFacing sidePlacedOn, @Nullable Entity placer)
-		}
+    {
+        IBlockState iblockstate1 = world.getBlockState(pos);
+        VoxelShape voxelShape = skipCollisionCheck ? null : blockIn.getDefaultState().getCollisionShape(world, pos);
 
-		//Check if double slab
+        if (voxelShape != null && !world.checkNoEntityCollision(iblockstate1, pos))
-		if (placer != null && doesBecomeDoubleSlab(((Player) placer), pos, sidePlacedOn)) {
+        {
-			return true;
+            return false;
-		}
+        }
 
-		//Check if same block
+        //Check if double slab
-		//Necessary otherwise extra items will be dropped
+        if (placer != null && doesBecomeDoubleSlab(((EntityPlayer) placer), pos, sidePlacedOn)) {
-		if (iblockstate1 == newBlockState) {
+            return true;
-			return false;
+        }
-		}
 
-		//TODO 1.14 check what Material.CIRCUITS has become
+        //Check if same block
-		if (iblockstate1.getMaterial() == Material.BUILDABLE_GLASS && blockIn == Blocks.ANVIL) {
+        //Necessary otherwise extra items will be dropped
-			return true;
+        if (iblockstate1 == newBlockState) {
-		}
+            return false;
+        }
 
-		//Check quickreplace
+        if (iblockstate1.getMaterial() == Material.CIRCUITS && blockIn == Blocks.ANVIL)
-		if (placer instanceof Player && ModifierSettingsManager.getModifierSettings(((Player) placer)).doQuickReplace()) {
+        {
-			return true;
+            return true;
-		}
+        }
 
-		//TODO 1.13 replaceable
+        //Check quickreplace
-		return iblockstate1.getMaterial().isReplaceable() /*&& canPlaceBlockOnSide(world, pos, sidePlacedOn)*/;
+        if (placer instanceof EntityPlayer && ModifierSettingsManager.getModifierSettings(((EntityPlayer) placer)).doQuickReplace()) {
-	}
+            return true;
+        }
+
+        //TODO 1.13 replaceable
+        return iblockstate1.getMaterial().isReplaceable() /*&& canPlaceBlockOnSide(world, pos, sidePlacedOn)*/;
+    }
 
 
-	//Can break using held tool? (or in creative)
-	public static boolean canBreak(Level world, Player player, BlockPos pos) {
-		BlockState blockState = world.getBlockState(pos);
-		if (!world.getFluidState(pos).isEmpty()) return false;
 
-		if (player.isCreative()) return true;
+    //Can break using held tool? (or in creative)
+    public static boolean canBreak(World world, EntityPlayer player, BlockPos pos) {
+        IBlockState blockState = world.getBlockState(pos);
+        if (!world.getFluidState(pos).isEmpty()) return false;
 
-		return ForgeEventFactory.doPlayerHarvestCheck(player, blockState, true);
+        if (player.isCreative()) return true;
-	}
 
-	public static boolean doesBecomeDoubleSlab(Player player, BlockPos pos, Direction facing) {
+        return canHarvestBlock(blockState.getBlock(), player, world, pos);
-		BlockState placedBlockState = player.level.getBlockState(pos);
+    }
 
-		ItemStack itemstack = player.getItemInHand(InteractionHand.MAIN_HAND);
+    //From ForgeHooks#canHarvestBlock
-		if (CompatHelper.isItemBlockProxy(itemstack))
+    public static boolean canHarvestBlock(@Nonnull Block block, @Nonnull EntityPlayer player, @Nonnull World world, @Nonnull BlockPos pos)
-			itemstack = CompatHelper.getItemBlockFromStack(itemstack);
+    {
+        IBlockState state = world.getBlockState(pos);
 
-		if (itemstack.isEmpty() || !(itemstack.getItem() instanceof BlockItem) || !(((BlockItem) itemstack.getItem()).getBlock() instanceof SlabBlock))
+        //Dont break bedrock
-			return false;
+        if (state.getBlockHardness(world, pos) < 0) {
-		SlabBlock heldSlab = (SlabBlock) ((BlockItem) itemstack.getItem()).getBlock();
+            return false;
+        }
 
-		if (placedBlockState.getBlock() == heldSlab) {
+        if (state.getMaterial().isToolNotRequired())
-			//TODO 1.13
+        {
+            return true;
+        }
+
+        ItemStack stack = player.getHeldItemMainhand();
+        ToolType tool = block.getHarvestTool(state);
+        if (stack.isEmpty() || tool == null)
+        {
+            return player.canHarvestBlock(state);
+        }
+
+        if (stack.getDamage() >= stack.getMaxDamage()) return false;
+
+        int toolLevel = stack.getItem().getHarvestLevel(stack, tool, player, state);
+        if (toolLevel < 0)
+        {
+            return player.canHarvestBlock(state);
+        }
+
+        return toolLevel >= block.getHarvestLevel(state);
+    }
+
+    public static boolean doesBecomeDoubleSlab(EntityPlayer player, BlockPos pos, EnumFacing facing) {
+        IBlockState placedBlockState = player.world.getBlockState(pos);
+
+        ItemStack itemstack = player.getHeldItem(EnumHand.MAIN_HAND);
+        if (CompatHelper.isItemBlockProxy(itemstack))
+            itemstack = CompatHelper.getItemBlockFromStack(itemstack);
+
+        if (itemstack.isEmpty() || !(itemstack.getItem() instanceof ItemBlock) || !(((ItemBlock) itemstack.getItem()).getBlock() instanceof BlockSlab)) return false;
+        BlockSlab heldSlab = (BlockSlab) ((ItemBlock) itemstack.getItem()).getBlock();
+
+        if (placedBlockState.getBlock() == heldSlab) {
+            //TODO 1.13
 //            IProperty<?> variantProperty = heldSlab.getVariantProperty();
 //            Comparable<?> placedVariant = placedBlockState.getValue(variantProperty);
 //            BlockSlab.EnumBlockHalf placedHalf = placedBlockState.getValue(BlockSlab.HALF);
@@ -311,7 +346,7 @@ public class SurvivalHelper {
 //            {
 //                return true;
 //            }
-		}
+        }
-		return false;
+        return false;
-	}
+    }
 }

src/main/java/nl/requios/effortlessbuilding/item/AbstractRandomizerBagItem.java

@@ -1,220 +0,0 @@
-package nl.requios.effortlessbuilding.item;
-
-import net.minecraft.MethodsReturnNonnullByDefault;
-import net.minecraft.world.level.block.Block;
-import net.minecraft.world.level.block.state.BlockState;
-import net.minecraft.world.item.TooltipFlag;
-import net.minecraft.world.entity.player.Player;
-import net.minecraft.server.level.ServerPlayer;
-import net.minecraft.world.level.material.Fluids;
-import net.minecraft.world.MenuProvider;
-import net.minecraft.nbt.CompoundTag;
-import net.minecraft.world.InteractionResultHolder;
-import net.minecraft.world.InteractionResult;
-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.network.chat.Component;
-import net.minecraft.ChatFormatting;
-import net.minecraft.world.level.Level;
-import net.minecraftforge.common.capabilities.ICapabilityProvider;
-import net.minecraftforge.network.NetworkHooks;
-import net.minecraftforge.items.CapabilityItemHandler;
-import net.minecraftforge.items.IItemHandler;
-import nl.requios.effortlessbuilding.buildmode.BuildModes;
-import nl.requios.effortlessbuilding.buildmode.ModeSettingsManager;
-import nl.requios.effortlessbuilding.buildmodifier.ModifierSettingsManager;
-import nl.requios.effortlessbuilding.capability.ItemHandlerCapabilityProvider;
-import nl.requios.effortlessbuilding.helper.SurvivalHelper;
-
-import javax.annotation.Nullable;
-import javax.annotation.ParametersAreNonnullByDefault;
-import java.util.ArrayList;
-import java.util.Calendar;
-import java.util.List;
-import java.util.Random;
-
-import net.minecraft.world.item.CreativeModeTab;
-import net.minecraft.world.item.Item;
-import net.minecraft.world.item.ItemStack;
-import net.minecraft.world.item.context.BlockPlaceContext;
-import net.minecraft.world.item.context.UseOnContext;
-
-@MethodsReturnNonnullByDefault
-@ParametersAreNonnullByDefault
-public abstract class AbstractRandomizerBagItem extends Item {
-
-    private static long currentSeed = 1337;
-    private static final Random rand = new Random(currentSeed);
-
-    public AbstractRandomizerBagItem() {
-        super(new Item.Properties().tab(CreativeModeTab.TAB_TOOLS).stacksTo(1));
-    }
-
-    public abstract int getInventorySize();
-
-    public abstract MenuProvider getContainerProvider(ItemStack item);
-
-    /**
-     * Get the inventory of a randomizer bag by checking the capability.
-     */
-    public IItemHandler getBagInventory(ItemStack bag) {
-        return bag.getCapability(CapabilityItemHandler.ITEM_HANDLER_CAPABILITY, null).orElse(null);
-    }
-
-    /**
-     * Pick a random slot from the bag. Empty slots will never get chosen.
-     */
-    public ItemStack pickRandomStack(IItemHandler bagInventory) {
-        //Find how many stacks are non-empty, and save them in a list
-        int nonempty = 0;
-        List<ItemStack> nonEmptyStacks = new ArrayList<>();
-        List<Integer> originalSlots = new ArrayList<>(getInventorySize());
-        for (int i = 0; i < bagInventory.getSlots(); i++) {
-            ItemStack stack = bagInventory.getStackInSlot(i);
-            if (!stack.isEmpty()) {
-                nonempty++;
-                nonEmptyStacks.add(stack);
-                originalSlots.add(i);
-            }
-        }
-
-        if (nonEmptyStacks.size() != originalSlots.size())
-            throw new Error("NonEmptyStacks and OriginalSlots not same size");
-
-        if (nonempty == 0) return ItemStack.EMPTY;
-
-        //Pick random slot
-        int randomSlot = rand.nextInt(nonempty);
-        if (randomSlot < 0 || randomSlot > bagInventory.getSlots()) return ItemStack.EMPTY;
-
-        int originalSlot = originalSlots.get(randomSlot);
-        if (originalSlot < 0 || originalSlot > bagInventory.getSlots()) return ItemStack.EMPTY;
-
-        return bagInventory.getStackInSlot(originalSlot);
-    }
-
-    public ItemStack findStack(IItemHandler bagInventory, Item item) {
-        for (int i = 0; i < bagInventory.getSlots(); i++) {
-            ItemStack stack = bagInventory.getStackInSlot(i);
-            if (!stack.isEmpty() && stack.getItem() == item) {
-                return stack;
-            }
-        }
-        return ItemStack.EMPTY;
-    }
-
-    public static void resetRandomness() {
-        rand.setSeed(currentSeed);
-    }
-
-    public static void renewRandomness() {
-        currentSeed = Calendar.getInstance().getTimeInMillis();
-        rand.setSeed(currentSeed);
-    }
-
-    @Override
-    public InteractionResult useOn(UseOnContext ctx) {
-        Player player = ctx.getPlayer();
-        Level world = ctx.getLevel();
-        BlockPos pos = ctx.getClickedPos();
-        Direction facing = ctx.getClickedFace();
-        ItemStack item = ctx.getItemInHand();
-        Vec3 hitVec = ctx.getClickLocation();
-
-        if (player == null) return InteractionResult.FAIL;
-
-        if (ctx.getPlayer() != null && ctx.getPlayer().isShiftKeyDown()) { //ctx.isPlacerSneaking()
-            if (world.isClientSide) return InteractionResult.SUCCESS;
-            //Open inventory
-            NetworkHooks.openScreen((ServerPlayer) player, getContainerProvider(item));
-        } else {
-            if (world.isClientSide) return InteractionResult.SUCCESS;
-
-            //Only place manually if in normal vanilla mode
-            BuildModes.BuildModeEnum buildMode = ModeSettingsManager.getModeSettings(player).getBuildMode();
-            ModifierSettingsManager.ModifierSettings modifierSettings = ModifierSettingsManager.getModifierSettings(player);
-            if (buildMode != BuildModes.BuildModeEnum.NORMAL || modifierSettings.doQuickReplace()) {
-                return InteractionResult.FAIL;
-            }
-
-            //Use item
-            //Get bag inventory
-            //TODO offhand support
-            ItemStack bag = player.getItemInHand(InteractionHand.MAIN_HAND);
-            IItemHandler bagInventory = getBagInventory(bag);
-            if (bagInventory == null)
-                return InteractionResult.FAIL;
-
-            ItemStack toPlace = pickRandomStack(bagInventory);
-            if (toPlace.isEmpty()) return InteractionResult.FAIL;
-
-            //Previously: use onItemUse to place block (no synergy)
-            //bag.setItemDamage(toPlace.getMetadata());
-            //toPlace.onItemUse(player, world, pos, hand, facing, hitX, hitY, hitZ);
-
-            //TODO replaceable
-            if (!world.getBlockState(pos).getBlock().canBeReplaced(world.getBlockState(pos), Fluids.EMPTY)) {
-                pos = pos.relative(facing);
-            }
-
-            BlockPlaceContext blockItemUseContext = new BlockPlaceContext(new UseOnContext(player, InteractionHand.MAIN_HAND, new BlockHitResult(hitVec, facing, pos, false)));
-            BlockState blockState = Block.byItem(toPlace.getItem()).getStateForPlacement(blockItemUseContext);
-
-            SurvivalHelper.placeBlock(world, player, pos, blockState, toPlace, facing, hitVec, false, false, true);
-
-            //Synergy
-            //Works without calling
-//            BlockSnapshot blockSnapshot = new BlockSnapshot(player.world, pos, blockState);
-//            BlockEvent.PlaceEvent placeEvent = new BlockEvent.PlaceEvent(blockSnapshot, blockState, player, hand);
-//            Mirror.onBlockPlaced(placeEvent);
-//            Array.onBlockPlaced(placeEvent);
-        }
-        return InteractionResult.SUCCESS;
-    }
-
-    @Override
-    public InteractionResultHolder<ItemStack> use(Level world, Player player, InteractionHand hand) {
-        ItemStack bag = player.getItemInHand(hand);
-
-        if (player.isShiftKeyDown()) {
-            if (world.isClientSide) return new InteractionResultHolder<>(InteractionResult.SUCCESS, bag);
-            //Open inventory
-            NetworkHooks.openScreen((ServerPlayer) player, getContainerProvider(bag));
-        } else {
-            //Use item
-            //Get bag inventory
-            IItemHandler bagInventory = getBagInventory(bag);
-            if (bagInventory == null)
-                return new InteractionResultHolder<>(InteractionResult.FAIL, bag);
-
-            ItemStack toUse = pickRandomStack(bagInventory);
-            if (toUse.isEmpty()) return new InteractionResultHolder<>(InteractionResult.FAIL, bag);
-
-            return toUse.use(world, player, hand);
-        }
-        return new InteractionResultHolder<>(InteractionResult.PASS, bag);
-    }
-
-    @Override
-    public int getUseDuration(ItemStack p_77626_1_) {
-        return 1;
-    }
-
-    @Nullable
-    @Override
-    public ICapabilityProvider initCapabilities(ItemStack stack, @Nullable CompoundTag nbt) {
-        return new ItemHandlerCapabilityProvider(getInventorySize());
-    }
-
-    @Override
-    public void appendHoverText(ItemStack stack, @Nullable Level world, List<Component> tooltip, TooltipFlag flag) {
-        tooltip.add(Component.literal(ChatFormatting.BLUE + "Rightclick" + ChatFormatting.GRAY + " to place a random block"));
-        tooltip.add(Component.literal(ChatFormatting.BLUE + "Sneak + rightclick" + ChatFormatting.GRAY + " to open inventory"));
-        if (world != null && world.players().size() > 1) {
-            tooltip.add(Component.literal(ChatFormatting.YELLOW + "Experimental on servers: may lose inventory"));
-        }
-    }
-}

src/main/java/nl/requios/effortlessbuilding/item/DiamondRandomizerBagItem.java

@@ -1,45 +0,0 @@
-package nl.requios.effortlessbuilding.item;
-
-import net.minecraft.network.chat.Component;
-import net.minecraft.world.MenuProvider;
-import net.minecraft.world.entity.player.Inventory;
-import net.minecraft.world.entity.player.Player;
-import net.minecraft.world.inventory.AbstractContainerMenu;
-import net.minecraft.world.item.ItemStack;
-import nl.requios.effortlessbuilding.gui.DiamondRandomizerBagContainer;
-
-import javax.annotation.Nullable;
-
-public class DiamondRandomizerBagItem extends AbstractRandomizerBagItem{
-    public static final int INV_SIZE = 27;
-
-    @Override
-    public int getInventorySize() {
-        return 27;
-    }
-
-    @Override
-    public MenuProvider getContainerProvider(ItemStack bag) {
-        return new ContainerProvider(bag);
-    }
-
-    public static class ContainerProvider implements MenuProvider {
-
-        private final ItemStack bag;
-
-        public ContainerProvider(ItemStack bag) {
-            this.bag = bag;
-        }
-
-        @Override
-        public Component getDisplayName() {
-            return Component.translatable("effortlessbuilding:diamond_randomizer_bag");
-        }
-
-        @Nullable
-        @Override
-        public AbstractContainerMenu createMenu(int containerId, Inventory playerInventory, Player player) {
-            return new DiamondRandomizerBagContainer(containerId, playerInventory, ((AbstractRandomizerBagItem)bag.getItem()).getBagInventory(bag));
-        }
-    }
-}

src/main/java/nl/requios/effortlessbuilding/item/GoldenRandomizerBagItem.java

@@ -1,45 +0,0 @@
-package nl.requios.effortlessbuilding.item;
-
-import net.minecraft.network.chat.Component;
-import net.minecraft.world.MenuProvider;
-import net.minecraft.world.entity.player.Inventory;
-import net.minecraft.world.entity.player.Player;
-import net.minecraft.world.inventory.AbstractContainerMenu;
-import net.minecraft.world.item.ItemStack;
-import nl.requios.effortlessbuilding.gui.GoldenRandomizerBagContainer;
-
-import javax.annotation.Nullable;
-
-public class GoldenRandomizerBagItem extends AbstractRandomizerBagItem{
-    public static final int INV_SIZE = 9;
-
-    @Override
-    public int getInventorySize() {
-        return 9;
-    }
-
-    @Override
-    public MenuProvider getContainerProvider(ItemStack bag) {
-        return new ContainerProvider(bag);
-    }
-
-    public static class ContainerProvider implements MenuProvider {
-
-        private final ItemStack bag;
-
-        public ContainerProvider(ItemStack bag) {
-            this.bag = bag;
-        }
-
-        @Override
-        public Component getDisplayName() {
-            return Component.translatable("effortlessbuilding:golden_randomizer_bag");
-        }
-
-        @Nullable
-        @Override
-        public AbstractContainerMenu createMenu(int containerId, Inventory playerInventory, Player player) {
-            return new GoldenRandomizerBagContainer(containerId, playerInventory, ((AbstractRandomizerBagItem)bag.getItem()).getBagInventory(bag));
-        }
-    }
-}

src/main/java/nl/requios/effortlessbuilding/item/ItemRandomizerBag.java

@@ -0,0 +1,218 @@
+package nl.requios.effortlessbuilding.item;
+
+import net.minecraft.block.Block;
+import net.minecraft.block.state.IBlockState;
+import net.minecraft.client.util.ITooltipFlag;
+import net.minecraft.entity.player.EntityPlayer;
+import net.minecraft.entity.player.EntityPlayerMP;
+import net.minecraft.item.*;
+import net.minecraft.nbt.NBTTagCompound;
+import net.minecraft.util.ActionResult;
+import net.minecraft.util.EnumActionResult;
+import net.minecraft.util.EnumFacing;
+import net.minecraft.util.EnumHand;
+import net.minecraft.util.math.BlockPos;
+import net.minecraft.util.math.Vec3d;
+import net.minecraft.util.text.ITextComponent;
+import net.minecraft.util.text.TextComponentString;
+import net.minecraft.util.text.TextFormatting;
+import net.minecraft.world.World;
+import net.minecraftforge.common.capabilities.ICapabilityProvider;
+import net.minecraftforge.fml.network.NetworkHooks;
+import net.minecraftforge.items.CapabilityItemHandler;
+import net.minecraftforge.items.IItemHandler;
+import nl.requios.effortlessbuilding.EffortlessBuilding;
+import nl.requios.effortlessbuilding.buildmode.BuildModes;
+import nl.requios.effortlessbuilding.buildmode.ModeSettingsManager;
+import nl.requios.effortlessbuilding.buildmodifier.ModifierSettingsManager;
+import nl.requios.effortlessbuilding.capability.ItemHandlerCapabilityProvider;
+import nl.requios.effortlessbuilding.gui.RandomizerBagContainer;
+import nl.requios.effortlessbuilding.gui.RandomizerBagGuiHandler;
+import nl.requios.effortlessbuilding.helper.SurvivalHelper;
+
+import javax.annotation.Nullable;
+import java.util.ArrayList;
+import java.util.Calendar;
+import java.util.List;
+import java.util.Random;
+
+public class ItemRandomizerBag extends Item {
+    public static final int INV_SIZE = 5;
+
+    private static long currentSeed = 1337;
+    private static Random rand = new Random(currentSeed);
+
+    public ItemRandomizerBag() {
+        super(new Item.Properties().group(ItemGroup.TOOLS).maxStackSize(1));
+
+        this.setRegistryName(EffortlessBuilding.MODID, "randomizer_bag");
+    }
+
+    @Override
+    public EnumActionResult onItemUse(ItemUseContext ctx) {
+        EntityPlayer player = ctx.getPlayer();
+        World world = ctx.getWorld();
+        BlockPos pos = ctx.getPos();
+        EnumFacing facing = ctx.getFace();
+        ItemStack item = ctx.getItem();
+
+        if (player == null) return EnumActionResult.FAIL;
+
+        if (ctx.isPlacerSneaking()) {
+            if (world.isRemote) return EnumActionResult.SUCCESS;
+            //Open inventory
+            NetworkHooks.openGui((EntityPlayerMP) player, new RandomizerBagGuiHandler());
+        } else {
+            if (world.isRemote) return EnumActionResult.SUCCESS;
+
+            //Only place manually if in normal vanilla mode
+            BuildModes.BuildModeEnum buildMode = ModeSettingsManager.getModeSettings(player).getBuildMode();
+            ModifierSettingsManager.ModifierSettings modifierSettings = ModifierSettingsManager.getModifierSettings(player);
+            if (buildMode != BuildModes.BuildModeEnum.NORMAL || modifierSettings.doQuickReplace()) {
+                return EnumActionResult.FAIL;
+            }
+
+            //Use item
+            //Get bag inventory
+            //TODO offhand support
+            ItemStack bag = player.getHeldItem(EnumHand.MAIN_HAND);
+            IItemHandler bagInventory = getBagInventory(bag);
+            if (bagInventory == null)
+                return EnumActionResult.FAIL;
+
+            ItemStack toPlace = pickRandomStack(bagInventory);
+            if (toPlace.isEmpty()) return EnumActionResult.FAIL;
+
+            //Previously: use onItemUse to place block (no synergy)
+            //bag.setItemDamage(toPlace.getMetadata());
+            //toPlace.onItemUse(player, world, pos, hand, facing, hitX, hitY, hitZ);
+
+            //TODO replaceable
+            if (!world.getBlockState(pos).getBlock().getMaterial(world.getBlockState(pos)).isReplaceable()) {
+                pos = pos.offset(facing);
+            }
+
+            BlockItemUseContext blockItemUseContext = new BlockItemUseContext(world, player, item, pos, facing, ctx.getHitX(), ctx.getHitY(), ctx.getHitZ());
+            IBlockState blockState = Block.getBlockFromItem(toPlace.getItem()).getStateForPlacement(blockItemUseContext);
+
+            SurvivalHelper.placeBlock(world, player, pos, blockState, toPlace, facing, new Vec3d(ctx.getHitX(), ctx.getHitY(), ctx.getHitZ()), false, false, true);
+
+            //Synergy
+            //Works without calling
+//            BlockSnapshot blockSnapshot = new BlockSnapshot(player.world, pos, blockState);
+//            BlockEvent.PlaceEvent placeEvent = new BlockEvent.PlaceEvent(blockSnapshot, blockState, player, hand);
+//            Mirror.onBlockPlaced(placeEvent);
+//            Array.onBlockPlaced(placeEvent);
+        }
+        return EnumActionResult.SUCCESS;
+    }
+
+    @Override
+    public ActionResult<ItemStack> onItemRightClick(World world, EntityPlayer player, EnumHand hand) {
+        ItemStack bag = player.getHeldItem(hand);
+
+        if (player.isSneaking()) {
+            if (world.isRemote) return new ActionResult<>(EnumActionResult.SUCCESS, bag);
+            //Open inventory
+            NetworkHooks.openGui((EntityPlayerMP) player, new RandomizerBagGuiHandler());
+        } else {
+            //Use item
+            //Get bag inventory
+            IItemHandler bagInventory = getBagInventory(bag);
+            if (bagInventory == null)
+                return new ActionResult<>(EnumActionResult.FAIL, bag);
+
+            ItemStack toUse = pickRandomStack(bagInventory);
+            if (toUse.isEmpty()) return new ActionResult<>(EnumActionResult.FAIL, bag);
+
+            return toUse.useItemRightClick(world, player, hand);
+        }
+        return new ActionResult<>(EnumActionResult.PASS, bag);
+    }
+
+    /**
+     * Get the inventory of a randomizer bag by checking the capability.
+     *
+     * @param bag
+     * @return
+     */
+    public static IItemHandler getBagInventory(ItemStack bag) {
+        return bag.getCapability(CapabilityItemHandler.ITEM_HANDLER_CAPABILITY, null).orElse(null);
+    }
+
+    /**
+     * Pick a random slot from the bag. Empty slots will never get chosen.
+     *
+     * @param bagInventory
+     * @return
+     */
+    public static ItemStack pickRandomStack(IItemHandler bagInventory) {
+        //Find how many stacks are non-empty, and save them in a list
+        int nonempty = 0;
+        List<ItemStack> nonEmptyStacks = new ArrayList<>(INV_SIZE);
+        List<Integer> originalSlots = new ArrayList<>(INV_SIZE);
+        for (int i = 0; i < bagInventory.getSlots(); i++) {
+            ItemStack stack = bagInventory.getStackInSlot(i);
+            if (!stack.isEmpty()) {
+                nonempty++;
+                nonEmptyStacks.add(stack);
+                originalSlots.add(i);
+            }
+        }
+
+        if (nonEmptyStacks.size() != originalSlots.size())
+            throw new Error("NonEmptyStacks and OriginalSlots not same size");
+
+        if (nonempty == 0) return ItemStack.EMPTY;
+
+        //Pick random slot
+        int randomSlot = rand.nextInt(nonempty);
+        if (randomSlot < 0 || randomSlot > bagInventory.getSlots()) return ItemStack.EMPTY;
+
+        int originalSlot = originalSlots.get(randomSlot);
+        if (originalSlot < 0 || originalSlot > bagInventory.getSlots()) return ItemStack.EMPTY;
+
+        return bagInventory.getStackInSlot(originalSlot);
+    }
+
+    public static ItemStack findStack(IItemHandler bagInventory, Item item) {
+        for (int i = 0; i < bagInventory.getSlots(); i++) {
+            ItemStack stack = bagInventory.getStackInSlot(i);
+            if (!stack.isEmpty() && stack.getItem() == item) {
+                return stack;
+            }
+        }
+        return ItemStack.EMPTY;
+    }
+
+    @Override
+    public int getUseDuration(ItemStack p_77626_1_) {
+        return 1;
+    }
+
+    @Nullable
+    @Override
+    public ICapabilityProvider initCapabilities(ItemStack stack, @Nullable NBTTagCompound nbt) {
+        return new ItemHandlerCapabilityProvider();
+    }
+
+    @Override
+    public void addInformation(ItemStack stack, @Nullable World world, List<ITextComponent> tooltip, ITooltipFlag flag) {
+        tooltip.add(new TextComponentString(TextFormatting.BLUE + "Rightclick" + TextFormatting.GRAY + " to place a random block"));
+        tooltip.add(new TextComponentString(TextFormatting.BLUE + "Sneak + rightclick" + TextFormatting.GRAY + " to open inventory"));
+    }
+
+    @Override
+    public String getTranslationKey() {
+        return this.getRegistryName().toString();
+    }
+
+    public static void resetRandomness() {
+        rand.setSeed(currentSeed);
+    }
+
+    public static void renewRandomness() {
+        currentSeed = Calendar.getInstance().getTimeInMillis();
+        rand.setSeed(currentSeed);
+    }
+}

src/main/java/nl/requios/effortlessbuilding/item/ItemReachUpgrade1.java

@@ -0,0 +1,65 @@
+package nl.requios.effortlessbuilding.item;
+
+import net.minecraft.client.util.ITooltipFlag;
+import net.minecraft.entity.player.EntityPlayer;
+import net.minecraft.item.Item;
+import net.minecraft.item.ItemGroup;
+import net.minecraft.item.ItemStack;
+import net.minecraft.util.*;
+import net.minecraft.util.text.ITextComponent;
+import net.minecraft.util.text.TextComponentString;
+import net.minecraft.util.text.TextFormatting;
+import net.minecraft.world.World;
+import nl.requios.effortlessbuilding.BuildConfig;
+import nl.requios.effortlessbuilding.EffortlessBuilding;
+import nl.requios.effortlessbuilding.buildmodifier.ModifierSettingsManager;
+import nl.requios.effortlessbuilding.helper.ReachHelper;
+
+import javax.annotation.Nullable;
+import java.util.List;
+
+public class ItemReachUpgrade1 extends Item {
+
+    public ItemReachUpgrade1() {
+        super(new Item.Properties().group(ItemGroup.TOOLS).maxStackSize(1));
+        this.setRegistryName(EffortlessBuilding.MODID, "reach_upgrade1");
+    }
+
+    @Override
+    public ActionResult<ItemStack> onItemRightClick(World world, EntityPlayer player, EnumHand hand) {
+        if (player.isCreative()) {
+            if (world.isRemote) EffortlessBuilding.log(player, "Reach upgrades are not necessary in creative.");
+            if (world.isRemote) EffortlessBuilding.log(player, "Still want increased reach? Use the config.");
+            return new ActionResult<>(EnumActionResult.PASS, player.getHeldItem(hand));
+        }
+
+        ModifierSettingsManager.ModifierSettings modifierSettings = ModifierSettingsManager.getModifierSettings(player);
+        int currentLevel = modifierSettings.getReachUpgrade();
+        if (currentLevel == 0) {
+            modifierSettings.setReachUpgrade(1);
+
+            if (world.isRemote) EffortlessBuilding.log(player, "Upgraded reach to " + ReachHelper.getMaxReach(player));
+            player.setHeldItem(hand, ItemStack.EMPTY);
+
+            SoundEvent soundEvent = new SoundEvent(new ResourceLocation("entity.player.levelup"));
+            player.playSound(soundEvent, 1f, 1f);
+        } else if (currentLevel > 0) {
+            if (world.isRemote) EffortlessBuilding.log(player, "Already used this upgrade! Current reach is " + ReachHelper
+                    .getMaxReach(player) + ".");
+
+            SoundEvent soundEvent = new SoundEvent(new ResourceLocation("item.armor.equip_leather"));
+            player.playSound(soundEvent, 1f, 1f);
+        }
+        return new ActionResult<>(EnumActionResult.PASS, player.getHeldItem(hand));
+    }
+
+    @Override
+    public void addInformation(ItemStack stack, @Nullable World world, List<ITextComponent> tooltip, ITooltipFlag flag) {
+        tooltip.add(new TextComponentString(TextFormatting.GRAY + "Consume to increase reach to " + TextFormatting.BLUE + BuildConfig.reach.maxReachLevel1.get()));
+    }
+
+    @Override
+    public String getTranslationKey() {
+        return this.getRegistryName().toString();
+    }
+}

src/main/java/nl/requios/effortlessbuilding/item/ItemReachUpgrade2.java

@@ -0,0 +1,70 @@
+package nl.requios.effortlessbuilding.item;
+
+import net.minecraft.client.util.ITooltipFlag;
+import net.minecraft.entity.player.EntityPlayer;
+import net.minecraft.item.Item;
+import net.minecraft.item.ItemGroup;
+import net.minecraft.item.ItemStack;
+import net.minecraft.util.*;
+import net.minecraft.util.text.ITextComponent;
+import net.minecraft.util.text.TextComponentString;
+import net.minecraft.util.text.TextFormatting;
+import net.minecraft.world.World;
+import nl.requios.effortlessbuilding.BuildConfig;
+import nl.requios.effortlessbuilding.EffortlessBuilding;
+import nl.requios.effortlessbuilding.buildmodifier.ModifierSettingsManager;
+import nl.requios.effortlessbuilding.helper.ReachHelper;
+
+import javax.annotation.Nullable;
+import java.util.List;
+
+public class ItemReachUpgrade2 extends Item {
+
+    public ItemReachUpgrade2() {
+        super(new Item.Properties().group(ItemGroup.TOOLS).maxStackSize(1));
+        this.setRegistryName(EffortlessBuilding.MODID, "reach_upgrade2");
+    }
+
+    @Override
+    public ActionResult<ItemStack> onItemRightClick(World world, EntityPlayer player, EnumHand hand) {
+        if (player.isCreative()) {
+            if (world.isRemote) EffortlessBuilding.log(player, "Reach upgrades are not necessary in creative.");
+            if (world.isRemote) EffortlessBuilding.log(player, "Still want increased reach? Use the config.");
+            return new ActionResult<>(EnumActionResult.PASS, player.getHeldItem(hand));
+        }
+
+        ModifierSettingsManager.ModifierSettings modifierSettings = ModifierSettingsManager.getModifierSettings(player);
+        int currentLevel = modifierSettings.getReachUpgrade();
+        if (currentLevel == 1) {
+            modifierSettings.setReachUpgrade(2);
+            if (world.isRemote) EffortlessBuilding.log(player, "Upgraded reach to " + ReachHelper.getMaxReach(player));
+            player.setHeldItem(hand, ItemStack.EMPTY);
+
+            SoundEvent soundEvent = new SoundEvent(new ResourceLocation("entity.player.levelup"));
+            player.playSound(soundEvent, 1f, 1f);
+        } else if (currentLevel < 1) {
+            if (world.isRemote) EffortlessBuilding.log(player, "Use Reach Upgrade 1 first.");
+
+            SoundEvent soundEvent = new SoundEvent(new ResourceLocation("item.armor.equip_leather"));
+            player.playSound(soundEvent, 1f, 1f);
+        } else if (currentLevel > 1) {
+            if (world.isRemote) EffortlessBuilding.log(player, "Already used this upgrade! Current reach is " + ReachHelper
+                    .getMaxReach(player) + ".");
+
+            SoundEvent soundEvent = new SoundEvent(new ResourceLocation("item.armor.equip_leather"));
+            player.playSound(soundEvent, 1f, 1f);
+        }
+        return new ActionResult<>(EnumActionResult.PASS, player.getHeldItem(hand));
+    }
+
+    @Override
+    public void addInformation(ItemStack stack, @Nullable World world, List<ITextComponent> tooltip, ITooltipFlag flag) {
+        tooltip.add(new TextComponentString(TextFormatting.GRAY + "Consume to increase reach to " + TextFormatting.BLUE + BuildConfig.reach.maxReachLevel2.get()));
+        tooltip.add(new TextComponentString(TextFormatting.GRAY + "Previous upgrades need to be consumed first"));
+    }
+
+    @Override
+    public String getTranslationKey() {
+        return this.getRegistryName().toString();
+    }
+}

src/main/java/nl/requios/effortlessbuilding/item/ItemReachUpgrade3.java

@@ -0,0 +1,73 @@
+package nl.requios.effortlessbuilding.item;
+
+import net.minecraft.client.util.ITooltipFlag;
+import net.minecraft.entity.player.EntityPlayer;
+import net.minecraft.item.Item;
+import net.minecraft.item.ItemGroup;
+import net.minecraft.item.ItemStack;
+import net.minecraft.util.*;
+import net.minecraft.util.text.ITextComponent;
+import net.minecraft.util.text.TextComponentString;
+import net.minecraft.util.text.TextFormatting;
+import net.minecraft.world.World;
+import nl.requios.effortlessbuilding.BuildConfig;
+import nl.requios.effortlessbuilding.EffortlessBuilding;
+import nl.requios.effortlessbuilding.buildmodifier.ModifierSettingsManager;
+import nl.requios.effortlessbuilding.helper.ReachHelper;
+
+import javax.annotation.Nullable;
+import java.util.List;
+
+public class ItemReachUpgrade3 extends Item {
+
+    public ItemReachUpgrade3() {
+        super(new Item.Properties().group(ItemGroup.TOOLS).maxStackSize(1));
+        this.setRegistryName(EffortlessBuilding.MODID, "reach_upgrade3");
+    }
+
+    @Override
+    public ActionResult<ItemStack> onItemRightClick(World world, EntityPlayer player, EnumHand hand) {
+        if (player.isCreative()) {
+            if (world.isRemote) EffortlessBuilding.log(player, "Reach upgrades are not necessary in creative.");
+            if (world.isRemote) EffortlessBuilding.log(player, "Still want increased reach? Use the config.");
+            return new ActionResult<>(EnumActionResult.PASS, player.getHeldItem(hand));
+        }
+
+        ModifierSettingsManager.ModifierSettings modifierSettings = ModifierSettingsManager.getModifierSettings(player);
+        int currentLevel = modifierSettings.getReachUpgrade();
+        if (currentLevel == 2) {
+            modifierSettings.setReachUpgrade(3);
+            if (world.isRemote) EffortlessBuilding.log(player, "Upgraded reach to " + ReachHelper.getMaxReach(player));
+            player.setHeldItem(hand, ItemStack.EMPTY);
+
+            SoundEvent soundEvent = new SoundEvent(new ResourceLocation("entity.player.levelup"));
+            player.playSound(soundEvent, 1f, 1f);
+        } else if (currentLevel < 2) {
+            if (currentLevel == 0)
+                if (world.isRemote) EffortlessBuilding.log(player, "Use Reach Upgrade 1 and 2 first.");
+            if (currentLevel == 1)
+                if (world.isRemote) EffortlessBuilding.log(player, "Use Reach Upgrade 2 first.");
+
+            SoundEvent soundEvent = new SoundEvent(new ResourceLocation("item.armor.equip_leather"));
+            player.playSound(soundEvent, 1f, 1f);
+        } else if (currentLevel > 2) {
+            if (world.isRemote) EffortlessBuilding.log(player, "Already used this upgrade! Current reach is " + ReachHelper
+                    .getMaxReach(player) + ".");
+
+            SoundEvent soundEvent = new SoundEvent(new ResourceLocation("item.armor.equip_leather"));
+            player.playSound(soundEvent, 1f, 1f);
+        }
+        return new ActionResult<>(EnumActionResult.PASS, player.getHeldItem(hand));
+    }
+
+    @Override
+    public void addInformation(ItemStack stack, @Nullable World world, List<ITextComponent> tooltip, ITooltipFlag flag) {
+        tooltip.add(new TextComponentString(TextFormatting.GRAY + "Consume to increase reach to " + TextFormatting.BLUE + BuildConfig.reach.maxReachLevel3.get()));
+        tooltip.add(new TextComponentString(TextFormatting.GRAY + "Previous upgrades need to be consumed first"));
+    }
+
+    @Override
+    public String getTranslationKey() {
+        return this.getRegistryName().toString();
+    }
+}

src/main/java/nl/requios/effortlessbuilding/item/RandomizerBagItem.java

@@ -1,45 +0,0 @@
-package nl.requios.effortlessbuilding.item;
-
-import net.minecraft.network.chat.Component;
-import net.minecraft.world.MenuProvider;
-import net.minecraft.world.entity.player.Inventory;
-import net.minecraft.world.entity.player.Player;
-import net.minecraft.world.inventory.AbstractContainerMenu;
-import net.minecraft.world.item.ItemStack;
-import nl.requios.effortlessbuilding.gui.RandomizerBagContainer;
-
-import javax.annotation.Nullable;
-
-public class RandomizerBagItem extends AbstractRandomizerBagItem {
-	public static final int INV_SIZE = 5;
-
-	@Override
-	public int getInventorySize() {
-		return 5;
-	}
-
-	@Override
-	public MenuProvider getContainerProvider(ItemStack bag) {
-		return new ContainerProvider(bag);
-	}
-
-	public static class ContainerProvider implements MenuProvider {
-
-		private final ItemStack bag;
-
-		public ContainerProvider(ItemStack bag) {
-			this.bag = bag;
-		}
-
-		@Override
-		public Component getDisplayName() {
-			return Component.translatable("effortlessbuilding:randomizer_bag");
-		}
-
-		@Nullable
-		@Override
-		public AbstractContainerMenu createMenu(int containerId, Inventory playerInventory, Player player) {
-			return new RandomizerBagContainer(containerId, playerInventory, ((AbstractRandomizerBagItem)bag.getItem()).getBagInventory(bag));
-		}
-	}
-}

src/main/java/nl/requios/effortlessbuilding/item/ReachUpgrade1Item.java

@@ -1,69 +0,0 @@
-package nl.requios.effortlessbuilding.item;
-
-import net.minecraft.MethodsReturnNonnullByDefault;
-import net.minecraft.world.item.TooltipFlag;
-import net.minecraft.world.entity.player.Player;
-import net.minecraft.world.item.Item;
-import net.minecraft.world.item.CreativeModeTab;
-import net.minecraft.world.item.ItemStack;
-import net.minecraft.network.chat.Component;
-import net.minecraft.ChatFormatting;
-import net.minecraft.world.level.Level;
-import nl.requios.effortlessbuilding.BuildConfig;
-import nl.requios.effortlessbuilding.EffortlessBuilding;
-import nl.requios.effortlessbuilding.buildmodifier.ModifierSettingsManager;
-import nl.requios.effortlessbuilding.helper.ReachHelper;
-
-import javax.annotation.Nullable;
-import javax.annotation.ParametersAreNonnullByDefault;
-import java.util.List;
-
-import net.minecraft.resources.ResourceLocation;
-import net.minecraft.sounds.SoundEvent;
-import net.minecraft.world.InteractionHand;
-import net.minecraft.world.InteractionResult;
-import net.minecraft.world.InteractionResultHolder;
-
-@ParametersAreNonnullByDefault
-@MethodsReturnNonnullByDefault
-public class ReachUpgrade1Item extends Item {
-
-	public ReachUpgrade1Item() {
-		super(new Item.Properties().tab(CreativeModeTab.TAB_TOOLS).stacksTo(1));
-	}
-
-	@Override
-	public InteractionResultHolder<ItemStack> use(Level world, Player player, InteractionHand hand) {
-		if (player.isCreative()) {
-			if (world.isClientSide) EffortlessBuilding.log(player, "Reach upgrades are not necessary in creative.");
-			if (world.isClientSide) EffortlessBuilding.log(player, "Still want increased reach? Use the config.");
-			return new InteractionResultHolder<>(InteractionResult.PASS, player.getItemInHand(hand));
-		}
-
-		ModifierSettingsManager.ModifierSettings modifierSettings = ModifierSettingsManager.getModifierSettings(player);
-		int currentLevel = modifierSettings.getReachUpgrade();
-		if (currentLevel == 0) {
-			modifierSettings.setReachUpgrade(1);
-
-			if (world.isClientSide) EffortlessBuilding.log(player, "Upgraded reach to " + ReachHelper.getMaxReach(player));
-			player.setItemInHand(hand, ItemStack.EMPTY);
-
-			SoundEvent soundEvent = new SoundEvent(new ResourceLocation("entity.player.levelup"));
-			player.playSound(soundEvent, 1f, 1f);
-		} else if (currentLevel > 0) {
-			if (world.isClientSide)
-				EffortlessBuilding.log(player, "Already used this upgrade! Current reach is " + ReachHelper
-					.getMaxReach(player) + ".");
-
-			SoundEvent soundEvent = new SoundEvent(new ResourceLocation("item.armor.equip_leather"));
-			player.playSound(soundEvent, 1f, 1f);
-		}
-		return new InteractionResultHolder<>(InteractionResult.PASS, player.getItemInHand(hand));
-	}
-
-	@Override
-	public void appendHoverText(ItemStack stack, @Nullable Level world, List<Component> tooltip, TooltipFlag flag) {
-		tooltip.add(Component.literal(ChatFormatting.GRAY + "Consume to increase reach to " + ChatFormatting.BLUE + BuildConfig.reach.maxReachLevel1.get()));
-	}
-
-}

src/main/java/nl/requios/effortlessbuilding/item/ReachUpgrade2Item.java

@@ -1,74 +0,0 @@
-package nl.requios.effortlessbuilding.item;
-
-import net.minecraft.MethodsReturnNonnullByDefault;
-import net.minecraft.world.item.TooltipFlag;
-import net.minecraft.world.entity.player.Player;
-import net.minecraft.world.item.Item;
-import net.minecraft.world.item.CreativeModeTab;
-import net.minecraft.world.item.ItemStack;
-import net.minecraft.network.chat.Component;
-import net.minecraft.ChatFormatting;
-import net.minecraft.world.level.Level;
-import nl.requios.effortlessbuilding.BuildConfig;
-import nl.requios.effortlessbuilding.EffortlessBuilding;
-import nl.requios.effortlessbuilding.buildmodifier.ModifierSettingsManager;
-import nl.requios.effortlessbuilding.helper.ReachHelper;
-
-import javax.annotation.Nullable;
-import javax.annotation.ParametersAreNonnullByDefault;
-import java.awt.*;
-import java.util.List;
-
-import net.minecraft.resources.ResourceLocation;
-import net.minecraft.sounds.SoundEvent;
-import net.minecraft.world.InteractionHand;
-import net.minecraft.world.InteractionResult;
-import net.minecraft.world.InteractionResultHolder;
-
-@ParametersAreNonnullByDefault
-@MethodsReturnNonnullByDefault
-public class ReachUpgrade2Item extends Item {
-
-	public ReachUpgrade2Item() {
-		super(new Item.Properties().tab(CreativeModeTab.TAB_TOOLS).stacksTo(1));
-	}
-
-	@Override
-	public InteractionResultHolder<ItemStack> use(Level world, Player player, InteractionHand hand) {
-		if (player.isCreative()) {
-			if (world.isClientSide) EffortlessBuilding.log(player, "Reach upgrades are not necessary in creative.");
-			if (world.isClientSide) EffortlessBuilding.log(player, "Still want increased reach? Use the config.");
-			return new InteractionResultHolder<>(InteractionResult.PASS, player.getItemInHand(hand));
-		}
-
-		ModifierSettingsManager.ModifierSettings modifierSettings = ModifierSettingsManager.getModifierSettings(player);
-		int currentLevel = modifierSettings.getReachUpgrade();
-		if (currentLevel == 1) {
-			modifierSettings.setReachUpgrade(2);
-			if (world.isClientSide) EffortlessBuilding.log(player, "Upgraded reach to " + ReachHelper.getMaxReach(player));
-			player.setItemInHand(hand, ItemStack.EMPTY);
-
-			SoundEvent soundEvent = new SoundEvent(new ResourceLocation("entity.player.levelup"));
-			player.playSound(soundEvent, 1f, 1f);
-		} else if (currentLevel < 1) {
-			if (world.isClientSide) EffortlessBuilding.log(player, "Use Reach Upgrade 1 first.");
-
-			SoundEvent soundEvent = new SoundEvent(new ResourceLocation("item.armor.equip_leather"));
-			player.playSound(soundEvent, 1f, 1f);
-		} else if (currentLevel > 1) {
-			if (world.isClientSide)
-				EffortlessBuilding.log(player, "Already used this upgrade! Current reach is " + ReachHelper
-					.getMaxReach(player) + ".");
-
-			SoundEvent soundEvent = new SoundEvent(new ResourceLocation("item.armor.equip_leather"));
-			player.playSound(soundEvent, 1f, 1f);
-		}
-		return new InteractionResultHolder<>(InteractionResult.PASS, player.getItemInHand(hand));
-	}
-
-	@Override
-	public void appendHoverText(ItemStack stack, @Nullable Level world, List<Component> tooltip, TooltipFlag flag) {
-		tooltip.add(Component.literal(ChatFormatting.GRAY + "Consume to increase reach to " + ChatFormatting.BLUE + BuildConfig.reach.maxReachLevel2.get()));
-		tooltip.add(Component.literal(ChatFormatting.GRAY + "Previous upgrades need to be consumed first"));
-	}
-}

src/main/java/nl/requios/effortlessbuilding/item/ReachUpgrade3Item.java

@@ -1,77 +0,0 @@
-package nl.requios.effortlessbuilding.item;
-
-import net.minecraft.MethodsReturnNonnullByDefault;
-import net.minecraft.world.item.TooltipFlag;
-import net.minecraft.world.entity.player.Player;
-import net.minecraft.world.item.Item;
-import net.minecraft.world.item.CreativeModeTab;
-import net.minecraft.world.item.ItemStack;
-import net.minecraft.network.chat.Component;
-import net.minecraft.ChatFormatting;
-import net.minecraft.world.level.Level;
-import nl.requios.effortlessbuilding.BuildConfig;
-import nl.requios.effortlessbuilding.EffortlessBuilding;
-import nl.requios.effortlessbuilding.buildmodifier.ModifierSettingsManager;
-import nl.requios.effortlessbuilding.helper.ReachHelper;
-
-import javax.annotation.Nullable;
-import javax.annotation.ParametersAreNonnullByDefault;
-import java.util.List;
-
-import net.minecraft.resources.ResourceLocation;
-import net.minecraft.sounds.SoundEvent;
-import net.minecraft.world.InteractionHand;
-import net.minecraft.world.InteractionResult;
-import net.minecraft.world.InteractionResultHolder;
-
-@ParametersAreNonnullByDefault
-@MethodsReturnNonnullByDefault
-public class ReachUpgrade3Item extends Item {
-
-	public ReachUpgrade3Item() {
-		super(new Item.Properties().tab(CreativeModeTab.TAB_TOOLS).stacksTo(1));
-	}
-
-	@Override
-	public InteractionResultHolder<ItemStack> use(Level world, Player player, InteractionHand hand) {
-		if (player.isCreative()) {
-			if (world.isClientSide) EffortlessBuilding.log(player, "Reach upgrades are not necessary in creative.");
-			if (world.isClientSide) EffortlessBuilding.log(player, "Still want increased reach? Use the config.");
-			return new InteractionResultHolder<>(InteractionResult.PASS, player.getItemInHand(hand));
-		}
-
-		ModifierSettingsManager.ModifierSettings modifierSettings = ModifierSettingsManager.getModifierSettings(player);
-		int currentLevel = modifierSettings.getReachUpgrade();
-		if (currentLevel == 2) {
-			modifierSettings.setReachUpgrade(3);
-			if (world.isClientSide) EffortlessBuilding.log(player, "Upgraded reach to " + ReachHelper.getMaxReach(player));
-			player.setItemInHand(hand, ItemStack.EMPTY);
-
-			SoundEvent soundEvent = new SoundEvent(new ResourceLocation("entity.player.levelup"));
-			player.playSound(soundEvent, 1f, 1f);
-		} else if (currentLevel < 2) {
-			if (currentLevel == 0)
-				if (world.isClientSide) EffortlessBuilding.log(player, "Use Reach Upgrade 1 and 2 first.");
-			if (currentLevel == 1)
-				if (world.isClientSide) EffortlessBuilding.log(player, "Use Reach Upgrade 2 first.");
-
-			SoundEvent soundEvent = new SoundEvent(new ResourceLocation("item.armor.equip_leather"));
-			player.playSound(soundEvent, 1f, 1f);
-		} else if (currentLevel > 2) {
-			if (world.isClientSide)
-				EffortlessBuilding.log(player, "Already used this upgrade! Current reach is " + ReachHelper
-					.getMaxReach(player) + ".");
-
-			SoundEvent soundEvent = new SoundEvent(new ResourceLocation("item.armor.equip_leather"));
-			player.playSound(soundEvent, 1f, 1f);
-		}
-		return new InteractionResultHolder<>(InteractionResult.PASS, player.getItemInHand(hand));
-	}
-
-	@Override
-	public void appendHoverText(ItemStack stack, @Nullable Level world, List<Component> tooltip, TooltipFlag flag) {
-		tooltip.add(Component.literal(ChatFormatting.GRAY + "Consume to increase reach to " + ChatFormatting.BLUE + BuildConfig.reach.maxReachLevel3.get()));
-		tooltip.add(Component.literal(ChatFormatting.GRAY + "Previous upgrades need to be consumed first"));
-	}
-
-}

src/main/java/nl/requios/effortlessbuilding/network/AddUndoMessage.java

@@ -1,20 +1,16 @@
 package nl.requios.effortlessbuilding.network;
 
-import net.minecraft.world.level.block.Block;
+import net.minecraft.block.Block;
-import net.minecraft.world.level.block.state.BlockState;
+import net.minecraft.block.state.IBlockState;
-import net.minecraft.world.entity.player.Player;
+import net.minecraft.entity.player.EntityPlayer;
-import net.minecraft.network.FriendlyByteBuf;
+import net.minecraft.network.PacketBuffer;
-import net.minecraft.core.BlockPos;
+import net.minecraft.util.math.BlockPos;
-import net.minecraft.world.phys.Vec3;
+import net.minecraft.util.math.Vec3d;
-import net.minecraftforge.api.distmarker.Dist;
-import net.minecraftforge.api.distmarker.OnlyIn;
-import net.minecraftforge.fml.DistExecutor;
 import net.minecraftforge.fml.LogicalSide;
-import net.minecraftforge.network.NetworkEvent;
+import net.minecraftforge.fml.network.NetworkEvent;
 import nl.requios.effortlessbuilding.EffortlessBuilding;
 import nl.requios.effortlessbuilding.buildmodifier.BlockSet;
 import nl.requios.effortlessbuilding.buildmodifier.UndoRedo;
-import nl.requios.effortlessbuilding.render.BlockPreviewRenderer;
 
 import java.util.ArrayList;
 import java.util.function.Supplier;
@@ -23,79 +19,68 @@ import java.util.function.Supplier;
  * Sends a message to the client asking to add a block to the undo stack.
  */
 public class AddUndoMessage {
-	private final BlockPos coordinate;
+    private BlockPos coordinate;
-	private final BlockState previousBlockState;
+    private IBlockState previousBlockState;
-	private final BlockState newBlockState;
+    private IBlockState newBlockState;
 
-	public AddUndoMessage() {
+    public AddUndoMessage() {
-		coordinate = BlockPos.ZERO;
+        coordinate = BlockPos.ORIGIN;
-		previousBlockState = null;
+        previousBlockState = null;
-		newBlockState = null;
+        newBlockState = null;
-	}
+    }
 
-	public AddUndoMessage(BlockPos coordinate, BlockState previousBlockState, BlockState newBlockState) {
+    public AddUndoMessage(BlockPos coordinate, IBlockState previousBlockState, IBlockState newBlockState) {
-		this.coordinate = coordinate;
+        this.coordinate = coordinate;
-		this.previousBlockState = previousBlockState;
+        this.previousBlockState = previousBlockState;
-		this.newBlockState = newBlockState;
+        this.newBlockState = newBlockState;
-	}
+    }
 
-	public static void encode(AddUndoMessage message, FriendlyByteBuf buf) {
+    public BlockPos getCoordinate() {
-		buf.writeInt(message.coordinate.getX());
+        return coordinate;
-		buf.writeInt(message.coordinate.getY());
+    }
-		buf.writeInt(message.coordinate.getZ());
-		buf.writeInt(Block.getId(message.previousBlockState));
-		buf.writeInt(Block.getId(message.newBlockState));
-	}
 
-	public static AddUndoMessage decode(FriendlyByteBuf buf) {
+    public IBlockState getPreviousBlockState() {
-		BlockPos coordinate = new BlockPos(buf.readInt(), buf.readInt(), buf.readInt());
+        return previousBlockState;
-		BlockState previousBlockState = Block.stateById(buf.readInt());
+    }
-		BlockState newBlockState = Block.stateById(buf.readInt());
-		return new AddUndoMessage(coordinate, previousBlockState, newBlockState);
-	}
 
-	public BlockPos getCoordinate() {
+    public IBlockState getNewBlockState() {
-		return coordinate;
+        return newBlockState;
-	}
+    }
 
-	public BlockState getPreviousBlockState() {
+    public static void encode(AddUndoMessage message, PacketBuffer buf) {
-		return previousBlockState;
+        buf.writeInt(message.coordinate.getX());
-	}
+        buf.writeInt(message.coordinate.getY());
+        buf.writeInt(message.coordinate.getZ());
+        buf.writeInt(Block.getStateId(message.previousBlockState));
+        buf.writeInt(Block.getStateId(message.newBlockState));
+    }
 
-	public BlockState getNewBlockState() {
+    public static AddUndoMessage decode(PacketBuffer buf) {
-		return newBlockState;
+        BlockPos coordinate = new BlockPos(buf.readInt(), buf.readInt(), buf.readInt());
-	}
+        IBlockState previousBlockState = Block.getStateById(buf.readInt());
+        IBlockState newBlockState = Block.getStateById(buf.readInt());
+        return new AddUndoMessage(coordinate, previousBlockState, newBlockState);
+    }
 
-	public static class Handler {
+    public static class Handler
-		public static void handle(AddUndoMessage message, Supplier<NetworkEvent.Context> ctx) {
+    {
-			ctx.get().enqueueWork(() -> {
+        public static void handle(AddUndoMessage message, Supplier<NetworkEvent.Context> ctx)
-				if (ctx.get().getDirection().getReceptionSide() == LogicalSide.CLIENT) {
+        {
-					//Received clientside
+            ctx.get().enqueueWork(() -> {
-					DistExecutor.unsafeRunWhenOn(Dist.CLIENT, () -> () -> ClientHandler.handle(message, ctx));
+                if (ctx.get().getDirection().getReceptionSide() == LogicalSide.CLIENT) {
-				}
+                    //Received clientside
-			});
-			ctx.get().setPacketHandled(true);
-		}
-	}
 
-	@OnlyIn(Dist.CLIENT)
+                    EntityPlayer player = EffortlessBuilding.proxy.getPlayerEntityFromContext(ctx);
-	public static class ClientHandler {
+                    //Add to undo stack clientside
-		public static void handle(AddUndoMessage message, Supplier<NetworkEvent.Context> ctx) {
+                    UndoRedo.addUndo(ctx.get().getSender(), new BlockSet(
-			Player player = EffortlessBuilding.proxy.getPlayerEntityFromContext(ctx);
+                            new ArrayList<BlockPos>() {{add(message.getCoordinate());}},
-			//Add to undo stack clientside
+                            new ArrayList<IBlockState>() {{add(message.getPreviousBlockState());}},
-			//Only the appropriate player that needs to add this to the undo stack gets this message
+                            new ArrayList<IBlockState>() {{add(message.getNewBlockState());}},
-			UndoRedo.addUndo(player, new BlockSet(
+                            new Vec3d(0,0,0),
-					new ArrayList<BlockPos>() {{
+                            message.getCoordinate(), message.getCoordinate()));
-						add(message.getCoordinate());
+                }
-					}},
+            });
-					new ArrayList<BlockState>() {{
+            ctx.get().setPacketHandled(true);
-						add(message.getPreviousBlockState());
+        }
-					}},
+    }
-					new ArrayList<BlockState>() {{
-						add(message.getNewBlockState());
-					}},
-					new Vec3(0, 0, 0),
-					message.getCoordinate(), message.getCoordinate()));
-		}
-	}
 }

src/main/java/nl/requios/effortlessbuilding/network/BlockBrokenMessage.java

@@ -1,13 +1,13 @@
 package nl.requios.effortlessbuilding.network;
 
-import net.minecraft.network.FriendlyByteBuf;
+import net.minecraft.network.PacketBuffer;
-import net.minecraft.core.Direction;
+import net.minecraft.util.EnumFacing;
-import net.minecraft.core.BlockPos;
+import net.minecraft.util.math.BlockPos;
-import net.minecraft.world.phys.BlockHitResult;
+import net.minecraft.util.math.RayTraceResult;
-import net.minecraft.world.phys.HitResult;
+import net.minecraft.util.math.Vec3d;
-import net.minecraft.world.phys.Vec3;
 import net.minecraftforge.fml.LogicalSide;
-import net.minecraftforge.network.NetworkEvent;
+import net.minecraftforge.fml.network.NetworkEvent;
+import nl.requios.effortlessbuilding.EffortlessBuilding;
 import nl.requios.effortlessbuilding.buildmode.BuildModes;
 
 import java.util.function.Supplier;
@@ -17,76 +17,78 @@ import java.util.function.Supplier;
  */
 public class BlockBrokenMessage {
 
-	private final boolean blockHit;
+    private boolean blockHit;
-	private final BlockPos blockPos;
+    private BlockPos blockPos;
-	private final Direction sideHit;
+    private EnumFacing sideHit;
-	private final Vec3 hitVec;
+    private Vec3d hitVec;
 
-	public BlockBrokenMessage() {
+    public BlockBrokenMessage() {
-		this.blockHit = false;
+        this.blockHit = false;
-		this.blockPos = BlockPos.ZERO;
+        this.blockPos = BlockPos.ORIGIN;
-		this.sideHit = Direction.UP;
+        this.sideHit = EnumFacing.UP;
-		this.hitVec = new Vec3(0, 0, 0);
+        this.hitVec = new Vec3d(0, 0, 0);
-	}
+    }
 
-	public BlockBrokenMessage(BlockHitResult result) {
+    public BlockBrokenMessage(RayTraceResult result) {
-		this.blockHit = result.getType() == HitResult.Type.BLOCK;
+        this.blockHit = result.type == RayTraceResult.Type.BLOCK;
-		this.blockPos = result.getBlockPos();
+        this.blockPos = result.getBlockPos();
-		this.sideHit = result.getDirection();
+        this.sideHit = result.sideHit;
-		this.hitVec = result.getLocation();
+        this.hitVec = result.hitVec;
-	}
+    }
 
-	public BlockBrokenMessage(boolean blockHit, BlockPos blockPos, Direction sideHit, Vec3 hitVec) {
+    public BlockBrokenMessage(boolean blockHit, BlockPos blockPos, EnumFacing sideHit, Vec3d hitVec) {
-		this.blockHit = blockHit;
+        this.blockHit = blockHit;
-		this.blockPos = blockPos;
+        this.blockPos = blockPos;
-		this.sideHit = sideHit;
+        this.sideHit = sideHit;
-		this.hitVec = hitVec;
+        this.hitVec = hitVec;
-	}
+    }
 
-	public static void encode(BlockBrokenMessage message, FriendlyByteBuf buf) {
+    public boolean isBlockHit() {
-		buf.writeBoolean(message.blockHit);
+        return blockHit;
-		buf.writeInt(message.blockPos.getX());
+    }
-		buf.writeInt(message.blockPos.getY());
-		buf.writeInt(message.blockPos.getZ());
-		buf.writeInt(message.sideHit.get3DDataValue());
-		buf.writeDouble(message.hitVec.x);
-		buf.writeDouble(message.hitVec.y);
-		buf.writeDouble(message.hitVec.z);
-	}
 
-	public static BlockBrokenMessage decode(FriendlyByteBuf buf) {
+    public BlockPos getBlockPos() {
-		boolean blockHit = buf.readBoolean();
+        return blockPos;
-		BlockPos blockPos = new BlockPos(buf.readInt(), buf.readInt(), buf.readInt());
+    }
-		Direction sideHit = Direction.from3DDataValue(buf.readInt());
-		Vec3 hitVec = new Vec3(buf.readDouble(), buf.readDouble(), buf.readDouble());
-		return new BlockBrokenMessage(blockHit, blockPos, sideHit, hitVec);
-	}
 
-	public boolean isBlockHit() {
+    public EnumFacing getSideHit() {
-		return blockHit;
+        return sideHit;
-	}
+    }
 
-	public BlockPos getBlockPos() {
+    public Vec3d getHitVec() {
-		return blockPos;
+        return hitVec;
-	}
+    }
 
-	public Direction getSideHit() {
+    public static void encode(BlockBrokenMessage message, PacketBuffer buf) {
-		return sideHit;
+        buf.writeBoolean(message.blockHit);
-	}
+        buf.writeInt(message.blockPos.getX());
+        buf.writeInt(message.blockPos.getY());
+        buf.writeInt(message.blockPos.getZ());
+        buf.writeInt(message.sideHit.getIndex());
+        buf.writeDouble(message.hitVec.x);
+        buf.writeDouble(message.hitVec.y);
+        buf.writeDouble(message.hitVec.z);
+    }
 
-	public Vec3 getHitVec() {
+    public static BlockBrokenMessage decode(PacketBuffer buf) {
-		return hitVec;
+        boolean blockHit = buf.readBoolean();
-	}
+        BlockPos blockPos = new BlockPos(buf.readInt(), buf.readInt(), buf.readInt());
+        EnumFacing sideHit = EnumFacing.byIndex(buf.readInt());
+        Vec3d hitVec = new Vec3d(buf.readDouble(), buf.readDouble(), buf.readDouble());
+        return new BlockBrokenMessage(blockHit, blockPos, sideHit, hitVec);
+    }
 
-	public static class Handler {
+    public static class Handler
-		public static void handle(BlockBrokenMessage message, Supplier<NetworkEvent.Context> ctx) {
+    {
-			ctx.get().enqueueWork(() -> {
+        public static void handle(BlockBrokenMessage message, Supplier<NetworkEvent.Context> ctx)
-				if (ctx.get().getDirection().getReceptionSide() == LogicalSide.SERVER) {
+        {
-					//Received serverside
+            ctx.get().enqueueWork(() -> {
-					BuildModes.onBlockBrokenMessage(ctx.get().getSender(), message);
+                if (ctx.get().getDirection().getReceptionSide() == LogicalSide.SERVER) {
-				}
+                    //Received serverside
-			});
+                    BuildModes.onBlockBrokenMessage(ctx.get().getSender(), message);
-			ctx.get().setPacketHandled(true);
+                }
-		}
+            });
-	}
+            ctx.get().setPacketHandled(true);
+        }
+    }
 }

src/main/java/nl/requios/effortlessbuilding/network/BlockPlacedMessage.java

@@ -1,16 +1,13 @@
 package nl.requios.effortlessbuilding.network;
 
-import net.minecraft.network.FriendlyByteBuf;
+import net.minecraft.util.EnumFacing;
-import net.minecraft.core.Direction;
+import net.minecraft.util.math.BlockPos;
-import net.minecraft.core.BlockPos;
+import net.minecraft.util.math.RayTraceResult;
-import net.minecraft.world.phys.BlockHitResult;
+import net.minecraft.util.math.Vec3d;
-import net.minecraft.world.phys.HitResult;
+import net.minecraft.network.PacketBuffer;
-import net.minecraft.world.phys.Vec3;
-import net.minecraftforge.api.distmarker.Dist;
-import net.minecraftforge.api.distmarker.OnlyIn;
-import net.minecraftforge.fml.DistExecutor;
 import net.minecraftforge.fml.LogicalSide;
-import net.minecraftforge.network.NetworkEvent;
+import net.minecraftforge.fml.network.NetworkEvent;
+import nl.requios.effortlessbuilding.EffortlessBuilding;
 import nl.requios.effortlessbuilding.buildmode.BuildModes;
 import nl.requios.effortlessbuilding.render.BlockPreviewRenderer;
 
@@ -22,97 +19,92 @@ import java.util.function.Supplier;
  */
 public class BlockPlacedMessage {
 
-	private final boolean blockHit;
+    private boolean blockHit;
-	private final BlockPos blockPos;
+    private BlockPos blockPos;
-	private final Direction sideHit;
+    private EnumFacing sideHit;
-	private final Vec3 hitVec;
+    private Vec3d hitVec;
-	private final boolean placeStartPos; //prevent double placing in normal mode
+    private boolean placeStartPos; //prevent double placing in normal mode
 
-	public BlockPlacedMessage() {
+    public BlockPlacedMessage() {
-		this.blockHit = false;
+        this.blockHit = false;
-		this.blockPos = BlockPos.ZERO;
+        this.blockPos = BlockPos.ORIGIN;
-		this.sideHit = Direction.UP;
+        this.sideHit = EnumFacing.UP;
-		this.hitVec = new Vec3(0, 0, 0);
+        this.hitVec = new Vec3d(0, 0, 0);
-		this.placeStartPos = true;
+        this.placeStartPos = true;
-	}
+    }
 
-	public BlockPlacedMessage(BlockHitResult result, boolean placeStartPos) {
+    public BlockPlacedMessage(RayTraceResult result, boolean placeStartPos) {
-		this.blockHit = result.getType() == HitResult.Type.BLOCK;
+        this.blockHit = result.type == RayTraceResult.Type.BLOCK;
-		this.blockPos = result.getBlockPos();
+        this.blockPos = result.getBlockPos();
-		this.sideHit = result.getDirection();
+        this.sideHit = result.sideHit;
-		this.hitVec = result.getLocation();
+        this.hitVec = result.hitVec;
-		this.placeStartPos = placeStartPos;
+        this.placeStartPos = placeStartPos;
-	}
+    }
 
-	public BlockPlacedMessage(boolean blockHit, BlockPos blockPos, Direction sideHit, Vec3 hitVec, boolean placeStartPos) {
+    public BlockPlacedMessage(boolean blockHit, BlockPos blockPos, EnumFacing sideHit, Vec3d hitVec, boolean placeStartPos) {
-		this.blockHit = blockHit;
+        this.blockHit = blockHit;
-		this.blockPos = blockPos;
+        this.blockPos = blockPos;
-		this.sideHit = sideHit;
+        this.sideHit = sideHit;
-		this.hitVec = hitVec;
+        this.hitVec = hitVec;
-		this.placeStartPos = placeStartPos;
+        this.placeStartPos = placeStartPos;
-	}
+    }
 
-	public static void encode(BlockPlacedMessage message, FriendlyByteBuf buf) {
+    public boolean isBlockHit() {
-		buf.writeBoolean(message.blockHit);
+        return blockHit;
-		buf.writeInt(message.blockPos.getX());
+    }
-		buf.writeInt(message.blockPos.getY());
-		buf.writeInt(message.blockPos.getZ());
-		buf.writeInt(message.sideHit.get3DDataValue());
-		buf.writeDouble(message.hitVec.x);
-		buf.writeDouble(message.hitVec.y);
-		buf.writeDouble(message.hitVec.z);
-		buf.writeBoolean(message.placeStartPos);
-	}
 
-	public static BlockPlacedMessage decode(FriendlyByteBuf buf) {
+    public BlockPos getBlockPos() {
-		boolean blockHit = buf.readBoolean();
+        return blockPos;
-		BlockPos blockPos = new BlockPos(buf.readInt(), buf.readInt(), buf.readInt());
+    }
-		Direction sideHit = Direction.from3DDataValue(buf.readInt());
-		Vec3 hitVec = new Vec3(buf.readDouble(), buf.readDouble(), buf.readDouble());
-		boolean placeStartPos = buf.readBoolean();
-		return new BlockPlacedMessage(blockHit, blockPos, sideHit, hitVec, placeStartPos);
-	}
 
-	public boolean isBlockHit() {
+    public EnumFacing getSideHit() {
-		return blockHit;
+        return sideHit;
-	}
+    }
 
-	public BlockPos getBlockPos() {
+    public Vec3d getHitVec() {
-		return blockPos;
+        return hitVec;
-	}
+    }
 
-	public Direction getSideHit() {
+    public boolean getPlaceStartPos() {
-		return sideHit;
+        return placeStartPos;
-	}
+    }
 
-	public Vec3 getHitVec() {
+    public static void encode(BlockPlacedMessage message, PacketBuffer buf) {
-		return hitVec;
+        buf.writeBoolean(message.blockHit);
-	}
+        buf.writeInt(message.blockPos.getX());
+        buf.writeInt(message.blockPos.getY());
+        buf.writeInt(message.blockPos.getZ());
+        buf.writeInt(message.sideHit.getIndex());
+        buf.writeDouble(message.hitVec.x);
+        buf.writeDouble(message.hitVec.y);
+        buf.writeDouble(message.hitVec.z);
+        buf.writeBoolean(message.placeStartPos);
+    }
 
-	public boolean getPlaceStartPos() {
+    public static BlockPlacedMessage decode(PacketBuffer buf) {
-		return placeStartPos;
+        boolean blockHit = buf.readBoolean();
-	}
+        BlockPos blockPos = new BlockPos(buf.readInt(), buf.readInt(), buf.readInt());
+        EnumFacing sideHit = EnumFacing.byIndex(buf.readInt());
+        Vec3d hitVec = new Vec3d(buf.readDouble(), buf.readDouble(), buf.readDouble());
+        boolean placeStartPos = buf.readBoolean();
+        return new BlockPlacedMessage(blockHit, blockPos, sideHit, hitVec, placeStartPos);
+    }
 
-	public static class Handler {
+    public static class Handler
-		public static void handle(BlockPlacedMessage message, Supplier<NetworkEvent.Context> ctx) {
+    {
-			ctx.get().enqueueWork(() -> {
+        public static void handle(BlockPlacedMessage message, Supplier<NetworkEvent.Context> ctx)
-				if (ctx.get().getDirection().getReceptionSide() == LogicalSide.CLIENT) {
+        {
-					//Received clientside
+            ctx.get().enqueueWork(() -> {
-					DistExecutor.unsafeRunWhenOn(Dist.CLIENT, () -> () -> ClientHandler.handle(message, ctx));
+                if (ctx.get().getDirection().getReceptionSide() == LogicalSide.CLIENT) {
-				} else {
+                    //Received clientside
-					//Received serverside
+                    //Nod RenderHandler to do the dissolve shader effect
-					BuildModes.onBlockPlacedMessage(ctx.get().getSender(), message);
+                    BlockPreviewRenderer.onBlocksPlaced();
-				}
+                } else {
-			});
+                    //Received serverside
-			ctx.get().setPacketHandled(true);
+                    BuildModes.onBlockPlacedMessage(ctx.get().getSender(), message);
-		}
+                }
-	}
+            });
-
+            ctx.get().setPacketHandled(true);
-	@OnlyIn(Dist.CLIENT)
+        }
-	public static class ClientHandler {
+    }
-		public static void handle(BlockPlacedMessage message, Supplier<NetworkEvent.Context> ctx) {
-			//Nod RenderHandler to do the dissolve shader effect
-			BlockPreviewRenderer.onBlocksPlaced();
-		}
-	}
 }

src/main/java/nl/requios/effortlessbuilding/network/CancelModeMessage.java

@@ -1,8 +1,8 @@
 package nl.requios.effortlessbuilding.network;
 
-import net.minecraft.world.entity.player.Player;
+import net.minecraft.entity.player.EntityPlayer;
-import net.minecraft.network.FriendlyByteBuf;
+import net.minecraft.network.PacketBuffer;
-import net.minecraftforge.network.NetworkEvent;
+import net.minecraftforge.fml.network.NetworkEvent;
 import nl.requios.effortlessbuilding.EffortlessBuilding;
 import nl.requios.effortlessbuilding.buildmode.BuildModes;
 
@@ -13,21 +13,23 @@ import java.util.function.Supplier;
  */
 public class CancelModeMessage {
 
-	public static void encode(CancelModeMessage message, FriendlyByteBuf buf) {
+    public static void encode(CancelModeMessage message, PacketBuffer buf) {
-	}
+    }
 
-	public static CancelModeMessage decode(FriendlyByteBuf buf) {
+    public static CancelModeMessage decode(PacketBuffer buf) {
-		return new CancelModeMessage();
+        return new CancelModeMessage();
-	}
+    }
 
-	public static class Handler {
+    public static class Handler
-		public static void handle(CancelModeMessage message, Supplier<NetworkEvent.Context> ctx) {
+    {
-			ctx.get().enqueueWork(() -> {
+        public static void handle(CancelModeMessage message, Supplier<NetworkEvent.Context> ctx)
-				Player player = EffortlessBuilding.proxy.getPlayerEntityFromContext(ctx);
+        {
+            ctx.get().enqueueWork(() -> {
+                EntityPlayer player = EffortlessBuilding.proxy.getPlayerEntityFromContext(ctx);
 
-				BuildModes.initializeMode(player);
+                BuildModes.initializeMode(player);
-			});
+            });
-			ctx.get().setPacketHandled(true);
+            ctx.get().setPacketHandled(true);
-		}
+        }
-	}
+    }
 }

src/main/java/nl/requios/effortlessbuilding/network/ClearUndoMessage.java

@@ -1,15 +1,11 @@
 package nl.requios.effortlessbuilding.network;
 
-import net.minecraft.world.entity.player.Player;
+import net.minecraft.entity.player.EntityPlayer;
-import net.minecraft.network.FriendlyByteBuf;
+import net.minecraft.network.PacketBuffer;
-import net.minecraftforge.api.distmarker.Dist;
-import net.minecraftforge.api.distmarker.OnlyIn;
-import net.minecraftforge.fml.DistExecutor;
 import net.minecraftforge.fml.LogicalSide;
-import net.minecraftforge.network.NetworkEvent;
+import net.minecraftforge.fml.network.NetworkEvent;
 import nl.requios.effortlessbuilding.EffortlessBuilding;
 import nl.requios.effortlessbuilding.buildmodifier.UndoRedo;
-import nl.requios.effortlessbuilding.render.BlockPreviewRenderer;
 
 import java.util.function.Supplier;
 
@@ -18,36 +14,31 @@ import java.util.function.Supplier;
  */
 public class ClearUndoMessage {
 
-	public ClearUndoMessage() {
+    public ClearUndoMessage() {
-	}
+    }
 
-	public static void encode(ClearUndoMessage message, FriendlyByteBuf buf) {
+    public static void encode(ClearUndoMessage message, PacketBuffer buf) {
 
-	}
+    }
 
-	public static ClearUndoMessage decode(FriendlyByteBuf buf) {
+    public static ClearUndoMessage decode(PacketBuffer buf) {
-		return new ClearUndoMessage();
+        return new ClearUndoMessage();
-	}
+    }
 
-	public static class Handler {
+    public static class Handler
-		public static void handle(ClearUndoMessage message, Supplier<NetworkEvent.Context> ctx) {
+    {
-			ctx.get().enqueueWork(() -> {
+        public static void handle(ClearUndoMessage message, Supplier<NetworkEvent.Context> ctx)
-				if (ctx.get().getDirection().getReceptionSide() == LogicalSide.CLIENT) {
+        {
-					//Received clientside
+            ctx.get().enqueueWork(() -> {
-					DistExecutor.unsafeRunWhenOn(Dist.CLIENT, () -> () -> ClientHandler.handle(message, ctx));
+                if (ctx.get().getDirection().getReceptionSide() == LogicalSide.CLIENT) {
-				}
+                    //Received clientside
-			});
+                    EntityPlayer player = EffortlessBuilding.proxy.getPlayerEntityFromContext(ctx);
-			ctx.get().setPacketHandled(true);
-		}
-	}
 
-	@OnlyIn(Dist.CLIENT)
+                    //Add to undo stack clientside
-	public static class ClientHandler {
+                    UndoRedo.clear(player);
-		public static void handle(ClearUndoMessage message, Supplier<NetworkEvent.Context> ctx) {
+                }
-			Player player = EffortlessBuilding.proxy.getPlayerEntityFromContext(ctx);
+            });
-
+            ctx.get().setPacketHandled(true);
-			//Add to undo stack clientside
+        }
-			UndoRedo.clear(player);
+    }
-		}
-	}
 }

src/main/java/nl/requios/effortlessbuilding/network/ModeActionMessage.java

@@ -1,8 +1,8 @@
 package nl.requios.effortlessbuilding.network;
 
-import net.minecraft.world.entity.player.Player;
+import net.minecraft.entity.player.EntityPlayer;
-import net.minecraft.network.FriendlyByteBuf;
+import net.minecraft.network.PacketBuffer;
-import net.minecraftforge.network.NetworkEvent;
+import net.minecraftforge.fml.network.NetworkEvent;
 import nl.requios.effortlessbuilding.EffortlessBuilding;
 import nl.requios.effortlessbuilding.buildmode.ModeOptions;
 
@@ -13,32 +13,34 @@ import java.util.function.Supplier;
  */
 public class ModeActionMessage {
 
-	private ModeOptions.ActionEnum action;
+    private ModeOptions.ActionEnum action;
 
-	public ModeActionMessage() {
+    public ModeActionMessage() {
-	}
+    }
 
-	public ModeActionMessage(ModeOptions.ActionEnum action) {
+    public ModeActionMessage(ModeOptions.ActionEnum action) {
-		this.action = action;
+        this.action = action;
-	}
+    }
 
-	public static void encode(ModeActionMessage message, FriendlyByteBuf buf) {
+    public static void encode(ModeActionMessage message, PacketBuffer buf) {
-		buf.writeInt(message.action.ordinal());
+        buf.writeInt(message.action.ordinal());
-	}
+    }
 
-	public static ModeActionMessage decode(FriendlyByteBuf buf) {
+    public static ModeActionMessage decode(PacketBuffer buf) {
-		ModeOptions.ActionEnum action = ModeOptions.ActionEnum.values()[buf.readInt()];
+        ModeOptions.ActionEnum action = ModeOptions.ActionEnum.values()[buf.readInt()];
-		return new ModeActionMessage(action);
+        return new ModeActionMessage(action);
-	}
+    }
 
-	public static class Handler {
+    public static class Handler
-		public static void handle(ModeActionMessage message, Supplier<NetworkEvent.Context> ctx) {
+    {
-			ctx.get().enqueueWork(() -> {
+        public static void handle(ModeActionMessage message, Supplier<NetworkEvent.Context> ctx)
-				Player player = EffortlessBuilding.proxy.getPlayerEntityFromContext(ctx);
+        {
+            ctx.get().enqueueWork(() -> {
+                EntityPlayer player = EffortlessBuilding.proxy.getPlayerEntityFromContext(ctx);
 
-				ModeOptions.performAction(player, message.action);
+                ModeOptions.performAction(player, message.action);
-			});
+            });
-			ctx.get().setPacketHandled(true);
+            ctx.get().setPacketHandled(true);
-		}
+        }
-	}
+    }
 }

src/main/java/nl/requios/effortlessbuilding/network/ModeSettingsMessage.java

@@ -1,8 +1,10 @@
 package nl.requios.effortlessbuilding.network;
 
-import net.minecraft.world.entity.player.Player;
+import io.netty.buffer.ByteBuf;
-import net.minecraft.network.FriendlyByteBuf;
+import net.minecraft.entity.player.EntityPlayer;
-import net.minecraftforge.network.NetworkEvent;
+import net.minecraft.network.PacketBuffer;
+import net.minecraft.util.IThreadListener;
+import net.minecraftforge.fml.network.NetworkEvent;
 import nl.requios.effortlessbuilding.EffortlessBuilding;
 import nl.requios.effortlessbuilding.buildmode.BuildModes;
 import nl.requios.effortlessbuilding.buildmode.ModeSettingsManager;
@@ -15,36 +17,38 @@ import java.util.function.Supplier;
  */
 public class ModeSettingsMessage {
 
-	private ModeSettings modeSettings;
+    private ModeSettings modeSettings;
 
-	public ModeSettingsMessage() {
+    public ModeSettingsMessage() {
-	}
+    }
 
-	public ModeSettingsMessage(ModeSettings modeSettings) {
+    public ModeSettingsMessage(ModeSettings modeSettings) {
-		this.modeSettings = modeSettings;
+        this.modeSettings = modeSettings;
-	}
+    }
 
-	public static void encode(ModeSettingsMessage message, FriendlyByteBuf buf) {
+    public static void encode(ModeSettingsMessage message, PacketBuffer buf) {
-		buf.writeInt(message.modeSettings.getBuildMode().ordinal());
+        buf.writeInt(message.modeSettings.getBuildMode().ordinal());
-	}
+    }
 
-	public static ModeSettingsMessage decode(FriendlyByteBuf buf) {
+    public static ModeSettingsMessage decode(PacketBuffer buf) {
-		BuildModes.BuildModeEnum buildMode = BuildModes.BuildModeEnum.values()[buf.readInt()];
+        BuildModes.BuildModeEnum buildMode = BuildModes.BuildModeEnum.values()[buf.readInt()];
 
-		return new ModeSettingsMessage(new ModeSettings(buildMode));
+        return new ModeSettingsMessage(new ModeSettings(buildMode));
-	}
+    }
 
-	public static class Handler {
+    public static class Handler
-		public static void handle(ModeSettingsMessage message, Supplier<NetworkEvent.Context> ctx) {
+    {
-			ctx.get().enqueueWork(() -> {
+        public static void handle(ModeSettingsMessage message, Supplier<NetworkEvent.Context> ctx)
-				Player player = EffortlessBuilding.proxy.getPlayerEntityFromContext(ctx);
+        {
+            ctx.get().enqueueWork(() -> {
+                EntityPlayer player = EffortlessBuilding.proxy.getPlayerEntityFromContext(ctx);
 
-				// Sanitize
+                // Sanitize
-				ModeSettingsManager.sanitize(message.modeSettings, player);
+                ModeSettingsManager.sanitize(message.modeSettings, player);
 
-				ModeSettingsManager.setModeSettings(player, message.modeSettings);
+                ModeSettingsManager.setModeSettings(player, message.modeSettings);
-			});
+            });
-			ctx.get().setPacketHandled(true);
+            ctx.get().setPacketHandled(true);
-		}
+        }
-	}
+    }
 }

src/main/java/nl/requios/effortlessbuilding/network/ModifierSettingsMessage.java

@@ -1,10 +1,10 @@
 package nl.requios.effortlessbuilding.network;
 
-import net.minecraft.world.entity.player.Player;
+import net.minecraft.entity.player.EntityPlayer;
-import net.minecraft.network.FriendlyByteBuf;
+import net.minecraft.network.PacketBuffer;
-import net.minecraft.core.BlockPos;
+import net.minecraft.util.math.BlockPos;
-import net.minecraft.world.phys.Vec3;
+import net.minecraft.util.math.Vec3d;
-import net.minecraftforge.network.NetworkEvent;
+import net.minecraftforge.fml.network.NetworkEvent;
 import nl.requios.effortlessbuilding.EffortlessBuilding;
 import nl.requios.effortlessbuilding.buildmodifier.Array;
 import nl.requios.effortlessbuilding.buildmodifier.Mirror;
@@ -13,128 +13,130 @@ import nl.requios.effortlessbuilding.buildmodifier.RadialMirror;
 
 import java.util.function.Supplier;
 
-import nl.requios.effortlessbuilding.buildmodifier.ModifierSettingsManager.ModifierSettings;
+import static nl.requios.effortlessbuilding.buildmodifier.ModifierSettingsManager.ModifierSettings;
 
 /**
  * Shares modifier settings (see ModifierSettingsManager) between server and client
  */
 public class ModifierSettingsMessage {
 
-	private ModifierSettings modifierSettings;
+    private ModifierSettings modifierSettings;
 
-	public ModifierSettingsMessage() {
+    public ModifierSettingsMessage() {
-	}
+    }
 
-	public ModifierSettingsMessage(ModifierSettings modifierSettings) {
+    public ModifierSettingsMessage(ModifierSettings modifierSettings) {
-		this.modifierSettings = modifierSettings;
+        this.modifierSettings = modifierSettings;
-	}
+    }
 
-	public static void encode(ModifierSettingsMessage message, FriendlyByteBuf buf) {
+    public static void encode(ModifierSettingsMessage message, PacketBuffer buf) {
-		//MIRROR
+        //MIRROR
-		Mirror.MirrorSettings m = message.modifierSettings.getMirrorSettings();
+        Mirror.MirrorSettings m = message.modifierSettings.getMirrorSettings();
-		buf.writeBoolean(m != null);
+        buf.writeBoolean(m != null);
-		if (m != null) {
+        if (m != null) {
-			buf.writeBoolean(m.enabled);
+            buf.writeBoolean(m.enabled);
-			buf.writeDouble(m.position.x);
+            buf.writeDouble(m.position.x);
-			buf.writeDouble(m.position.y);
+            buf.writeDouble(m.position.y);
-			buf.writeDouble(m.position.z);
+            buf.writeDouble(m.position.z);
-			buf.writeBoolean(m.mirrorX);
+            buf.writeBoolean(m.mirrorX);
-			buf.writeBoolean(m.mirrorY);
+            buf.writeBoolean(m.mirrorY);
-			buf.writeBoolean(m.mirrorZ);
+            buf.writeBoolean(m.mirrorZ);
-			buf.writeInt(m.radius);
+            buf.writeInt(m.radius);
-			buf.writeBoolean(m.drawLines);
+            buf.writeBoolean(m.drawLines);
-			buf.writeBoolean(m.drawPlanes);
+            buf.writeBoolean(m.drawPlanes);
-		}
+        }
 
-		//ARRAY
+        //ARRAY
-		Array.ArraySettings a = message.modifierSettings.getArraySettings();
+        Array.ArraySettings a = message.modifierSettings.getArraySettings();
-		buf.writeBoolean(a != null);
+        buf.writeBoolean(a != null);
-		if (a != null) {
+        if (a != null) {
-			buf.writeBoolean(a.enabled);
+            buf.writeBoolean(a.enabled);
-			buf.writeInt(a.offset.getX());
+            buf.writeInt(a.offset.getX());
-			buf.writeInt(a.offset.getY());
+            buf.writeInt(a.offset.getY());
-			buf.writeInt(a.offset.getZ());
+            buf.writeInt(a.offset.getZ());
-			buf.writeInt(a.count);
+            buf.writeInt(a.count);
-		}
+        }
 
-		buf.writeBoolean(message.modifierSettings.doQuickReplace());
+        buf.writeBoolean(message.modifierSettings.doQuickReplace());
 
-		buf.writeInt(message.modifierSettings.getReachUpgrade());
+        buf.writeInt(message.modifierSettings.getReachUpgrade());
 
-		//RADIAL MIRROR
+        //RADIAL MIRROR
-		RadialMirror.RadialMirrorSettings r = message.modifierSettings.getRadialMirrorSettings();
+        RadialMirror.RadialMirrorSettings r = message.modifierSettings.getRadialMirrorSettings();
-		buf.writeBoolean(r != null);
+        buf.writeBoolean(r != null);
-		if (r != null) {
+        if (r != null) {
-			buf.writeBoolean(r.enabled);
+            buf.writeBoolean(r.enabled);
-			buf.writeDouble(r.position.x);
+            buf.writeDouble(r.position.x);
-			buf.writeDouble(r.position.y);
+            buf.writeDouble(r.position.y);
-			buf.writeDouble(r.position.z);
+            buf.writeDouble(r.position.z);
-			buf.writeInt(r.slices);
+            buf.writeInt(r.slices);
-			buf.writeBoolean(r.alternate);
+            buf.writeBoolean(r.alternate);
-			buf.writeInt(r.radius);
+            buf.writeInt(r.radius);
-			buf.writeBoolean(r.drawLines);
+            buf.writeBoolean(r.drawLines);
-			buf.writeBoolean(r.drawPlanes);
+            buf.writeBoolean(r.drawPlanes);
-		}
+        }
-	}
+    }
 
-	public static ModifierSettingsMessage decode(FriendlyByteBuf buf) {
+    public static ModifierSettingsMessage decode(PacketBuffer buf) {
-		//MIRROR
+        //MIRROR
-		Mirror.MirrorSettings m = new Mirror.MirrorSettings();
+        Mirror.MirrorSettings m = new Mirror.MirrorSettings();
-		if (buf.readBoolean()) {
+        if (buf.readBoolean()) {
-			boolean mirrorEnabled = buf.readBoolean();
+            boolean mirrorEnabled = buf.readBoolean();
-			Vec3 mirrorPosition = new Vec3(buf.readDouble(), buf.readDouble(), buf.readDouble());
+            Vec3d mirrorPosition = new Vec3d(buf.readDouble(), buf.readDouble(), buf.readDouble());
-			boolean mirrorX = buf.readBoolean();
+            boolean mirrorX = buf.readBoolean();
-			boolean mirrorY = buf.readBoolean();
+            boolean mirrorY = buf.readBoolean();
-			boolean mirrorZ = buf.readBoolean();
+            boolean mirrorZ = buf.readBoolean();
-			int mirrorRadius = buf.readInt();
+            int mirrorRadius = buf.readInt();
-			boolean mirrorDrawLines = buf.readBoolean();
+            boolean mirrorDrawLines = buf.readBoolean();
-			boolean mirrorDrawPlanes = buf.readBoolean();
+            boolean mirrorDrawPlanes = buf.readBoolean();
-			m = new Mirror.MirrorSettings(mirrorEnabled, mirrorPosition, mirrorX, mirrorY, mirrorZ, mirrorRadius,
+            m = new Mirror.MirrorSettings(mirrorEnabled, mirrorPosition, mirrorX, mirrorY, mirrorZ, mirrorRadius,
-				mirrorDrawLines, mirrorDrawPlanes);
+                    mirrorDrawLines, mirrorDrawPlanes);
-		}
+        }
 
-		//ARRAY
+        //ARRAY
-		Array.ArraySettings a = new Array.ArraySettings();
+        Array.ArraySettings a = new Array.ArraySettings();
-		if (buf.readBoolean()) {
+        if (buf.readBoolean()) {
-			boolean arrayEnabled = buf.readBoolean();
+            boolean arrayEnabled = buf.readBoolean();
-			BlockPos arrayOffset = new BlockPos(buf.readInt(), buf.readInt(), buf.readInt());
+            BlockPos arrayOffset = new BlockPos(buf.readInt(), buf.readInt(), buf.readInt());
-			int arrayCount = buf.readInt();
+            int arrayCount = buf.readInt();
-			a = new Array.ArraySettings(arrayEnabled, arrayOffset, arrayCount);
+            a = new Array.ArraySettings(arrayEnabled, arrayOffset, arrayCount);
-		}
+        }
 
-		boolean quickReplace = buf.readBoolean();
+        boolean quickReplace = buf.readBoolean();
 
-		int reachUpgrade = buf.readInt();
+        int reachUpgrade = buf.readInt();
 
-		//RADIAL MIRROR
+        //RADIAL MIRROR
-		RadialMirror.RadialMirrorSettings r = new RadialMirror.RadialMirrorSettings();
+        RadialMirror.RadialMirrorSettings r = new RadialMirror.RadialMirrorSettings();
-		if (buf.readBoolean()) {
+        if (buf.readBoolean()) {
-			boolean radialMirrorEnabled = buf.readBoolean();
+            boolean radialMirrorEnabled = buf.readBoolean();
-			Vec3 radialMirrorPosition = new Vec3(buf.readDouble(), buf.readDouble(), buf.readDouble());
+            Vec3d radialMirrorPosition = new Vec3d(buf.readDouble(), buf.readDouble(), buf.readDouble());
-			int radialMirrorSlices = buf.readInt();
+            int radialMirrorSlices = buf.readInt();
-			boolean radialMirrorAlternate = buf.readBoolean();
+            boolean radialMirrorAlternate = buf.readBoolean();
-			int radialMirrorRadius = buf.readInt();
+            int radialMirrorRadius = buf.readInt();
-			boolean radialMirrorDrawLines = buf.readBoolean();
+            boolean radialMirrorDrawLines = buf.readBoolean();
-			boolean radialMirrorDrawPlanes = buf.readBoolean();
+            boolean radialMirrorDrawPlanes = buf.readBoolean();
-			r = new RadialMirror.RadialMirrorSettings(radialMirrorEnabled, radialMirrorPosition, radialMirrorSlices,
+            r = new RadialMirror.RadialMirrorSettings(radialMirrorEnabled, radialMirrorPosition, radialMirrorSlices,
-				radialMirrorAlternate, radialMirrorRadius, radialMirrorDrawLines, radialMirrorDrawPlanes);
+                    radialMirrorAlternate, radialMirrorRadius, radialMirrorDrawLines, radialMirrorDrawPlanes);
-		}
+        }
 
-		ModifierSettings modifierSettings = new ModifierSettings(m, a, r, quickReplace, reachUpgrade);
+        ModifierSettings modifierSettings = new ModifierSettings(m, a, r, quickReplace, reachUpgrade);
-		return new ModifierSettingsMessage(modifierSettings);
+        return new ModifierSettingsMessage(modifierSettings);
-	}
+    }
 
-	public static class Handler {
+    public static class Handler
-		public static void handle(ModifierSettingsMessage message, Supplier<NetworkEvent.Context> ctx) {
+    {
-			ctx.get().enqueueWork(() -> {
+        public static void handle(ModifierSettingsMessage message, Supplier<NetworkEvent.Context> ctx)
-				Player player = EffortlessBuilding.proxy.getPlayerEntityFromContext(ctx);
+        {
+            ctx.get().enqueueWork(() -> {
+                EntityPlayer player = EffortlessBuilding.proxy.getPlayerEntityFromContext(ctx);
 
-				// Sanitize
+                // Sanitize
-				ModifierSettingsManager.sanitize(message.modifierSettings, player);
+                ModifierSettingsManager.sanitize(message.modifierSettings, player);
 
-				ModifierSettingsManager.setModifierSettings(player, message.modifierSettings);
+                ModifierSettingsManager.setModifierSettings(player, message.modifierSettings);
-			});
+            });
-			ctx.get().setPacketHandled(true);
+            ctx.get().setPacketHandled(true);
-		}
+        }
-	}
+    }
 }

src/main/java/nl/requios/effortlessbuilding/network/PacketHandler.java

@@ -1,32 +1,32 @@
 package nl.requios.effortlessbuilding.network;
 
-import net.minecraft.resources.ResourceLocation;
+import net.minecraft.util.ResourceLocation;
-import net.minecraftforge.network.NetworkRegistry;
+import net.minecraftforge.fml.network.NetworkRegistry;
-import net.minecraftforge.network.simple.SimpleChannel;
+import net.minecraftforge.fml.network.simple.SimpleChannel;
 import nl.requios.effortlessbuilding.EffortlessBuilding;
 
 public class PacketHandler {
-	private static final String PROTOCOL_VERSION = "1";
+    private static final String PROTOCOL_VERSION = "1";
-	public static final SimpleChannel INSTANCE = NetworkRegistry.newSimpleChannel(
+    public static final SimpleChannel INSTANCE = NetworkRegistry.ChannelBuilder
-			new ResourceLocation(EffortlessBuilding.MODID, "main"),
+            .named(new ResourceLocation(EffortlessBuilding.MODID, "main_channel"))
-			() -> PROTOCOL_VERSION,
+            .clientAcceptedVersions(PROTOCOL_VERSION::equals)
-			PROTOCOL_VERSION::equals,
+            .serverAcceptedVersions(PROTOCOL_VERSION::equals)
-			PROTOCOL_VERSION::equals
+            .networkProtocolVersion(() -> PROTOCOL_VERSION)
-			);
+            .simpleChannel();
 
-	public static void register() {
+    public static void register() {
-		int id = 0;
+        int id = 0;
 
-		INSTANCE.registerMessage(id++, ModifierSettingsMessage.class, ModifierSettingsMessage::encode, ModifierSettingsMessage::decode, ModifierSettingsMessage.Handler::handle);
+        INSTANCE.registerMessage(id++, ModifierSettingsMessage.class, ModifierSettingsMessage::encode, ModifierSettingsMessage::decode, ModifierSettingsMessage.Handler::handle);
-		INSTANCE.registerMessage(id++, ModeSettingsMessage.class, ModeSettingsMessage::encode, ModeSettingsMessage::decode, ModeSettingsMessage.Handler::handle);
+        INSTANCE.registerMessage(id++, ModeSettingsMessage.class, ModeSettingsMessage::encode, ModeSettingsMessage::decode, ModeSettingsMessage.Handler::handle);
-		INSTANCE.registerMessage(id++, ModeActionMessage.class, ModeActionMessage::encode, ModeActionMessage::decode, ModeActionMessage.Handler::handle);
+        INSTANCE.registerMessage(id++, ModeActionMessage.class, ModeActionMessage::encode, ModeActionMessage::decode, ModeActionMessage.Handler::handle);
-		INSTANCE.registerMessage(id++, BlockPlacedMessage.class, BlockPlacedMessage::encode, BlockPlacedMessage::decode, BlockPlacedMessage.Handler::handle);
+        INSTANCE.registerMessage(id++, BlockPlacedMessage.class, BlockPlacedMessage::encode, BlockPlacedMessage::decode, BlockPlacedMessage.Handler::handle);
-		INSTANCE.registerMessage(id++, BlockBrokenMessage.class, BlockBrokenMessage::encode, BlockBrokenMessage::decode, BlockBrokenMessage.Handler::handle);
+        INSTANCE.registerMessage(id++, BlockBrokenMessage.class, BlockBrokenMessage::encode, BlockBrokenMessage::decode, BlockBrokenMessage.Handler::handle);
-		INSTANCE.registerMessage(id++, CancelModeMessage.class, CancelModeMessage::encode, CancelModeMessage::decode, CancelModeMessage.Handler::handle);
+        INSTANCE.registerMessage(id++, CancelModeMessage.class, CancelModeMessage::encode, CancelModeMessage::decode, CancelModeMessage.Handler::handle);
-		INSTANCE.registerMessage(id++, RequestLookAtMessage.class, RequestLookAtMessage::encode, RequestLookAtMessage::decode, RequestLookAtMessage.Handler::handle);
+        INSTANCE.registerMessage(id++, RequestLookAtMessage.class, RequestLookAtMessage::encode, RequestLookAtMessage::decode, RequestLookAtMessage.Handler::handle);
-		INSTANCE.registerMessage(id++, AddUndoMessage.class, AddUndoMessage::encode, AddUndoMessage::decode, AddUndoMessage.Handler::handle);
+        INSTANCE.registerMessage(id++, AddUndoMessage.class, AddUndoMessage::encode, AddUndoMessage::decode, AddUndoMessage.Handler::handle);
-		INSTANCE.registerMessage(id++, ClearUndoMessage.class, ClearUndoMessage::encode, ClearUndoMessage::decode, ClearUndoMessage.Handler::handle);
+        INSTANCE.registerMessage(id++, ClearUndoMessage.class, ClearUndoMessage::encode, ClearUndoMessage::decode, ClearUndoMessage.Handler::handle);
 
-	}
+    }
 
 }

src/main/java/nl/requios/effortlessbuilding/network/RequestLookAtMessage.java

@@ -1,18 +1,19 @@
 package nl.requios.effortlessbuilding.network;
 
-import net.minecraft.world.entity.player.Player;
+import net.minecraft.block.Block;
-import net.minecraft.network.FriendlyByteBuf;
+import net.minecraft.block.state.IBlockState;
-import net.minecraft.world.phys.BlockHitResult;
+import net.minecraft.entity.player.EntityPlayer;
-import net.minecraft.world.phys.HitResult;
+import net.minecraft.network.PacketBuffer;
-import net.minecraftforge.api.distmarker.Dist;
+import net.minecraft.util.math.BlockPos;
-import net.minecraftforge.api.distmarker.OnlyIn;
+import net.minecraft.util.math.Vec3d;
-import net.minecraftforge.fml.DistExecutor;
 import net.minecraftforge.fml.LogicalSide;
-import net.minecraftforge.network.NetworkEvent;
+import net.minecraftforge.fml.network.NetworkEvent;
 import nl.requios.effortlessbuilding.EffortlessBuilding;
+import nl.requios.effortlessbuilding.buildmodifier.BlockSet;
+import nl.requios.effortlessbuilding.buildmodifier.UndoRedo;
 import nl.requios.effortlessbuilding.proxy.ClientProxy;
-import nl.requios.effortlessbuilding.render.BlockPreviewRenderer;
 
+import java.util.ArrayList;
 import java.util.function.Supplier;
 
 /***
@@ -20,54 +21,45 @@ import java.util.function.Supplier;
  * This is then sent back with a BlockPlacedMessage.
  */
 public class RequestLookAtMessage {
-	private final boolean placeStartPos;
+    private boolean placeStartPos;
 
-	public RequestLookAtMessage() {
+    public RequestLookAtMessage() {
-		placeStartPos = false;
+        placeStartPos = false;
-	}
+    }
 
-	public RequestLookAtMessage(boolean placeStartPos) {
+    public RequestLookAtMessage(boolean placeStartPos) {
-		this.placeStartPos = placeStartPos;
+        this.placeStartPos = placeStartPos;
-	}
+    }
 
-	public static void encode(RequestLookAtMessage message, FriendlyByteBuf buf) {
+    public boolean getPlaceStartPos() {
-		buf.writeBoolean(message.placeStartPos);
+        return placeStartPos;
-	}
+    }
 
-	public static RequestLookAtMessage decode(FriendlyByteBuf buf) {
+    public static void encode(RequestLookAtMessage message, PacketBuffer buf) {
-		boolean placeStartPos = buf.readBoolean();
+        buf.writeBoolean(message.placeStartPos);
-		return new RequestLookAtMessage(placeStartPos);
+    }
-	}
 
-	public boolean getPlaceStartPos() {
+    public static RequestLookAtMessage decode(PacketBuffer buf) {
-		return placeStartPos;
+        boolean placeStartPos = buf.readBoolean();
-	}
+        return new RequestLookAtMessage(placeStartPos);
+    }
 
-	public static class Handler {
+    public static class Handler
-		public static void handle(RequestLookAtMessage message, Supplier<NetworkEvent.Context> ctx) {
+    {
-			ctx.get().enqueueWork(() -> {
+        public static void handle(RequestLookAtMessage message, Supplier<NetworkEvent.Context> ctx)
-				if (ctx.get().getDirection().getReceptionSide() == LogicalSide.CLIENT) {
+        {
-					//Received clientside
+            ctx.get().enqueueWork(() -> {
-					DistExecutor.unsafeRunWhenOn(Dist.CLIENT, () -> () -> ClientHandler.handle(message, ctx));
+                if (ctx.get().getDirection().getReceptionSide() == LogicalSide.CLIENT) {
-				}
+                    //Received clientside
-			});
+                    //Send back your info
-			ctx.get().setPacketHandled(true);
+                    EntityPlayer player = EffortlessBuilding.proxy.getPlayerEntityFromContext(ctx);
-		}
-	}
 
-	@OnlyIn(Dist.CLIENT)
+                    //Prevent double placing in normal mode with placeStartPos false
-	public static class ClientHandler {
+                    //Unless QuickReplace is on, then we do need to place start pos.
-		public static void handle(RequestLookAtMessage message, Supplier<NetworkEvent.Context> ctx) {
+                    PacketHandler.INSTANCE.sendToServer(new BlockPlacedMessage(ClientProxy.previousLookAt, message.getPlaceStartPos()));
-			//Send back your info
+                }
-			Player player = EffortlessBuilding.proxy.getPlayerEntityFromContext(ctx);
+            });
-
+            ctx.get().setPacketHandled(true);
-			//Prevent double placing in normal mode with placeStartPos false
+        }
-			//Unless QuickReplace is on, then we do need to place start pos.
+    }
-			if (ClientProxy.previousLookAt.getType() == HitResult.Type.BLOCK) {
-				PacketHandler.INSTANCE.sendToServer(new BlockPlacedMessage((BlockHitResult) ClientProxy.previousLookAt, message.getPlaceStartPos()));
-			} else {
-				PacketHandler.INSTANCE.sendToServer(new BlockPlacedMessage());
-			}
-		}
-	}
 }

src/main/java/nl/requios/effortlessbuilding/network/TranslatedLogMessage.java

@@ -1,74 +0,0 @@
-package nl.requios.effortlessbuilding.network;
-
-import net.minecraft.world.entity.player.Player;
-import net.minecraft.network.FriendlyByteBuf;
-import net.minecraftforge.fml.LogicalSide;
-import net.minecraftforge.network.NetworkEvent;
-import nl.requios.effortlessbuilding.EffortlessBuilding;
-
-import java.util.function.Supplier;
-
-/**
- * Send packet to client to translate and log the containing message
- */
-public class TranslatedLogMessage {
-	private final String prefix;
-	private final String translationKey;
-	private final String suffix;
-	private final boolean actionBar;
-
-	public TranslatedLogMessage() {
-		prefix = "";
-		translationKey = "";
-		suffix = "";
-		actionBar = false;
-	}
-
-	public TranslatedLogMessage(String prefix, String translationKey, String suffix, boolean actionBar) {
-		this.prefix = prefix;
-		this.translationKey = translationKey;
-		this.suffix = suffix;
-		this.actionBar = actionBar;
-	}
-
-	public static void encode(TranslatedLogMessage message, FriendlyByteBuf buf) {
-		buf.writeUtf(message.prefix);
-		buf.writeUtf(message.translationKey);
-		buf.writeUtf(message.suffix);
-		buf.writeBoolean(message.actionBar);
-	}
-
-	public static TranslatedLogMessage decode(FriendlyByteBuf buf) {
-		return new TranslatedLogMessage(buf.readUtf(), buf.readUtf(), buf.readUtf(), buf.readBoolean());
-	}
-
-	public String getPrefix() {
-		return prefix;
-	}
-
-	public String getTranslationKey() {
-		return translationKey;
-	}
-
-	public String getSuffix() {
-		return suffix;
-	}
-
-	public boolean isActionBar() {
-		return actionBar;
-	}
-
-	public static class Handler {
-		public static void handle(TranslatedLogMessage message, Supplier<NetworkEvent.Context> ctx) {
-			ctx.get().enqueueWork(() -> {
-				if (ctx.get().getDirection().getReceptionSide() == LogicalSide.CLIENT) {
-					//Received clientside
-
-					Player player = EffortlessBuilding.proxy.getPlayerEntityFromContext(ctx);
-					EffortlessBuilding.logTranslate(player, message.prefix, message.translationKey, message.suffix, message.actionBar);
-				}
-			});
-			ctx.get().setPacketHandled(true);
-		}
-	}
-}

src/main/java/nl/requios/effortlessbuilding/proxy/ClientProxy.java

@@ -1,334 +1,393 @@
 package nl.requios.effortlessbuilding.proxy;
 
-import net.minecraft.MethodsReturnNonnullByDefault;
+import net.minecraft.block.SoundType;
-import net.minecraft.client.gui.screens.MenuScreens;
+import net.minecraft.block.state.IBlockState;
-import net.minecraft.world.level.block.state.BlockState;
+import net.minecraft.client.KeyboardListener;
-import net.minecraft.world.level.block.SoundType;
 import net.minecraft.client.Minecraft;
-import net.minecraft.client.player.LocalPlayer;
+import net.minecraft.client.entity.EntityPlayerSP;
-import net.minecraft.client.gui.screens.Screen;
+import net.minecraft.client.gui.GuiScreen;
-import net.minecraft.client.resources.language.I18n;
+import net.minecraft.client.renderer.texture.TextureAtlasSprite;
-import net.minecraft.client.KeyMapping;
+import net.minecraft.client.renderer.texture.TextureMap;
-import com.mojang.blaze3d.platform.InputConstants;
+import net.minecraft.client.resources.I18n;
-import net.minecraft.world.entity.player.Player;
+import net.minecraft.client.settings.KeyBinding;
-import net.minecraft.world.item.BlockItem;
+import net.minecraft.client.util.InputMappings;
-import net.minecraft.world.item.ItemStack;
+import net.minecraft.entity.player.EntityPlayer;
-import net.minecraft.world.InteractionHand;
+import net.minecraft.item.ItemBlock;
-import net.minecraft.sounds.SoundSource;
+import net.minecraft.item.ItemStack;
-import net.minecraft.core.BlockPos;
+import net.minecraft.util.EnumHand;
-import net.minecraft.world.phys.BlockHitResult;
+import net.minecraft.util.ResourceLocation;
-import net.minecraft.world.level.ClipContext;
+import net.minecraft.util.SoundCategory;
-import net.minecraft.world.phys.HitResult;
+import net.minecraft.util.math.BlockPos;
-import net.minecraft.world.phys.Vec3;
+import net.minecraft.util.math.RayTraceFluidMode;
-import net.minecraft.ChatFormatting;
+import net.minecraft.util.math.RayTraceResult;
-import net.minecraft.world.level.Level;
+import net.minecraft.util.text.TextFormatting;
 import net.minecraftforge.api.distmarker.Dist;
+import net.minecraftforge.client.event.GuiOpenEvent;
 import net.minecraftforge.client.event.InputEvent;
-import net.minecraftforge.client.event.RegisterKeyMappingsEvent;
+import net.minecraftforge.client.event.ModelRegistryEvent;
-import net.minecraftforge.client.event.ScreenEvent;
+import net.minecraftforge.client.event.TextureStitchEvent;
 import net.minecraftforge.client.settings.KeyConflictContext;
 import net.minecraftforge.client.settings.KeyModifier;
-import net.minecraftforge.event.TickEvent;
+import net.minecraftforge.event.entity.EntityJoinWorldEvent;
 import net.minecraftforge.eventbus.api.SubscribeEvent;
 import net.minecraftforge.fml.LogicalSide;
+import net.minecraftforge.fml.client.registry.ClientRegistry;
 import net.minecraftforge.fml.common.Mod;
+import net.minecraftforge.fml.common.gameevent.TickEvent;
 import net.minecraftforge.fml.event.lifecycle.FMLClientSetupEvent;
 import net.minecraftforge.fml.event.lifecycle.FMLCommonSetupEvent;
-import net.minecraftforge.network.NetworkEvent;
+import net.minecraftforge.fml.network.NetworkEvent;
 import nl.requios.effortlessbuilding.EffortlessBuilding;
 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.DiamondRandomizerBagScreen;
-import nl.requios.effortlessbuilding.gui.GoldenRandomizerBagScreen;
-import nl.requios.effortlessbuilding.gui.RandomizerBagScreen;
-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.RenderHandler;
+import nl.requios.effortlessbuilding.render.ShaderHandler;
 import org.lwjgl.glfw.GLFW;
 
-import javax.annotation.ParametersAreNonnullByDefault;
+import javax.annotation.Nullable;
+import java.util.HashMap;
 import java.util.function.Supplier;
 
 @Mod.EventBusSubscriber(value = {Dist.CLIENT})
-@ParametersAreNonnullByDefault
-@MethodsReturnNonnullByDefault
 public class ClientProxy implements IProxy {
-	public static KeyMapping[] keyBindings;
+    public static KeyBinding[] keyBindings;
-	public static HitResult previousLookAt;
+    public static RayTraceResult previousLookAt;
-	public static HitResult currentLookAt;
+    public static RayTraceResult currentLookAt;
-	public static int ticksInGame = 0;
+    private static int placeCooldown = 0;
-	private static int placeCooldown = 0;
+    private static int breakCooldown = 0;
-	private static int breakCooldown = 0;
+    private static boolean shadersInitialized = false;
 
-	@Override
+    public static int ticksInGame = 0;
-	public void setup(FMLCommonSetupEvent event) {
-	}
 
-	@Override
+    private static final HashMap<BuildModes.BuildModeEnum, ResourceLocation> buildModeIcons = new HashMap<>();
-	public void clientSetup(FMLClientSetupEvent event) {
+    private static final HashMap<ModeOptions.ActionEnum, ResourceLocation> modeOptionIcons = new HashMap<>();
-		//Keybindings are setup and registered in ModClientEventHandler
 
-		MenuScreens.register(EffortlessBuilding.RANDOMIZER_BAG_CONTAINER.get(), RandomizerBagScreen::new);
+    @Override
-		MenuScreens.register(EffortlessBuilding.GOLDEN_RANDOMIZER_BAG_CONTAINER.get(), GoldenRandomizerBagScreen::new);
+    public void setup(FMLCommonSetupEvent event) {}
-		MenuScreens.register(EffortlessBuilding.DIAMOND_RANDOMIZER_BAG_CONTAINER.get(), DiamondRandomizerBagScreen::new);
-	}
 
-	@SubscribeEvent
+    @Override
-	public static void onClientTick(TickEvent.ClientTickEvent event) {
+    public void clientSetup(FMLClientSetupEvent event) {
+        //Crashes in 1.13, do it elsewhere
+//        ShaderHandler.init();
 
-		if (event.phase == TickEvent.Phase.START) {
+        // register key bindings
-			onMouseInput();
+        keyBindings = new KeyBinding[7];
 
-			//Update previousLookAt
+        // instantiate the key bindings
-			HitResult objectMouseOver = Minecraft.getInstance().hitResult;
+        keyBindings[0] = new KeyBinding("key.effortlessbuilding.hud.desc", KeyConflictContext.UNIVERSAL, InputMappings.getInputByCode(GLFW.GLFW_KEY_KP_ADD, 0), "key.effortlessbuilding.category");
-			//Checking for null is necessary! Even in vanilla when looking down ladders it is occasionally null (instead of Type MISS)
+        keyBindings[1] = new KeyBinding("key.effortlessbuilding.replace.desc", KeyConflictContext.IN_GAME, InputMappings.getInputByCode(GLFW.GLFW_KEY_KP_SUBTRACT, 0), "key.effortlessbuilding.category");
-			if (objectMouseOver == null) return;
+        keyBindings[2] = new KeyBinding("key.effortlessbuilding.creative.desc", KeyConflictContext.IN_GAME, InputMappings.getInputByCode(GLFW.GLFW_KEY_F4, 0), "key.effortlessbuilding.category");
+        keyBindings[3] = new KeyBinding("key.effortlessbuilding.mode.desc", KeyConflictContext.IN_GAME, InputMappings.getInputByCode(GLFW.GLFW_KEY_LEFT_ALT, 0), "key.effortlessbuilding.category") {
+            @Override
+            public boolean func_197983_b(KeyBinding other) {
+                //Does not conflict with Chisels and Bits radial menu
+                if (other.getKey().getKeyCode() == getKey().getKeyCode() && other.getKeyDescription().equals("mod.chiselsandbits.other.mode")) return false;
+                return super.func_197983_b(other);
+            }
+        };
+        keyBindings[4] = new KeyBinding("key.effortlessbuilding.undo.desc", KeyConflictContext.IN_GAME, KeyModifier.CONTROL, InputMappings.getInputByCode(GLFW.GLFW_KEY_Z, 0), "key.effortlessbuilding.category");
+        keyBindings[5] = new KeyBinding("key.effortlessbuilding.redo.desc", KeyConflictContext.IN_GAME, KeyModifier.CONTROL, InputMappings.getInputByCode(GLFW.GLFW_KEY_Y, 0), "key.effortlessbuilding.category");
+        keyBindings[6] = new KeyBinding("key.effortlessbuilding.altplacement.desc", KeyConflictContext.IN_GAME, InputMappings.getInputByCode(GLFW.GLFW_KEY_LEFT_CONTROL, 0), "key.effortlessbuilding.category");
+        //keyBindings[7] = new KeyBinding("Reload shaders", KeyConflictContext.UNIVERSAL, InputMappings.getInputByCode(GLFW.GLFW_KEY_TAB, 0), "key.effortlessbuilding.category");
 
-			if (currentLookAt == null) {
+        // register all the key bindings
-				currentLookAt = objectMouseOver;
+        for (int i = 0; i < keyBindings.length; ++i) {
-				previousLookAt = objectMouseOver;
+            ClientRegistry.registerKeyBinding(keyBindings[i]);
-				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++;
-			}
-		}
 
-	}
+    public EntityPlayer getPlayerEntityFromContext(Supplier<NetworkEvent.Context> ctx){
+        return (ctx.get().getDirection().getReceptionSide() == LogicalSide.CLIENT ? Minecraft.getInstance().player : ctx.get().getSender());
+    }
 
-	private static void onMouseInput() {
+    @SubscribeEvent
-		Minecraft mc = Minecraft.getInstance();
+    public static void onEntityJoinWorld(EntityJoinWorldEvent event) {
-		LocalPlayer player = mc.player;
+        if (event.getEntity() == Minecraft.getInstance().player) {
-		if (player == null) return;
+            event.getWorld().addEventListener(new RenderHandler());
-		BuildModes.BuildModeEnum buildMode = ModeSettingsManager.getModeSettings(player).getBuildMode();
+        }
+    }
 
-		if (mc.screen != null ||
+    @SubscribeEvent
-			buildMode == BuildModes.BuildModeEnum.NORMAL ||
+    public static void onTextureStitch(final TextureStitchEvent.Pre event) {
-			RadialMenu.instance.isVisible()) {
+        //register icon textures
-			return;
+        final TextureMap map = event.getMap();
-		}
 
-		if (mc.options.keyUse.isDown()) {
+        for ( final BuildModes.BuildModeEnum mode : BuildModes.BuildModeEnum.values() )
+        {
+            final ResourceLocation sprite = new ResourceLocation(EffortlessBuilding.MODID, "icons/" + mode.name().toLowerCase());
+            map.registerSprite(Minecraft.getInstance().getResourceManager(), sprite);
+            buildModeIcons.put(mode, sprite);
+        }
 
-			//KeyBinding.setKeyBindState(mc.gameSettings.keyBindUseItem.getKeyCode(), false);
+        for ( final ModeOptions.ActionEnum action : ModeOptions.ActionEnum.values() )
+        {
+            final ResourceLocation sprite = new ResourceLocation(EffortlessBuilding.MODID, "icons/" + action.name().toLowerCase());
+            map.registerSprite(Minecraft.getInstance().getResourceManager(), sprite);
+            modeOptionIcons.put(action, sprite);
+        }
+    }
 
-			if (placeCooldown <= 0) {
+    public static TextureAtlasSprite getBuildModeIcon(BuildModes.BuildModeEnum mode) {
-				placeCooldown = 4;
+        return Minecraft.getInstance().getTextureMap().getSprite(buildModeIcons.get(mode));
+    }
 
-				ItemStack currentItemStack = player.getItemInHand(InteractionHand.MAIN_HAND);
+    public static TextureAtlasSprite getModeOptionIcon(ModeOptions.ActionEnum action) {
-				if (currentItemStack.getItem() instanceof BlockItem ||
+        return Minecraft.getInstance().getTextureMap().getSprite(modeOptionIcons.get(action));
-					(CompatHelper.isItemBlockProxy(currentItemStack) && !player.isShiftKeyDown())) {
+    }
 
-					ItemStack itemStack = CompatHelper.getItemBlockFromStack(currentItemStack);
+    @SubscribeEvent
+    public static void onClientTick(TickEvent.ClientTickEvent event) {
 
-					//find position in distance
+        if (event.phase == TickEvent.Phase.START) {
-					HitResult lookingAt = getLookingAt(player);
+            onMouseInput();
-					if (lookingAt != null && lookingAt.getType() == HitResult.Type.BLOCK) {
-						BlockHitResult blockLookingAt = (BlockHitResult) lookingAt;
 
-						BuildModes.onBlockPlacedMessage(player, new BlockPlacedMessage(blockLookingAt, true));
+            //Update previousLookAt
-						PacketHandler.INSTANCE.sendToServer(new BlockPlacedMessage(blockLookingAt, true));
+            RayTraceResult objectMouseOver = Minecraft.getInstance().objectMouseOver;
+            //Checking for null is necessary! Even in vanilla when looking down ladders it is occasionally null (instead of Type MISS)
+            if (objectMouseOver == null) return;
 
-						//play sound if further than normal
+            if (currentLookAt == null) {
-						if ((blockLookingAt.getLocation().subtract(player.getEyePosition(1f))).lengthSqr() > 25f &&
+                currentLookAt = objectMouseOver;
-							itemStack.getItem() instanceof BlockItem) {
+                previousLookAt = objectMouseOver;
+                return;
+            }
 
-							BlockState state = ((BlockItem) itemStack.getItem()).getBlock().defaultBlockState();
+            if (objectMouseOver.type == RayTraceResult.Type.BLOCK) {
-							BlockPos blockPos = blockLookingAt.getBlockPos();
+                if (currentLookAt.type != RayTraceResult.Type.BLOCK) {
-							SoundType soundType = state.getBlock().getSoundType(state, player.level, blockPos, player);
+                    currentLookAt = objectMouseOver;
-							player.level.playSound(player, player.blockPosition(), soundType.getPlaceSound(), SoundSource.BLOCKS,
+                    previousLookAt = objectMouseOver;
-								0.4f, soundType.getPitch());
+                } else {
-							player.swing(InteractionHand.MAIN_HAND);
+                    if (currentLookAt.getBlockPos() != objectMouseOver.getBlockPos()) {
-						}
+                        previousLookAt = currentLookAt;
-					} else {
+                        currentLookAt = objectMouseOver;
-						BuildModes.onBlockPlacedMessage(player, new BlockPlacedMessage());
+                    }
-						PacketHandler.INSTANCE.sendToServer(new BlockPlacedMessage());
+                }
-					}
+            }
-				}
-			} else if (buildMode == BuildModes.BuildModeEnum.NORMAL_PLUS) {
-				placeCooldown--;
-				if (ModeOptions.getBuildSpeed() == ModeOptions.ActionEnum.FAST_SPEED) placeCooldown = 0;
-			}
-		} else {
-			placeCooldown = 0;
-		}
 
-		if (mc.options.keyAttack.isDown()) {
+        } else if (event.phase == TickEvent.Phase.END){
+            GuiScreen gui = Minecraft.getInstance().currentScreen;
+            if(gui == null || !gui.doesGuiPauseGame()) {
+                ticksInGame++;
+            }
 
-			//Break block in distance in creative (or survival if enabled in config)
+            //Init shaders in the first tick. Doing it anywhere before this seems to crash the game.
-			if (breakCooldown <= 0) {
+            if (!shadersInitialized) {
-				breakCooldown = 4;
+                ShaderHandler.init();
+                shadersInitialized = true;
+            }
+        }
 
-				HitResult lookingAt = getLookingAt(player);
+    }
-				if (lookingAt != null && lookingAt.getType() == HitResult.Type.BLOCK) {
-					BlockHitResult blockLookingAt = (BlockHitResult) lookingAt;
 
-					BuildModes.onBlockBrokenMessage(player, new BlockBrokenMessage(blockLookingAt));
+    private static void onMouseInput() {
-					PacketHandler.INSTANCE.sendToServer(new BlockBrokenMessage(blockLookingAt));
+        Minecraft mc = Minecraft.getInstance();
+        EntityPlayerSP player = mc.player;
+        if (player == null) return;
+        BuildModes.BuildModeEnum buildMode = ModeSettingsManager.getModeSettings(player).getBuildMode();
 
-					//play sound if further than normal
+        if (Minecraft.getInstance().currentScreen != null ||
-					if ((blockLookingAt.getLocation().subtract(player.getEyePosition(1f))).lengthSqr() > 25f) {
+            buildMode == BuildModes.BuildModeEnum.NORMAL ||
+            RadialMenu.instance.isVisible()) {
+            return;
+        }
 
-						BlockPos blockPos = blockLookingAt.getBlockPos();
+        if (mc.gameSettings.keyBindUseItem.isKeyDown()) {
-						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.NORMAL_PLUS) {
-				breakCooldown--;
-				if (ModeOptions.getBuildSpeed() == ModeOptions.ActionEnum.FAST_SPEED) breakCooldown = 0;
-			}
 
-			//EffortlessBuilding.packetHandler.sendToServer(new CancelModeMessage());
+            //KeyBinding.setKeyBindState(mc.gameSettings.keyBindUseItem.getKeyCode(), false);
 
-		} else {
+            if (placeCooldown <= 0) {
-			breakCooldown = 0;
+                placeCooldown = 4;
-		}
-	}
 
-	@SubscribeEvent(receiveCanceled = true)
+                ItemStack currentItemStack = player.getHeldItem(EnumHand.MAIN_HAND);
-	public static void onKeyPress(InputEvent.Key event) {
+                if (currentItemStack.getItem() instanceof ItemBlock ||
-		LocalPlayer player = Minecraft.getInstance().player;
+                    (CompatHelper.isItemBlockProxy(currentItemStack) && !player.isSneaking())) {
-		if (player == null)
-			return;
 
-		//Remember to send packet to server if necessary
+                    ItemStack itemStack = CompatHelper.getItemBlockFromStack(currentItemStack);
-		//Show Modifier Settings GUI
-		if (keyBindings[0].consumeClick()) {
-			openModifierSettings();
-		}
 
-		//QuickReplace toggle
+                    //find position in distance
-		if (keyBindings[1].consumeClick()) {
+                    RayTraceResult lookingAt = getLookingAt(player);
-			ModifierSettingsManager.ModifierSettings modifierSettings = ModifierSettingsManager.getModifierSettings(player);
+                    BuildModes.onBlockPlacedMessage(player, lookingAt == null ? new BlockPlacedMessage() : new BlockPlacedMessage(lookingAt, true));
-			modifierSettings.setQuickReplace(!modifierSettings.doQuickReplace());
+                    PacketHandler.INSTANCE.sendToServer(lookingAt == null ? new BlockPlacedMessage() : new BlockPlacedMessage(lookingAt, true));
-			EffortlessBuilding.log(player, "Set " + ChatFormatting.GOLD + "Quick Replace " + ChatFormatting.RESET + (
-				modifierSettings.doQuickReplace() ? "on" : "off"));
-			PacketHandler.INSTANCE.sendToServer(new ModifierSettingsMessage(modifierSettings));
-		}
 
-		//Radial menu
+                    //play sound if further than normal
-		if (keyBindings[2].isDown()) {
+                    if (lookingAt != null && lookingAt.type == RayTraceResult.Type.BLOCK &&
-			if (ReachHelper.getMaxReach(player) > 0) {
+                        (lookingAt.hitVec.subtract(player.getEyePosition(1f))).lengthSquared() > 25f &&
-				if (!RadialMenu.instance.isVisible()) {
+                        itemStack.getItem() instanceof ItemBlock) {
-					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)
+                        IBlockState state = ((ItemBlock) itemStack.getItem()).getBlock().getDefaultState();
-		if (keyBindings[3].consumeClick()) {
+                        BlockPos blockPos = lookingAt.getBlockPos();
-			ModeOptions.ActionEnum action = ModeOptions.ActionEnum.UNDO;
+                        SoundType soundType = state.getBlock().getSoundType(state, player.world, blockPos, player);
-			ModeOptions.performAction(player, action);
+                        player.world.playSound(player, player.getPosition(), soundType.getPlaceSound(), SoundCategory.BLOCKS,
-			PacketHandler.INSTANCE.sendToServer(new ModeActionMessage(action));
+                                0.4f, soundType.getPitch() * 1f);
-		}
+                        player.swingArm(EnumHand.MAIN_HAND);
+                    }
+                }
+            }
+            else if (buildMode == BuildModes.BuildModeEnum.NORMAL_PLUS) {
+                placeCooldown--;
+                if (ModeOptions.getBuildSpeed() == ModeOptions.ActionEnum.FAST_SPEED) placeCooldown = 0;
+            }
+        } else {
+            placeCooldown = 0;
+        }
 
-		//Redo (Ctrl+Y)
+        if (mc.gameSettings.keyBindAttack.isKeyDown()) {
-		if (keyBindings[4].consumeClick()) {
-			ModeOptions.ActionEnum action = ModeOptions.ActionEnum.REDO;
-			ModeOptions.performAction(player, action);
-			PacketHandler.INSTANCE.sendToServer(new ModeActionMessage(action));
-		}
 
-		//Change placement mode
+            //Break block in distance in creative (or survival if enabled in config)
-		if (keyBindings[5].consumeClick()) {
+            if (breakCooldown <= 0) {
-			//Toggle between first two actions of the first option of the current build mode
+                breakCooldown = 4;
-			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]));
-					}
-				}
-			}
-		}
 
-	}
+                //Early out if cant break far, coming from own mouse event (not block broken event)
+                //To make breaking blocks in survival possible like array
+                //TODO this causes not being able to cancel placement in survival
+                //  moving it to after buildmodes fixes that, but introduces this bug
+                if (!ReachHelper.canBreakFar(player)) return;
 
-	public static void openModifierSettings() {
+                RayTraceResult lookingAt = getLookingAt(player);
-		Minecraft mc = Minecraft.getInstance();
+                BuildModes.onBlockBrokenMessage(player, lookingAt == null ? new BlockBrokenMessage() : new BlockBrokenMessage(lookingAt));
-		LocalPlayer player = mc.player;
+                PacketHandler.INSTANCE.sendToServer(lookingAt == null ? new BlockBrokenMessage() : new BlockBrokenMessage(lookingAt));
-		if (player == null) return;
 
-		//Disabled if max reach is 0, might be set in the config that way.
+                //play sound if further than normal
-		if (ReachHelper.getMaxReach(player) == 0) {
+                if (lookingAt != null && lookingAt.type == RayTraceResult.Type.BLOCK &&
-			EffortlessBuilding.log(player, "Build modifiers are disabled until your reach has increased. Increase your reach with craftable reach upgrades.");
+                    (lookingAt.hitVec.subtract(player.getEyePosition(1f))).lengthSquared() > 25f) {
-		} else {
-			mc.setScreen(new ModifierSettingsGui());
-		}
-	}
 
-	public static void openPlayerSettings() {
+                    BlockPos blockPos = lookingAt.getBlockPos();
-		Minecraft mc = Minecraft.getInstance();
+                    IBlockState state = player.world.getBlockState(blockPos);
-		mc.setScreen(new PlayerSettingsGui());
+                    SoundType soundtype = state.getBlock().getSoundType(state, player.world, blockPos, player);
-	}
+                    player.world.playSound(player, player.getPosition(), soundtype.getBreakSound(), SoundCategory.BLOCKS,
+                            0.4f, soundtype.getPitch() * 1f);
+                    player.swingArm(EnumHand.MAIN_HAND);
+                }
+            }
+            else if (buildMode == BuildModes.BuildModeEnum.NORMAL_PLUS) {
+                breakCooldown--;
+                if (ModeOptions.getBuildSpeed() == ModeOptions.ActionEnum.FAST_SPEED) breakCooldown = 0;
+            }
 
-	@SubscribeEvent
+            //EffortlessBuilding.packetHandler.sendToServer(new CancelModeMessage());
-	public static void onGuiOpen(ScreenEvent event) {
-		Player player = Minecraft.getInstance().player;
-		if (player != null) {
-			BuildModes.initializeMode(player);
-		}
-	}
 
-	public static boolean isKeybindDown(int keybindIndex) {
+        } else {
-		return InputConstants.isKeyDown(
+            breakCooldown = 0;
-				Minecraft.getInstance().getWindow().getWindow(),
+        }
-				ClientProxy.keyBindings[2].getKey().getValue());
+    }
-	}
 
-	public static HitResult getLookingAt(Player player) {
+    @SubscribeEvent(receiveCanceled = true)
-		Level world = player.level;
+    public static void onKeyPress(InputEvent.KeyInputEvent event) {
+        EntityPlayerSP player = Minecraft.getInstance().player;
 
-		//base distance off of player ability (config)
+        //Remember to send packet to server if necessary
-		float raytraceRange = ReachHelper.getPlacementReach(player);
+        //Show Modifier Settings GUI
+        if (keyBindings[0].isPressed()) {
+            openModifierSettings();
+        }
 
-		Vec3 look = player.getLookAngle();
+        //QuickReplace toggle
-		Vec3 start = new Vec3(player.getX(), player.getY() + player.getEyeHeight(), player.getZ());
+        if (keyBindings[1].isPressed()) {
-		Vec3 end = new Vec3(player.getX() + look.x * raytraceRange, player.getY() + player.getEyeHeight() + look.y * raytraceRange, player.getZ() + look.z * raytraceRange);
+            ModifierSettingsManager.ModifierSettings modifierSettings = ModifierSettingsManager.getModifierSettings(player);
-//        return player.rayTrace(raytraceRange, 1f, RayTraceFluidMode.NEVER);
+            modifierSettings.setQuickReplace(!modifierSettings.doQuickReplace());
-		//TODO 1.14 check if correct
+            EffortlessBuilding.log(player, "Set " + TextFormatting.GOLD + "Quick Replace " + TextFormatting.RESET + (
-		return world.clip(new ClipContext(start, end, ClipContext.Block.COLLIDER, ClipContext.Fluid.NONE, player));
+                    modifierSettings.doQuickReplace() ? "on" : "off"));
-	}
+            PacketHandler.INSTANCE.sendToServer(new ModifierSettingsMessage(modifierSettings));
+        }
 
-	public Player getPlayerEntityFromContext(Supplier<NetworkEvent.Context> ctx) {
+        //Creative/survival mode toggle
-		return (ctx.get().getDirection().getReceptionSide() == LogicalSide.CLIENT ? Minecraft.getInstance().player : ctx.get().getSender());
+        if (keyBindings[2].isPressed()) {
-	}
+            if (player.isCreative()) {
+                player.sendChatMessage("/gamemode survival");
+            } else {
+                player.sendChatMessage("/gamemode creative");
+            }
+        }
 
-	@Override
+        //Undo (Ctrl+Z)
-	public void logTranslate(Player player, String prefix, String translationKey, String suffix, boolean actionBar) {
+        if (keyBindings[4].isPressed()) {
-		EffortlessBuilding.log(Minecraft.getInstance().player, prefix + I18n.get(translationKey) + suffix, actionBar);
+            ModeOptions.ActionEnum action = ModeOptions.ActionEnum.UNDO;
-	}
+            ModeOptions.performAction(player, action);
+            PacketHandler.INSTANCE.sendToServer(new ModeActionMessage(action));
+        }
+
+        //Redo (Ctrl+Y)
+        if (keyBindings[5].isPressed()) {
+            ModeOptions.ActionEnum action = ModeOptions.ActionEnum.REDO;
+            ModeOptions.performAction(player, action);
+            PacketHandler.INSTANCE.sendToServer(new ModeActionMessage(action));
+        }
+
+        //Change placement mode
+        if (keyBindings[6].isPressed()) {
+            //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]));
+                    }
+                }
+            }
+        }
+
+        //For shader development
+        if (keyBindings.length >= 8 && keyBindings[7].isPressed()) {
+            ShaderHandler.init();
+            EffortlessBuilding.log(player, "Reloaded shaders");
+        }
+
+    }
+
+    public static void openModifierSettings() {
+        Minecraft mc = Minecraft.getInstance();
+        EntityPlayerSP player = mc.player;
+
+        RadialMenu.instance.setVisibility(0f);
+
+        //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 {
+            if (mc.currentScreen == null) {
+                mc.displayGuiScreen(new ModifierSettingsGui());
+            } else {
+                player.closeScreen();
+            }
+        }
+    }
+
+    @SubscribeEvent
+    public static void onGuiOpen(GuiOpenEvent event) {
+        EntityPlayer player = Minecraft.getInstance().player;
+        if (player != null) {
+            BuildModes.initializeMode(player);
+        }
+    }
+
+    @Nullable
+    public static RayTraceResult getLookingAt(EntityPlayer player) {
+//        World world = player.world;
+
+        //base distance off of player ability (config)
+        float raytraceRange = ReachHelper.getPlacementReach(player);
+
+//        Vec3d look = player.getLookVec();
+//        Vec3d start = new Vec3d(player.posX, player.posY + player.getEyeHeight(), player.posZ);
+//        Vec3d end = new Vec3d(player.posX + look.x * raytraceRange, player.posY + player.getEyeHeight() + look.y * raytraceRange, player.posZ + look.z * raytraceRange);
+        return player.rayTrace(raytraceRange, 1f, RayTraceFluidMode.NEVER);
+//        return world.rayTraceBlocks(start, end, false, false, false);
+    }
+
+    public static void logTranslate(String key) {
+        EffortlessBuilding.log(Minecraft.getInstance().player, I18n.format(key), true);
+    }
 }

src/main/java/nl/requios/effortlessbuilding/proxy/IProxy.java

@@ -1,18 +1,16 @@
 package nl.requios.effortlessbuilding.proxy;
 
-import net.minecraft.world.entity.player.Player;
+import net.minecraft.entity.player.EntityPlayer;
 import net.minecraftforge.fml.event.lifecycle.FMLClientSetupEvent;
 import net.minecraftforge.fml.event.lifecycle.FMLCommonSetupEvent;
-import net.minecraftforge.network.NetworkEvent;
+import net.minecraftforge.fml.network.NetworkEvent;
 
 import java.util.function.Supplier;
 
 public interface IProxy {
-	void setup(final FMLCommonSetupEvent event);
+    void setup(final FMLCommonSetupEvent event);
 
-	void clientSetup(final FMLClientSetupEvent event);
+    void clientSetup(final FMLClientSetupEvent event);
 
-	Player getPlayerEntityFromContext(Supplier<NetworkEvent.Context> ctx);
+    EntityPlayer getPlayerEntityFromContext(Supplier<NetworkEvent.Context> ctx);
-
-	void logTranslate(Player player, String prefix, String translationKey, String suffix, boolean actionBar);
 }

src/main/java/nl/requios/effortlessbuilding/proxy/ServerProxy.java

@@ -1,33 +1,23 @@
 package nl.requios.effortlessbuilding.proxy;
 
-import net.minecraft.world.entity.player.Player;
+import net.minecraft.entity.player.EntityPlayer;
-import net.minecraft.server.level.ServerPlayer;
 import net.minecraftforge.fml.event.lifecycle.FMLClientSetupEvent;
 import net.minecraftforge.fml.event.lifecycle.FMLCommonSetupEvent;
-import net.minecraftforge.network.NetworkEvent;
+import net.minecraftforge.fml.network.NetworkEvent;
-import net.minecraftforge.network.PacketDistributor;
-import nl.requios.effortlessbuilding.network.PacketHandler;
-import nl.requios.effortlessbuilding.network.TranslatedLogMessage;
 
 import java.util.function.Supplier;
 
 public class ServerProxy implements IProxy {
-	//Only physical server! Singleplayer server is seen as clientproxy
+    //Only physical server! Singleplayer server is seen as clientproxy
-	@Override
+    @Override
-	public void setup(FMLCommonSetupEvent event) {
+    public void setup(FMLCommonSetupEvent event) {
 
-	}
+    }
 
-	@Override
+    @Override
-	public void clientSetup(FMLClientSetupEvent event) {
+    public void clientSetup(FMLClientSetupEvent event) {}
-	}
 
-	public Player getPlayerEntityFromContext(Supplier<NetworkEvent.Context> ctx) {
+    public EntityPlayer getPlayerEntityFromContext(Supplier<NetworkEvent.Context> ctx){
-		return ctx.get().getSender();
+        return ctx.get().getSender();
-	}
+    }
-
-	@Override
-	public void logTranslate(Player player, String prefix, String translationKey, String suffix, boolean actionBar) {
-		PacketHandler.INSTANCE.send(PacketDistributor.PLAYER.with(() -> (ServerPlayer) player), new TranslatedLogMessage(prefix, translationKey, suffix, actionBar));
-	}
 }

src/main/java/nl/requios/effortlessbuilding/render/BlockPreviewRenderer.java

@@ -1,23 +1,22 @@
 package nl.requios.effortlessbuilding.render;
 
-import com.mojang.blaze3d.vertex.PoseStack;
+import net.minecraft.block.SoundType;
-import com.mojang.blaze3d.vertex.VertexConsumer;
+import net.minecraft.block.state.IBlockState;
-import net.minecraft.world.level.block.state.BlockState;
-import net.minecraft.world.level.block.SoundType;
 import net.minecraft.client.Minecraft;
-import net.minecraft.client.player.LocalPlayer;
+import net.minecraft.client.entity.EntityPlayerSP;
-import net.minecraft.client.renderer.block.BlockRenderDispatcher;
+import net.minecraft.client.renderer.BlockRendererDispatcher;
-import net.minecraft.client.renderer.MultiBufferSource;
+import net.minecraft.client.renderer.GlStateManager;
-import net.minecraft.world.entity.player.Player;
+import net.minecraft.client.renderer.OpenGlHelper;
-import net.minecraft.world.item.ItemStack;
+import net.minecraft.client.renderer.texture.TextureMap;
-import net.minecraft.core.Direction;
+import net.minecraft.entity.player.EntityPlayer;
-import net.minecraft.sounds.SoundSource;
+import net.minecraft.item.ItemStack;
-import net.minecraft.core.BlockPos;
+import net.minecraft.util.EnumFacing;
-import net.minecraft.world.phys.BlockHitResult;
+import net.minecraft.util.SoundCategory;
-import net.minecraft.util.Mth;
+import net.minecraft.util.math.BlockPos;
-import net.minecraft.world.phys.HitResult;
+import net.minecraft.util.math.MathHelper;
-import net.minecraft.world.phys.shapes.VoxelShape;
+import net.minecraft.util.math.RayTraceResult;
-import net.minecraft.world.phys.Vec3;
+import net.minecraft.util.math.Vec3d;
+import net.minecraft.util.math.shapes.VoxelShape;
 import net.minecraftforge.api.distmarker.Dist;
 import net.minecraftforge.api.distmarker.OnlyIn;
 import nl.requios.effortlessbuilding.BuildConfig;
@@ -32,353 +31,409 @@ import nl.requios.effortlessbuilding.buildmodifier.ModifierSettingsManager.Modif
 import nl.requios.effortlessbuilding.compatibility.CompatHelper;
 import nl.requios.effortlessbuilding.helper.ReachHelper;
 import nl.requios.effortlessbuilding.helper.SurvivalHelper;
-import nl.requios.effortlessbuilding.item.AbstractRandomizerBagItem;
+import nl.requios.effortlessbuilding.item.ItemRandomizerBag;
 import nl.requios.effortlessbuilding.proxy.ClientProxy;
+import org.lwjgl.opengl.ARBMultitexture;
+import org.lwjgl.opengl.ARBShaderObjects;
+import org.lwjgl.opengl.GL11;
 
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.List;
+import java.util.function.Consumer;
 
 @OnlyIn(Dist.CLIENT)
 public class BlockPreviewRenderer {
-	private static final List<PlacedData> placedDataList = new ArrayList<>();
+    private static List<BlockPos> previousCoordinates;
-	private static List<BlockPos> previousCoordinates;
+    private static List<IBlockState> previousBlockStates;
-	private static List<BlockState> previousBlockStates;
+    private static List<ItemStack> previousItemStacks;
-	private static List<ItemStack> previousItemStacks;
+    private static BlockPos previousFirstPos;
-	private static BlockPos previousFirstPos;
+    private static BlockPos previousSecondPos;
-	private static BlockPos previousSecondPos;
+    private static int soundTime = 0;
-	private static int soundTime = 0;
+
-
+    static class PlacedData {
-	public static void render(PoseStack matrixStack, MultiBufferSource.BufferSource renderTypeBuffer, Player player, ModifierSettings modifierSettings, ModeSettings modeSettings) {
+        float time;
-
+        List<BlockPos> coordinates;
-		//Render placed blocks with dissolve effect
+        List<IBlockState> blockStates;
-		//Use fancy shader if config allows, otherwise no dissolve
+        List<ItemStack> itemStacks;
-		if (BuildConfig.visuals.useShaders.get()) {
+        BlockPos firstPos;
-			for (int i = 0; i < placedDataList.size(); i++) {
+        BlockPos secondPos;
-				PlacedData placed = placedDataList.get(i);
+        boolean breaking;
-				if (placed.coordinates != null && !placed.coordinates.isEmpty()) {
+
-
+        public PlacedData(float time, List<BlockPos> coordinates, List<IBlockState> blockStates,
-					double totalTime = Mth.clampedLerp(30, 60, placed.firstPos.distSqr(placed.secondPos) / 100.0) * BuildConfig.visuals.dissolveTimeMultiplier.get();
+                          List<ItemStack> itemStacks, BlockPos firstPos, BlockPos secondPos, boolean breaking) {
-					float dissolve = (ClientProxy.ticksInGame - placed.time) / (float) totalTime;
+            this.time = time;
-					renderBlockPreviews(matrixStack, renderTypeBuffer, placed.coordinates, placed.blockStates, placed.itemStacks, dissolve, placed.firstPos, placed.secondPos, false, placed.breaking);
+            this.coordinates = coordinates;
-				}
+            this.blockStates = blockStates;
-			}
+            this.itemStacks = itemStacks;
-		}
+            this.firstPos = firstPos;
-		//Expire
+            this.secondPos = secondPos;
-		placedDataList.removeIf(placed -> {
+            this.breaking = breaking;
-			double totalTime = Mth.clampedLerp(30, 60, placed.firstPos.distSqr(placed.secondPos) / 100.0) * BuildConfig.visuals.dissolveTimeMultiplier.get();
+        }
-			return placed.time + totalTime < ClientProxy.ticksInGame;
+    }
-		});
+
-
+    private static List<PlacedData> placedDataList = new ArrayList<>();
-		//Render block previews
+
-		HitResult lookingAt = ClientProxy.getLookingAt(player);
+    private static final int primaryTextureUnit = 0;
-		if (modeSettings.getBuildMode() == BuildModes.BuildModeEnum.NORMAL)
+    private static final int secondaryTextureUnit = 2;
-			lookingAt = Minecraft.getInstance().hitResult;
+
-
+    public static void render(EntityPlayer player, ModifierSettings modifierSettings, ModeSettings modeSettings) {
-		ItemStack mainhand = player.getMainHandItem();
+
-		boolean noBlockInHand = !(!mainhand.isEmpty() && CompatHelper.isItemBlockProxy(mainhand));
+        //Render placed blocks with dissolve effect
-
+        //Use fancy shader if config allows, otherwise no dissolve
-		BlockPos startPos = null;
+        if (BuildConfig.visuals.useShaders.get()) {
-		Direction sideHit = null;
+            RenderHandler.beginBlockPreviews();
-		Vec3 hitVec = null;
+            for (int i = 0; i < placedDataList.size(); i++) {
-
+                PlacedData placed = placedDataList.get(i);
-		//Checking for null is necessary! Even in vanilla when looking down ladders it is occasionally null (instead of Type MISS)
+                if (placed.coordinates != null && !placed.coordinates.isEmpty()) {
-		if (lookingAt != null && lookingAt.getType() == HitResult.Type.BLOCK) {
+
-			BlockHitResult blockLookingAt = (BlockHitResult) lookingAt;
+                    double totalTime = MathHelper.clampedLerp(30, 60, placed.firstPos.distanceSq(placed.secondPos) / 100.0) * BuildConfig.visuals.dissolveTimeMultiplier.get();
-			startPos = blockLookingAt.getBlockPos();
+                    float dissolve = (ClientProxy.ticksInGame - placed.time) / (float) totalTime;
-
+                    renderBlockPreviews(placed.coordinates, placed.blockStates, placed.itemStacks, dissolve, placed.firstPos, placed.secondPos, false, placed.breaking);
-			//Check if tool (or none) in hand
+                }
-			//TODO 1.13 replaceable
+            }
-			boolean replaceable = player.level.getBlockState(startPos).getMaterial().isReplaceable();
+            RenderHandler.endBlockPreviews();
-			boolean becomesDoubleSlab = SurvivalHelper.doesBecomeDoubleSlab(player, startPos, blockLookingAt.getDirection());
+        }
-			if (!modifierSettings.doQuickReplace() && !noBlockInHand && !replaceable && !becomesDoubleSlab) {
+        //Expire
-				startPos = startPos.relative(blockLookingAt.getDirection());
+        placedDataList.removeIf(placed -> {
-			}
+            double totalTime = MathHelper.clampedLerp(30, 60, placed.firstPos.distanceSq(placed.secondPos) / 100.0) * BuildConfig.visuals.dissolveTimeMultiplier.get();
-
+            return placed.time + totalTime < ClientProxy.ticksInGame;
-			//Get under tall grass and other replaceable blocks
+        });
-			if (modifierSettings.doQuickReplace() && !noBlockInHand && replaceable) {
+
-				startPos = startPos.below();
+        //Render block previews
-			}
+        RayTraceResult lookingAt = ClientProxy.getLookingAt(player);
-
+        if (modeSettings.getBuildMode() == BuildModes.BuildModeEnum.NORMAL) lookingAt = Minecraft.getInstance().objectMouseOver;
-			sideHit = blockLookingAt.getDirection();
+
-			hitVec = blockLookingAt.getLocation();
+        ItemStack mainhand = player.getHeldItemMainhand();
-		}
+        boolean toolInHand = !(!mainhand.isEmpty() && CompatHelper.isItemBlockProxy(mainhand));
-
+
-		//Dont render if in normal mode and modifiers are disabled
+        BlockPos startPos = null;
-		//Unless alwaysShowBlockPreview is true in config
+        EnumFacing sideHit = null;
-		if (doRenderBlockPreviews(modifierSettings, modeSettings, startPos)) {
+        Vec3d hitVec = null;
-
+
-			//Keep blockstate the same for every block in the buildmode
+        //Checking for null is necessary! Even in vanilla when looking down ladders it is occasionally null (instead of Type MISS)
-			//So dont rotate blocks when in the middle of placing wall etc.
+        if (lookingAt != null && lookingAt.type == RayTraceResult.Type.BLOCK) {
-			if (BuildModes.isActive(player)) {
+            startPos = lookingAt.getBlockPos();
-				IBuildMode buildModeInstance = modeSettings.getBuildMode().instance;
+
-				if (buildModeInstance.getSideHit(player) != null) sideHit = buildModeInstance.getSideHit(player);
+            //Check if tool (or none) in hand
-				if (buildModeInstance.getHitVec(player) != null) hitVec = buildModeInstance.getHitVec(player);
+            //TODO 1.13 replaceable
-			}
+            boolean replaceable = player.world.getBlockState(startPos).getBlock().getMaterial(player.world.getBlockState(startPos)).isReplaceable();
-
+            boolean becomesDoubleSlab = SurvivalHelper.doesBecomeDoubleSlab(player, startPos, lookingAt.sideHit);
-			if (sideHit != null) {
+            if (!modifierSettings.doQuickReplace() && !toolInHand && !replaceable && !becomesDoubleSlab) {
-
+                startPos = startPos.offset(lookingAt.sideHit);
-				//Should be red?
+            }
-				boolean breaking = BuildModes.currentlyBreakingClient.get(player) != null && BuildModes.currentlyBreakingClient.get(player);
+
-
+            //Get under tall grass and other replaceable blocks
-				//get coordinates
+            if (modifierSettings.doQuickReplace() && !toolInHand && replaceable) {
-				List<BlockPos> startCoordinates = BuildModes.findCoordinates(player, startPos, breaking || modifierSettings.doQuickReplace());
+                startPos = startPos.down();
-
+            }
-				//Remember first and last point for the shader
+
-				BlockPos firstPos = BlockPos.ZERO, secondPos = BlockPos.ZERO;
+            sideHit = lookingAt.sideHit;
-				if (!startCoordinates.isEmpty()) {
+            hitVec = lookingAt.hitVec;
-					firstPos = startCoordinates.get(0);
+        }
-					secondPos = startCoordinates.get(startCoordinates.size() - 1);
+
-				}
+        //Dont render if in normal mode and modifiers are disabled
-
+        //Unless alwaysShowBlockPreview is true in config
-				//Limit number of blocks you can place
+        if (doRenderBlockPreviews(modifierSettings, modeSettings, startPos)) {
-				int limit = ReachHelper.getMaxBlocksPlacedAtOnce(player);
+
-				if (startCoordinates.size() > limit) {
+            //Keep blockstate the same for every block in the buildmode
-					startCoordinates = startCoordinates.subList(0, limit);
+            //So dont rotate blocks when in the middle of placing wall etc.
-				}
+            if (BuildModes.isActive(player)) {
-
+                IBuildMode buildModeInstance = modeSettings.getBuildMode().instance;
-				List<BlockPos> newCoordinates = BuildModifiers.findCoordinates(player, startCoordinates);
+                if (buildModeInstance.getSideHit(player) != null) sideHit = buildModeInstance.getSideHit(player);
-
+                if (buildModeInstance.getHitVec(player) != null) hitVec = buildModeInstance.getHitVec(player);
-				sortOnDistanceToPlayer(newCoordinates, player);
+            }
-
+
-				hitVec = new Vec3(Math.abs(hitVec.x - ((int) hitVec.x)), Math.abs(hitVec.y - ((int) hitVec.y)),
+            if (sideHit != null) {
-					Math.abs(hitVec.z - ((int) hitVec.z)));
+
-
+                //Should be red?
-				//Get blockstates
+                boolean breaking = BuildModes.currentlyBreakingClient.get(player) != null && BuildModes.currentlyBreakingClient.get(player);
-				List<ItemStack> itemStacks = new ArrayList<>();
+
-				List<BlockState> blockStates = new ArrayList<>();
+                //get coordinates
-				if (breaking) {
+                List<BlockPos> startCoordinates = BuildModes.findCoordinates(player, startPos, breaking || modifierSettings.doQuickReplace());
-					//Find blockstate of world
+
-					for (BlockPos coordinate : newCoordinates) {
+                //Remember first and last point for the shader
-						blockStates.add(player.level.getBlockState(coordinate));
+                BlockPos firstPos = BlockPos.ORIGIN, secondPos = BlockPos.ORIGIN;
-					}
+                if (!startCoordinates.isEmpty()) {
-				} else {
+                    firstPos = startCoordinates.get(0);
-					blockStates = BuildModifiers.findBlockStates(player, startCoordinates, hitVec, sideHit, itemStacks);
+                    secondPos = startCoordinates.get(startCoordinates.size() - 1);
-				}
+                }
-
+
-
+                //Limit number of blocks you can place
-				//Check if they are different from previous
+                int limit = ReachHelper.getMaxBlocksPlacedAtOnce(player);
-				//TODO fix triggering when moving player
+                if (startCoordinates.size() > limit) {
-				if (!BuildModifiers.compareCoordinates(previousCoordinates, newCoordinates)) {
+                    startCoordinates = startCoordinates.subList(0, limit);
-					previousCoordinates = newCoordinates;
+                }
-					//remember the rest for placed blocks
+
-					previousBlockStates = blockStates;
+                List<BlockPos> newCoordinates = BuildModifiers.findCoordinates(player, startCoordinates);
-					previousItemStacks = itemStacks;
+
-					previousFirstPos = firstPos;
+                sortOnDistanceToPlayer(newCoordinates, player);
-					previousSecondPos = secondPos;
+
-
+                hitVec = new Vec3d(Math.abs(hitVec.x - ((int) hitVec.x)), Math.abs(hitVec.y - ((int) hitVec.y)),
-					//if so, renew randomness of randomizer bag
+                        Math.abs(hitVec.z - ((int) hitVec.z)));
-					AbstractRandomizerBagItem.renewRandomness();
+
-					//and play sound (max once every tick)
+                //Get blockstates
-					if (newCoordinates.size() > 1 && blockStates.size() > 1 && soundTime < ClientProxy.ticksInGame - 0) {
+                List<ItemStack> itemStacks = new ArrayList<>();
-						soundTime = ClientProxy.ticksInGame;
+                List<IBlockState> blockStates = new ArrayList<>();
-
+                if (breaking) {
-						if (blockStates.get(0) != null) {
+                    //Find blockstate of world
-							SoundType soundType = blockStates.get(0).getBlock().getSoundType(blockStates.get(0), player.level,
+                    for (BlockPos coordinate : newCoordinates) {
-								newCoordinates.get(0), player);
+                        blockStates.add(player.world.getBlockState(coordinate));
-							player.level.playSound(player, player.blockPosition(), breaking ? soundType.getBreakSound() : soundType.getPlaceSound(),
+                    }
-								SoundSource.BLOCKS, 0.3f, 0.8f);
+                } else {
-						}
+                    blockStates = BuildModifiers.findBlockStates(player, startCoordinates, hitVec, sideHit, itemStacks);
-					}
+                }
-				}
+
-
+
-				//Render block previews
+                //Check if they are different from previous
-				if (blockStates.size() != 0 && newCoordinates.size() == blockStates.size()) {
+                //TODO fix triggering when moving player
-					int blockCount;
+                if (!BuildModifiers.compareCoordinates(previousCoordinates, newCoordinates)) {
-
+                    previousCoordinates = newCoordinates;
-					//Use fancy shader if config allows, otherwise outlines
+                    //remember the rest for placed blocks
-					if (BuildConfig.visuals.useShaders.get() && newCoordinates.size() < BuildConfig.visuals.shaderThreshold.get()) {
+                    previousBlockStates = blockStates;
-						blockCount = renderBlockPreviews(matrixStack, renderTypeBuffer, newCoordinates, blockStates, itemStacks, 0f, firstPos, secondPos, !breaking, breaking);
+                    previousItemStacks = itemStacks;
-					} else {
+                    previousFirstPos = firstPos;
-						VertexConsumer buffer = RenderHandler.beginLines(renderTypeBuffer);
+                    previousSecondPos = secondPos;
-
+
-						Vec3 color = new Vec3(1f, 1f, 1f);
+                    //if so, renew randomness of randomizer bag
-						if (breaking) color = new Vec3(1f, 0f, 0f);
+                    ItemRandomizerBag.renewRandomness();
-
+                    //and play sound (max once every tick)
-						for (int i = newCoordinates.size() - 1; i >= 0; i--) {
+                    if (newCoordinates.size() > 1 && blockStates.size() > 1 && soundTime < ClientProxy.ticksInGame - 0) {
-							VoxelShape collisionShape = blockStates.get(i).getCollisionShape(player.level, newCoordinates.get(i));
+                        soundTime = ClientProxy.ticksInGame;
-							RenderHandler.renderBlockOutline(matrixStack, buffer, newCoordinates.get(i), collisionShape, color);
+
-						}
+                        if (blockStates.get(0) != null) {
-
+                            SoundType soundType = blockStates.get(0).getBlock().getSoundType(blockStates.get(0), player.world,
-						RenderHandler.endLines(renderTypeBuffer);
+                                    newCoordinates.get(0), player);
-
+                            player.world.playSound(player, player.getPosition(), breaking ? soundType.getBreakSound() : soundType.getPlaceSound(),
-						blockCount = newCoordinates.size();
+                                    SoundCategory.BLOCKS, 0.3f, 0.8f);
-					}
+                        }
-
+                    }
-					//Display block count and dimensions in actionbar
+                }
-					if (BuildModes.isActive(player)) {
+
-
+                //Render block previews
-						//Find min and max values (not simply firstPos and secondPos because that doesn't work with circles)
+                if (blockStates.size() != 0 && newCoordinates.size() == blockStates.size()) {
-						int minX = Integer.MAX_VALUE, maxX = Integer.MIN_VALUE;
+                    int blockCount;
-						int minY = Integer.MAX_VALUE, maxY = Integer.MIN_VALUE;
+
-						int minZ = Integer.MAX_VALUE, maxZ = Integer.MIN_VALUE;
+                    //Use fancy shader if config allows, otherwise outlines
-						for (BlockPos pos : startCoordinates) {
+                    if (BuildConfig.visuals.useShaders.get() && newCoordinates.size() < BuildConfig.visuals.shaderTreshold.get()) {
-							if (pos.getX() < minX) minX = pos.getX();
+
-							if (pos.getX() > maxX) maxX = pos.getX();
+                        RenderHandler.beginBlockPreviews();
-							if (pos.getY() < minY) minY = pos.getY();
+
-							if (pos.getY() > maxY) maxY = pos.getY();
+                        blockCount = renderBlockPreviews(newCoordinates, blockStates, itemStacks, 0f, firstPos, secondPos, !breaking, breaking);
-							if (pos.getZ() < minZ) minZ = pos.getZ();
+
-							if (pos.getZ() > maxZ) maxZ = pos.getZ();
+                        RenderHandler.endBlockPreviews();
-						}
+                    } else {
-						BlockPos dim = new BlockPos(maxX - minX + 1, maxY - minY + 1, maxZ - minZ + 1);
+
-
+                        RenderHandler.beginLines();
-						String dimensions = "(";
+
-						if (dim.getX() > 1) dimensions += dim.getX() + "x";
+                        Vec3d color = new Vec3d(1f, 1f, 1f);
-						if (dim.getZ() > 1) dimensions += dim.getZ() + "x";
+                        if (breaking) color = new Vec3d(1f, 0f, 0f);
-						if (dim.getY() > 1) dimensions += dim.getY() + "x";
+
-						dimensions = dimensions.substring(0, dimensions.length() - 1);
+                        for (int i = newCoordinates.size() - 1; i >= 0; i--) {
-						if (dimensions.length() > 1) dimensions += ")";
+                            VoxelShape collisionShape = blockStates.get(i).getCollisionShape(player.world, newCoordinates.get(i));
-
+                            RenderHandler.renderBlockOutline(newCoordinates.get(i), collisionShape, color);
-						EffortlessBuilding.log(player, blockCount + " blocks " + dimensions, true);
+                        }
-					}
+
-				}
+                        RenderHandler.endLines();
-
+
-
+                        blockCount = newCoordinates.size();
-			}
+                    }
-
+
-			//Draw outlines if no block in hand
+                    //Display block count and dimensions in actionbar
-			//Find proper raytrace: either normal range or increased range depending on canBreakFar
+                    if (BuildModes.isActive(player)) {
-			VertexConsumer buffer = RenderHandler.beginLines(renderTypeBuffer);
+
-			HitResult objectMouseOver = Minecraft.getInstance().hitResult;
+                        //Find min and max values (not simply firstPos and secondPos because that doesn't work with circles)
-			HitResult breakingRaytrace = ReachHelper.canBreakFar(player) ? lookingAt : objectMouseOver;
+                        int minX = Integer.MAX_VALUE, maxX = Integer.MIN_VALUE;
-
+                        int minY = Integer.MAX_VALUE, maxY = Integer.MIN_VALUE;
-			if (player.isCreative() && noBlockInHand && breakingRaytrace != null && breakingRaytrace.getType() == HitResult.Type.BLOCK) {
+                        int minZ = Integer.MAX_VALUE, maxZ = Integer.MIN_VALUE;
-				BlockHitResult blockBreakingRaytrace = (BlockHitResult) breakingRaytrace;
+                        for (BlockPos pos : startCoordinates) {
-				List<BlockPos> breakCoordinates = BuildModifiers.findCoordinates(player, blockBreakingRaytrace.getBlockPos());
+                            if (pos.getX() < minX) minX = pos.getX();
-
+                            if (pos.getX() > maxX) maxX = pos.getX();
-				//Only render first outline if further than normal reach
+                            if (pos.getY() < minY) minY = pos.getY();
-				boolean excludeFirst = objectMouseOver != null && objectMouseOver.getType() == HitResult.Type.BLOCK;
+                            if (pos.getY() > maxY) maxY = pos.getY();
-				for (int i = excludeFirst ? 1 : 0; i < breakCoordinates.size(); i++) {
+                            if (pos.getZ() < minZ) minZ = pos.getZ();
-					BlockPos coordinate = breakCoordinates.get(i);
+                            if (pos.getZ() > maxZ) maxZ = pos.getZ();
-
+                        }
-					BlockState blockState = player.level.getBlockState(coordinate);
+                        BlockPos dim = new BlockPos(maxX - minX + 1, maxY - minY + 1, maxZ - minZ + 1);
-					if (!blockState.isAir()) {
+
-						if (SurvivalHelper.canBreak(player.level, player, coordinate) || i == 0) {
+                        String dimensions = "(";
-							VoxelShape collisionShape = blockState.getCollisionShape(player.level, coordinate);
+                        if (dim.getX() > 1) dimensions += dim.getX() + "x";
-							RenderHandler.renderBlockOutline(matrixStack, buffer, coordinate, collisionShape, new Vec3(0f, 0f, 0f));
+                        if (dim.getZ() > 1) dimensions += dim.getZ() + "x";
-						}
+                        if (dim.getY() > 1) dimensions += dim.getY() + "x";
-					}
+                        dimensions = dimensions.substring(0, dimensions.length() - 1);
-				}
+                        if (dimensions.length() > 1) dimensions += ")";
-			}
+
-			RenderHandler.endLines(renderTypeBuffer);
+                        EffortlessBuilding.log(player, blockCount + " blocks " + dimensions, true);
-		}
+                    }
-	}
+                }
-
+
-	//Whether to draw any block previews or outlines
+
-	public static boolean doRenderBlockPreviews(ModifierSettings modifierSettings, ModeSettings modeSettings, BlockPos startPos) {
+            }
-		return modeSettings.getBuildMode() != BuildModes.BuildModeEnum.NORMAL ||
+
-			(startPos != null && BuildModifiers.isEnabled(modifierSettings, startPos)) ||
+            RenderHandler.beginLines();
-			BuildConfig.visuals.alwaysShowBlockPreview.get();
+            //Draw outlines if tool in hand
-	}
+            //Find proper raytrace: either normal range or increased range depending on canBreakFar
-
+            RayTraceResult objectMouseOver = Minecraft.getInstance().objectMouseOver;
-	protected static int renderBlockPreviews(PoseStack matrixStack, MultiBufferSource.BufferSource renderTypeBuffer, List<BlockPos> coordinates, List<BlockState> blockStates,
+            RayTraceResult breakingRaytrace = ReachHelper.canBreakFar(player) ? lookingAt : objectMouseOver;
-											 List<ItemStack> itemStacks, float dissolve, BlockPos firstPos,
+            if (toolInHand && breakingRaytrace != null && breakingRaytrace.type == RayTraceResult.Type.BLOCK) {
-											 BlockPos secondPos, boolean checkCanPlace, boolean red) {
+                List<BlockPos> breakCoordinates = BuildModifiers.findCoordinates(player, breakingRaytrace.getBlockPos());
-		Player player = Minecraft.getInstance().player;
+
-		ModifierSettings modifierSettings = ModifierSettingsManager.getModifierSettings(player);
+                //Only render first outline if further than normal reach
-		BlockRenderDispatcher dispatcher = Minecraft.getInstance().getBlockRenderer();
+                boolean excludeFirst = objectMouseOver != null && objectMouseOver.type == RayTraceResult.Type.BLOCK;
-		int blocksValid = 0;
+                for (int i = excludeFirst ? 1 : 0; i < breakCoordinates.size(); i++) {
-
+                    BlockPos coordinate = breakCoordinates.get(i);
-		if (coordinates.isEmpty()) return blocksValid;
+
-
+                    IBlockState blockState = player.world.getBlockState(coordinate);
-		for (int i = coordinates.size() - 1; i >= 0; i--) {
+                    if (!blockState.getBlock().isAir(blockState, player.world, coordinate)) {
-			BlockPos blockPos = coordinates.get(i);
+                        if (SurvivalHelper.canBreak(player.world, player, coordinate) || i == 0) {
-			BlockState blockState = blockStates.get(i);
+                            VoxelShape collisionShape = blockState.getCollisionShape(player.world, coordinate);
-			ItemStack itemstack = itemStacks.isEmpty() ? ItemStack.EMPTY : itemStacks.get(i);
+                            RenderHandler.renderBlockOutline(coordinate, collisionShape, new Vec3d(0f, 0f, 0f));
-			if (CompatHelper.isItemBlockProxy(itemstack))
+                        }
-				itemstack = CompatHelper.getItemBlockByState(itemstack, blockState);
+                    }
-
+                }
-			//Check if can place
+            }
-			//If check is turned off, check if blockstate is the same (for dissolve effect)
+            RenderHandler.endLines();
-			if ((!checkCanPlace /*&& player.world.getNewBlockState(blockPos) == blockState*/) || //TODO enable (breaks the breaking shader)
+        }
-				SurvivalHelper.canPlace(player.level, player, blockPos, blockState, itemstack, modifierSettings.doQuickReplace(), Direction.UP)) {
+    }
-
+
-				RenderHandler.renderBlockPreview(matrixStack, renderTypeBuffer, dispatcher, blockPos, blockState, dissolve, firstPos, secondPos, red);
+    //Whether to draw any block previews or outlines
-				blocksValid++;
+    public static boolean doRenderBlockPreviews(ModifierSettings modifierSettings, ModeSettings modeSettings, BlockPos startPos) {
-			}
+        return modeSettings.getBuildMode() != BuildModes.BuildModeEnum.NORMAL ||
-		}
+               (startPos != null && BuildModifiers.isEnabled(modifierSettings, startPos)) ||
-		return blocksValid;
+               BuildConfig.visuals.alwaysShowBlockPreview.get();
-	}
+    }
-
+
-	public static void onBlocksPlaced() {
+    protected static int renderBlockPreviews(List<BlockPos> coordinates, List<IBlockState> blockStates,
-		onBlocksPlaced(previousCoordinates, previousItemStacks, previousBlockStates, previousFirstPos, previousSecondPos);
+                                              List<ItemStack> itemStacks, float dissolve, BlockPos firstPos,
-	}
+                                              BlockPos secondPos, boolean checkCanPlace, boolean red) {
-
+        EntityPlayer player = Minecraft.getInstance().player;
-	public static void onBlocksPlaced(List<BlockPos> coordinates, List<ItemStack> itemStacks, List<BlockState> blockStates,
+        ModifierSettings modifierSettings = ModifierSettingsManager.getModifierSettings(player);
-									  BlockPos firstPos, BlockPos secondPos) {
+        BlockRendererDispatcher dispatcher = Minecraft.getInstance().getBlockRendererDispatcher();
-		LocalPlayer player = Minecraft.getInstance().player;
+        int blocksValid = 0;
-		ModifierSettings modifierSettings = ModifierSettingsManager.getModifierSettings(player);
+
-		ModeSettings modeSettings = ModeSettingsManager.getModeSettings(player);
+        if (coordinates.isEmpty()) return blocksValid;
-
+
-		//Check if block previews are enabled
+        for (int i = coordinates.size() - 1; i >= 0; i--) {
-		if (doRenderBlockPreviews(modifierSettings, modeSettings, firstPos)) {
+            BlockPos blockPos = coordinates.get(i);
-
+            IBlockState blockState = blockStates.get(i);
-			//Save current coordinates, blockstates and itemstacks
+            ItemStack itemstack = itemStacks.isEmpty() ? ItemStack.EMPTY : itemStacks.get(i);
-			if (!coordinates.isEmpty() && blockStates.size() == coordinates.size() &&
+            if (CompatHelper.isItemBlockProxy(itemstack))
-				coordinates.size() > 1 && coordinates.size() < BuildConfig.visuals.shaderThreshold.get()) {
+                itemstack = CompatHelper.getItemBlockByState(itemstack, blockState);
-
+
-				placedDataList.add(new PlacedData(ClientProxy.ticksInGame, coordinates, blockStates,
+            //Check if can place
-					itemStacks, firstPos, secondPos, false));
+            //If check is turned off, check if blockstate is the same (for dissolve effect)
-			}
+            if ((!checkCanPlace /*&& player.world.getNewBlockState(blockPos) == blockState*/) || //TODO enable (breaks breaking shader)
-		}
+                SurvivalHelper.canPlace(player.world, player, blockPos, blockState, itemstack, modifierSettings.doQuickReplace(), EnumFacing.UP)) {
-
+
-	}
+                ShaderHandler.useShader(ShaderHandler.dissolve, generateShaderCallback(dissolve,
-
+                        new Vec3d(blockPos), new Vec3d(firstPos), new Vec3d(secondPos),
-	public static void onBlocksBroken() {
+                        blockPos == secondPos, red));
-		onBlocksBroken(previousCoordinates, previousItemStacks, previousBlockStates, previousFirstPos, previousSecondPos);
+                RenderHandler.renderBlockPreview(dispatcher, blockPos, blockState);
-	}
+                blocksValid++;
-
+            }
-	public static void onBlocksBroken(List<BlockPos> coordinates, List<ItemStack> itemStacks, List<BlockState> blockStates,
+        }
-									  BlockPos firstPos, BlockPos secondPos) {
+        return blocksValid;
-		LocalPlayer player = Minecraft.getInstance().player;
+    }
-		ModifierSettings modifierSettings = ModifierSettingsManager.getModifierSettings(player);
+
-		ModeSettings modeSettings = ModeSettingsManager.getModeSettings(player);
+    public static void onBlocksPlaced() {
-
+        onBlocksPlaced(previousCoordinates, previousItemStacks, previousBlockStates, previousFirstPos, previousSecondPos);
-		//Check if block previews are enabled
+    }
-		if (doRenderBlockPreviews(modifierSettings, modeSettings, firstPos)) {
+
-
+    public static void onBlocksPlaced(List<BlockPos> coordinates, List<ItemStack> itemStacks, List<IBlockState> blockStates,
-			//Save current coordinates, blockstates and itemstacks
+                                      BlockPos firstPos, BlockPos secondPos) {
-			if (!coordinates.isEmpty() && blockStates.size() == coordinates.size() &&
+        EntityPlayerSP player = Minecraft.getInstance().player;
-				coordinates.size() > 1 && coordinates.size() < BuildConfig.visuals.shaderThreshold.get()) {
+        ModifierSettings modifierSettings = ModifierSettingsManager.getModifierSettings(player);
-
+        ModeSettings modeSettings = ModeSettingsManager.getModeSettings(player);
-				sortOnDistanceToPlayer(coordinates, player);
+
-
+        //Check if block previews are enabled
-				placedDataList.add(new PlacedData(ClientProxy.ticksInGame, coordinates, blockStates,
+        if (doRenderBlockPreviews(modifierSettings, modeSettings, firstPos)) {
-					itemStacks, firstPos, secondPos, true));
+
-			}
+            //Save current coordinates, blockstates and itemstacks
-		}
+            if (!coordinates.isEmpty() && blockStates.size() == coordinates.size() &&
-
+                coordinates.size() > 1 && coordinates.size() < BuildConfig.visuals.shaderTreshold.get()) {
-	}
+
-
+                placedDataList.add(new PlacedData(ClientProxy.ticksInGame, coordinates, blockStates,
-	private static void sortOnDistanceToPlayer(List<BlockPos> coordinates, Player player) {
+                        itemStacks, firstPos, secondPos, false));
-
+            }
-		Collections.sort(coordinates, (lhs, rhs) -> {
+        }
-			// -1 - less than, 1 - greater than, 0 - equal
+
-			double lhsDistanceToPlayer = Vec3.atLowerCornerOf(lhs).subtract(player.getEyePosition(1f)).lengthSqr();
+    }
-			double rhsDistanceToPlayer = Vec3.atLowerCornerOf(rhs).subtract(player.getEyePosition(1f)).lengthSqr();
+
-			return (int) Math.signum(lhsDistanceToPlayer - rhsDistanceToPlayer);
+    public static void onBlocksBroken() {
-		});
+        onBlocksBroken(previousCoordinates, previousItemStacks, previousBlockStates, previousFirstPos, previousSecondPos);
-
+    }
-	}
+
-
+    public static void onBlocksBroken(List<BlockPos> coordinates, List<ItemStack> itemStacks, List<IBlockState> blockStates,
-	static class PlacedData {
+                                      BlockPos firstPos, BlockPos secondPos) {
-		float time;
+        EntityPlayerSP player = Minecraft.getInstance().player;
-		List<BlockPos> coordinates;
+        ModifierSettings modifierSettings = ModifierSettingsManager.getModifierSettings(player);
-		List<BlockState> blockStates;
+        ModeSettings modeSettings = ModeSettingsManager.getModeSettings(player);
-		List<ItemStack> itemStacks;
+
-		BlockPos firstPos;
+        //Check if block previews are enabled
-		BlockPos secondPos;
+        if (doRenderBlockPreviews(modifierSettings, modeSettings, firstPos)) {
-		boolean breaking;
+
-
+            //Save current coordinates, blockstates and itemstacks
-		public PlacedData(float time, List<BlockPos> coordinates, List<BlockState> blockStates,
+            if (!coordinates.isEmpty() && blockStates.size() == coordinates.size() &&
-						  List<ItemStack> itemStacks, BlockPos firstPos, BlockPos secondPos, boolean breaking) {
+                coordinates.size() > 1 && coordinates.size() < BuildConfig.visuals.shaderTreshold.get()) {
-			this.time = time;
+
-			this.coordinates = coordinates;
+                sortOnDistanceToPlayer(coordinates, player);
-			this.blockStates = blockStates;
+
-			this.itemStacks = itemStacks;
+                placedDataList.add(new PlacedData(ClientProxy.ticksInGame, coordinates, blockStates,
-			this.firstPos = firstPos;
+                        itemStacks, firstPos, secondPos, true));
-			this.secondPos = secondPos;
+            }
-			this.breaking = breaking;
+        }
-		}
+
-	}
+    }
+
+    private static Consumer<Integer> generateShaderCallback(final float dissolve, final Vec3d blockpos,
+                                                            final Vec3d firstpos, final Vec3d secondpos,
+                                                            final boolean highlight, final boolean red) {
+        Minecraft mc = Minecraft.getInstance();
+        return (Integer shader) -> {
+            int percentileUniform = ARBShaderObjects.glGetUniformLocationARB(shader, "dissolve");
+            int highlightUniform = ARBShaderObjects.glGetUniformLocationARB(shader, "highlight");
+            int redUniform = ARBShaderObjects.glGetUniformLocationARB(shader, "red");
+            int blockposUniform = ARBShaderObjects.glGetUniformLocationARB(shader, "blockpos");
+            int firstposUniform = ARBShaderObjects.glGetUniformLocationARB(shader, "firstpos");
+            int secondposUniform = ARBShaderObjects.glGetUniformLocationARB(shader, "secondpos");
+            int imageUniform = ARBShaderObjects.glGetUniformLocationARB(shader, "image");
+            int maskUniform = ARBShaderObjects.glGetUniformLocationARB(shader, "mask");
+
+            GlStateManager.enableTexture2D();
+            GL11.glGetInteger(GL11.GL_TEXTURE_BINDING_2D);
+
+            //mask
+            ARBShaderObjects.glUniform1iARB(maskUniform, secondaryTextureUnit);
+            OpenGlHelper.glActiveTexture(ARBMultitexture.GL_TEXTURE0_ARB + secondaryTextureUnit);
+            GL11.glBindTexture(GL11.GL_TEXTURE_2D, mc.getTextureManager().getTexture(ShaderHandler.shaderMaskTextureLocation).getGlTextureId());
+
+            //image
+            ARBShaderObjects.glUniform1iARB(imageUniform, primaryTextureUnit);
+            OpenGlHelper.glActiveTexture(ARBMultitexture.GL_TEXTURE0_ARB + primaryTextureUnit);
+            GL11.glBindTexture(GL11.GL_TEXTURE_2D, mc.getTextureManager().getTexture(TextureMap.LOCATION_BLOCKS_TEXTURE).getGlTextureId());
+
+            //blockpos
+            ARBShaderObjects.glUniform3fARB(blockposUniform, (float) blockpos.x, (float) blockpos.y, (float) blockpos.z);
+            ARBShaderObjects.glUniform3fARB(firstposUniform, (float) firstpos.x, (float) firstpos.y, (float) firstpos.z);
+            ARBShaderObjects.glUniform3fARB(secondposUniform, (float) secondpos.x, (float) secondpos.y, (float) secondpos.z);
+
+            //dissolve
+            ARBShaderObjects.glUniform1fARB(percentileUniform, dissolve);
+            //highlight
+            ARBShaderObjects.glUniform1iARB(highlightUniform, highlight ? 1 : 0);
+            //red
+            ARBShaderObjects.glUniform1iARB(redUniform, red ? 1 : 0);
+        };
+    }
+
+    private static void sortOnDistanceToPlayer(List<BlockPos> coordinates, EntityPlayer player) {
+
+        Collections.sort(coordinates, (lhs, rhs) -> {
+            // -1 - less than, 1 - greater than, 0 - equal
+            double lhsDistanceToPlayer = new Vec3d(lhs).subtract(player.getEyePosition(1f)).lengthSquared();
+            double rhsDistanceToPlayer = new Vec3d(rhs).subtract(player.getEyePosition(1f)).lengthSquared();
+            return (int) Math.signum(lhsDistanceToPlayer - rhsDistanceToPlayer);
+        });
+
+    }
 }