Refactored shader code to use GL20 instead of ARB.

.gitignore

@@ -1,26 +1,43 @@
-# eclipse
-bin
-*.launch
-.settings
-.metadata
-.classpath
-.project
+## Based on GitHub's Eclipse .gitignore
 
-# idea
-out
-*.ipr
-*.iws
+classes/
+run/
+.gradle/
+build/
+gradle-app.setting
+
+## IntelliJ IDEA
+
+.idea/
 *.iml
-.idea
+*.iws
+*.ipr
 
-# gradle
-build
-.gradle
+## Eclipse
 
-# other
-eclipse
-run
-logs/*
+eclipse/
+*.pydevproject
+.project
+.metadata
+bin/
+tmp/
+*.tmp
+*.bak
+*.swp
+*~.nib
+local.properties
+.classpath
+.settings/
+.loadpath
 
-# Files from Forge MDK
-forge*changelog.txt
+# External tool builders
+.externalToolBuilders/
+
+# Locally stored "Eclipse launch configurations"
+*.launch
+
+# CDT-specific
+.cproject
+
+# PDT-specific
+.buildpath

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.txt

@@ -1,53 +0,0 @@
--------------------------------------------
-Source installation information for modders
--------------------------------------------
-This code follows the Minecraft Forge installation methodology. It will apply
-some small patches to the vanilla MCP source code, giving you and it access 
-to some of the data and functions you need to build a successful mod.
-
-Note also that the patches are built against "unrenamed" MCP source code (aka
-srgnames) - this means that you will not be able to read them directly against
-normal code.
-
-Source pack installation information:
-
-Standalone source installation
-==============================
-
-See the Forge Documentation online for more detailed instructions:
-http://mcforge.readthedocs.io/en/latest/gettingstarted/
-
-Step 1: Open your command-line and browse to the folder where you extracted the zip file.
-
-Step 2: You're left with a choice.
-If you prefer to use Eclipse:
-1. Run the following command: "gradlew genEclipseRuns" (./gradlew genEclipseRuns if you are on Mac/Linux)
-2. Open Eclipse, Import > Existing Gradle Project > Select Folder 
-   or run "gradlew eclipse" to generate the project.
-(Current Issue)
-4. Open Project > Run/Debug Settings > Edit runClient and runServer > Environment
-5. Edit MOD_CLASSES to show [modid]%%[Path]; 2 times rather then the generated 4.
-
-If you prefer to use IntelliJ:
-1. Open IDEA, and import project.
-2. Select your build.gradle file and have it import.
-3. Run the following command: "gradlew genIntellijRuns" (./gradlew genIntellijRuns if you are on Mac/Linux)
-4. Refresh the Gradle Project in IDEA if required.
-
-If at any point you are missing libraries in your IDE, or you've run into problems you can run "gradlew --refresh-dependencies" to refresh the local cache. "gradlew clean" to reset everything {this does not affect your code} and then start the processs again.
-
-Should it still not work, 
-Refer to #ForgeGradle on EsperNet for more information about the gradle environment.
-or the Forge Project Discord discord.gg/UvedJ9m
-
-Forge source installation
-=========================
-MinecraftForge ships with this code and installs it as part of the forge
-installation process, no further action is required on your part.
-
-LexManos' Install Video
-=======================
-https://www.youtube.com/watch?v=8VEdtQLuLO0&feature=youtu.be
-
-For more details update more often refer to the Forge Forums:
-http://www.minecraftforge.net/forum/index.php/topic,14048.0.html

build.gradle

@@ -1,146 +1,82 @@
 buildscript {
     repositories {
-        maven { url = 'https://files.minecraftforge.net/maven' }
         jcenter()
-        mavenCentral()
+        maven { url = "http://files.minecraftforge.net/maven" }
     }
     dependencies {
-        classpath group: 'net.minecraftforge.gradle', name: 'ForgeGradle', version: '5.1+', changing: true
+        classpath 'net.minecraftforge.gradle:ForgeGradle:2.3-SNAPSHOT'
     }
 }
-apply plugin: 'net.minecraftforge.gradle'
+apply plugin: 'net.minecraftforge.gradle.forge'
 //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.16.3-2.32'
-group = 'nl.requios.effortlessbuilding' // http://maven.apache.org/guides/mini/guide-naming-conventions.html
-archivesBaseName = 'effortlessbuilding'
 
-sourceCompatibility = targetCompatibility = compileJava.sourceCompatibility = compileJava.targetCompatibility = '1.8' // Need this here so eclipse task generates correctly.
+version = "1.12.2-2.10"
+group = "nl.requios.effortlessbuilding" // http://maven.apache.org/guides/mini/guide-naming-conventions.html
+archivesBaseName = "effortlessbuilding"
+
+sourceCompatibility = targetCompatibility = '1.8' // Need this here so eclipse task generates correctly.
+compileJava {
+    sourceCompatibility = targetCompatibility = '1.8'
+}
 
 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.
+    version = "1.12.2-14.23.5.2825"
+    runDir = "run"
+    
+    // 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.16.5'
-    accessTransformer = file('src/main/resources/META-INF/accesstransformer.cfg')
+    // simply re-run your setup task after changing the mappings to update your workspace.
+    mappings = "stable_39"
     // makeObfSourceJar = false // an Srg named sources jar is made by default. uncomment this to disable.
-
-    // Default run configurations.
-    // These can be tweaked, removed, or duplicated as needed.
-    runs {
-        client {
-            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'
-
-            mods {
-                effortlessbuilding {
-                    source sourceSets.main
-                }
-            }
 }
 
-        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'
-
-            mods {
-                effortlessbuilding {
-                    source sourceSets.main
-                }
-            }
-        }
-
-        data {
-            workingDirectory project.file('run')
-
-            // Recommended logging data for a userdev environment (SCAN,REGISTRIES,REGISTRYDUMP)
-            property 'forge.logging.markers', 'REGISTRIES'
-
-            // Recommended logging level for the console
-            property 'forge.logging.console.level', 'debug'
-
-            // Specify the modid for data generation, where to output the resulting resource, and where to look for existing resources.
-            args '--mod', 'effortlessbuilding', '--all', '--output', file('src/generated/resources/'), '--existing', file('src/main/resources/')
-
-            mods {
-                effortlessbuilding {
-                    source sourceSets.main
-                }
-            }
-        }
-    }
+repositories {
+	flatDir { dirs 'libs' }
 }
 
 dependencies {
-    // Specify the version of Minecraft to use, If this is any group other then 'net.minecraft' it is assumed
-    // that the dep is a ForgeGradle 'patcher' dependency. And it's patches will be applied.
-    // The userdev artifact is a special name and will get all sorts of transformations applied to it.
-    minecraft 'net.minecraftforge:forge:1.16.3-34.0.9'
-
-    // You may put jars on which you depend on in ./libs or you may define them like so..
+    // you may put jars on which you depend on in ./libs
+    // or you may define them like so..
     //compile "some.group:artifact:version:classifier"
     //compile "some.group:artifact:version"
       
-    // Real examples
+    // real examples
     //compile 'com.mod-buildcraft:buildcraft:6.0.8:dev'  // adds buildcraft to the dev env
     //compile 'com.googlecode.efficient-java-matrix-library:ejml:0.24' // adds ejml to the dev env
 
-    // The 'provided' configuration is for optional dependencies that exist at compile-time but might not at runtime.
+    // 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'
+    // the deobf configurations:  'deobfCompile' and 'deobfProvided' are the same as the normal compile and provided,
+    // except that these dependencies get remapped to your current MCP mappings
+    //deobfCompile 'com.mod-buildcraft:buildcraft:6.0.8:dev'
+    //deobfProvided 'com.mod-buildcraft:buildcraft:6.0.8:dev'
+	provided 'mod.chiselsandbits:chiselsandbits:14.30'
 
-    // For more info...
+    // 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..
-jar {
-    manifest {
-        attributes([
-            "Specification-Title": "effortlessbuilding",
-            "Specification-Vendor": "requios",
-            "Specification-Version": "1", // We are version 1 of ourselves
-            "Implementation-Title": project.name,
-            "Implementation-Version": "${version}",
-            "Implementation-Vendor" :"requios",
-            "Implementation-Timestamp": new Date().format("yyyy-MM-dd'T'HH:mm:ssZ")
-        ])
-    }
+processResources {
+    // this will ensure that this task is redone when the versions change.
+    inputs.property "version", project.version
+    inputs.property "mcversion", project.minecraft.version
+
+    // replace stuff in mcmod.info, nothing else
+    from(sourceSets.main.resources.srcDirs) {
+        include 'mcmod.info'
+                
+        // replace version and mcversion
+        expand 'version':project.version, 'mcversion':project.minecraft.version
     }
         
-// Example configuration to allow publishing using the maven-publish task
-// This is the preferred method to reobfuscate your jar file
-jar.finalizedBy('reobfJar') 
-// However if you are in a multi-project build, dev time needs unobfed jar files, so you can delay the obfuscation until publishing by doing
-//publish.dependsOn('reobfJar')
-
-publishing {
-    publications {
-        mavenJava(MavenPublication) {
-            artifact jar
-        }
-    }
-    repositories {
-        maven {
-            url "file:///${project.projectDir}/mcmodsrepo"
-        }
+    // copy everything else except the mcmod.info
+    from(sourceSets.main.resources.srcDirs) {
+        exclude 'mcmod.info'
     }
 }

gradle.properties

@@ -1,4 +0,0 @@
-# Sets default memory used for gradle commands. Can be overridden by user or command line properties.
-# This is required to provide enough memory for the Minecraft decompilation process.
-org.gradle.jvmargs=-Xmx3G
-org.gradle.daemon=false

gradle/wrapper/gradle-wrapper.properties

@@ -1,5 +1,6 @@
+#Mon Sep 14 12:28:28 PDT 2015
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.2-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
+distributionUrl=https\://services.gradle.org/distributions/gradle-2.14-bin.zip

gradlew

@@ -1,51 +1,17 @@
 #!/usr/bin/env bash
 
-#
-# Copyright 2015 the original author or authors.
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#      https://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-
 ##############################################################################
 ##
 ##  Gradle start up script for UN*X
 ##
 ##############################################################################
 
-# Attempt to set APP_HOME
-# Resolve links: $0 may be a link
-PRG="$0"
-# Need this for relative symlinks.
-while [ -h "$PRG" ] ; do
-    ls=`ls -ld "$PRG"`
-    link=`expr "$ls" : '.*-> \(.*\)$'`
-    if expr "$link" : '/.*' > /dev/null; then
-        PRG="$link"
-    else
-        PRG=`dirname "$PRG"`"/$link"
-    fi
-done
-SAVED="`pwd`"
-cd "`dirname \"$PRG\"`/" >/dev/null
-APP_HOME="`pwd -P`"
-cd "$SAVED" >/dev/null
+# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
+DEFAULT_JVM_OPTS=""
 
 APP_NAME="Gradle"
 APP_BASE_NAME=`basename "$0"`
 
-# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
-DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
-
 # Use the maximum available, or set MAX_FD != -1 to use that value.
 MAX_FD="maximum"
 
@@ -64,7 +30,6 @@ die () {
 cygwin=false
 msys=false
 darwin=false
-nonstop=false
 case "`uname`" in
   CYGWIN* )
     cygwin=true
@@ -72,16 +37,35 @@ case "`uname`" in
   Darwin* )
     darwin=true
     ;;
-  MSYS* | MINGW* )
+  MINGW* )
     msys=true
     ;;
-  NONSTOP* )
-    nonstop=true
-    ;;
 esac
 
-CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar
+# For Cygwin, ensure paths are in UNIX format before anything is touched.
+if $cygwin ; then
+    [ -n "$JAVA_HOME" ] && JAVA_HOME=`cygpath --unix "$JAVA_HOME"`
+fi
 
+# Attempt to set APP_HOME
+# Resolve links: $0 may be a link
+PRG="$0"
+# Need this for relative symlinks.
+while [ -h "$PRG" ] ; do
+    ls=`ls -ld "$PRG"`
+    link=`expr "$ls" : '.*-> \(.*\)$'`
+    if expr "$link" : '/.*' > /dev/null; then
+        PRG="$link"
+    else
+        PRG=`dirname "$PRG"`"/$link"
+    fi
+done
+SAVED="`pwd`"
+cd "`dirname \"$PRG\"`/" >&-
+APP_HOME="`pwd -P`"
+cd "$SAVED" >&-
+
+CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar
 
 # Determine the Java command to use to start the JVM.
 if [ -n "$JAVA_HOME" ] ; then
@@ -106,7 +90,7 @@ location of your Java installation."
 fi
 
 # Increase the maximum file descriptors if we can.
-if [ "$cygwin" = "false" -a "$darwin" = "false" -a "$nonstop" = "false" ] ; then
+if [ "$cygwin" = "false" -a "$darwin" = "false" ] ; then
     MAX_FD_LIMIT=`ulimit -H -n`
     if [ $? -eq 0 ] ; then
         if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ] ; then
@@ -126,13 +110,11 @@ if $darwin; then
     GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\""
 fi
 
-# For Cygwin or MSYS, switch paths to Windows format before running java
-if [ "$cygwin" = "true" -o "$msys" = "true" ] ; then
+# For Cygwin, switch paths to Windows format before running java
+if $cygwin ; then
     APP_HOME=`cygpath --path --mixed "$APP_HOME"`
     CLASSPATH=`cygpath --path --mixed "$CLASSPATH"`
 
-    JAVACMD=`cygpath --unix "$JAVACMD"`
-
     # We build the pattern for arguments to be converted via cygpath
     ROOTDIRSRAW=`find -L / -maxdepth 1 -mindepth 1 -type d 2>/dev/null`
     SEP=""
@@ -156,28 +138,27 @@ if [ "$cygwin" = "true" -o "$msys" = "true" ] ; then
         else
             eval `echo args$i`="\"$arg\""
         fi
-        i=`expr $i + 1`
+        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" ;;
+        (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
 
-ARGV=("$@")
-eval set -- $DEFAULT_JVM_OPTS
+# Split up the JVM_OPTS And GRADLE_OPTS values into an array, following the shell quoting and substitution rules
+function splitJvmOpts() {
+    JVM_OPTS=("$@")
+}
+eval splitJvmOpts $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS
+JVM_OPTS[${#JVM_OPTS[*]}]="-Dorg.gradle.appname=$APP_BASE_NAME"
 
-IFS=$'
-' read -rd '' -a JAVA_OPTS_ARR <<< "$(echo $JAVA_OPTS | xargs -n1)"
-IFS=$'
-' read -rd '' -a GRADLE_OPTS_ARR <<< "$(echo $GRADLE_OPTS | xargs -n1)"
-
-exec "$JAVACMD" "$@" "${JAVA_OPTS_ARR[@]}" "${GRADLE_OPTS_ARR[@]}" "-Dorg.gradle.appname=$APP_BASE_NAME" -classpath "$CLASSPATH" org.gradle.wrapper.GradleWrapperMain "${ARGV[@]}"
+exec "$JAVACMD" "${JVM_OPTS[@]}" -classpath "$CLASSPATH" org.gradle.wrapper.GradleWrapperMain "$@"

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
@@ -24,23 +8,20 @@
 @rem Set local scope for the variables with windows NT shell
 if "%OS%"=="Windows_NT" setlocal
 
+@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
+set DEFAULT_JVM_OPTS=
+
 set DIRNAME=%~dp0
 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"
-
 @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,34 @@ echo location of your Java installation.
 
 goto fail
 
+:init
+@rem Get command-line arguments, handling Windowz variants
+
+if not "%OS%" == "Windows_NT" goto win9xME_args
+if "%@eval[2+2]" == "4" goto 4NT_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=%*
+goto execute
+
+:4NT_args
+@rem Get arguments from the 4NT Shell from JP Software
+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

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

@@ -1,134 +1,89 @@
 package nl.requios.effortlessbuilding;
 
-import net.minecraftforge.common.ForgeConfigSpec;
+import net.minecraftforge.common.config.Config;
 
+import static net.minecraftforge.common.config.Config.*;
+
+@Config(modid = EffortlessBuilding.MODID, name = "EffortlessBuilding", type = Type.INSTANCE, category = "")
 public class BuildConfig {
 
-	private static final ForgeConfigSpec.Builder builder = new ForgeConfigSpec.Builder();
-	public static final Reach reach = new Reach(builder);
-	public static final SurvivalBalancers survivalBalancers = new SurvivalBalancers(builder);
-	public static final Visuals visuals = new Visuals(builder);
-	public static final ForgeConfigSpec spec = builder.build();
+    public static Reach reach = new Reach();
+    public static SurvivalBalancers survivalBalancers = new SurvivalBalancers();
+    public static Visuals visuals = new Visuals();
 
     public static class Reach {
-		public final ForgeConfigSpec.ConfigValue<Boolean> enableReachUpgrades;
-		public final ForgeConfigSpec.ConfigValue<Integer> maxReachCreative;
-		public final ForgeConfigSpec.ConfigValue<Integer> maxReachLevel0;
-		public final ForgeConfigSpec.ConfigValue<Integer> maxReachLevel1;
-		public final ForgeConfigSpec.ConfigValue<Integer> maxReachLevel2;
-		public final ForgeConfigSpec.ConfigValue<Integer> maxReachLevel3;
-
-		public Reach(ForgeConfigSpec.Builder builder) {
-			builder.push("Reach");
-			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.",
-					"If disabled, reach is set to level 3 for survival players.")
-				.define("enableReachUpgrades", true);
+                 "If disabled, reach is set to level 3 for survival players."})
+        public boolean enableReachUpgrades = true;
 
-			maxReachCreative = builder
-				.comment("Maximum reach in creative",
-					"Keep in mind that chunks need to be loaded to be able to place blocks inside.")
-				.define("maxReachCreative", 200);
+        @Comment({"Maximum reach in creative",
+                 "Keep in mind that chunks need to be loaded to be able to place blocks inside."})
+        public int maxReachCreative = 200;
 
-			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.",
-					"Set to 0 to disable Effortless Building until the player has consumed a reach upgrade.")
-				.define("maxReachLevel0", 20);
+                 "Set to 0 to disable Effortless Building until the player has consumed a reach upgrade."})
+        public int maxReachLevel0 = 20;
 
-			maxReachLevel1 = builder
-				.comment("Maximum reach in survival with one upgrade")
-				.define("maxReachLevel1", 50);
+        @Comment("Maximum reach in survival with one upgrade")
+        public int maxReachLevel1 = 50;
 
-			maxReachLevel2 = builder
-				.comment("Maximum reach in survival with two upgrades")
-				.define("maxReachLevel2", 100);
+        @Comment("Maximum reach in survival with two upgrades")
+        public int maxReachLevel2 = 100;
 
-			maxReachLevel3 = builder
-				.comment("Maximum reach in survival with three upgrades")
-				.define("maxReachLevel3", 200);
-
-			builder.pop();
-		}
+        @Comment("Maximum reach in survival with three upgrades")
+        public int maxReachLevel3 = 200;
     }
 
     public static class SurvivalBalancers {
-		public final ForgeConfigSpec.ConfigValue<Boolean> breakFar;
-		public final ForgeConfigSpec.ConfigValue<Boolean> increasedMiningTime;
-		public final ForgeConfigSpec.ConfigValue<Integer> miningTimePercentage;
-		public final ForgeConfigSpec.ConfigValue<Integer> quickReplaceMiningLevel;
-		public final ForgeConfigSpec.ConfigValue<Integer> undoStackSize;
+        @Comment({"Allows a survival player to break blocks that are far away, in addition to placing blocks.",
+                 "Note: this allows insta-breaking of blocks in survival."})
+        public boolean breakFar = false;
 
-		public SurvivalBalancers(ForgeConfigSpec.Builder builder) {
-			builder.push("SurvivalBalancers");
-
-			breakFar = builder
-				.comment("Allows a survival player to break blocks that are far away, in addition to placing blocks.",
-					"Note: this allows insta-breaking of blocks in survival.")
-				.define("breakFar", false);
-
-			increasedMiningTime = builder
-				.comment("Increases the time to mine a block when breaking multiple at once.",
+        @Comment({"Increases the time to mine a block when breaking multiple at once.",
                  "Mining time depends on how many blocks, what type of blocks, and the percentage below.",
-					"Example: breaking 1 dirt + 1 obsidian takes the time of breaking 1 dirt + 1 obsidian.")
-				.define("increasedMiningTime", true);
+                 "Example: breaking 1 dirt + 1 obsidian takes the time of breaking 1 dirt + 1 obsidian."})
+        public boolean increasedMiningTime = true;
 
-			miningTimePercentage = builder
-				.comment("How much the mining time of each additional block counts towards an increased mining time.",
+        @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);
+                 "The block in front of you always counts as 100%."})
+        @RangeInt(min = 0, max = 200)
+        public int miningTimePercentage = 50;
 
-			quickReplaceMiningLevel = builder
-				.comment("Determines what blocks can be replaced in survival.",
+        @Comment({"Determines what blocks can be replaced in survival.",
                  "-1: only blocks that can be harvested by hand (default)",
-					"0: blocks that can be harvested with wooden or gold tools",
+                 "0: blocks that can be harvested with wooden oref gold tools",
                  "1: blocks that can be harvested with stone tools",
                  "2: blocks that can be harvested with iron tools",
-					"3: blocks that can be harvested with diamond tools")
-				.defineInRange("quickReplaceMiningLevel", -1, -1, 3);
+                 "3: blocks that can be harvested with diamond tools",
+                 })
+        @RangeInt(min = -1, max = 3)
+        public int quickReplaceMiningLevel = -1;
 
-			undoStackSize = builder
-				.comment("How many placements are remembered for the undo functionality.")
-				.worldRestart()
-				.define("undoStackSize", 10);
-
-			builder.pop();
-		}
+        @Comment({"How many placements are remembered for the undo functionality."})
+        @RequiresMcRestart
+        public int undoStackSize = 10;
     }
 
     public static class Visuals {
-		public final ForgeConfigSpec.ConfigValue<Boolean> alwaysShowBlockPreview;
-		public final ForgeConfigSpec.ConfigValue<Double> dissolveTimeMultiplier;
-		public final ForgeConfigSpec.ConfigValue<Integer> shaderTreshold;
-		public final ForgeConfigSpec.ConfigValue<Boolean> useShaders;
+        @Comment({"Show a block preview if you have a block in hand on build mode NORMAL"})
+        public boolean alwaysShowBlockPreview = false;
 
-		public Visuals(ForgeConfigSpec.Builder builder) {
-			builder.push("Visuals");
-
-			alwaysShowBlockPreview = builder
-				.comment("Show a block preview if you have a block in hand even in the 'Normal' build mode")
-				.define("alwaysShowBlockPreview", false);
-
-			dissolveTimeMultiplier = builder
-				.comment("How long the dissolve effect takes when placing blocks.",
+        @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);
+                 "Relaxing: 1.5"})
+        public double dissolveTimeMultiplier = 1.0;
 
-			shaderTreshold = builder
-				.comment("Switch to using the simple performance shader when placing more than this many blocks.")
-				.define("shaderTreshold", 1500);
+        @Comment({"Switch to using the simple performance shader when placing more than this many blocks."})
+        public int shaderTreshold = 1500;
 
-			useShaders = builder
-				.comment("Use fancy shaders while placing blocks")
-				.define("useShaders", true);
+        @Comment({"Use fancy shaders while placing blocks"})
+        public boolean useShaders = true;
 
-			builder.pop();
-		}
     }
 }

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

@@ -1,115 +1,141 @@
 package nl.requios.effortlessbuilding;
 
-import net.minecraft.entity.player.PlayerEntity;
-import net.minecraft.inventory.container.Container;
-import net.minecraft.inventory.container.ContainerType;
+import net.minecraft.block.Block;
+import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.item.Item;
-import net.minecraft.util.text.StringTextComponent;
+import net.minecraft.util.ResourceLocation;
+import net.minecraft.util.SoundEvent;
+import net.minecraft.util.text.TextComponentString;
 import net.minecraftforge.common.capabilities.CapabilityManager;
-import net.minecraftforge.eventbus.api.SubscribeEvent;
-import net.minecraftforge.fml.DistExecutor;
-import net.minecraftforge.fml.ModLoadingContext;
-import net.minecraftforge.fml.RegistryObject;
+import net.minecraftforge.common.config.Config;
+import net.minecraftforge.common.config.ConfigManager;
 import net.minecraftforge.fml.common.Mod;
-import net.minecraftforge.fml.config.ModConfig;
-import net.minecraftforge.fml.event.lifecycle.FMLClientSetupEvent;
-import net.minecraftforge.fml.event.lifecycle.FMLCommonSetupEvent;
-import net.minecraftforge.fml.javafmlmod.FMLJavaModLoadingContext;
-import net.minecraftforge.fml.network.IContainerFactory;
-import net.minecraftforge.registries.DeferredRegister;
-import net.minecraftforge.registries.ForgeRegistries;
+import net.minecraftforge.fml.common.Mod.EventHandler;
+import net.minecraftforge.fml.common.SidedProxy;
+import net.minecraftforge.fml.common.event.FMLInitializationEvent;
+import net.minecraftforge.fml.common.event.FMLPostInitializationEvent;
+import net.minecraftforge.fml.common.event.FMLPreInitializationEvent;
+import net.minecraftforge.fml.common.event.FMLServerStartingEvent;
+import net.minecraftforge.fml.common.network.NetworkRegistry;
+import net.minecraftforge.fml.common.network.simpleimpl.SimpleNetworkWrapper;
+import net.minecraftforge.fml.relauncher.Side;
+import nl.requios.effortlessbuilding.buildmode.BuildModes;
 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.GoldenRandomizerBagContainer;
-import nl.requios.effortlessbuilding.gui.RandomizerBagContainer;
-import nl.requios.effortlessbuilding.item.*;
-import nl.requios.effortlessbuilding.network.PacketHandler;
-import nl.requios.effortlessbuilding.proxy.ClientProxy;
+import nl.requios.effortlessbuilding.gui.RandomizerBagGuiHandler;
+import nl.requios.effortlessbuilding.item.ItemRandomizerBag;
+import nl.requios.effortlessbuilding.item.ItemReachUpgrade1;
+import nl.requios.effortlessbuilding.item.ItemReachUpgrade2;
+import nl.requios.effortlessbuilding.item.ItemReachUpgrade3;
+import nl.requios.effortlessbuilding.network.*;
 import nl.requios.effortlessbuilding.proxy.IProxy;
-import nl.requios.effortlessbuilding.proxy.ServerProxy;
-import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
 
-// The value here should match an entry in the META-INF/mods.toml file
-@Mod(EffortlessBuilding.MODID)
-@Mod.EventBusSubscriber(bus = Mod.EventBusSubscriber.Bus.MOD)
-public class EffortlessBuilding {
+@Mod(modid = EffortlessBuilding.MODID, name = EffortlessBuilding.NAME, version = EffortlessBuilding.VERSION)
+@Mod.EventBusSubscriber
+public class EffortlessBuilding
+{
     public static final String MODID = "effortlessbuilding";
-	public static final Logger logger = LogManager.getLogger();
+    public static final String NAME = "Effortless Building";
+    public static final String VERSION = "1.12.2-2.10";
 
+    @Mod.Instance(EffortlessBuilding.MODID)
     public static EffortlessBuilding instance;
-	public static IProxy proxy = DistExecutor.runForDist(() -> ClientProxy::new, () -> ServerProxy::new);
 
-	//Registration
-	private static final DeferredRegister<Item> ITEMS = DeferredRegister.create(ForgeRegistries.ITEMS, MODID);
-	private static final DeferredRegister<ContainerType<?>> CONTAINERS = DeferredRegister.create(ForgeRegistries.CONTAINERS, EffortlessBuilding.MODID);
+    public static Logger logger;
 
-	public static final RegistryObject<Item> RANDOMIZER_BAG_ITEM = ITEMS.register("randomizer_bag", RandomizerBagItem::new);
-	public static final RegistryObject<Item> GOLDEN_RANDOMIZER_BAG_ITEM = ITEMS.register("golden_randomizer_bag", GoldenRandomizerBagItem::new);
-	public static final RegistryObject<Item> DIAMOND_RANDOMIZER_BAG_ITEM = ITEMS.register("diamond_randomizer_bag", DiamondRandomizerBagItem::new);
-	public static final RegistryObject<Item> REACH_UPGRADE_1_ITEM = ITEMS.register("reach_upgrade1", ReachUpgrade1Item::new);
-	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);
+    @SidedProxy(
+        clientSide="nl.requios.effortlessbuilding.proxy.ClientProxy",
+        serverSide="nl.requios.effortlessbuilding.proxy.ServerProxy"
+    )
+    public static IProxy proxy;
 
-	public static final RegistryObject<ContainerType<RandomizerBagContainer>> RANDOMIZER_BAG_CONTAINER = CONTAINERS.register("randomizer_bag", () -> registerContainer(RandomizerBagContainer::new));
-	public static final RegistryObject<ContainerType<GoldenRandomizerBagContainer>> GOLDEN_RANDOMIZER_BAG_CONTAINER = CONTAINERS.register("golden_randomizer_bag", () -> registerContainer(GoldenRandomizerBagContainer::new));
-	public static final RegistryObject<ContainerType<DiamondRandomizerBagContainer>> DIAMOND_RANDOMIZER_BAG_CONTAINER = CONTAINERS.register("diamond_randomizer_bag", () -> registerContainer(DiamondRandomizerBagContainer::new));
+    public static final SimpleNetworkWrapper packetHandler = NetworkRegistry.INSTANCE.newSimpleChannel(EffortlessBuilding.MODID);
 
-	public EffortlessBuilding() {
-		instance = this;
+    public static final ItemRandomizerBag ITEM_RANDOMIZER_BAG = new ItemRandomizerBag();
+    public static final ItemReachUpgrade1 ITEM_REACH_UPGRADE_1 = new ItemReachUpgrade1();
+    public static final ItemReachUpgrade2 ITEM_REACH_UPGRADE_2 = new ItemReachUpgrade2();
+    public static final ItemReachUpgrade3 ITEM_REACH_UPGRADE_3 = new ItemReachUpgrade3();
 
-		// Register ourselves for server and other game events we are interested in
-		FMLJavaModLoadingContext.get().getModEventBus().register(this);
+    public static final Block[] BLOCKS = {
+    };
 
-		ITEMS.register(FMLJavaModLoadingContext.get().getModEventBus());
-		CONTAINERS.register(FMLJavaModLoadingContext.get().getModEventBus());
+    public static final Item[] ITEMS = {
+            ITEM_RANDOMIZER_BAG,
+            ITEM_REACH_UPGRADE_1,
+            ITEM_REACH_UPGRADE_2,
+            ITEM_REACH_UPGRADE_3
+    };
 
-		//Register config
-		ModLoadingContext.get().registerConfig(ModConfig.Type.COMMON, BuildConfig.spec);
+    public static final int RANDOMIZER_BAG_GUI = 0;
+
+    @EventHandler
+    // preInit "Run before anything else. Read your config, create blocks, items, etc, and register them with the GameRegistry."
+    public void preInit(FMLPreInitializationEvent event)
+    {
+        logger = event.getModLog();
+
+        CapabilityManager.INSTANCE.register(ModifierCapabilityManager.IModifierCapability.class, new ModifierCapabilityManager.Storage(), ModifierCapabilityManager.ModifierCapability.class);
+        CapabilityManager.INSTANCE.register(ModeCapabilityManager.IModeCapability.class, new ModeCapabilityManager.Storage(), ModeCapabilityManager.ModeCapability.class);
+
+        EffortlessBuilding.packetHandler.registerMessage(ModifierSettingsMessage.MessageHandler.class, ModifierSettingsMessage.class, 0, Side.SERVER);
+        EffortlessBuilding.packetHandler.registerMessage(ModifierSettingsMessage.MessageHandler.class, ModifierSettingsMessage.class, 0, Side.CLIENT);
+
+        EffortlessBuilding.packetHandler.registerMessage(ModeSettingsMessage.MessageHandler.class, ModeSettingsMessage.class, 1, Side.SERVER);
+        EffortlessBuilding.packetHandler.registerMessage(ModeSettingsMessage.MessageHandler.class, ModeSettingsMessage.class, 1, Side.CLIENT);
+
+        EffortlessBuilding.packetHandler.registerMessage(ModeActionMessage.MessageHandler.class, ModeActionMessage.class, 2, Side.SERVER);
+        EffortlessBuilding.packetHandler.registerMessage(ModeActionMessage.MessageHandler.class, ModeActionMessage.class, 2, Side.CLIENT);
+
+        EffortlessBuilding.packetHandler.registerMessage(BlockPlacedMessage.MessageHandler.class, BlockPlacedMessage.class, 3, Side.SERVER);
+        EffortlessBuilding.packetHandler.registerMessage(BlockPlacedMessage.MessageHandler.class, BlockPlacedMessage.class, 3, Side.CLIENT);
+
+        EffortlessBuilding.packetHandler.registerMessage(BlockBrokenMessage.MessageHandler.class, BlockBrokenMessage.class, 4, Side.SERVER);
+
+        EffortlessBuilding.packetHandler.registerMessage(CancelModeMessage.MessageHandler.class, CancelModeMessage.class, 5, Side.SERVER);
+
+        EffortlessBuilding.packetHandler.registerMessage(RequestLookAtMessage.MessageHandler.class, RequestLookAtMessage.class, 6, Side.CLIENT);
+
+        proxy.preInit(event);
     }
 
-	public static <T extends Container> ContainerType<T> registerContainer(IContainerFactory<T> fact){
-		ContainerType<T> type = new ContainerType<T>(fact);
-		return type;
+    @EventHandler
+    // Do your mod setup. Build whatever data structures you care about.
+    // Register network handlers
+    public void init(FMLInitializationEvent event)
+    {
+        ConfigManager.sync(MODID, Config.Type.INSTANCE);
+        NetworkRegistry.INSTANCE.registerGuiHandler(EffortlessBuilding.instance, new RandomizerBagGuiHandler());
+
+        proxy.init(event);
+    }
+
+    @EventHandler
+    // postInit "Handle interaction with other mods, complete your setup based on this."
+    public void postInit(FMLPostInitializationEvent event)
+    {
+        proxy.postInit(event);
+        CompatHelper.postInit();
+    }
+
+    @EventHandler
+    public void serverStarting(FMLServerStartingEvent event)
+    {
+        event.registerServerCommand(new CommandReach());
+        proxy.serverStarting(event);
     }
 
     public static void log(String msg){
         logger.info(msg);
     }
 
-	public static void log(PlayerEntity player, String msg) {
+    public static void log(EntityPlayer player, String msg){
         log(player, msg, false);
     }
 
-	public static void log(PlayerEntity player, String msg, boolean actionBar) {
-		player.displayClientMessage(new StringTextComponent(msg), actionBar);
-	}
-
-	//Log with translation supported, call either on client or server (which then sends a message)
-	public static void logTranslate(PlayerEntity player, String prefix, String translationKey, String suffix, boolean actionBar) {
-		proxy.logTranslate(player, prefix, translationKey, suffix, actionBar);
-	}
-
-	@SubscribeEvent
-	public void setup(final FMLCommonSetupEvent event) {
-		CapabilityManager.INSTANCE.register(ModifierCapabilityManager.IModifierCapability.class, new ModifierCapabilityManager.Storage(), ModifierCapabilityManager.ModifierCapability::new);
-		CapabilityManager.INSTANCE.register(ModeCapabilityManager.IModeCapability.class, new ModeCapabilityManager.Storage(), ModeCapabilityManager.ModeCapability::new);
-
-		PacketHandler.register();
-
-		//TODO 1.13 config
-//        ConfigManager.sync(MODID, Config.Type.INSTANCE);
-
-		proxy.setup(event);
-
-		CompatHelper.setup();
-	}
-
-	@SubscribeEvent
-	public void clientSetup(final FMLClientSetupEvent event) {
-
-		proxy.clientSetup(event);
+    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,22 +1,28 @@
 package nl.requios.effortlessbuilding;
 
-import net.minecraft.block.BlockState;
-import net.minecraft.block.Blocks;
+import net.minecraft.block.Block;
+import net.minecraft.block.state.IBlockState;
 import net.minecraft.entity.Entity;
-import net.minecraft.entity.player.PlayerEntity;
-import net.minecraft.entity.player.ServerPlayerEntity;
+import net.minecraft.entity.player.EntityPlayer;
+import net.minecraft.entity.player.EntityPlayerMP;
+import net.minecraft.item.Item;
+import net.minecraft.item.ItemBlock;
 import net.minecraft.util.ResourceLocation;
 import net.minecraft.util.math.BlockPos;
+import net.minecraft.util.math.Vec3d;
 import net.minecraft.world.World;
-import net.minecraftforge.common.util.FakePlayer;
+import net.minecraftforge.common.config.Config;
+import net.minecraftforge.common.config.ConfigManager;
 import net.minecraftforge.event.AttachCapabilitiesEvent;
+import net.minecraftforge.event.RegistryEvent;
 import net.minecraftforge.event.entity.player.PlayerEvent;
 import net.minecraftforge.event.world.BlockEvent;
-import net.minecraftforge.eventbus.api.SubscribeEvent;
+import net.minecraftforge.fml.client.event.ConfigChangedEvent;
 import net.minecraftforge.fml.common.Mod;
-import net.minecraftforge.fml.network.PacketDistributor;
+import net.minecraftforge.fml.common.eventhandler.SubscribeEvent;
 import nl.requios.effortlessbuilding.buildmode.BuildModes;
 import nl.requios.effortlessbuilding.buildmode.ModeSettingsManager;
+import nl.requios.effortlessbuilding.buildmodifier.BlockSet;
 import nl.requios.effortlessbuilding.buildmodifier.BuildModifiers;
 import nl.requios.effortlessbuilding.buildmodifier.ModifierSettingsManager;
 import nl.requios.effortlessbuilding.buildmodifier.UndoRedo;
@@ -24,65 +30,81 @@ import nl.requios.effortlessbuilding.capability.ModeCapabilityManager;
 import nl.requios.effortlessbuilding.capability.ModifierCapabilityManager;
 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;
+import scala.actors.threadpool.Arrays;
 
+import java.util.ArrayList;
 import java.util.List;
 
+import static net.minecraftforge.fml.common.gameevent.PlayerEvent.*;
+
 @Mod.EventBusSubscriber
-public class EventHandler {
+public class EventHandler
+{
+
+    @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).setRegistryName(block.getRegistryName()));
+        }
+    }
 
     @SubscribeEvent
     public static void attachCapabilities(AttachCapabilitiesEvent<Entity> event) {
-		if (event.getObject() instanceof FakePlayer) return;
-		if (event.getObject() instanceof PlayerEntity) {
-			event.addCapability(new ResourceLocation(EffortlessBuilding.MODID, "build_modifier"), new ModifierCapabilityManager.Provider());
-			event.addCapability(new ResourceLocation(EffortlessBuilding.MODID, "build_mode"), new ModeCapabilityManager.Provider());
+        if (event.getObject() instanceof EntityPlayer) {
+            event.addCapability(new ResourceLocation(EffortlessBuilding.MODID, "BuildModifier"), new ModifierCapabilityManager.Provider());
+            event.addCapability(new ResourceLocation(EffortlessBuilding.MODID, "BuildMode"), new ModeCapabilityManager.Provider());
         }
     }
 
     @SubscribeEvent
-	public static void onBlockPlaced(BlockEvent.EntityPlaceEvent event) {
-		if (event.getWorld().isClientSide()) return;
+    public static void onConfigChangedEvent(ConfigChangedEvent.OnConfigChangedEvent event)
+    {
+        if (event.getModID().equals(EffortlessBuilding.MODID))
+        {
+            ConfigManager.sync(EffortlessBuilding.MODID, Config.Type.INSTANCE);
+        }
+    }
 
-		if (!(event.getEntity() instanceof PlayerEntity)) return;
+//    @SubscribeEvent
+//    public static void onServerTick(TickEvent.ServerTickEvent event) {
+//
+//    }
 
-		if (event.getEntity() instanceof FakePlayer) return;
+    @SubscribeEvent
+    //Only called serverside (except with lilypads...)
+    public static void onBlockPlaced(BlockEvent.PlaceEvent event) {
+        if (event.getWorld().isRemote) return;
 
         //Cancel event if necessary
-		ServerPlayerEntity player = ((ServerPlayerEntity) event.getEntity());
+        EntityPlayer player = event.getPlayer();
         BuildModes.BuildModeEnum buildMode = ModeSettingsManager.getModeSettings(player).getBuildMode();
         ModifierSettingsManager.ModifierSettings modifierSettings = ModifierSettingsManager.getModifierSettings(player);
 
-		if (buildMode != BuildModes.BuildModeEnum.NORMAL) {
+        if (buildMode != BuildModes.BuildModeEnum.NORMAL || modifierSettings.doQuickReplace()) {
             event.setCanceled(true);
-		} 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
+            //But modifiers and QuickReplace 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()));
+            EffortlessBuilding.packetHandler.sendTo(new RequestLookAtMessage(event.getPos(), event.getBlockSnapshot().getReplacedBlock(), event.getState()), (EntityPlayerMP) player);
         }
-
-//        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
     public static void onBlockBroken(BlockEvent.BreakEvent event) {
-		if (event.getWorld().isClientSide()) return;
-
-		if (event.getPlayer() instanceof FakePlayer) return;
+        if (event.getWorld().isRemote) return;
 
         //Cancel event if necessary
         //If cant break far then dont cancel event ever
@@ -94,30 +116,21 @@ public class EventHandler {
             //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
-			if (event.getPlayer() instanceof ServerPlayerEntity && event.getState() != null && event.getPos() != null) {
-				PacketDistributor.PacketTarget packetTarget = PacketDistributor.PLAYER.with(() -> (ServerPlayerEntity) event.getPlayer());
-				if (packetTarget != null)
-					PacketHandler.INSTANCE.send(packetTarget, new AddUndoMessage(event.getPos(), event.getState(), Blocks.AIR.defaultBlockState()));
-			}
         }
     }
 
     @SubscribeEvent
     public static void breakSpeed(PlayerEvent.BreakSpeed event) {
         //Disable if config says so
-		if (!BuildConfig.survivalBalancers.increasedMiningTime.get()) return;
+        if (!BuildConfig.survivalBalancers.increasedMiningTime) return;
 
-		if (event.getPlayer() instanceof FakePlayer) return;
-
-		PlayerEntity player = event.getPlayer();
-		World world = player.level;
+        EntityPlayer player = event.getEntityPlayer();
+        World world = player.world;
         BlockPos pos = event.getPos();
 
         //EffortlessBuilding.log(player, String.valueOf(event.getNewSpeed()));
 
-		float originalBlockHardness = event.getState().getDestroySpeed(world, pos);
+        float originalBlockHardness = event.getState().getBlockHardness(world, pos);
         if (originalBlockHardness < 0) return; //Dont break bedrock
         float totalBlockHardness = 0;
         //get coordinates
@@ -125,14 +138,14 @@ public class EventHandler {
         for (int i = 1; i < coordinates.size(); i++) {
             BlockPos coordinate = coordinates.get(i);
             //get existing blockstates at those coordinates
-			BlockState blockState = world.getBlockState(coordinate);
+            IBlockState blockState = world.getBlockState(coordinate);
             //add hardness for each blockstate, if can break
             if (SurvivalHelper.canBreak(world, player, coordinate))
-				totalBlockHardness += blockState.getDestroySpeed(world, coordinate);
+                totalBlockHardness += blockState.getBlockHardness(world, coordinate);
         }
 
         //Grabbing percentage from config
-		float percentage = (float) BuildConfig.survivalBalancers.miningTimePercentage.get() / 100;
+        float percentage = (float) BuildConfig.survivalBalancers.miningTimePercentage / 100;
         totalBlockHardness *= percentage;
         totalBlockHardness += originalBlockHardness;
 
@@ -144,65 +157,32 @@ public class EventHandler {
     }
 
     @SubscribeEvent
-	public static void onPlayerLoggedIn(PlayerEvent.PlayerLoggedInEvent event) {
-		if (event.getPlayer() instanceof FakePlayer) return;
-		PlayerEntity player = event.getPlayer();
+    public static void onPlayerLoggedIn(PlayerLoggedInEvent event) {
+        EntityPlayer player = event.player;
         ModifierSettingsManager.handleNewPlayer(player);
         ModeSettingsManager.handleNewPlayer(player);
     }
 
     @SubscribeEvent
-	public static void onPlayerLoggedOut(PlayerEvent.PlayerLoggedOutEvent event) {
-		if (event.getPlayer() instanceof FakePlayer) return;
-		PlayerEntity player = event.getPlayer();
-		if (player.getCommandSenderWorld().isClientSide) return;
-
-		UndoRedo.clear(player);
-		PacketHandler.INSTANCE.send(PacketDistributor.PLAYER.with(() -> (ServerPlayerEntity) player), new ClearUndoMessage());
+    public static void onPlayerLoggedOut(PlayerLoggedOutEvent event) {
+        UndoRedo.clear(event.player);
+        //TODO call clientside
     }
 
     @SubscribeEvent
-	public static void onPlayerRespawn(PlayerEvent.PlayerRespawnEvent event) {
-		if (event.getPlayer() instanceof FakePlayer) return;
-		PlayerEntity player = event.getPlayer();
+    public static void onPlayerRespawn(PlayerRespawnEvent event) {
+        EntityPlayer player = event.player;
         ModifierSettingsManager.handleNewPlayer(player);
         ModeSettingsManager.handleNewPlayer(player);
     }
 
     @SubscribeEvent
-	public static void onPlayerChangedDimension(PlayerEvent.PlayerChangedDimensionEvent event) {
-		if (event.getPlayer() instanceof FakePlayer) return;
-		PlayerEntity player = event.getPlayer();
-		if (player.getCommandSenderWorld().isClientSide) return;
-
-		//Set build mode to normal
-		ModeSettingsManager.ModeSettings modeSettings = ModeSettingsManager.getModeSettings(player);
-		modeSettings.setBuildMode(BuildModes.BuildModeEnum.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);
-
+    public static void onPlayerChangedDimension(PlayerChangedDimensionEvent event) {
+        EntityPlayer player = event.player;
         ModifierSettingsManager.handleNewPlayer(player);
         ModeSettingsManager.handleNewPlayer(player);
 
-		UndoRedo.clear(player);
-		PacketHandler.INSTANCE.send(PacketDistributor.PLAYER.with(() -> (ServerPlayerEntity) player), new ClearUndoMessage());
-	}
-
-	@SubscribeEvent
-	public static void onPlayerClone(PlayerEvent.Clone event) {
-		if (event.getPlayer() instanceof FakePlayer) return;
-		//Attach capabilities on death, otherwise crash
-		PlayerEntity oldPlayer = event.getOriginal();
-		oldPlayer.revive();
-
-		PlayerEntity newPlayer = event.getPlayer();
-		ModifierSettingsManager.setModifierSettings(newPlayer, ModifierSettingsManager.getModifierSettings(oldPlayer));
-		ModeSettingsManager.setModeSettings(newPlayer, ModeSettingsManager.getModeSettings(oldPlayer));
+        UndoRedo.clear(event.player);
+        //TODO call clientside
     }
 }

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

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

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

@@ -1,39 +0,0 @@
-package nl.requios.effortlessbuilding.buildmode;
-
-import net.minecraft.entity.player.PlayerEntity;
-import net.minecraft.util.Direction;
-import net.minecraft.util.math.BlockPos;
-import net.minecraft.util.math.vector.Vector3d;
-
-import java.util.Dictionary;
-import java.util.Hashtable;
-import java.util.UUID;
-
-public abstract class BaseBuildMode implements IBuildMode {
-	//In singleplayer client and server variables are shared
-	//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> rightClickServerTable = new Hashtable<>();
-	protected Dictionary<UUID, BlockPos> firstPosTable = new Hashtable<>();
-	protected Dictionary<UUID, Direction> sideHitTable = new Hashtable<>();
-	protected Dictionary<UUID, Vector3d> hitVecTable = new Hashtable<>();
-
-	@Override
-	public void initialize(PlayerEntity player) {
-		rightClickClientTable.put(player.getUUID(), 0);
-		rightClickServerTable.put(player.getUUID(), 0);
-		firstPosTable.put(player.getUUID(), BlockPos.ZERO);
-		sideHitTable.put(player.getUUID(), Direction.UP);
-		hitVecTable.put(player.getUUID(), Vector3d.ZERO);
-	}
-
-	@Override
-	public Direction getSideHit(PlayerEntity player) {
-		return sideHitTable.get(player.getUUID());
-	}
-
-	@Override
-	public Vector3d getHitVec(PlayerEntity player) {
-		return hitVecTable.get(player.getUUID());
-	}
-}

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

@@ -1,16 +1,14 @@
 package nl.requios.effortlessbuilding.buildmode;
 
-import net.minecraft.entity.player.PlayerEntity;
-import net.minecraft.util.Direction;
+import net.minecraft.entity.player.EntityPlayer;
+import net.minecraft.util.EnumFacing;
+import net.minecraft.util.EnumHand;
 import net.minecraft.util.math.BlockPos;
-import net.minecraft.util.math.RayTraceContext;
-import net.minecraft.util.math.RayTraceResult;
-import net.minecraft.util.math.vector.Vector3d;
-import net.minecraft.util.math.vector.Vector4f;
+import net.minecraft.util.math.Vec3d;
 import nl.requios.effortlessbuilding.EffortlessBuilding;
-import nl.requios.effortlessbuilding.buildmode.buildmodes.*;
-import nl.requios.effortlessbuilding.buildmodifier.BuildModifiers;
-import nl.requios.effortlessbuilding.buildmodifier.ModifierSettingsManager;
+import nl.requios.effortlessbuilding.buildmode.ModeOptions.ActionEnum;
+import nl.requios.effortlessbuilding.buildmodifier.*;
+import nl.requios.effortlessbuilding.compatibility.CompatHelper;
 import nl.requios.effortlessbuilding.helper.ReachHelper;
 import nl.requios.effortlessbuilding.helper.SurvivalHelper;
 import nl.requios.effortlessbuilding.network.BlockBrokenMessage;
@@ -21,22 +19,42 @@ import java.util.Dictionary;
 import java.util.Hashtable;
 import java.util.List;
 
-import static nl.requios.effortlessbuilding.buildmode.ModeOptions.OptionEnum;
-
 public class BuildModes {
 
     //Static variables are shared between client and server in singleplayer
     //We need them separate
-	public static Dictionary<PlayerEntity, Boolean> currentlyBreakingClient = new Hashtable<>();
-	public static Dictionary<PlayerEntity, Boolean> currentlyBreakingServer = new Hashtable<>();
+    public static Dictionary<EntityPlayer, Boolean> currentlyBreakingClient = new Hashtable<>();
+    public static Dictionary<EntityPlayer, Boolean> currentlyBreakingServer = new Hashtable<>();
+
+    public enum BuildModeEnum {
+        NORMAL("effortlessbuilding.mode.normal", new Normal(), new ActionEnum[]{}),
+        NORMAL_PLUS("effortlessbuilding.mode.normal_plus", new NormalPlus(), new ActionEnum[]{ActionEnum.NORMAL_SPEED, ActionEnum.FAST_SPEED}),
+        LINE("effortlessbuilding.mode.line", new Line(), new ActionEnum[]{/*ActionEnum.THICKNESS_1, ActionEnum.THICKNESS_3, ActionEnum.THICKNESS_5*/}),
+        WALL("effortlessbuilding.mode.wall", new Wall(), new ActionEnum[]{ActionEnum.FULL, ActionEnum.HOLLOW}),
+        FLOOR("effortlessbuilding.mode.floor", new Floor(), new ActionEnum[]{ActionEnum.FULL, ActionEnum.HOLLOW}),
+        DIAGONAL_LINE("effortlessbuilding.mode.diagonal_line", new DiagonalLine(), new ActionEnum[]{/*ActionEnum.THICKNESS_1, ActionEnum.THICKNESS_3, ActionEnum.THICKNESS_5*/}),
+        DIAGONAL_WALL("effortlessbuilding.mode.diagonal_wall", new DiagonalWall(), new ActionEnum[]{/*ActionEnum.FULL, ActionEnum.HOLLOW*/}),
+        SLOPE_FLOOR("effortlessbuilding.mode.slope_floor", new SlopeFloor(), new ActionEnum[]{ActionEnum.SHORT_EDGE, ActionEnum.LONG_EDGE}),
+        CUBE("effortlessbuilding.mode.cube", new Cube(), new ActionEnum[]{ActionEnum.CUBE_FULL, ActionEnum.CUBE_HOLLOW, ActionEnum.CUBE_SKELETON});
+
+        public String name;
+        public IBuildMode instance;
+        public ActionEnum[] options;
+
+        BuildModeEnum(String name, IBuildMode instance, ActionEnum[] options) {
+            this.name = name;
+            this.instance = instance;
+            this.options = options;
+        }
+    }
 
     //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(PlayerEntity player, BlockPlacedMessage message) {
+    public static void onBlockPlacedMessage(EntityPlayer player, BlockPlacedMessage message) {
 
         //Check if not in the middle of breaking
-		Dictionary<PlayerEntity, Boolean> currentlyBreaking = player.level.isClientSide ? currentlyBreakingClient : currentlyBreakingServer;
+        Dictionary<EntityPlayer, Boolean> currentlyBreaking = player.world.isRemote ? currentlyBreakingClient : currentlyBreakingServer;
         if (currentlyBreaking.get(player) != null && currentlyBreaking.get(player)) {
             //Cancel breaking
             initializeMode(player);
@@ -53,21 +71,20 @@ public class BuildModes {
             startPos = message.getBlockPos();
 
             //Offset in direction of sidehit if not quickreplace and not replaceable
-			//TODO 1.13 replaceable
-			boolean replaceable = player.level.getBlockState(startPos).getMaterial().isReplaceable();
+            boolean replaceable = player.world.getBlockState(startPos).getBlock().isReplaceable(player.world, startPos);
             boolean becomesDoubleSlab = SurvivalHelper.doesBecomeDoubleSlab(player, startPos, message.getSideHit());
             if (!modifierSettings.doQuickReplace() && !replaceable && !becomesDoubleSlab) {
-				startPos = startPos.relative(message.getSideHit());
+                startPos = startPos.offset(message.getSideHit());
             }
 
             //Get under tall grass and other replaceable blocks
             if (modifierSettings.doQuickReplace() && replaceable) {
-				startPos = startPos.below();
+                startPos = startPos.down();
             }
 
             //Check if player reach does not exceed startpos
             int maxReach = ReachHelper.getMaxReach(player);
-			if (buildMode != BuildModeEnum.NORMAL && player.blockPosition().distSqr(startPos) > maxReach * maxReach) {
+            if (buildMode != BuildModeEnum.NORMAL && player.getPosition().distanceSq(startPos) > maxReach * maxReach) {
                 EffortlessBuilding.log(player, "Placement exceeds your reach.");
                 return;
             }
@@ -88,10 +105,10 @@ public class BuildModes {
             coordinates = coordinates.subList(0, limit);
         }
 
-		Direction sideHit = buildMode.instance.getSideHit(player);
+        EnumFacing sideHit = buildMode.instance.getSideHit(player);
         if (sideHit == null) sideHit = message.getSideHit();
 
-		Vector3d hitVec = buildMode.instance.getHitVec(player);
+        Vec3d hitVec = buildMode.instance.getHitVec(player);
         if (hitVec == null) hitVec = message.getHitVec();
 
         BuildModifiers.onBlockPlaced(player, coordinates, sideHit, hitVec, message.getPlaceStartPos());
@@ -103,33 +120,33 @@ public class BuildModes {
     }
 
     //Use a network message to break blocks in the distance using clientside mouse input
-	public static void onBlockBrokenMessage(PlayerEntity player, BlockBrokenMessage message) {
+    public static void onBlockBrokenMessage(EntityPlayer player, BlockBrokenMessage message) {
         BlockPos startPos = message.isBlockHit() ? message.getBlockPos() : null;
         onBlockBroken(player, startPos, true);
     }
 
-	public static void onBlockBroken(PlayerEntity player, BlockPos startPos, boolean breakStartPos) {
+    public static void onBlockBroken(EntityPlayer player, BlockPos startPos, boolean breakStartPos) {
 
         //Check if not in the middle of placing
-		Dictionary<PlayerEntity, Boolean> currentlyBreaking = player.level.isClientSide ? currentlyBreakingClient : currentlyBreakingServer;
+        Dictionary<EntityPlayer, Boolean> currentlyBreaking = player.world.isRemote ? currentlyBreakingClient : currentlyBreakingServer;
         if (currentlyBreaking.get(player) != null && !currentlyBreaking.get(player)) {
             //Cancel placing
             initializeMode(player);
             return;
         }
 
+        if (!ReachHelper.canBreakFar(player)) return;
+
         //If first click
         if (currentlyBreaking.get(player) == null) {
             //If startpos is null, dont do anything
             if (startPos == null) return;
         }
 
-		ModifierSettingsManager.ModifierSettings modifierSettings = ModifierSettingsManager.getModifierSettings(player);
-		ModeSettingsManager.ModeSettings modeSettings = ModeSettingsManager.getModeSettings(player);
-
         //Get coordinates
+        ModeSettingsManager.ModeSettings modeSettings = ModeSettingsManager.getModeSettings(player);
         BuildModeEnum buildMode = modeSettings.getBuildMode();
-		List<BlockPos> coordinates = buildMode.instance.onRightClick(player, startPos, Direction.UP, Vector3d.ZERO, true);
+        List<BlockPos> coordinates = buildMode.instance.onRightClick(player, startPos, EnumFacing.UP, Vec3d.ZERO, true);
 
         if (coordinates.isEmpty()) {
             currentlyBreaking.put(player, true);
@@ -144,7 +161,7 @@ public class BuildModes {
         currentlyBreaking.remove(player);
     }
 
-	public static List<BlockPos> findCoordinates(PlayerEntity player, BlockPos startPos, boolean skipRaytrace) {
+    public static List<BlockPos> findCoordinates(EntityPlayer player, BlockPos startPos, boolean skipRaytrace) {
         List<BlockPos> coordinates = new ArrayList<>();
 
         ModeSettingsManager.ModeSettings modeSettings = ModeSettingsManager.getModeSettings(player);
@@ -153,143 +170,54 @@ public class BuildModes {
         return coordinates;
     }
 
-	public static void initializeMode(PlayerEntity player) {
+    public static void initializeMode(EntityPlayer player) {
         //Resetting mode, so not placing or breaking
-		Dictionary<PlayerEntity, Boolean> currentlyBreaking = player.level.isClientSide ? currentlyBreakingClient : currentlyBreakingServer;
+        Dictionary<EntityPlayer, Boolean> currentlyBreaking = player.world.isRemote ? currentlyBreakingClient : currentlyBreakingServer;
         currentlyBreaking.remove(player);
 
         ModeSettingsManager.getModeSettings(player).getBuildMode().instance.initialize(player);
     }
 
-	public static boolean isCurrentlyPlacing(PlayerEntity player) {
-		Dictionary<PlayerEntity, Boolean> currentlyBreaking = player.level.isClientSide ? currentlyBreakingClient : currentlyBreakingServer;
+    public static boolean isCurrentlyPlacing(EntityPlayer player) {
+        Dictionary<EntityPlayer, Boolean> currentlyBreaking = player.world.isRemote ? currentlyBreakingClient : currentlyBreakingServer;
         return currentlyBreaking.get(player) != null && !currentlyBreaking.get(player);
     }
 
-	public static boolean isCurrentlyBreaking(PlayerEntity player) {
-		Dictionary<PlayerEntity, Boolean> currentlyBreaking = player.level.isClientSide ? currentlyBreakingClient : currentlyBreakingServer;
+    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(PlayerEntity player) {
-		Dictionary<PlayerEntity, Boolean> currentlyBreaking = player.level.isClientSide ? currentlyBreakingClient : currentlyBreakingServer;
+    public static boolean isActive(EntityPlayer player) {
+        Dictionary<EntityPlayer, Boolean> currentlyBreaking = player.world.isRemote ? currentlyBreakingClient : currentlyBreakingServer;
         return currentlyBreaking.get(player) != null;
     }
 
+
     //Find coordinates on a line bound by a plane
-	public static Vector3d findXBound(double x, Vector3d start, Vector3d look) {
+    public static Vec3d findXBound(double x, Vec3d start, Vec3d look) {
         //then y and z are
         double y = (x - start.x) / look.x * look.y + start.y;
         double z = (x - start.x) / look.x * look.z + start.z;
 
-		return new Vector3d(x, y, z);
+        return new Vec3d(x, y, z);
     }
 
-
-	//-- Common build mode functionality --//
-
-	public static Vector3d findYBound(double y, Vector3d start, Vector3d look) {
+    public static Vec3d findYBound(double y, Vec3d start, Vec3d look) {
         //then x and z are
         double x = (y - start.y) / look.y * look.x + start.x;
         double z = (y - start.y) / look.y * look.z + start.z;
 
-		return new Vector3d(x, y, z);
+        return new Vec3d(x, y, z);
     }
 
-	public static Vector3d findZBound(double z, Vector3d start, Vector3d look) {
+    public static Vec3d findZBound(double z, Vec3d start, Vec3d look) {
         //then x and y are
         double x = (z - start.z) / look.z * look.x + start.x;
         double y = (z - start.z) / look.z * look.y + start.y;
 
-		return new Vector3d(x, y, z);
+        return new Vec3d(x, y, z);
     }
 
-	//Use this instead of player.getLookVec() in any buildmodes code
-	public static Vector3d getPlayerLookVec(PlayerEntity player) {
-		Vector3d lookVec = player.getLookAngle();
-		double x = lookVec.x;
-		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)
-		//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;
-		if (Math.abs(y - 1.0) < 0.0001) y = 0.9999;
-		if (Math.abs(y + 1.0) < 0.0001) y = -0.9999;
-
-		if (Math.abs(z) < 0.0001) z = 0.0001;
-		if (Math.abs(z - 1.0) < 0.0001) z = 0.9999;
-		if (Math.abs(z + 1.0) < 0.0001) z = -0.9999;
-
-		return new Vector3d(x, y, z);
-	}
-
-	public static boolean isCriteriaValid(Vector3d start, Vector3d look, int reach, PlayerEntity player, boolean skipRaytrace, Vector3d lineBound, Vector3d planeBound, double distToPlayerSq) {
-		boolean intersects = false;
-		if (!skipRaytrace) {
-			//collision within a 1 block radius to selected is fine
-			RayTraceContext rayTraceContext = new RayTraceContext(start, lineBound, RayTraceContext.BlockMode.COLLIDER, RayTraceContext.FluidMode.NONE, player);
-			RayTraceResult rayTraceResult = player.level.clip(rayTraceContext);
-			intersects = rayTraceResult != null && rayTraceResult.getType() == RayTraceResult.Type.BLOCK &&
-				planeBound.subtract(rayTraceResult.getLocation()).lengthSqr() > 4;
-		}
-
-		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);
-
-		public String name;
-		public IBuildMode instance;
-		public final BuildModeCategoryEnum category;
-		public 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 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/Cube.java

@@ -0,0 +1,208 @@
+package nl.requios.effortlessbuilding.buildmode;
+
+import net.minecraft.entity.player.EntityPlayer;
+import net.minecraft.util.EnumFacing;
+import net.minecraft.util.math.BlockPos;
+import net.minecraft.util.math.Vec3d;
+import nl.requios.effortlessbuilding.helper.ReachHelper;
+
+import java.util.*;
+
+public class Cube implements IBuildMode {
+    //In singleplayer client and server variables are shared
+    //Split everything that needs separate values and may not be called twice in one click
+    private Dictionary<UUID, Integer> rightClickClientTable = new Hashtable<>();
+    private Dictionary<UUID, Integer> rightClickServerTable = new Hashtable<>();
+    private Dictionary<UUID, BlockPos> firstPosTable = new Hashtable<>();
+    private Dictionary<UUID, BlockPos> secondPosTable = new Hashtable<>();
+    private Dictionary<UUID, EnumFacing> sideHitTable = new Hashtable<>();
+    private Dictionary<UUID, Vec3d> hitVecTable = new Hashtable<>();
+
+    @Override
+    public void initialize(EntityPlayer player) {
+        rightClickClientTable.put(player.getUniqueID(), 0);
+        rightClickServerTable.put(player.getUniqueID(), 0);
+        firstPosTable.put(player.getUniqueID(), BlockPos.ORIGIN);
+        sideHitTable.put(player.getUniqueID(), EnumFacing.UP);
+        hitVecTable.put(player.getUniqueID(), Vec3d.ZERO);
+    }
+
+    @Override
+    public List<BlockPos> onRightClick(EntityPlayer player, BlockPos blockPos, EnumFacing sideHit, Vec3d hitVec, boolean skipRaytrace) {
+        List<BlockPos> list = new ArrayList<>();
+
+        Dictionary<UUID, Integer> rightClickTable = player.world.isRemote ? rightClickClientTable : rightClickServerTable;
+        int rightClickNr = rightClickTable.get(player.getUniqueID());
+        rightClickNr++;
+        rightClickTable.put(player.getUniqueID(), rightClickNr);
+
+        if (rightClickNr == 1) {
+            //If clicking in air, reset and try again
+            if (blockPos == null) {
+                rightClickTable.put(player.getUniqueID(), 0);
+                return list;
+            }
+
+            //First click, remember starting position
+            firstPosTable.put(player.getUniqueID(), blockPos);
+            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 = Floor.findFloor(player, firstPos, skipRaytrace);
+
+            if (secondPos == null) {
+                rightClickTable.put(player.getUniqueID(), 1);
+                return list;
+            }
+
+            secondPosTable.put(player.getUniqueID(), secondPos);
+
+        } else {
+            //Third click, place cube with height
+            list = findCoordinates(player, blockPos, skipRaytrace);
+            rightClickTable.put(player.getUniqueID(), 0);
+        }
+
+        return list;
+    }
+
+    @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());
+
+        if (rightClickNr == 0) {
+            if (blockPos != null)
+                list.add(blockPos);
+        } else if (rightClickNr == 1) {
+            BlockPos firstPos = firstPosTable.get(player.getUniqueID());
+
+            BlockPos secondPos = Floor.findFloor(player, firstPos, skipRaytrace);
+            if (secondPos == null) return list;
+
+            //Add whole floor
+            //Limit amount of blocks you can place per row
+            int axisLimit = ReachHelper.getMaxBlocksPerAxis(player);
+
+            int x1 = firstPos.getX(), x2 = secondPos.getX();
+            int y = firstPos.getY();
+            int z1 = firstPos.getZ(), z2 = secondPos.getZ();
+
+            //limit axis
+            if (x2 - x1 >= axisLimit) x2 = x1 + axisLimit - 1;
+            if (x1 - x2 >= axisLimit) x2 = x1 - axisLimit + 1;
+            if (z2 - z1 >= axisLimit) z2 = z1 + axisLimit - 1;
+            if (z1 - z2 >= axisLimit) z2 = z1 - axisLimit + 1;
+
+            if (ModeOptions.getCubeFill() == ModeOptions.ActionEnum.CUBE_SKELETON) {
+                //Hollow floor
+                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);
+            } else {
+                //Filled floor
+                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) {
+
+                        list.add(new BlockPos(l, y, n));
+                    }
+                }
+            }
+
+        } else {
+            BlockPos firstPos = firstPosTable.get(player.getUniqueID());
+            BlockPos secondPos = secondPosTable.get(player.getUniqueID());
+
+            BlockPos thirdPos = DiagonalLine.findHeight(player, secondPos, skipRaytrace);
+            if (thirdPos == null) return list;
+
+            //Add whole cube
+            //Limit amount of blocks you can place per row
+            int axisLimit = ReachHelper.getMaxBlocksPerAxis(player);
+
+            int x1 = firstPos.getX(), x2 = thirdPos.getX();
+            int y1 = firstPos.getY(), y2 = thirdPos.getY();
+            int z1 = firstPos.getZ(), z2 = thirdPos.getZ();
+
+            //limit axis
+            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;
+
+            switch (ModeOptions.getCubeFill()) {
+                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;
+            }
+
+        }
+
+        return list;
+    }
+
+    public static void addCubeBlocks(List<BlockPos> list, int x1, int x2, int y1, int y2, int z1, int z2) {
+        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 m = y1; y1 < y2 ? m <= y2 : m >= y2; m += y1 < y2 ? 1 : -1) {
+                    list.add(new BlockPos(l, m, n));
+                }
+            }
+        }
+    }
+
+    public static void addHollowCubeBlocks(List<BlockPos> list, int x1, int x2, int y1, int y2, int z1, int z2) {
+        Wall.addXWallBlocks(list, x1, y1, y2, z1, z2);
+        Wall.addXWallBlocks(list, x2, y1, y2, z1, z2);
+
+        Wall.addZWallBlocks(list, x1, x2, y1, y2, z1);
+        Wall.addZWallBlocks(list, x1, x2, y1, y2, z2);
+
+        Floor.addFloorBlocks(list, x1, x2, y1, z1, z2);
+        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) {
+        Line.addXLineBlocks(list, x1, x2, y1, z1);
+        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);
+        Line.addYLineBlocks(list, y1, y2, x1, z2);
+        Line.addYLineBlocks(list, y1, y2, x2, z1);
+        Line.addYLineBlocks(list, y1, y2, x2, z2);
+
+        Line.addZLineBlocks(list, z1, z2, x1, y1);
+        Line.addZLineBlocks(list, z1, z2, x1, y2);
+        Line.addZLineBlocks(list, z1, z2, x2, y1);
+        Line.addZLineBlocks(list, z1, z2, x2, y2);
+    }
+
+    @Override
+    public EnumFacing getSideHit(EntityPlayer player) {
+        return sideHitTable.get(player.getUniqueID());
+    }
+
+    @Override
+    public Vec3d getHitVec(EntityPlayer player) {
+        return hitVecTable.get(player.getUniqueID());
+    }
+
+}

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

@@ -0,0 +1,228 @@
+package nl.requios.effortlessbuilding.buildmode;
+
+import net.minecraft.entity.player.EntityPlayer;
+import net.minecraft.util.EnumFacing;
+import net.minecraft.util.math.BlockPos;
+import net.minecraft.util.math.RayTraceResult;
+import net.minecraft.util.math.Vec3d;
+import nl.requios.effortlessbuilding.helper.ReachHelper;
+
+import java.util.*;
+
+public class DiagonalLine implements IBuildMode {
+    //In singleplayer client and server variables are shared
+    //Split everything that needs separate values and may not be called twice in one click
+    private Dictionary<UUID, Integer> rightClickClientTable = new Hashtable<>();
+    private Dictionary<UUID, Integer> rightClickServerTable = new Hashtable<>();
+    private Dictionary<UUID, BlockPos> firstPosTable = new Hashtable<>();
+    private Dictionary<UUID, BlockPos> secondPosTable = new Hashtable<>();
+    private Dictionary<UUID, EnumFacing> sideHitTable = new Hashtable<>();
+    private Dictionary<UUID, Vec3d> hitVecTable = new Hashtable<>();
+
+    static class HeightCriteria {
+        Vec3d planeBound;
+        Vec3d lineBound;
+        double distToLineSq;
+        double distToPlayerSq;
+
+        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();
+        }
+
+        //Make it from a plane into a line, on y axis only
+        private Vec3d toLongestLine(Vec3d boundVec, BlockPos secondPos) {
+            BlockPos bound = new BlockPos(boundVec);
+            return new Vec3d(secondPos.getX(), bound.getY(), secondPos.getZ());
+        }
+
+        //check if its not behind the player and its not too close and not too far
+        //also check if raytrace from player to block does not intersect blocks
+        public boolean isValid(Vec3d start, Vec3d look, int reach, EntityPlayer player, boolean skipRaytrace) {
+
+            boolean intersects = false;
+            if (!skipRaytrace) {
+                //collision within a 1 block radius to selected is fine
+                RayTraceResult rayTraceResult = player.world.rayTraceBlocks(start, lineBound, false, true, false);
+                intersects = rayTraceResult != null && rayTraceResult.typeOfHit == RayTraceResult.Type.BLOCK &&
+                             planeBound.subtract(rayTraceResult.hitVec).lengthSquared() > 4;
+            }
+
+            return planeBound.subtract(start).dotProduct(look) > 0 &&
+                   distToPlayerSq > 2 && distToPlayerSq < reach * reach &&
+                   !intersects;
+        }
+    }
+    
+    @Override
+    public void initialize(EntityPlayer player) {
+        rightClickClientTable.put(player.getUniqueID(), 0);
+        rightClickServerTable.put(player.getUniqueID(), 0);
+        firstPosTable.put(player.getUniqueID(), BlockPos.ORIGIN);
+        sideHitTable.put(player.getUniqueID(), EnumFacing.UP);
+        hitVecTable.put(player.getUniqueID(), Vec3d.ZERO);
+    }
+
+    @Override
+    public List<BlockPos> onRightClick(EntityPlayer player, BlockPos blockPos, EnumFacing sideHit, Vec3d hitVec, boolean skipRaytrace) {
+        List<BlockPos> list = new ArrayList<>();
+
+        Dictionary<UUID, Integer> rightClickTable = player.world.isRemote ? rightClickClientTable : rightClickServerTable;
+        int rightClickNr = rightClickTable.get(player.getUniqueID());
+        rightClickNr++;
+        rightClickTable.put(player.getUniqueID(), rightClickNr);
+
+        if (rightClickNr == 1) {
+            //If clicking in air, reset and try again
+            if (blockPos == null) {
+                rightClickTable.put(player.getUniqueID(), 0);
+                return list;
+            }
+
+            //First click, remember starting position
+            firstPosTable.put(player.getUniqueID(), blockPos);
+            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 = Floor.findFloor(player, firstPos, true);
+
+            if (secondPos == null) {
+                rightClickTable.put(player.getUniqueID(), 1);
+                return list;
+            }
+
+            secondPosTable.put(player.getUniqueID(), secondPos);
+
+        } else {
+            //Third click, place diagonal line with height
+            list = findCoordinates(player, blockPos, skipRaytrace);
+            rightClickTable.put(player.getUniqueID(), 0);
+        }
+
+        return list;
+    }
+
+    @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());
+
+        if (rightClickNr == 0) {
+            if (blockPos != null)
+                list.add(blockPos);
+        } else if (rightClickNr == 1) {
+            BlockPos firstPos = firstPosTable.get(player.getUniqueID());
+
+            BlockPos secondPos = Floor.findFloor(player, firstPos, true);
+            if (secondPos == null) return list;
+
+            //Add diagonal line from first to second
+            list.addAll(getDiagonalLineBlocks(player , firstPos, secondPos, 10));
+
+        } else {
+            BlockPos firstPos = firstPosTable.get(player.getUniqueID());
+            BlockPos secondPos = secondPosTable.get(player.getUniqueID());
+
+            BlockPos thirdPos = findHeight(player, secondPos, skipRaytrace);
+            if (thirdPos == null) return list;
+
+            //Add diagonal line from first to third
+            list.addAll(getDiagonalLineBlocks(player , firstPos, thirdPos, 10));
+        }
+
+        return list;
+    }
+    
+    //Finds height after floor has been chosen in buildmodes with 3 clicks
+    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);
+
+        List<HeightCriteria> criteriaList = new ArrayList<>(3);
+
+        //X
+        Vec3d xBound = BuildModes.findXBound(secondPos.getX(), start, look);
+        criteriaList.add(new HeightCriteria(xBound, secondPos, start));
+
+        //Z
+        Vec3d zBound = BuildModes.findZBound(secondPos.getZ(), start, look);
+        criteriaList.add(new HeightCriteria(zBound, secondPos, start));
+
+        //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));
+
+        //If none are valid, return empty list of blocks
+        if (criteriaList.isEmpty()) return null;
+
+        //If only 1 is valid, choose that one
+        HeightCriteria selected = criteriaList.get(0);
+
+        //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);
+    }
+
+    //Add diagonal line from first to second
+    public static List<BlockPos> getDiagonalLineBlocks(EntityPlayer player, BlockPos firstPos, BlockPos secondPos, float sampleMultiplier) {
+        List<BlockPos> list = new ArrayList<>();
+
+        int axisLimit = ReachHelper.getMaxBlocksPerAxis(player);
+
+        int x1 = firstPos.getX(), x2 = secondPos.getX();
+        int y1 = firstPos.getY(), y2 = secondPos.getY();
+        int z1 = firstPos.getZ(), z2 = secondPos.getZ();
+
+        //limit axis
+        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;
+
+        Vec3d first = new Vec3d(x1, y1, z1).add(0.5, 0.5, 0.5);
+        Vec3d second = new Vec3d(x2, y2, z2).add(0.5, 0.5, 0.5);
+
+        int iterations = (int) Math.ceil(first.distanceTo(second) * sampleMultiplier);
+        for (double t = 0; t <= 1.0; t += 1.0/iterations) {
+            Vec3d lerp = first.add(second.subtract(first).scale(t));
+            BlockPos candidate = new BlockPos(lerp);
+            //Only add if not equal to the last in the list
+            if (list.isEmpty() || !list.get(list.size() - 1).equals(candidate))
+                list.add(candidate);
+        }
+
+        return list;
+    }
+
+    @Override
+    public EnumFacing getSideHit(EntityPlayer player) {
+        return sideHitTable.get(player.getUniqueID());
+    }
+
+    @Override
+    public Vec3d getHitVec(EntityPlayer player) {
+        return hitVecTable.get(player.getUniqueID());
+    }
+}

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

@@ -0,0 +1,138 @@
+package nl.requios.effortlessbuilding.buildmode;
+
+import net.minecraft.entity.player.EntityPlayer;
+import net.minecraft.util.EnumFacing;
+import net.minecraft.util.math.BlockPos;
+import net.minecraft.util.math.Vec3d;
+import nl.requios.effortlessbuilding.helper.ReachHelper;
+
+import java.util.*;
+
+public class DiagonalWall implements IBuildMode {
+    //In singleplayer client and server variables are shared
+    //Split everything that needs separate values and may not be called twice in one click
+    private Dictionary<UUID, Integer> rightClickClientTable = new Hashtable<>();
+    private Dictionary<UUID, Integer> rightClickServerTable = new Hashtable<>();
+    private Dictionary<UUID, BlockPos> firstPosTable = new Hashtable<>();
+    private Dictionary<UUID, BlockPos> secondPosTable = new Hashtable<>();
+    private Dictionary<UUID, EnumFacing> sideHitTable = new Hashtable<>();
+    private Dictionary<UUID, Vec3d> hitVecTable = new Hashtable<>();
+
+    @Override
+    public void initialize(EntityPlayer player) {
+        rightClickClientTable.put(player.getUniqueID(), 0);
+        rightClickServerTable.put(player.getUniqueID(), 0);
+        firstPosTable.put(player.getUniqueID(), BlockPos.ORIGIN);
+        sideHitTable.put(player.getUniqueID(), EnumFacing.UP);
+        hitVecTable.put(player.getUniqueID(), Vec3d.ZERO);
+    }
+
+    @Override
+    public List<BlockPos> onRightClick(EntityPlayer player, BlockPos blockPos, EnumFacing sideHit, Vec3d hitVec, boolean skipRaytrace) {
+        List<BlockPos> list = new ArrayList<>();
+
+        Dictionary<UUID, Integer> rightClickTable = player.world.isRemote ? rightClickClientTable : rightClickServerTable;
+        int rightClickNr = rightClickTable.get(player.getUniqueID());
+        rightClickNr++;
+        rightClickTable.put(player.getUniqueID(), rightClickNr);
+
+        if (rightClickNr == 1) {
+            //If clicking in air, reset and try again
+            if (blockPos == null) {
+                rightClickTable.put(player.getUniqueID(), 0);
+                return list;
+            }
+
+            //First click, remember starting position
+            firstPosTable.put(player.getUniqueID(), blockPos);
+            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 = Floor.findFloor(player, firstPos, true);
+
+            if (secondPos == null) {
+                rightClickTable.put(player.getUniqueID(), 1);
+                return list;
+            }
+
+            secondPosTable.put(player.getUniqueID(), secondPos);
+
+        } else {
+            //Third click, place diagonal wall with height
+            list = findCoordinates(player, blockPos, skipRaytrace);
+            rightClickTable.put(player.getUniqueID(), 0);
+        }
+
+        return list;
+    }
+
+    @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());
+
+        if (rightClickNr == 0) {
+            if (blockPos != null)
+                list.add(blockPos);
+        } else if (rightClickNr == 1) {
+            BlockPos firstPos = firstPosTable.get(player.getUniqueID());
+
+            BlockPos secondPos = Floor.findFloor(player, firstPos, true);
+            if (secondPos == null) return list;
+
+            //Add diagonal line
+            list.addAll(DiagonalLine.getDiagonalLineBlocks(player, firstPos, secondPos, 1));
+
+        } else {
+            BlockPos firstPos = firstPosTable.get(player.getUniqueID());
+            BlockPos secondPos = secondPosTable.get(player.getUniqueID());
+
+            BlockPos thirdPos = DiagonalLine.findHeight(player, secondPos, skipRaytrace);
+            if (thirdPos == null) return list;
+
+            //Add diagonal wall
+            list.addAll(getDiagonalWallBlocks(player, firstPos, secondPos, thirdPos));
+        }
+
+        return list;
+    }
+
+    //Add diagonal wall from first to second
+    public static List<BlockPos> getDiagonalWallBlocks(EntityPlayer player, BlockPos firstPos, BlockPos secondPos, BlockPos thirdPos) {
+        List<BlockPos> list = new ArrayList<>();
+
+        int axisLimit = ReachHelper.getMaxBlocksPerAxis(player);
+
+        //Get diagonal line blocks
+        List<BlockPos> diagonalLineBlocks = DiagonalLine.getDiagonalLineBlocks(player, firstPos, secondPos, 1);
+
+        //Limit amount of blocks we can place
+        int lowest = Math.min(firstPos.getY(), thirdPos.getY());
+        int highest = Math.max(firstPos.getY(), thirdPos.getY());
+
+        if (highest - lowest >= axisLimit) highest = lowest + axisLimit - 1;
+
+        //Copy diagonal line on y axis
+        for (int y = lowest; y <= highest; y++) {
+            for (BlockPos blockPos : diagonalLineBlocks) {
+                list.add(new BlockPos(blockPos.getX(), y, blockPos.getZ()));
+            }
+        }
+
+        return list;
+    }
+
+    @Override
+    public EnumFacing getSideHit(EntityPlayer player) {
+        return sideHitTable.get(player.getUniqueID());
+    }
+
+    @Override
+    public Vec3d getHitVec(EntityPlayer player) {
+        return hitVecTable.get(player.getUniqueID());
+    }
+}

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

@@ -0,0 +1,183 @@
+package nl.requios.effortlessbuilding.buildmode;
+
+import net.minecraft.entity.player.EntityPlayer;
+import net.minecraft.util.EnumFacing;
+import net.minecraft.util.math.BlockPos;
+import net.minecraft.util.math.RayTraceResult;
+import net.minecraft.util.math.Vec3d;
+import nl.requios.effortlessbuilding.helper.ReachHelper;
+
+import java.util.*;
+
+public class Floor implements IBuildMode {
+    //In singleplayer client and server variables are shared
+    //Split everything that needs separate values and may not be called twice in one click
+    private Dictionary<UUID, Integer> rightClickClientTable = new Hashtable<>();
+    private Dictionary<UUID, Integer> rightClickServerTable = new Hashtable<>();
+    private Dictionary<UUID, BlockPos> firstPosTable = new Hashtable<>();
+    private Dictionary<UUID, EnumFacing> sideHitTable = new Hashtable<>();
+    private Dictionary<UUID, Vec3d> hitVecTable = new Hashtable<>();
+
+    static class Criteria {
+        Vec3d planeBound;
+        double distToPlayerSq;
+
+        Criteria(Vec3d planeBound, Vec3d start) {
+            this.planeBound = planeBound;
+            this.distToPlayerSq = this.planeBound.subtract(start).lengthSquared();
+        }
+
+        //check if its not behind the player and its not too close and not too far
+        //also check if raytrace from player to block does not intersect blocks
+        public boolean isValid(Vec3d start, Vec3d look, int reach, EntityPlayer player, boolean skipRaytrace) {
+
+            boolean intersects = false;
+            if (!skipRaytrace) {
+                //collision within a 1 block radius to selected is fine
+                RayTraceResult rayTraceResult = player.world.rayTraceBlocks(start, planeBound, false, true, false);
+                intersects = rayTraceResult != null && rayTraceResult.typeOfHit == RayTraceResult.Type.BLOCK &&
+                    planeBound.subtract(rayTraceResult.hitVec).lengthSquared() > 4;
+            }
+
+            return planeBound.subtract(start).dotProduct(look) > 0 &&
+                   distToPlayerSq > 2 && distToPlayerSq < reach * reach &&
+                   !intersects;
+        }
+    }
+
+    @Override
+    public void initialize(EntityPlayer player) {
+        rightClickClientTable.put(player.getUniqueID(), 0);
+        rightClickServerTable.put(player.getUniqueID(), 0);
+        firstPosTable.put(player.getUniqueID(), BlockPos.ORIGIN);
+        sideHitTable.put(player.getUniqueID(), EnumFacing.UP);
+        hitVecTable.put(player.getUniqueID(), Vec3d.ZERO);
+    }
+
+    @Override
+    public List<BlockPos> onRightClick(EntityPlayer player, BlockPos blockPos, EnumFacing sideHit, Vec3d hitVec, boolean skipRaytrace) {
+        List<BlockPos> list = new ArrayList<>();
+
+        Dictionary<UUID, Integer> rightClickTable = player.world.isRemote ? rightClickClientTable : rightClickServerTable;
+        int rightClickNr = rightClickTable.get(player.getUniqueID());
+        rightClickNr++;
+        rightClickTable.put(player.getUniqueID(), rightClickNr);
+
+        if (rightClickNr == 1) {
+            //If clicking in air, reset and try again
+            if (blockPos == null) {
+                rightClickTable.put(player.getUniqueID(), 0);
+                return list;
+            }
+
+            //First click, remember starting position
+            firstPosTable.put(player.getUniqueID(), blockPos);
+            sideHitTable.put(player.getUniqueID(), sideHit);
+            hitVecTable.put(player.getUniqueID(), hitVec);
+            //Keep list empty, dont place any blocks yet
+        } else {
+            //Second click, place wall
+
+            list = findCoordinates(player, blockPos, skipRaytrace);
+            rightClickTable.put(player.getUniqueID(), 0);
+        }
+
+        return list;
+    }
+
+    @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());
+        BlockPos firstPos = firstPosTable.get(player.getUniqueID());
+
+        if (rightClickNr == 0) {
+            if (blockPos != null)
+                list.add(blockPos);
+        } else {
+            BlockPos secondPos = findFloor(player, firstPos, skipRaytrace);
+            if (secondPos == null) return list;
+
+            //Add whole floor
+            list.addAll(getFloorBlocks(player, firstPos, secondPos));
+        }
+
+        return list;
+    }
+
+    public static BlockPos findFloor(EntityPlayer player, BlockPos firstPos, boolean skipRaytrace) {
+        Vec3d look = player.getLookVec();
+        Vec3d start = new Vec3d(player.posX, player.posY + player.getEyeHeight(), player.posZ);
+
+        List<Criteria> criteriaList = new ArrayList<>(3);
+
+        //Y
+        Vec3d yBound = BuildModes.findYBound(firstPos.getY(), start, look);
+        criteriaList.add(new Criteria(yBound, start));
+
+        //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));
+
+        //If none are valid, return empty list of blocks
+        if (criteriaList.isEmpty()) return null;
+
+        //Then only 1 can be valid, return that one
+        Criteria selected = criteriaList.get(0);
+
+        return new BlockPos(selected.planeBound);
+    }
+
+    public static List<BlockPos> getFloorBlocks(EntityPlayer player, BlockPos firstPos, BlockPos secondPos) {
+        List<BlockPos> list = new ArrayList<>();
+
+        //Limit amount of blocks you can place per row
+        int axisLimit = ReachHelper.getMaxBlocksPerAxis(player);
+
+        int x1 = firstPos.getX(), x2 = secondPos.getX();
+        int y = firstPos.getY();
+        int z1 = firstPos.getZ(), z2 = secondPos.getZ();
+
+        //limit axis
+        if (x2 - x1 >= axisLimit) x2 = x1 + axisLimit - 1;
+        if (x1 - x2 >= axisLimit) x2 = x1 - axisLimit + 1;
+        if (z2 - z1 >= axisLimit) z2 = z1 + axisLimit - 1;
+        if (z1 - z2 >= axisLimit) z2 = z1 - axisLimit + 1;
+
+        if (ModeOptions.getFill() == ModeOptions.ActionEnum.FULL)
+            addFloorBlocks(list, x1, x2, y, z1, z2);
+        else
+            addHollowFloorBlocks(list, x1, x2, y, z1, z2);
+
+        return list;
+    }
+
+    public static void addFloorBlocks(List<BlockPos> list, int x1, int x2, int y, int z1, int z2) {
+
+        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) {
+
+                list.add(new BlockPos(l, y, n));
+            }
+        }
+    }
+
+    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);
+    }
+
+    @Override
+    public EnumFacing getSideHit(EntityPlayer player) {
+        return sideHitTable.get(player.getUniqueID());
+    }
+
+    @Override
+    public Vec3d getHitVec(EntityPlayer player) {
+        return hitVecTable.get(player.getUniqueID());
+    }
+}

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

@@ -1,25 +1,25 @@
 package nl.requios.effortlessbuilding.buildmode;
 
-import net.minecraft.entity.player.PlayerEntity;
-import net.minecraft.util.Direction;
+import net.minecraft.entity.player.EntityPlayer;
+import net.minecraft.util.EnumFacing;
 import net.minecraft.util.math.BlockPos;
-import net.minecraft.util.math.vector.Vector3d;
+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
-	void initialize(PlayerEntity player);
+    void initialize(EntityPlayer player);
 
     //Fired when a block would be placed
     //Return a list of coordinates where you want to place blocks
-	List<BlockPos> onRightClick(PlayerEntity player, BlockPos blockPos, Direction sideHit, Vector3d hitVec, boolean skipRaytrace);
+    List<BlockPos> onRightClick(EntityPlayer player, BlockPos blockPos, EnumFacing sideHit, Vec3d hitVec, boolean skipRaytrace);
 
     //Fired continuously for visualization purposes
-	List<BlockPos> findCoordinates(PlayerEntity player, BlockPos blockPos, boolean skipRaytrace);
+    List<BlockPos> findCoordinates(EntityPlayer player, BlockPos blockPos, boolean skipRaytrace);
 
-	Direction getSideHit(PlayerEntity player);
+    EnumFacing getSideHit(EntityPlayer player);
 
-	Vector3d getHitVec(PlayerEntity player);
+    Vec3d getHitVec(EntityPlayer player);
 }

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

@@ -0,0 +1,239 @@
+package nl.requios.effortlessbuilding.buildmode;
+
+import net.minecraft.entity.player.EntityPlayer;
+import net.minecraft.util.EnumFacing;
+import net.minecraft.util.math.BlockPos;
+import net.minecraft.util.math.RayTraceResult;
+import net.minecraft.util.math.Vec3d;
+import nl.requios.effortlessbuilding.helper.ReachHelper;
+
+import java.util.*;
+
+public class Line implements IBuildMode {
+    //In singleplayer client and server variables are shared
+    //Split everything that needs separate values and may not be called twice in one click
+    private Dictionary<UUID, Integer> rightClickClientTable = new Hashtable<>();
+    private Dictionary<UUID, Integer> rightClickServerTable = new Hashtable<>();
+    private Dictionary<UUID, BlockPos> firstPosTable = new Hashtable<>();
+    private Dictionary<UUID, EnumFacing> sideHitTable = new Hashtable<>();
+    private Dictionary<UUID, Vec3d> hitVecTable = new Hashtable<>();
+
+    static class Criteria {
+        Vec3d planeBound;
+        Vec3d lineBound;
+        double distToLineSq;
+        double distToPlayerSq;
+
+        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();
+        }
+
+        //Make it from a plane into a line
+        //Select the axis that is longest
+        private Vec3d toLongestLine(Vec3d boundVec, BlockPos firstPos) {
+            BlockPos bound = new BlockPos(boundVec);
+
+            BlockPos firstToSecond = bound.subtract(firstPos);
+            firstToSecond = new BlockPos(Math.abs(firstToSecond.getX()), Math.abs(firstToSecond.getY()), Math.abs(firstToSecond.getZ()));
+            int longest = Math.max(firstToSecond.getX(), Math.max(firstToSecond.getY(), firstToSecond.getZ()));
+            if (longest == firstToSecond.getX()) {
+                return new 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;
+        }
+
+        //check if its not behind the player and its not too close and not too far
+        //also check if raytrace from player to block does not intersect blocks
+        public boolean isValid(Vec3d start, Vec3d look, int reach, EntityPlayer player, boolean skipRaytrace) {
+
+            boolean intersects = false;
+            if (!skipRaytrace) {
+                //collision within a 1 block radius to selected is fine
+                RayTraceResult rayTraceResult = player.world.rayTraceBlocks(start, lineBound, false, true, false);
+                intersects = rayTraceResult != null && rayTraceResult.typeOfHit == RayTraceResult.Type.BLOCK &&
+                             planeBound.subtract(rayTraceResult.hitVec).lengthSquared() > 4;
+            }
+
+            return planeBound.subtract(start).dotProduct(look) > 0 &&
+                   distToPlayerSq > 2 && distToPlayerSq < reach * reach &&
+                   !intersects;
+        }
+    }
+
+    @Override
+    public void initialize(EntityPlayer player) {
+        rightClickClientTable.put(player.getUniqueID(), 0);
+        rightClickServerTable.put(player.getUniqueID(), 0);
+        firstPosTable.put(player.getUniqueID(), BlockPos.ORIGIN);
+        sideHitTable.put(player.getUniqueID(), EnumFacing.UP);
+        hitVecTable.put(player.getUniqueID(), Vec3d.ZERO);
+    }
+
+    @Override
+    public List<BlockPos> onRightClick(EntityPlayer player, BlockPos blockPos, EnumFacing sideHit, Vec3d hitVec, boolean skipRaytrace) {
+        List<BlockPos> list = new ArrayList<>();
+
+        Dictionary<UUID, Integer> rightClickTable = player.world.isRemote ? rightClickClientTable : rightClickServerTable;
+        int rightClickNr = rightClickTable.get(player.getUniqueID());
+        rightClickNr++;
+        rightClickTable.put(player.getUniqueID(), rightClickNr);
+
+        if (rightClickNr == 1) {
+            //If clicking in air, reset and try again
+            if (blockPos == null) {
+                rightClickTable.put(player.getUniqueID(), 0);
+                return list;
+            }
+
+            //First click, remember starting position
+            firstPosTable.put(player.getUniqueID(), blockPos);
+            sideHitTable.put(player.getUniqueID(), sideHit);
+            hitVecTable.put(player.getUniqueID(), hitVec);
+            //Keep list empty, dont place any blocks yet
+        } else {
+            //Second click, place wall
+
+            list = findCoordinates(player, blockPos, skipRaytrace);
+            rightClickTable.put(player.getUniqueID(), 0);
+        }
+
+        return list;
+    }
+
+    @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());
+        BlockPos firstPos = firstPosTable.get(player.getUniqueID());
+
+        if (rightClickNr == 0) {
+            if (blockPos != null)
+                list.add(blockPos);
+        } else {
+            BlockPos secondPos = findLine(player, firstPos, skipRaytrace);
+            if (secondPos == null) return list;
+
+            list.addAll(getLineBlocks(player, firstPos, secondPos));
+        }
+
+        return list;
+    }
+
+    public static BlockPos findLine(EntityPlayer player, BlockPos firstPos, boolean skipRaytrace) {
+        Vec3d look = player.getLookVec();
+        Vec3d start = new Vec3d(player.posX, player.posY + player.getEyeHeight(), player.posZ);
+
+        List<Criteria> criteriaList = new ArrayList<>(3);
+
+        //X
+        Vec3d xBound = BuildModes.findXBound(firstPos.getX(), start, look);
+        criteriaList.add(new Criteria(xBound, firstPos, start));
+
+        //Y
+        Vec3d yBound = BuildModes.findYBound(firstPos.getY(), start, look);
+        criteriaList.add(new Criteria(yBound, firstPos, start));
+
+        //Z
+        Vec3d zBound = BuildModes.findZBound(firstPos.getZ(), start, look);
+        criteriaList.add(new Criteria(zBound, firstPos, start));
+
+        //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));
+
+        //If none are valid, return empty list of blocks
+        if (criteriaList.isEmpty()) return null;
+
+        //If only 1 is valid, choose that one
+        Criteria selected = criteriaList.get(0);
+
+        //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++) {
+                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;
+                }
+            }
+
+        }
+
+        return new BlockPos(selected.lineBound);
+    }
+
+    public static List<BlockPos> getLineBlocks(EntityPlayer player, BlockPos firstPos, BlockPos secondPos) {
+        List<BlockPos> list = new ArrayList<>();
+
+        //Limit amount of blocks we can place
+        int axisLimit = ReachHelper.getMaxBlocksPerAxis(player);
+
+        //Add whole line
+        int x1 = firstPos.getX(), x2 = secondPos.getX();
+        int y1 = firstPos.getY(), y2 = secondPos.getY();
+        int z1 = firstPos.getZ(), z2 = secondPos.getZ();
+
+        //limit axis
+        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 (x1 != x2) {
+            addXLineBlocks(list, x1, x2, y1, z1);
+        } else if (y1 != y2) {
+            addYLineBlocks(list, y1, y2, x1, z1);
+        } else {
+            addZLineBlocks(list, z1, z2, x1, y1);
+        }
+
+        return list;
+    }
+
+    public static void addXLineBlocks(List<BlockPos> list, int x1, int x2, int y, int z) {
+        for (int x = x1; x1 < x2 ? x <= x2 : x >= x2; x += x1 < x2 ? 1 : -1) {
+            list.add(new BlockPos(x, y, z));
+        }
+    }
+
+    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));
+        }
+    }
+
+    @Override
+    public EnumFacing getSideHit(EntityPlayer player) {
+        return sideHitTable.get(player.getUniqueID());
+    }
+
+    @Override
+    public Vec3d getHitVec(EntityPlayer player) {
+        return hitVecTable.get(player.getUniqueID());
+    }
+
+}

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

@@ -1,6 +1,6 @@
 package nl.requios.effortlessbuilding.buildmode;
 
-import net.minecraft.entity.player.PlayerEntity;
+import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.util.text.TextFormatting;
 import nl.requios.effortlessbuilding.EffortlessBuilding;
 import nl.requios.effortlessbuilding.buildmodifier.ModifierSettingsManager;
@@ -9,31 +9,41 @@ import nl.requios.effortlessbuilding.proxy.ClientProxy;
 
 public class ModeOptions {
 
+    public enum ActionEnum {
+        UNDO("effortlessbuilding.action.undo"),
+        REDO("effortlessbuilding.action.redo"),
+        REPLACE("effortlessbuilding.action.replace"),
+        OPEN_MODIFIER_SETTINGS("effortlessbuilding.action.open_modifier_settings"),
+
+        NORMAL_SPEED("effortlessbuilding.action.normal_speed"),
+        FAST_SPEED("effortlessbuilding.action.fast_speed"),
+
+        FULL("effortlessbuilding.action.full"),
+        HOLLOW("effortlessbuilding.action.hollow"),
+
+        CUBE_FULL("effortlessbuilding.action.full"),
+        CUBE_HOLLOW("effortlessbuilding.action.hollow"),
+        CUBE_SKELETON("effortlessbuilding.action.skeleton"),
+
+        SHORT_EDGE("effortlessbuilding.action.short_edge"),
+        LONG_EDGE("effortlessbuilding.action.long_edge"),
+
+        THICKNESS_1("effortlessbuilding.action.thickness_1"),
+        THICKNESS_3("effortlessbuilding.action.thickness_3"),
+        THICKNESS_5("effortlessbuilding.action.thickness_5");
+
+        public String name;
+
+        ActionEnum(String name) {
+            this.name = name;
+        }
+    }
+
     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 static ActionEnum getOptionSetting(OptionEnum option) {
-		switch (option) {
-			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() {
         return buildSpeed;
@@ -55,12 +65,8 @@ public class ModeOptions {
         return lineThickness;
     }
 
-	public static ActionEnum getCircleStart() {
-		return circleStart;
-	}
-
     //Called on both client and server
-	public static void performAction(PlayerEntity player, ActionEnum action) {
+    public static void performAction(EntityPlayer player, ActionEnum action) {
         if (action == null) return;
 
         switch (action) {
@@ -77,13 +83,9 @@ public class ModeOptions {
                         modifierSettings.doQuickReplace() ? "on" : "off"), true);
                 break;
             case OPEN_MODIFIER_SETTINGS:
-				if (player.level.isClientSide)
+                if (player.world.isRemote)
                     ClientProxy.openModifierSettings();
                 break;
-			case OPEN_PLAYER_SETTINGS:
-				if (player.level.isClientSide)
-					ClientProxy.openPlayerSettings();
-				break;
 
             case NORMAL_SPEED:
                 buildSpeed = ActionEnum.NORMAL_SPEED;
@@ -121,71 +123,10 @@ public class ModeOptions {
             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 &&
-			action != ActionEnum.REPLACE &&
-			action != ActionEnum.OPEN_MODIFIER_SETTINGS &&
-			action != ActionEnum.OPEN_PLAYER_SETTINGS) {
-
-			EffortlessBuilding.logTranslate(player, "", action.name, "", true);
-		}
-	}
-
-	public enum ActionEnum {
-		UNDO("effortlessbuilding.action.undo"),
-		REDO("effortlessbuilding.action.redo"),
-		REPLACE("effortlessbuilding.action.replace"),
-		OPEN_MODIFIER_SETTINGS("effortlessbuilding.action.open_modifier_settings"),
-		OPEN_PLAYER_SETTINGS("effortlessbuilding.action.open_player_settings"),
-
-		NORMAL_SPEED("effortlessbuilding.action.normal_speed"),
-		FAST_SPEED("effortlessbuilding.action.fast_speed"),
-
-		FULL("effortlessbuilding.action.full"),
-		HOLLOW("effortlessbuilding.action.hollow"),
-
-		CUBE_FULL("effortlessbuilding.action.full"),
-		CUBE_HOLLOW("effortlessbuilding.action.hollow"),
-		CUBE_SKELETON("effortlessbuilding.action.skeleton"),
-
-		SHORT_EDGE("effortlessbuilding.action.short_edge"),
-		LONG_EDGE("effortlessbuilding.action.long_edge"),
-
-		THICKNESS_1("effortlessbuilding.action.thickness_1"),
-		THICKNESS_3("effortlessbuilding.action.thickness_3"),
-		THICKNESS_5("effortlessbuilding.action.thickness_5"),
-
-		CIRCLE_START_CORNER("effortlessbuilding.action.start_corner"),
-		CIRCLE_START_CENTER("effortlessbuilding.action.start_center");
-
-		public String name;
-
-		ActionEnum(String name) {
-			this.name = name;
-		}
-	}
-
-	public enum OptionEnum {
-		BUILD_SPEED("effortlessbuilding.action.build_speed", ActionEnum.NORMAL_SPEED, ActionEnum.FAST_SPEED),
-		FILL("effortlessbuilding.action.filling", ActionEnum.FULL, ActionEnum.HOLLOW),
-		CUBE_FILL("effortlessbuilding.action.filling", ActionEnum.CUBE_FULL, ActionEnum.CUBE_HOLLOW, ActionEnum.CUBE_SKELETON),
-		RAISED_EDGE("effortlessbuilding.action.raised_edge", ActionEnum.SHORT_EDGE, ActionEnum.LONG_EDGE),
-		LINE_THICKNESS("effortlessbuilding.action.thickness", ActionEnum.THICKNESS_1, ActionEnum.THICKNESS_3, ActionEnum.THICKNESS_5),
-		CIRCLE_START("effortlessbuilding.action.circle_start", ActionEnum.CIRCLE_START_CORNER, ActionEnum.CIRCLE_START_CENTER);
-
-		public String name;
-		public ActionEnum[] actions;
-
-		OptionEnum(String name, ActionEnum... actions) {
-			this.name = name;
-			this.actions = actions;
+        if (player.world.isRemote && action != ActionEnum.REPLACE && action != ActionEnum.OPEN_MODIFIER_SETTINGS) {
+            ClientProxy.logTranslate(action.name);
         }
     }
 }

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

@@ -1,62 +1,49 @@
 package nl.requios.effortlessbuilding.buildmode;
 
-import net.minecraft.entity.player.PlayerEntity;
-import net.minecraft.entity.player.ServerPlayerEntity;
-import net.minecraftforge.common.util.LazyOptional;
+import net.minecraft.entity.player.EntityPlayer;
+import net.minecraft.entity.player.EntityPlayerMP;
 import net.minecraftforge.fml.common.Mod;
-import net.minecraftforge.fml.network.PacketDistributor;
 import nl.requios.effortlessbuilding.EffortlessBuilding;
 import nl.requios.effortlessbuilding.capability.ModeCapabilityManager;
 import nl.requios.effortlessbuilding.helper.ReachHelper;
 import nl.requios.effortlessbuilding.network.ModeSettingsMessage;
-import nl.requios.effortlessbuilding.network.PacketHandler;
-
-import javax.annotation.Nonnull;
 
 @Mod.EventBusSubscriber
 public class ModeSettingsManager {
 
     //Retrieves the buildsettings of a player through the modifierCapability capability
     //Never returns null
-	@Nonnull
-	public static ModeSettings getModeSettings(PlayerEntity player) {
-		LazyOptional<ModeCapabilityManager.IModeCapability> modeCapability =
-			player.getCapability(ModeCapabilityManager.modeCapability, null);
-
-		if (modeCapability.isPresent()) {
-			ModeCapabilityManager.IModeCapability capability = modeCapability.orElse(null);
+    public static ModeSettings getModeSettings(EntityPlayer player) {
+        if (player.hasCapability(ModeCapabilityManager.modeCapability, null)) {
+            ModeCapabilityManager.IModeCapability capability = player.getCapability(
+                    ModeCapabilityManager.modeCapability, null);
             if (capability.getModeData() == null) {
                 capability.setModeData(new ModeSettings());
             }
             return capability.getModeData();
         }
-
-		//Player does not have modeCapability capability
-		//Return dummy settings
-		return new ModeSettings();
-//        throw new IllegalArgumentException("Player does not have modeCapability capability");
+        throw new IllegalArgumentException("Player does not have modeCapability capability");
     }
 
-	public static void setModeSettings(PlayerEntity player, ModeSettings modeSettings) {
+    public static void setModeSettings(EntityPlayer player, ModeSettings modeSettings) {
         if (player == null) {
-			EffortlessBuilding.log("Cannot set buildmode settings, player is null");
+            EffortlessBuilding.log("Cannot set buildsettings, player is null");
             return;
         }
-		LazyOptional<ModeCapabilityManager.IModeCapability> modeCapability =
-			player.getCapability(ModeCapabilityManager.modeCapability, null);
+        if (player.hasCapability(ModeCapabilityManager.modeCapability, null)) {
+            ModeCapabilityManager.IModeCapability capability = player.getCapability(
+                    ModeCapabilityManager.modeCapability, null);
 
-		modeCapability.ifPresent((capability) -> {
             capability.setModeData(modeSettings);
 
+            //Initialize new mode
             BuildModes.initializeMode(player);
-		});
-
-		if (!modeCapability.isPresent()) {
-			EffortlessBuilding.log(player, "Saving buildmode settings failed.");
+        } else {
+            EffortlessBuilding.log(player, "Saving buildsettings failed.");
         }
     }
 
-	public static String sanitize(ModeSettings modeSettings, PlayerEntity player) {
+    public static String sanitize(ModeSettings modeSettings, EntityPlayer player) {
         int maxReach = ReachHelper.getMaxReach(player);
         String error = "";
 
@@ -65,18 +52,6 @@ public class ModeSettingsManager {
         return error;
     }
 
-	public static void handleNewPlayer(PlayerEntity player) {
-		//Makes sure player has mode settings (if it doesnt it will create it)
-		getModeSettings(player);
-
-		//Only on server
-		if (!player.level.isClientSide) {
-			//Send to client
-			ModeSettingsMessage msg = new ModeSettingsMessage(getModeSettings(player));
-			PacketHandler.INSTANCE.send(PacketDistributor.PLAYER.with(() -> (ServerPlayerEntity) player), msg);
-		}
-	}
-
     public static class ModeSettings {
         private BuildModes.BuildModeEnum buildMode = BuildModes.BuildModeEnum.NORMAL;
 
@@ -95,4 +70,17 @@ public class ModeSettingsManager {
             this.buildMode = buildMode;
         }
     }
+
+    public static void handleNewPlayer(EntityPlayer player){
+        if (getModeSettings(player) == null) {
+            setModeSettings(player, new ModeSettings());
+        }
+
+        //Only on server
+        if (!player.world.isRemote) {
+            //Send to client
+            ModeSettingsMessage msg = new ModeSettingsMessage(getModeSettings(player));
+            EffortlessBuilding.packetHandler.sendTo(msg, (EntityPlayerMP) player);
+        }
+    }
 }

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

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

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

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

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

@@ -0,0 +1,178 @@
+package nl.requios.effortlessbuilding.buildmode;
+
+import net.minecraft.entity.player.EntityPlayer;
+import net.minecraft.util.EnumFacing;
+import net.minecraft.util.math.BlockPos;
+import net.minecraft.util.math.Vec3d;
+import nl.requios.effortlessbuilding.helper.ReachHelper;
+
+import java.util.*;
+
+public class SlopeFloor implements IBuildMode {
+    //In singleplayer client and server variables are shared
+    //Split everything that needs separate values and may not be called twice in one click
+    private Dictionary<UUID, Integer> rightClickClientTable = new Hashtable<>();
+    private Dictionary<UUID, Integer> rightClickServerTable = new Hashtable<>();
+    private Dictionary<UUID, BlockPos> firstPosTable = new Hashtable<>();
+    private Dictionary<UUID, BlockPos> secondPosTable = new Hashtable<>();
+    private Dictionary<UUID, EnumFacing> sideHitTable = new Hashtable<>();
+    private Dictionary<UUID, Vec3d> hitVecTable = new Hashtable<>();
+
+    @Override
+    public void initialize(EntityPlayer player) {
+        rightClickClientTable.put(player.getUniqueID(), 0);
+        rightClickServerTable.put(player.getUniqueID(), 0);
+        firstPosTable.put(player.getUniqueID(), BlockPos.ORIGIN);
+        sideHitTable.put(player.getUniqueID(), EnumFacing.UP);
+        hitVecTable.put(player.getUniqueID(), Vec3d.ZERO);
+    }
+
+    @Override
+    public List<BlockPos> onRightClick(EntityPlayer player, BlockPos blockPos, EnumFacing sideHit, Vec3d hitVec, boolean skipRaytrace) {
+        List<BlockPos> list = new ArrayList<>();
+
+        Dictionary<UUID, Integer> rightClickTable = player.world.isRemote ? rightClickClientTable : rightClickServerTable;
+        int rightClickNr = rightClickTable.get(player.getUniqueID());
+        rightClickNr++;
+        rightClickTable.put(player.getUniqueID(), rightClickNr);
+
+        if (rightClickNr == 1) {
+            //If clicking in air, reset and try again
+            if (blockPos == null) {
+                rightClickTable.put(player.getUniqueID(), 0);
+                return list;
+            }
+
+            //First click, remember starting position
+            firstPosTable.put(player.getUniqueID(), blockPos);
+            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 = Floor.findFloor(player, firstPos, true);
+
+            if (secondPos == null) {
+                rightClickTable.put(player.getUniqueID(), 1);
+                return list;
+            }
+
+            secondPosTable.put(player.getUniqueID(), secondPos);
+
+        } else {
+            //Third click, place slope floor with height
+            list = findCoordinates(player, blockPos, skipRaytrace);
+            rightClickTable.put(player.getUniqueID(), 0);
+        }
+
+        return list;
+    }
+
+    @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());
+
+        if (rightClickNr == 0) {
+            if (blockPos != null)
+                list.add(blockPos);
+        } else if (rightClickNr == 1) {
+            BlockPos firstPos = firstPosTable.get(player.getUniqueID());
+
+            BlockPos secondPos = Floor.findFloor(player, firstPos, true);
+            if (secondPos == null) return list;
+
+            //Add whole floor
+            list.addAll(Floor.getFloorBlocks(player, firstPos, secondPos));
+
+        } else {
+            BlockPos firstPos = firstPosTable.get(player.getUniqueID());
+            BlockPos secondPos = secondPosTable.get(player.getUniqueID());
+
+            BlockPos thirdPos = DiagonalLine.findHeight(player, secondPos, skipRaytrace);
+            if (thirdPos == null) return list;
+
+            //Add slope floor blocks
+            list.addAll(getSlopeFloorBlocks(player, firstPos, secondPos, thirdPos));
+        }
+
+        return list;
+    }
+
+    //Add slope floor from first to second
+    public static List<BlockPos> getSlopeFloorBlocks(EntityPlayer player, BlockPos firstPos, BlockPos secondPos, BlockPos thirdPos) {
+        List<BlockPos> list = new ArrayList<>();
+
+        int axisLimit = ReachHelper.getMaxBlocksPerAxis(player);
+
+        //Determine whether to use x or z axis to slope up
+        boolean onXAxis = true;
+
+        int xLength = Math.abs(secondPos.getX() - firstPos.getX());
+        int zLength = Math.abs(secondPos.getZ() - firstPos.getZ());
+
+        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;
+        }
+
+        if (onXAxis) {
+            //Along X goes up
+
+            //Get diagonal line blocks
+            BlockPos linePoint = new BlockPos(secondPos.getX(), thirdPos.getY(), firstPos.getZ());
+            List<BlockPos> diagonalLineBlocks = DiagonalLine.getDiagonalLineBlocks(player, firstPos, linePoint, 1f);
+
+            //Limit amount of blocks we can place
+            int lowest = Math.min(firstPos.getZ(), secondPos.getZ());
+            int highest = Math.max(firstPos.getZ(), secondPos.getZ());
+
+            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));
+                }
+            }
+
+        } else {
+            //Along Z goes up
+
+            //Get diagonal line blocks
+            BlockPos linePoint = new BlockPos(firstPos.getX(), thirdPos.getY(), secondPos.getZ());
+            List<BlockPos> diagonalLineBlocks = DiagonalLine.getDiagonalLineBlocks(player, firstPos, linePoint, 1f);
+
+            //Limit amount of blocks we can place
+            int lowest = Math.min(firstPos.getX(), secondPos.getX());
+            int highest = Math.max(firstPos.getX(), secondPos.getX());
+
+            if (highest - lowest >= axisLimit) highest = lowest + axisLimit - 1;
+
+            //Copy diagonal line on x axis
+            for (int x = lowest; x <= highest; x++) {
+                for (BlockPos blockPos : diagonalLineBlocks) {
+                    list.add(new BlockPos(x, blockPos.getY(), blockPos.getZ()));
+                }
+            }
+        }
+
+
+        return list;
+    }
+
+    @Override
+    public EnumFacing getSideHit(EntityPlayer player) {
+        return sideHitTable.get(player.getUniqueID());
+    }
+
+    @Override
+    public Vec3d getHitVec(EntityPlayer player) {
+        return hitVecTable.get(player.getUniqueID());
+    }
+}

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

@@ -1,213 +0,0 @@
-package nl.requios.effortlessbuilding.buildmode;
-
-import net.minecraft.entity.player.PlayerEntity;
-import net.minecraft.util.Direction;
-import net.minecraft.util.math.BlockPos;
-import net.minecraft.util.math.vector.Vector3d;
-import nl.requios.effortlessbuilding.helper.ReachHelper;
-
-import java.util.*;
-
-public abstract class ThreeClicksBuildMode extends BaseBuildMode {
-	protected Dictionary<UUID, BlockPos> secondPosTable = new Hashtable<>();
-
-	//Finds height after floor has been chosen in buildmodes with 3 clicks
-	public static BlockPos findHeight(PlayerEntity player, BlockPos secondPos, boolean skipRaytrace) {
-		Vector3d look = BuildModes.getPlayerLookVec(player);
-		Vector3d start = new Vector3d(player.getX(), player.getY() + player.getEyeHeight(), player.getZ());
-
-		List<HeightCriteria> criteriaList = new ArrayList<>(3);
-
-		//X
-		Vector3d xBound = BuildModes.findXBound(secondPos.getX(), start, look);
-		criteriaList.add(new HeightCriteria(xBound, secondPos, start));
-
-		//Z
-		Vector3d zBound = BuildModes.findZBound(secondPos.getZ(), start, look);
-		criteriaList.add(new HeightCriteria(zBound, secondPos, start));
-
-		//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));
-
-		//If none are valid, return empty list of blocks
-		if (criteriaList.isEmpty()) return null;
-
-		//If only 1 is valid, choose that one
-		HeightCriteria selected = criteriaList.get(0);
-
-		//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);
-	}
-
-	@Override
-	public void initialize(PlayerEntity player) {
-		super.initialize(player);
-		secondPosTable.put(player.getUUID(), BlockPos.ZERO);
-	}
-
-	@Override
-	public List<BlockPos> onRightClick(PlayerEntity player, BlockPos blockPos, Direction sideHit, Vector3d hitVec, boolean skipRaytrace) {
-		List<BlockPos> list = new ArrayList<>();
-
-		Dictionary<UUID, Integer> rightClickTable = player.level.isClientSide ? rightClickClientTable : rightClickServerTable;
-		int rightClickNr = rightClickTable.get(player.getUUID());
-		rightClickNr++;
-		rightClickTable.put(player.getUUID(), rightClickNr);
-
-		if (rightClickNr == 1) {
-			//If clicking in air, reset and try again
-			if (blockPos == null) {
-				rightClickTable.put(player.getUUID(), 0);
-				return list;
-			}
-
-			//First click, remember starting position
-			firstPosTable.put(player.getUUID(), blockPos);
-			sideHitTable.put(player.getUUID(), sideHit);
-			hitVecTable.put(player.getUUID(), hitVec);
-			//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) {
-				rightClickTable.put(player.getUUID(), 1);
-				return list;
-			}
-
-			secondPosTable.put(player.getUUID(), secondPos);
-
-		} else {
-			//Third click, place diagonal wall with height
-			list = findCoordinates(player, blockPos, skipRaytrace);
-			rightClickTable.put(player.getUUID(), 0);
-		}
-
-		return list;
-	}
-
-	@Override
-	public List<BlockPos> findCoordinates(PlayerEntity player, BlockPos blockPos, boolean skipRaytrace) {
-		List<BlockPos> list = new ArrayList<>();
-		Dictionary<UUID, Integer> rightClickTable = player.level.isClientSide ? rightClickClientTable : rightClickServerTable;
-		int rightClickNr = rightClickTable.get(player.getUUID());
-
-		if (rightClickNr == 0) {
-			if (blockPos != null)
-				list.add(blockPos);
-		} else if (rightClickNr == 1) {
-			BlockPos firstPos = firstPosTable.get(player.getUUID());
-
-			BlockPos secondPos = findSecondPos(player, firstPos, true);
-			if (secondPos == null) return list;
-
-			//Limit amount of blocks you can place per row
-			int axisLimit = ReachHelper.getMaxBlocksPerAxis(player);
-
-			int x1 = firstPos.getX(), x2 = secondPos.getX();
-			int y1 = firstPos.getY(), y2 = secondPos.getY();
-			int z1 = firstPos.getZ(), z2 = secondPos.getZ();
-
-			//limit axis
-			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;
-
-			//Add diagonal line from first to second
-			list.addAll(getIntermediateBlocks(player, x1, y1, z1, x2, y2, z2));
-
-		} else {
-			BlockPos firstPos = firstPosTable.get(player.getUUID());
-			BlockPos secondPos = secondPosTable.get(player.getUUID());
-
-			BlockPos thirdPos = findThirdPos(player, firstPos, secondPos, skipRaytrace);
-			if (thirdPos == null) return list;
-
-			//Limit amount of blocks you can place per row
-			int axisLimit = ReachHelper.getMaxBlocksPerAxis(player);
-
-			int x1 = firstPos.getX(), x2 = secondPos.getX(), x3 = thirdPos.getX();
-			int y1 = firstPos.getY(), y2 = secondPos.getY(), y3 = thirdPos.getY();
-			int z1 = firstPos.getZ(), z2 = secondPos.getZ(), z3 = thirdPos.getZ();
-
-			//limit axis
-			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;
-			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;
-
-			//Add diagonal line from first to third
-			list.addAll(getFinalBlocks(player, x1, y1, z1, x2, y2, z2, x3, y3, z3));
-		}
-
-		return list;
-	}
-
-	//Finds the place of the second block pos
-	protected abstract BlockPos findSecondPos(PlayerEntity player, BlockPos firstPos, boolean skipRaytrace);
-
-	//Finds the place of the third block pos
-	protected abstract BlockPos findThirdPos(PlayerEntity player, BlockPos firstPos, BlockPos secondPos, boolean skipRaytrace);
-
-	//After first and second pos are known, we want to visualize the blocks in a way (like floor for cube)
-	protected abstract List<BlockPos> getIntermediateBlocks(PlayerEntity player, int x1, int y1, int z1, int x2, int y2, int z2);
-
-	//After first, second and third pos are known, we want all the blocks
-	protected abstract List<BlockPos> getFinalBlocks(PlayerEntity player, int x1, int y1, int z1, int x2, int y2, int z2, int x3, int y3, int z3);
-
-	static class HeightCriteria {
-		Vector3d planeBound;
-		Vector3d lineBound;
-		double distToLineSq;
-		double distToPlayerSq;
-
-		HeightCriteria(Vector3d planeBound, BlockPos secondPos, Vector3d start) {
-			this.planeBound = planeBound;
-			this.lineBound = toLongestLine(this.planeBound, secondPos);
-			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
-		private Vector3d toLongestLine(Vector3d boundVec, BlockPos secondPos) {
-			BlockPos bound = new BlockPos(boundVec);
-			return new Vector3d(secondPos.getX(), bound.getY(), secondPos.getZ());
-		}
-
-		//check if its not behind the player and its not too close and not too far
-		//also check if raytrace from player to block does not intersect blocks
-		public boolean isValid(Vector3d start, Vector3d look, int reach, PlayerEntity player, boolean skipRaytrace) {
-
-			return BuildModes.isCriteriaValid(start, look, reach, player, skipRaytrace, lineBound, planeBound, distToPlayerSq);
-		}
-	}
-}

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

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

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

@@ -0,0 +1,226 @@
+package nl.requios.effortlessbuilding.buildmode;
+
+import net.minecraft.entity.player.EntityPlayer;
+import net.minecraft.util.EnumFacing;
+import net.minecraft.util.math.BlockPos;
+import net.minecraft.util.math.RayTraceResult;
+import net.minecraft.util.math.Vec3d;
+import nl.requios.effortlessbuilding.helper.ReachHelper;
+
+import java.util.*;
+
+public class Wall implements IBuildMode {
+    //In singleplayer client and server variables are shared
+    //Split everything that needs separate values and may not be called twice in one click
+    private Dictionary<UUID, Integer> rightClickClientTable = new Hashtable<>();
+    private Dictionary<UUID, Integer> rightClickServerTable = new Hashtable<>();
+    private Dictionary<UUID, BlockPos> firstPosTable = new Hashtable<>();
+    private Dictionary<UUID, EnumFacing> sideHitTable = new Hashtable<>();
+    private Dictionary<UUID, Vec3d> hitVecTable = new Hashtable<>();
+
+    static class Criteria {
+        Vec3d planeBound;
+        double distToPlayerSq;
+        double angle;
+
+        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)
+        }
+
+        //check if its not behind the player and its not too close and not too far
+        //also check if raytrace from player to block does not intersect blocks
+        public boolean isValid(Vec3d start, Vec3d look, int reach, EntityPlayer player, boolean skipRaytrace) {
+
+            boolean intersects = false;
+            if (!skipRaytrace) {
+                //collision within a 1 block radius to selected is fine
+                RayTraceResult rayTraceResult = player.world.rayTraceBlocks(start, planeBound, false, true, false);
+                intersects = rayTraceResult != null && rayTraceResult.typeOfHit == RayTraceResult.Type.BLOCK &&
+                             planeBound.subtract(rayTraceResult.hitVec).lengthSquared() > 4;
+            }
+
+            return planeBound.subtract(start).dotProduct(look) > 0 &&
+                   distToPlayerSq > 2 && distToPlayerSq < reach * reach &&
+                   !intersects;
+        }
+    }
+
+    @Override
+    public void initialize(EntityPlayer player) {
+        rightClickClientTable.put(player.getUniqueID(), 0);
+        rightClickServerTable.put(player.getUniqueID(), 0);
+        firstPosTable.put(player.getUniqueID(), BlockPos.ORIGIN);
+        sideHitTable.put(player.getUniqueID(), EnumFacing.UP);
+        hitVecTable.put(player.getUniqueID(), Vec3d.ZERO);
+    }
+
+    @Override
+    public List<BlockPos> onRightClick(EntityPlayer player, BlockPos blockPos, EnumFacing sideHit, Vec3d hitVec, boolean skipRaytrace) {
+        List<BlockPos> list = new ArrayList<>();
+
+        Dictionary<UUID, Integer> rightClickTable = player.world.isRemote ? rightClickClientTable : rightClickServerTable;
+        int rightClickNr = rightClickTable.get(player.getUniqueID());
+        rightClickNr++;
+        rightClickTable.put(player.getUniqueID(), rightClickNr);
+
+        if (rightClickNr == 1) {
+            //If clicking in air, reset and try again
+            if (blockPos == null) {
+                rightClickTable.put(player.getUniqueID(), 0);
+                return list;
+            }
+
+            //First click, remember starting position
+            firstPosTable.put(player.getUniqueID(), blockPos);
+            sideHitTable.put(player.getUniqueID(), sideHit);
+            hitVecTable.put(player.getUniqueID(), hitVec);
+            //Keep list empty, dont place any blocks yet
+        } else {
+            //Second click, place wall
+
+            list = findCoordinates(player, blockPos, skipRaytrace);
+            rightClickTable.put(player.getUniqueID(), 0);
+        }
+
+        return list;
+    }
+
+    @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());
+        BlockPos firstPos = firstPosTable.get(player.getUniqueID());
+
+        if (rightClickNr == 0) {
+            if (blockPos != null)
+                list.add(blockPos);
+        } else {
+            BlockPos secondPos = findWall(player, firstPos, skipRaytrace);
+            if (secondPos == null) return list;
+
+            //Add whole wall
+            list.addAll(getWallBlocks(player, firstPos, secondPos));
+        }
+
+        return list;
+    }
+
+    public static BlockPos findWall(EntityPlayer player, BlockPos firstPos, boolean skipRaytrace) {
+        Vec3d look = player.getLookVec();
+        Vec3d start = new Vec3d(player.posX, player.posY + player.getEyeHeight(), player.posZ);
+
+        List<Criteria> criteriaList = new ArrayList<>(3);
+
+        //X
+        Vec3d xBound = BuildModes.findXBound(firstPos.getX(), start, look);
+        criteriaList.add(new Criteria(xBound, firstPos, start, look));
+
+        //Z
+        Vec3d zBound = BuildModes.findZBound(firstPos.getZ(), start, look);
+        criteriaList.add(new Criteria(zBound, firstPos, start, look));
+
+        //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));
+
+        //If none are valid, return empty list of blocks
+        if (criteriaList.isEmpty()) return null;
+
+        //If only 1 is valid, choose that one
+        Criteria selected = criteriaList.get(0);
+
+        //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;
+            }
+        }
+
+        return new BlockPos(selected.planeBound);
+    }
+
+    public static List<BlockPos> getWallBlocks(EntityPlayer player, BlockPos firstPos, BlockPos secondPos) {
+        List<BlockPos> list = new ArrayList<>();
+
+        //Limit amount of blocks we can place per row
+        int axisLimit = ReachHelper.getMaxBlocksPerAxis(player);
+
+        int x1 = firstPos.getX(), x2 = secondPos.getX();
+        int y1 = firstPos.getY(), y2 = secondPos.getY();
+        int z1 = firstPos.getZ(), z2 = secondPos.getZ();
+
+        //limit axis
+        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 (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);
+        }
+
+        return list;
+    }
+
+    public static void addXWallBlocks(List<BlockPos> list, int x, int y1, int y2, int z1, int z2) {
+
+        for (int z = z1; z1 < z2 ? z <= z2 : z >= z2; z += z1 < z2 ? 1 : -1) {
+
+            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 addZWallBlocks(List<BlockPos> list, int x1, int x2, int y1, int y2, int z) {
+
+        for (int x = x1; x1 < x2 ? x <= x2 : x >= x2; x += x1 < x2 ? 1 : -1) {
+
+            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 addXHollowWallBlocks(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) {
+        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
+    public EnumFacing getSideHit(EntityPlayer player) {
+        return sideHitTable.get(player.getUniqueID());
+    }
+
+    @Override
+    public Vec3d getHitVec(EntityPlayer player) {
+        return hitVecTable.get(player.getUniqueID());
+    }
+}

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

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

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

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

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

@@ -1,50 +0,0 @@
-package nl.requios.effortlessbuilding.buildmode.buildmodes;
-
-import net.minecraft.entity.player.PlayerEntity;
-import net.minecraft.util.math.BlockPos;
-import nl.requios.effortlessbuilding.buildmode.ThreeClicksBuildMode;
-
-import java.util.ArrayList;
-import java.util.List;
-
-public class Cylinder extends ThreeClicksBuildMode {
-
-	public static List<BlockPos> getCylinderBlocks(PlayerEntity player, int x1, int y1, int z1, int x2, int y2, int z2, int x3, int y3, int z3) {
-		List<BlockPos> list = new ArrayList<>();
-
-		//Get circle blocks (using CIRCLE_START and FILL options built-in)
-		List<BlockPos> circleBlocks = Circle.getCircleBlocks(player, x1, y1, z1, x2, y2, z2);
-
-		int lowest = Math.min(y1, y3);
-		int highest = Math.max(y1, y3);
-
-		//Copy circle on y axis
-		for (int y = lowest; y <= highest; y++) {
-			for (BlockPos blockPos : circleBlocks) {
-				list.add(new BlockPos(blockPos.getX(), y, blockPos.getZ()));
-			}
-		}
-
-		return list;
-	}
-
-	@Override
-	public BlockPos findSecondPos(PlayerEntity player, BlockPos firstPos, boolean skipRaytrace) {
-		return Floor.findFloor(player, firstPos, skipRaytrace);
-	}
-
-	@Override
-	public BlockPos findThirdPos(PlayerEntity player, BlockPos firstPos, BlockPos secondPos, boolean skipRaytrace) {
-		return findHeight(player, secondPos, skipRaytrace);
-	}
-
-	@Override
-	public List<BlockPos> getIntermediateBlocks(PlayerEntity player, int x1, int y1, int z1, int x2, int y2, int z2) {
-		return Circle.getCircleBlocks(player, x1, y1, z1, x2, y2, z2);
-	}
-
-	@Override
-	public List<BlockPos> getFinalBlocks(PlayerEntity player, int x1, int y1, int z1, int x2, int y2, int z2, int x3, int y3, int z3) {
-		return getCylinderBlocks(player, x1, y1, z1, x2, y2, z2, x3, y3, z3);
-	}
-}

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

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

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

@@ -1,51 +0,0 @@
-package nl.requios.effortlessbuilding.buildmode.buildmodes;
-
-import net.minecraft.entity.player.PlayerEntity;
-import net.minecraft.util.math.BlockPos;
-import nl.requios.effortlessbuilding.buildmode.ThreeClicksBuildMode;
-
-import java.util.ArrayList;
-import java.util.List;
-
-public class DiagonalWall extends ThreeClicksBuildMode {
-
-	//Add diagonal wall from first to second
-	public static List<BlockPos> getDiagonalWallBlocks(PlayerEntity player, int x1, int y1, int z1, int x2, int y2, int z2, int x3, int y3, int z3) {
-		List<BlockPos> list = new ArrayList<>();
-
-		//Get diagonal line blocks
-		List<BlockPos> diagonalLineBlocks = DiagonalLine.getDiagonalLineBlocks(player, x1, y1, z1, x2, y2, z2, 1);
-
-		int lowest = Math.min(y1, y3);
-		int highest = Math.max(y1, y3);
-
-		//Copy diagonal line on y axis
-		for (int y = lowest; y <= highest; y++) {
-			for (BlockPos blockPos : diagonalLineBlocks) {
-				list.add(new BlockPos(blockPos.getX(), y, blockPos.getZ()));
-			}
-		}
-
-		return list;
-	}
-
-	@Override
-	protected BlockPos findSecondPos(PlayerEntity player, BlockPos firstPos, boolean skipRaytrace) {
-		return Floor.findFloor(player, firstPos, skipRaytrace);
-	}
-
-	@Override
-	protected BlockPos findThirdPos(PlayerEntity player, BlockPos firstPos, BlockPos secondPos, boolean skipRaytrace) {
-		return findHeight(player, secondPos, skipRaytrace);
-	}
-
-	@Override
-	protected List<BlockPos> getIntermediateBlocks(PlayerEntity player, int x1, int y1, int z1, int x2, int y2, int z2) {
-		return DiagonalLine.getDiagonalLineBlocks(player, x1, y1, z1, x2, y2, z2, 1);
-	}
-
-	@Override
-	protected List<BlockPos> getFinalBlocks(PlayerEntity player, int x1, int y1, int z1, int x2, int y2, int z2, int x3, int y3, int z3) {
-		return getDiagonalWallBlocks(player, x1, y1, z1, x2, y2, z2, x3, y3, z3);
-	}
-}

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

@@ -1,94 +0,0 @@
-package nl.requios.effortlessbuilding.buildmode.buildmodes;
-
-import net.minecraft.entity.player.PlayerEntity;
-import net.minecraft.util.math.BlockPos;
-import net.minecraft.util.math.vector.Vector3d;
-import nl.requios.effortlessbuilding.buildmode.BuildModes;
-import nl.requios.effortlessbuilding.buildmode.ModeOptions;
-import nl.requios.effortlessbuilding.buildmode.TwoClicksBuildMode;
-import nl.requios.effortlessbuilding.helper.ReachHelper;
-
-import java.util.ArrayList;
-import java.util.List;
-
-public class Floor extends TwoClicksBuildMode {
-
-	public static BlockPos findFloor(PlayerEntity player, BlockPos firstPos, boolean skipRaytrace) {
-		Vector3d look = BuildModes.getPlayerLookVec(player);
-		Vector3d start = new Vector3d(player.getX(), player.getY() + player.getEyeHeight(), player.getZ());
-
-		List<Criteria> criteriaList = new ArrayList<>(3);
-
-		//Y
-		Vector3d yBound = BuildModes.findYBound(firstPos.getY(), start, look);
-		criteriaList.add(new Criteria(yBound, start));
-
-		//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));
-
-		//If none are valid, return empty list of blocks
-		if (criteriaList.isEmpty()) return null;
-
-		//Then only 1 can be valid, return that one
-		Criteria selected = criteriaList.get(0);
-
-		return new BlockPos(selected.planeBound);
-	}
-
-	public static List<BlockPos> getFloorBlocks(PlayerEntity player, int x1, int y1, int z1, int x2, int y2, int z2) {
-		List<BlockPos> list = new ArrayList<>();
-
-		if (ModeOptions.getFill() == ModeOptions.ActionEnum.FULL)
-			addFloorBlocks(list, x1, x2, y1, z1, z2);
-		else
-			addHollowFloorBlocks(list, x1, x2, y1, z1, z2);
-
-		return list;
-	}
-
-	public static void addFloorBlocks(List<BlockPos> list, int x1, int x2, int y, int z1, int z2) {
-
-		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) {
-
-				list.add(new BlockPos(l, y, n));
-			}
-		}
-	}
-
-	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);
-	}
-
-	@Override
-	protected BlockPos findSecondPos(PlayerEntity player, BlockPos firstPos, boolean skipRaytrace) {
-		return findFloor(player, firstPos, skipRaytrace);
-	}
-
-	@Override
-	protected List<BlockPos> getAllBlocks(PlayerEntity player, int x1, int y1, int z1, int x2, int y2, int z2) {
-		return getFloorBlocks(player, x1, y1, z1, x2, y2, z2);
-	}
-
-	static class Criteria {
-		Vector3d planeBound;
-		double distToPlayerSq;
-
-		Criteria(Vector3d planeBound, Vector3d start) {
-			this.planeBound = planeBound;
-			this.distToPlayerSq = this.planeBound.subtract(start).lengthSqr();
-		}
-
-		//check if its not behind the player and its not too close and not too far
-		//also check if raytrace from player to block does not intersect blocks
-		public boolean isValid(Vector3d start, Vector3d look, int reach, PlayerEntity player, boolean skipRaytrace) {
-
-			return BuildModes.isCriteriaValid(start, look, reach, player, skipRaytrace, planeBound, planeBound, distToPlayerSq);
-		}
-	}
-}

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

@@ -1,147 +0,0 @@
-package nl.requios.effortlessbuilding.buildmode.buildmodes;
-
-import net.minecraft.entity.player.PlayerEntity;
-import net.minecraft.util.math.BlockPos;
-import net.minecraft.util.math.vector.Vector3d;
-import nl.requios.effortlessbuilding.buildmode.BuildModes;
-import nl.requios.effortlessbuilding.buildmode.TwoClicksBuildMode;
-import nl.requios.effortlessbuilding.helper.ReachHelper;
-
-import java.util.ArrayList;
-import java.util.List;
-
-public class Line extends TwoClicksBuildMode {
-
-	public static BlockPos findLine(PlayerEntity player, BlockPos firstPos, boolean skipRaytrace) {
-		Vector3d look = BuildModes.getPlayerLookVec(player);
-		Vector3d start = new Vector3d(player.getX(), player.getY() + player.getEyeHeight(), player.getZ());
-
-		List<Criteria> criteriaList = new ArrayList<>(3);
-
-		//X
-		Vector3d xBound = BuildModes.findXBound(firstPos.getX(), start, look);
-		criteriaList.add(new Criteria(xBound, firstPos, start));
-
-		//Y
-		Vector3d yBound = BuildModes.findYBound(firstPos.getY(), start, look);
-		criteriaList.add(new Criteria(yBound, firstPos, start));
-
-		//Z
-		Vector3d zBound = BuildModes.findZBound(firstPos.getZ(), start, look);
-		criteriaList.add(new Criteria(zBound, firstPos, start));
-
-		//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));
-
-		//If none are valid, return empty list of blocks
-		if (criteriaList.isEmpty()) return null;
-
-		//If only 1 is valid, choose that one
-		Criteria selected = criteriaList.get(0);
-
-		//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++) {
-				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;
-				}
-			}
-
-		}
-
-		return new BlockPos(selected.lineBound);
-	}
-
-	public static List<BlockPos> getLineBlocks(PlayerEntity player, int x1, int y1, int z1, int x2, int y2, int z2) {
-		List<BlockPos> list = new ArrayList<>();
-
-		if (x1 != x2) {
-			addXLineBlocks(list, x1, x2, y1, z1);
-		} else if (y1 != y2) {
-			addYLineBlocks(list, y1, y2, x1, z1);
-		} else {
-			addZLineBlocks(list, z1, z2, x1, y1);
-		}
-
-		return list;
-	}
-
-	public static void addXLineBlocks(List<BlockPos> list, int x1, int x2, int y, int z) {
-		for (int x = x1; x1 < x2 ? x <= x2 : x >= x2; x += x1 < x2 ? 1 : -1) {
-			list.add(new BlockPos(x, y, z));
-		}
-	}
-
-	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));
-		}
-	}
-
-	@Override
-	protected BlockPos findSecondPos(PlayerEntity player, BlockPos firstPos, boolean skipRaytrace) {
-		return findLine(player, firstPos, skipRaytrace);
-	}
-
-	@Override
-	protected List<BlockPos> getAllBlocks(PlayerEntity player, int x1, int y1, int z1, int x2, int y2, int z2) {
-		return getLineBlocks(player, x1, y1, z1, x2, y2, z2);
-	}
-
-	static class Criteria {
-		Vector3d planeBound;
-		Vector3d lineBound;
-		double distToLineSq;
-		double distToPlayerSq;
-
-		Criteria(Vector3d planeBound, BlockPos firstPos, Vector3d start) {
-			this.planeBound = planeBound;
-			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
-		//Select the axis that is longest
-		private Vector3d toLongestLine(Vector3d boundVec, BlockPos firstPos) {
-			BlockPos bound = new BlockPos(boundVec);
-
-			BlockPos firstToSecond = bound.subtract(firstPos);
-			firstToSecond = new BlockPos(Math.abs(firstToSecond.getX()), Math.abs(firstToSecond.getY()), Math.abs(firstToSecond.getZ()));
-			int longest = Math.max(firstToSecond.getX(), Math.max(firstToSecond.getY(), firstToSecond.getZ()));
-			if (longest == firstToSecond.getX()) {
-				return new Vector3d(bound.getX(), firstPos.getY(), firstPos.getZ());
-			}
-			if (longest == firstToSecond.getY()) {
-				return new Vector3d(firstPos.getX(), bound.getY(), firstPos.getZ());
-			}
-			if (longest == firstToSecond.getZ()) {
-				return new Vector3d(firstPos.getX(), firstPos.getY(), bound.getZ());
-			}
-			return null;
-		}
-
-		//check if its not behind the player and its not too close and not too far
-		//also check if raytrace from player to block does not intersect blocks
-		public boolean isValid(Vector3d start, Vector3d look, int reach, PlayerEntity player, boolean skipRaytrace) {
-
-			return BuildModes.isCriteriaValid(start, look, reach, player, skipRaytrace, lineBound, planeBound, distToPlayerSq);
-		}
-
-	}
-}

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

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

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

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

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

@@ -1,95 +0,0 @@
-package nl.requios.effortlessbuilding.buildmode.buildmodes;
-
-import net.minecraft.entity.player.PlayerEntity;
-import net.minecraft.util.math.BlockPos;
-import nl.requios.effortlessbuilding.buildmode.ModeOptions;
-import nl.requios.effortlessbuilding.buildmode.ThreeClicksBuildMode;
-import nl.requios.effortlessbuilding.helper.ReachHelper;
-
-import java.util.ArrayList;
-import java.util.List;
-
-public class SlopeFloor extends ThreeClicksBuildMode {
-
-	//Add slope floor from first to second
-	public static List<BlockPos> getSlopeFloorBlocks(PlayerEntity player, int x1, int y1, int z1, int x2, int y2, int z2, int x3, int y3, int z3) {
-		List<BlockPos> list = new ArrayList<>();
-
-		int axisLimit = ReachHelper.getMaxBlocksPerAxis(player);
-
-		//Determine whether to use x or z axis to slope up
-		boolean onXAxis = true;
-
-		int xLength = Math.abs(x2 - x1);
-		int zLength = Math.abs(z2 - z1);
-
-		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;
-		}
-
-		if (onXAxis) {
-			//Along X goes up
-
-			//Get diagonal line blocks
-			List<BlockPos> diagonalLineBlocks = DiagonalLine.getDiagonalLineBlocks(player, x1, y1, z1, x2, y3, z1, 1f);
-
-			//Limit amount of blocks we can place
-			int lowest = Math.min(z1, z2);
-			int highest = Math.max(z1, z2);
-
-			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));
-				}
-			}
-
-		} else {
-			//Along Z goes up
-
-			//Get diagonal line blocks
-			List<BlockPos> diagonalLineBlocks = DiagonalLine.getDiagonalLineBlocks(player, x1, y1, z1, x1, y3, z2, 1f);
-
-			//Limit amount of blocks we can place
-			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 x = lowest; x <= highest; x++) {
-				for (BlockPos blockPos : diagonalLineBlocks) {
-					list.add(new BlockPos(x, blockPos.getY(), blockPos.getZ()));
-				}
-			}
-		}
-
-		return list;
-	}
-
-	@Override
-	protected BlockPos findSecondPos(PlayerEntity player, BlockPos firstPos, boolean skipRaytrace) {
-		return Floor.findFloor(player, firstPos, skipRaytrace);
-	}
-
-	@Override
-	protected BlockPos findThirdPos(PlayerEntity player, BlockPos firstPos, BlockPos secondPos, boolean skipRaytrace) {
-		return findHeight(player, secondPos, skipRaytrace);
-	}
-
-	@Override
-	protected List<BlockPos> getIntermediateBlocks(PlayerEntity player, int x1, int y1, int z1, int x2, int y2, int z2) {
-		return Floor.getFloorBlocks(player, x1, y1, z1, x2, y2, z2);
-	}
-
-	@Override
-	protected List<BlockPos> getFinalBlocks(PlayerEntity player, int x1, int y1, int z1, int x2, int y2, int z2, int x3, int y3, int z3) {
-		return getSlopeFloorBlocks(player, x1, y1, z1, x2, y2, z2, x3, y3, z3);
-	}
-}

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

@@ -1,110 +0,0 @@
-package nl.requios.effortlessbuilding.buildmode.buildmodes;
-
-import net.minecraft.entity.player.PlayerEntity;
-import net.minecraft.util.math.BlockPos;
-import net.minecraft.util.math.MathHelper;
-import nl.requios.effortlessbuilding.buildmode.ModeOptions;
-import nl.requios.effortlessbuilding.buildmode.ThreeClicksBuildMode;
-
-import java.util.ArrayList;
-import java.util.List;
-
-public class Sphere extends ThreeClicksBuildMode {
-
-	public static List<BlockPos> getSphereBlocks(PlayerEntity player, int x1, int y1, int z1, int x2, int y2, int z2, int x3, int y3, int z3) {
-		List<BlockPos> list = new ArrayList<>();
-
-		float centerX = x1;
-		float centerY = y1;
-		float centerZ = z1;
-
-		//Adjust for CIRCLE_START
-		if (ModeOptions.getCircleStart() == ModeOptions.ActionEnum.CIRCLE_START_CORNER) {
-			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));
-		}
-
-		float radiusX = MathHelper.abs(x2 - centerX);
-		float radiusY = MathHelper.abs(y3 - centerY);
-		float radiusZ = MathHelper.abs(z2 - centerZ);
-
-		if (ModeOptions.getFill() == ModeOptions.ActionEnum.FULL)
-			addSphereBlocks(list, x1, y1, z1, x3, y3, z3, centerX, centerY, centerZ, radiusX, radiusY, radiusZ);
-		else
-			addHollowSphereBlocks(list, x1, y1, z1, x3, y3, z3, centerX, centerY, centerZ, radiusX, radiusY, radiusZ);
-
-		return list;
-	}
-
-	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) {
-		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 m = y1; y1 < y2 ? m <= y2 : m >= y2; m += y1 < y2 ? 1 : -1) {
-
-					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)
-						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,
-											 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 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) {
-
-					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));
-				}
-			}
-		}
-	}
-
-	private static float distance(float x1, float y1, float z1, float x2, float y2, float z2) {
-		return MathHelper.sqrt((x2 - x1) * (x2 - x1) + (y2 - y1) * (y2 - y1) + (z2 - z1) * (z2 - z1));
-	}
-
-	public static float calculateSpheroidRadius(float centerX, float centerY, float centerZ, float radiusX, float radiusY, float radiusZ, int x, int y, int z) {
-		//Twice ellipse radius
-		float radiusXZ = Circle.calculateEllipseRadius(centerX, centerZ, radiusX, radiusZ, x, z);
-
-		//TODO project x to plane
-
-		return Circle.calculateEllipseRadius(centerX, centerY, radiusXZ, radiusY, x, y);
-	}
-
-	@Override
-	public BlockPos findSecondPos(PlayerEntity player, BlockPos firstPos, boolean skipRaytrace) {
-		return Floor.findFloor(player, firstPos, skipRaytrace);
-	}
-
-	@Override
-	public BlockPos findThirdPos(PlayerEntity player, BlockPos firstPos, BlockPos secondPos, boolean skipRaytrace) {
-		return findHeight(player, secondPos, skipRaytrace);
-	}
-
-	@Override
-	public List<BlockPos> getIntermediateBlocks(PlayerEntity player, int x1, int y1, int z1, int x2, int y2, int z2) {
-		return Circle.getCircleBlocks(player, x1, y1, z1, x2, y2, z2);
-	}
-
-	@Override
-	public List<BlockPos> getFinalBlocks(PlayerEntity player, int x1, int y1, int z1, int x2, int y2, int z2, int x3, int y3, int z3) {
-		return getSphereBlocks(player, x1, y1, z1, x2, y2, z2, x3, y3, z3);
-	}
-}

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

@@ -1,135 +0,0 @@
-package nl.requios.effortlessbuilding.buildmode.buildmodes;
-
-import net.minecraft.entity.player.PlayerEntity;
-import net.minecraft.util.math.BlockPos;
-import net.minecraft.util.math.vector.Vector3d;
-import nl.requios.effortlessbuilding.buildmode.BuildModes;
-import nl.requios.effortlessbuilding.buildmode.ModeOptions;
-import nl.requios.effortlessbuilding.buildmode.TwoClicksBuildMode;
-import nl.requios.effortlessbuilding.helper.ReachHelper;
-
-import java.util.ArrayList;
-import java.util.List;
-
-public class Wall extends TwoClicksBuildMode {
-
-	public static BlockPos findWall(PlayerEntity player, BlockPos firstPos, boolean skipRaytrace) {
-		Vector3d look = BuildModes.getPlayerLookVec(player);
-		Vector3d start = new Vector3d(player.getX(), player.getY() + player.getEyeHeight(), player.getZ());
-
-		List<Criteria> criteriaList = new ArrayList<>(3);
-
-		//X
-		Vector3d xBound = BuildModes.findXBound(firstPos.getX(), start, look);
-		criteriaList.add(new Criteria(xBound, firstPos, start, look));
-
-		//Z
-		Vector3d zBound = BuildModes.findZBound(firstPos.getZ(), start, look);
-		criteriaList.add(new Criteria(zBound, firstPos, start, look));
-
-		//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));
-
-		//If none are valid, return empty list of blocks
-		if (criteriaList.isEmpty()) return null;
-
-		//If only 1 is valid, choose that one
-		Criteria selected = criteriaList.get(0);
-
-		//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;
-			}
-		}
-
-		return new BlockPos(selected.planeBound);
-	}
-
-	public static List<BlockPos> getWallBlocks(PlayerEntity player, int x1, int y1, int z1, int x2, int y2, int z2) {
-		List<BlockPos> list = new ArrayList<>();
-
-		if (x1 == x2) {
-			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);
-		}
-
-		return list;
-	}
-
-	public static void addXWallBlocks(List<BlockPos> list, int x, int y1, int y2, int z1, int z2) {
-
-		for (int z = z1; z1 < z2 ? z <= z2 : z >= z2; z += z1 < z2 ? 1 : -1) {
-
-			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 addZWallBlocks(List<BlockPos> list, int x1, int x2, int y1, int y2, int z) {
-
-		for (int x = x1; x1 < x2 ? x <= x2 : x >= x2; x += x1 < x2 ? 1 : -1) {
-
-			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 addXHollowWallBlocks(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) {
-		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
-	protected BlockPos findSecondPos(PlayerEntity player, BlockPos firstPos, boolean skipRaytrace) {
-		return findWall(player, firstPos, skipRaytrace);
-	}
-
-	@Override
-	protected List<BlockPos> getAllBlocks(PlayerEntity player, int x1, int y1, int z1, int x2, int y2, int z2) {
-		return getWallBlocks(player, x1, y1, z1, x2, y2, z2);
-	}
-
-	static class Criteria {
-		Vector3d planeBound;
-		double distToPlayerSq;
-		double angle;
-
-		Criteria(Vector3d planeBound, BlockPos firstPos, Vector3d start, Vector3d look) {
-			this.planeBound = planeBound;
-			this.distToPlayerSq = this.planeBound.subtract(start).lengthSqr();
-			Vector3d wall = this.planeBound.subtract(Vector3d.atLowerCornerOf(firstPos));
-			this.angle = wall.x * look.x + wall.z * look.z; //dot product ignoring y (looking up/down should not affect this angle)
-		}
-
-		//check if its not behind the player and its not too close and not too far
-		//also check if raytrace from player to block does not intersect blocks
-		public boolean isValid(Vector3d start, Vector3d look, int reach, PlayerEntity player, boolean skipRaytrace) {
-
-			return BuildModes.isCriteriaValid(start, look, reach, player, skipRaytrace, planeBound, planeBound, distToPlayerSq);
-		}
-	}
-}

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

@@ -1,84 +1,24 @@
 package nl.requios.effortlessbuilding.buildmodifier;
 
-import net.minecraft.block.BlockState;
-import net.minecraft.entity.player.PlayerEntity;
+import net.minecraft.block.state.IBlockState;
+import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.item.ItemStack;
-import net.minecraft.util.Direction;
-import net.minecraft.util.Hand;
+import net.minecraft.util.EnumFacing;
+import net.minecraft.util.EnumHand;
 import net.minecraft.util.math.BlockPos;
-import net.minecraft.util.math.vector.Vector3d;
-import net.minecraft.util.math.vector.Vector3i;
+import net.minecraft.util.math.Vec3d;
+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(PlayerEntity player, BlockPos startPos) {
-		List<BlockPos> coordinates = new ArrayList<>();
-
-		//find arraysettings for the player
-		ArraySettings a = ModifierSettingsManager.getModifierSettings(player).getArraySettings();
-		if (!isEnabled(a)) return coordinates;
-
-		BlockPos pos = startPos;
-		Vector3i offset = new Vector3i(a.offset.getX(), a.offset.getY(), a.offset.getZ());
-
-		for (int i = 0; i < a.count; i++) {
-			pos = pos.offset(offset);
-			coordinates.add(pos);
-		}
-
-		return coordinates;
-	}
-
-	public static List<BlockState> findBlockStates(PlayerEntity player, BlockPos startPos, BlockState blockState, ItemStack itemStack, List<ItemStack> itemStacks) {
-		List<BlockState> blockStates = new ArrayList<>();
-
-		//find arraysettings for the player that placed the block
-		ArraySettings a = ModifierSettingsManager.getModifierSettings(player).getArraySettings();
-		if (!isEnabled(a)) return blockStates;
-
-		BlockPos pos = startPos;
-		Vector3i offset = new Vector3i(a.offset.getX(), a.offset.getY(), a.offset.getZ());
-
-		//Randomizer bag synergy
-		AbstractRandomizerBagItem randomizerBagItem = null;
-		IItemHandler bagInventory = null;
-		if (!itemStack.isEmpty() && itemStack.getItem() instanceof AbstractRandomizerBagItem) {
-			randomizerBagItem = (AbstractRandomizerBagItem) itemStack.getItem();
-			bagInventory = randomizerBagItem.getBagInventory(itemStack);
-		}
-
-		for (int i = 0; i < a.count; i++) {
-			pos = pos.offset(offset);
-
-			//Randomizer bag synergy
-			if (randomizerBagItem != null) {
-				itemStack = randomizerBagItem.pickRandomStack(bagInventory);
-				blockState = BuildModifiers
-					.getBlockStateFromItem(itemStack, player, startPos, Direction.UP, new Vector3d(0, 0, 0), Hand.MAIN_HAND);
-			}
-
-			//blockState = blockState.getBlock().getStateForPlacement(player.world, pos, )
-			blockStates.add(blockState);
-			itemStacks.add(itemStack);
-		}
-
-		return blockStates;
-	}
-
-	public static boolean isEnabled(ArraySettings a) {
-		if (a == null || !a.enabled) return false;
-
-		return a.offset.getX() != 0 || a.offset.getY() != 0 || a.offset.getZ() != 0;
-	}
-
     public static class ArraySettings{
         public boolean enabled = false;
-		public BlockPos offset = BlockPos.ZERO;
+        public BlockPos offset = BlockPos.ORIGIN;
         public int count = 5;
 
         public ArraySettings() {
@@ -101,4 +41,64 @@ public class Array {
         }
     }
 
+    public static List<BlockPos> findCoordinates(EntityPlayer player, BlockPos startPos) {
+        List<BlockPos> coordinates = new ArrayList<>();
+
+        //find arraysettings for the player
+        ArraySettings a = ModifierSettingsManager.getModifierSettings(player).getArraySettings();
+        if (!isEnabled(a)) return coordinates;
+
+        BlockPos pos = startPos;
+        Vec3i offset = new Vec3i(a.offset.getX(), a.offset.getY(), a.offset.getZ());
+
+        for (int i = 0; i < a.count; i++) {
+            pos = pos.add(offset);
+            coordinates.add(pos);
+        }
+
+        return coordinates;
+    }
+
+    public static List<IBlockState> findBlockStates(EntityPlayer player, BlockPos startPos, IBlockState blockState, ItemStack itemStack, List<ItemStack> itemStacks) {
+        List<IBlockState> blockStates = new ArrayList<>();
+
+        //find arraysettings for the player that placed the block
+        ArraySettings a = ModifierSettingsManager.getModifierSettings(player).getArraySettings();
+        if (!isEnabled(a)) return blockStates;
+
+        BlockPos pos = startPos;
+        Vec3i offset = new Vec3i(a.offset.getX(), a.offset.getY(), a.offset.getZ());
+
+        //Randomizer bag synergy
+        IItemHandler bagInventory = null;
+        if (!itemStack.isEmpty() && itemStack.getItem() instanceof ItemRandomizerBag) {
+            bagInventory = ItemRandomizerBag.getBagInventory(itemStack);
+        }
+
+        for (int i = 0; i < a.count; i++) {
+            pos = pos.add(offset);
+
+            //Randomizer bag synergy
+            if (bagInventory != null) {
+                itemStack = ItemRandomizerBag.pickRandomStack(bagInventory);
+                blockState = BuildModifiers
+                        .getBlockStateFromItem(itemStack, player, startPos, EnumFacing.UP, new Vec3d(0, 0, 0), EnumHand.MAIN_HAND);
+            }
+
+            //blockState = blockState.getBlock().getStateForPlacement(player.world, pos, )
+            blockStates.add(blockState);
+            itemStacks.add(itemStack);
+        }
+
+        return blockStates;
+    }
+
+    public static boolean isEnabled(ArraySettings a) {
+        if (a == null || !a.enabled) return false;
+
+        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,20 +1,20 @@
 package nl.requios.effortlessbuilding.buildmodifier;
 
-import net.minecraft.block.BlockState;
+import net.minecraft.block.state.IBlockState;
 import net.minecraft.util.math.BlockPos;
-import net.minecraft.util.math.vector.Vector3d;
+import net.minecraft.util.math.Vec3d;
 
 import java.util.List;
 
 public class BlockSet {
-	private final List<BlockPos> coordinates;
-	private final List<BlockState> previousBlockStates;
-	private final List<BlockState> newBlockStates;
-	private final Vector3d hitVec;
-	private final BlockPos firstPos;
-	private final BlockPos secondPos;
+    private List<BlockPos> coordinates;
+    private List<IBlockState> previousBlockStates;
+    private List<IBlockState> newBlockStates;
+    private Vec3d hitVec;
+    private BlockPos firstPos;
+    private BlockPos secondPos;
 
-	public BlockSet(List<BlockPos> coordinates, List<BlockState> previousBlockStates, List<BlockState> newBlockStates, Vector3d hitVec,
+    public BlockSet(List<BlockPos> coordinates, List<IBlockState> previousBlockStates,  List<IBlockState> newBlockStates, Vec3d hitVec,
                     BlockPos firstPos, BlockPos secondPos) {
         this.coordinates = coordinates;
         this.previousBlockStates = previousBlockStates;
@@ -28,15 +28,15 @@ public class BlockSet {
         return coordinates;
     }
 
-	public List<BlockState> getPreviousBlockStates() {
+    public List<IBlockState> getPreviousBlockStates() {
         return previousBlockStates;
     }
 
-	public List<BlockState> getNewBlockStates() {
+    public List<IBlockState> getNewBlockStates() {
         return newBlockStates;
     }
 
-	public Vector3d getHitVec() {
+    public Vec3d getHitVec() {
         return hitVec;
     }
 

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

@@ -1,55 +1,50 @@
 package nl.requios.effortlessbuilding.buildmodifier;
 
 import net.minecraft.block.Block;
-import net.minecraft.block.BlockState;
-import net.minecraft.block.Blocks;
-import net.minecraft.entity.player.PlayerEntity;
-import net.minecraft.item.BlockItem;
-import net.minecraft.item.BlockItemUseContext;
+import net.minecraft.block.state.IBlockState;
+import net.minecraft.entity.player.EntityPlayer;
+import net.minecraft.item.ItemBlock;
 import net.minecraft.item.ItemStack;
-import net.minecraft.item.ItemUseContext;
-import net.minecraft.util.Direction;
-import net.minecraft.util.Hand;
+import net.minecraft.util.EnumFacing;
+import net.minecraft.util.EnumHand;
 import net.minecraft.util.math.BlockPos;
-import net.minecraft.util.math.BlockRayTraceResult;
-import net.minecraft.util.math.vector.Vector3d;
+import net.minecraft.util.math.Vec3d;
 import net.minecraft.world.World;
 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.Collections;
-import java.util.List;
+import java.util.*;
 
 public class BuildModifiers {
 
+
     //Called from BuildModes
-	public static void onBlockPlaced(PlayerEntity player, List<BlockPos> startCoordinates, Direction sideHit, Vector3d hitVec, boolean placeStartPos) {
-		World world = player.level;
-		AbstractRandomizerBagItem.renewRandomness();
+    public static void onBlockPlaced(EntityPlayer player, List<BlockPos> startCoordinates, EnumFacing sideHit, Vec3d hitVec, boolean placeStartPos) {
+        World world = player.world;
+        ItemRandomizerBag.renewRandomness();
 
         //Format hitvec to 0.x
-		hitVec = new Vector3d(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
         List<BlockPos> coordinates = findCoordinates(player, startCoordinates);
         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
         if (blockStates.size() == 0 || coordinates.size() != blockStates.size()) return;
 
         //remember previous blockstates for undo
-		List<BlockState> previousBlockStates = new ArrayList<>(coordinates.size());
-		List<BlockState> newBlockStates = new ArrayList<>(coordinates.size());
+        List<IBlockState> previousBlockStates = new ArrayList<>(coordinates.size());
+        List<IBlockState> newBlockStates = new ArrayList<>(coordinates.size());
         for (BlockPos coordinate : coordinates) {
             previousBlockStates.add(world.getBlockState(coordinate));
         }
 
-		if (world.isClientSide) {
+        if (world.isRemote) {
 
             BlockPreviewRenderer.onBlocksPlaced();
 
@@ -60,17 +55,17 @@ public class BuildModifiers {
             //place blocks
             for (int i = placeStartPos ? 0 : 1; i < coordinates.size(); i++) {
                 BlockPos blockPos = coordinates.get(i);
-				BlockState blockState = blockStates.get(i);
+                IBlockState blockState = blockStates.get(i);
                 ItemStack itemStack = itemStacks.get(i);
 
-				if (world.isLoaded(blockPos)) {
+                if (world.isBlockLoaded(blockPos, true)) {
                     //check itemstack empty
                     if (itemStack.isEmpty()) {
                         //try to find new stack, otherwise continue
                         itemStack = InventoryHelper.findItemStackInInventory(player, blockState.getBlock());
                         if (itemStack.isEmpty()) continue;
                     }
-					SurvivalHelper.placeBlock(world, player, blockPos, blockState, itemStack, Direction.UP, hitVec, false, false, false);
+                    SurvivalHelper.placeBlock(world, player, blockPos, blockState, itemStack, EnumFacing.UP, hitVec, false, false, false);
                 }
             }
 
@@ -80,53 +75,45 @@ public class BuildModifiers {
             }
         }
 
-		//Set first previousBlockState to empty if in NORMAL mode, to make undo/redo work
-		//(Block is placed by the time it gets here, and unplaced after this)
-		if (!placeStartPos) previousBlockStates.set(0, Blocks.AIR.defaultBlockState());
-
-		//If all new blockstates are air then no use in adding it, no block was actually placed
-		//Can happen when e.g. placing one block in yourself
-		if (Collections.frequency(newBlockStates, Blocks.AIR.defaultBlockState()) != newBlockStates.size()) {
         //add to undo stack
         BlockPos firstPos = startCoordinates.get(0);
         BlockPos secondPos = startCoordinates.get(startCoordinates.size() - 1);
         UndoRedo.addUndo(player, new BlockSet(coordinates, previousBlockStates, newBlockStates, hitVec, firstPos, secondPos));
     }
-	}
 
-	public static void onBlockBroken(PlayerEntity player, List<BlockPos> startCoordinates, boolean breakStartPos) {
-		World world = player.level;
+    public static void onBlockBroken(EntityPlayer player, List<BlockPos> startCoordinates, boolean breakStartPos) {
+        World world = player.world;
 
         List<BlockPos> coordinates = findCoordinates(player, startCoordinates);
 
         if (coordinates.isEmpty()) return;
 
         //remember previous blockstates for undo
-		List<BlockState> previousBlockStates = new ArrayList<>(coordinates.size());
-		List<BlockState> newBlockStates = new ArrayList<>(coordinates.size());
+        List<IBlockState> previousBlockStates = new ArrayList<>(coordinates.size());
+        List<IBlockState> newBlockStates = new ArrayList<>(coordinates.size());
         for (BlockPos coordinate : coordinates) {
             previousBlockStates.add(world.getBlockState(coordinate));
         }
 
-		if (world.isClientSide) {
+        if (world.isRemote) {
             BlockPreviewRenderer.onBlocksBroken();
 
             //list of air blockstates
-			for (int i = 0; i < coordinates.size(); i++) {
-				newBlockStates.add(Blocks.AIR.defaultBlockState());
+            for (BlockPos coordinate : coordinates) {
+                newBlockStates.add(Block.getBlockById(0).getDefaultState());
             }
 
         } else {
 
             //If the player is going to instabreak grass or a plant, only break other instabreaking things
             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
             for (int i = breakStartPos ? 0 : 1; i < coordinates.size(); i++) {
                 BlockPos coordinate = coordinates.get(i);
-				if (world.isLoaded(coordinate) && !world.isEmptyBlock(coordinate)) {
-					if (!onlyInstaBreaking || world.getBlockState(coordinate).getDestroySpeed(world, coordinate) == 0f) {
+                if (world.isBlockLoaded(coordinate, false)) {
+                    if (!onlyInstaBreaking || world.getBlockState(coordinate).getBlockHardness(world, coordinate) == 0f) {
                         SurvivalHelper.breakBlock(world, player, coordinate, false);
                     }
                 }
@@ -138,19 +125,15 @@ public class BuildModifiers {
             }
         }
 
-		//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)
-		if (!breakStartPos) newBlockStates.set(0, Blocks.AIR.defaultBlockState());
-
         //add to undo stack
         BlockPos firstPos = startCoordinates.get(0);
         BlockPos secondPos = startCoordinates.get(startCoordinates.size() - 1);
-		Vector3d hitVec = new Vector3d(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));
 
     }
 
-	public static List<BlockPos> findCoordinates(PlayerEntity player, List<BlockPos> posList) {
+    public static List<BlockPos> findCoordinates(EntityPlayer player, List<BlockPos> posList) {
         List<BlockPos> coordinates = new ArrayList<>();
         //Add current blocks being placed too
         coordinates.addAll(posList);
@@ -171,18 +154,18 @@ public class BuildModifiers {
         return coordinates;
     }
 
-	public static List<BlockPos> findCoordinates(PlayerEntity player, BlockPos blockPos) {
-		return findCoordinates(player, new ArrayList<>(Collections.singletonList(blockPos)));
+    public static List<BlockPos> findCoordinates(EntityPlayer player, BlockPos blockPos) {
+        return findCoordinates(player, new ArrayList<>(Arrays.asList(blockPos)));
     }
 
-	public static List<BlockState> findBlockStates(PlayerEntity player, List<BlockPos> posList, Vector3d hitVec, Direction facing, List<ItemStack> itemStacks) {
-		List<BlockState> blockStates = new ArrayList<>();
+    public static List<IBlockState> findBlockStates(EntityPlayer player, List<BlockPos> posList, Vec3d hitVec, EnumFacing facing, List<ItemStack> itemStacks) {
+        List<IBlockState> blockStates = new ArrayList<>();
         itemStacks.clear();
 
         //Get itemstack
-		ItemStack itemStack = player.getItemInHand(Hand.MAIN_HAND);
+        ItemStack itemStack = player.getHeldItem(EnumHand.MAIN_HAND);
         if (itemStack.isEmpty() || !CompatHelper.isItemBlockProxy(itemStack)) {
-			itemStack = player.getItemInHand(Hand.OFF_HAND);
+            itemStack = player.getHeldItem(EnumHand.OFF_HAND);
         }
         if (itemStack.isEmpty() || !CompatHelper.isItemBlockProxy(itemStack)) {
             return blockStates;
@@ -190,22 +173,22 @@ public class BuildModifiers {
 
         //Get ItemBlock stack
         ItemStack itemBlock = ItemStack.EMPTY;
-		if (itemStack.getItem() instanceof BlockItem) itemBlock = itemStack;
+        if (itemStack.getItem() instanceof ItemBlock) itemBlock = itemStack;
         else itemBlock = CompatHelper.getItemBlockFromStack(itemStack);
-		AbstractRandomizerBagItem.resetRandomness();
+        ItemRandomizerBag.resetRandomness();
 
         //Add blocks in posList first
         for (BlockPos blockPos : posList) {
-			if (!(itemStack.getItem() instanceof BlockItem)) itemBlock = CompatHelper.getItemBlockFromStack(itemStack);
-			BlockState blockState = getBlockStateFromItem(itemBlock, player, blockPos, facing, hitVec, Hand.MAIN_HAND);
+            if (!(itemStack.getItem() instanceof ItemBlock)) itemBlock = CompatHelper.getItemBlockFromStack(itemStack);
+            IBlockState blockState = getBlockStateFromItem(itemBlock, player, blockPos, facing, hitVec, EnumHand.MAIN_HAND);
             blockStates.add(blockState);
             itemStacks.add(itemBlock);
         }
 
         for (BlockPos blockPos : posList) {
-			BlockState blockState = getBlockStateFromItem(itemBlock, player, blockPos, facing, hitVec, Hand.MAIN_HAND);
+            IBlockState blockState = getBlockStateFromItem(itemBlock, player, blockPos, facing, hitVec, EnumHand.MAIN_HAND);
 
-			List<BlockState> arrayBlockStates = Array.findBlockStates(player, blockPos, blockState, itemStack, itemStacks);
+            List<IBlockState> arrayBlockStates = Array.findBlockStates(player, blockPos, blockState, itemStack, itemStacks);
             blockStates.addAll(arrayBlockStates);
             blockStates.addAll(Mirror.findBlockStates(player, blockPos, blockState, itemStack, itemStacks));
             blockStates.addAll(RadialMirror.findBlockStates(player, blockPos, blockState, itemStack, itemStacks));
@@ -213,7 +196,7 @@ public class BuildModifiers {
             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);
+                IBlockState blockState1 = arrayBlockStates.get(i);
                 blockStates.addAll(Mirror.findBlockStates(player, coordinate, blockState1, itemStack, itemStacks));
                 blockStates.addAll(RadialMirror.findBlockStates(player, coordinate, blockState1, itemStack, itemStacks));
             }
@@ -238,8 +221,9 @@ public class BuildModifiers {
                modifierSettings.doQuickReplace();
     }
 
-	public static BlockState getBlockStateFromItem(ItemStack itemStack, PlayerEntity player, BlockPos blockPos, Direction facing, Vector3d hitVec, Hand hand) {
-		return Block.byItem(itemStack.getItem()).getStateForPlacement(new BlockItemUseContext(new ItemUseContext(player, hand, new BlockRayTraceResult(hitVec, facing, blockPos, false))));
+    public static IBlockState getBlockStateFromItem(ItemStack itemStack, EntityPlayer player, BlockPos blockPos, EnumFacing facing, Vec3d hitVec, EnumHand hand) {
+        return Block.getBlockFromItem(itemStack.getItem()).getStateForPlacement(player.world, blockPos, facing,
+                ((float) hitVec.x), ((float) hitVec.y), ((float) hitVec.z), itemStack.getMetadata(), player, hand);
     }
 
     //Returns true if equal (or both null)
@@ -247,16 +231,6 @@ public class BuildModifiers {
         if (coordinates1 == null && coordinates2 == null) return true;
         if (coordinates1 == null || coordinates2 == null) return false;
 
-		//Check count, not actual values
-		if (coordinates1.size() == coordinates2.size()) {
-			if (coordinates1.size() == 1) {
-				return coordinates1.get(0).equals(coordinates2.get(0));
-			}
-			return true;
-		} else {
-			return false;
-		}
-
-//        return coordinates1.equals(coordinates2);
+        return coordinates1.equals(coordinates2);
     }
 }

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

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

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

@@ -1,62 +1,46 @@
 package nl.requios.effortlessbuilding.buildmodifier;
 
-import net.minecraft.entity.player.PlayerEntity;
-import net.minecraft.entity.player.ServerPlayerEntity;
-import net.minecraftforge.common.util.LazyOptional;
+import net.minecraft.entity.player.EntityPlayer;
+import net.minecraft.entity.player.EntityPlayerMP;
 import net.minecraftforge.fml.common.Mod;
-import net.minecraftforge.fml.network.PacketDistributor;
 import nl.requios.effortlessbuilding.BuildConfig;
 import nl.requios.effortlessbuilding.EffortlessBuilding;
 import nl.requios.effortlessbuilding.capability.ModifierCapabilityManager;
 import nl.requios.effortlessbuilding.helper.ReachHelper;
 import nl.requios.effortlessbuilding.network.ModifierSettingsMessage;
-import nl.requios.effortlessbuilding.network.PacketHandler;
-
-import javax.annotation.Nonnull;
 
 @Mod.EventBusSubscriber
 public class ModifierSettingsManager {
 
     //Retrieves the buildsettings of a player through the modifierCapability capability
     //Never returns null
-	@Nonnull
-	public static ModifierSettings getModifierSettings(PlayerEntity player) {
-		LazyOptional<ModifierCapabilityManager.IModifierCapability> modifierCapability =
-			player.getCapability(ModifierCapabilityManager.modifierCapability, null);
-
-		if (modifierCapability.isPresent()) {
-			ModifierCapabilityManager.IModifierCapability capability = modifierCapability.orElse(null);
+    public static ModifierSettings getModifierSettings(EntityPlayer player){
+        if (player.hasCapability(ModifierCapabilityManager.modifierCapability, null)) {
+            ModifierCapabilityManager.IModifierCapability capability = player.getCapability(
+                    ModifierCapabilityManager.modifierCapability, null);
             if (capability.getModifierData() == null) {
                 capability.setModifierData(new ModifierSettings());
             }
             return capability.getModifierData();
         }
-
-		//Player does not have modifierCapability capability
-		//Return dummy settings
-		return new ModifierSettings();
-//        throw new IllegalArgumentException("Player does not have modifierCapability capability");
+        throw new IllegalArgumentException("Player does not have modifierCapability capability");
     }
 
-	public static void setModifierSettings(PlayerEntity player, ModifierSettings modifierSettings) {
+    public static void setModifierSettings(EntityPlayer player, ModifierSettings modifierSettings) {
         if (player == null) {
             EffortlessBuilding.log("Cannot set buildsettings, player is null");
             return;
         }
-
-		LazyOptional<ModifierCapabilityManager.IModifierCapability> modifierCapability =
-			player.getCapability(ModifierCapabilityManager.modifierCapability, null);
-
-		modifierCapability.ifPresent((capability) -> {
+        if (player.hasCapability(ModifierCapabilityManager.modifierCapability, null)) {
+            ModifierCapabilityManager.IModifierCapability capability = player.getCapability(
+                    ModifierCapabilityManager.modifierCapability, null);
             capability.setModifierData(modifierSettings);
-		});
-
-		if (!modifierCapability.isPresent()) {
+        } else {
             EffortlessBuilding.log(player, "Saving buildsettings failed.");
         }
     }
 
-	public static String sanitize(ModifierSettings modifierSettings, PlayerEntity player) {
+    public static String sanitize(ModifierSettings modifierSettings, EntityPlayer player) {
         int maxReach = ReachHelper.getMaxReach(player);
         String error = "";
 
@@ -110,18 +94,6 @@ public class ModifierSettingsManager {
         return error;
     }
 
-	public static void handleNewPlayer(PlayerEntity player) {
-		//Makes sure player has modifier settings (if it doesnt it will create it)
-		getModifierSettings(player);
-
-		//Only on server
-		if (!player.level.isClientSide) {
-			//Send to client
-			ModifierSettingsMessage msg = new ModifierSettingsMessage(getModifierSettings(player));
-			PacketHandler.INSTANCE.send(PacketDistributor.PLAYER.with(() -> (ServerPlayerEntity) player), msg);
-		}
-	}
-
     public static class ModifierSettings {
         private Mirror.MirrorSettings mirrorSettings;
         private Array.ArraySettings arraySettings;
@@ -191,24 +163,33 @@ public class ModifierSettingsManager {
             //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;
+                case 0: reach = BuildConfig.reach.maxReachLevel0; break;
+                case 1: reach =  BuildConfig.reach.maxReachLevel1; break;
+                case 2: reach =  BuildConfig.reach.maxReachLevel2; break;
+                case 3: reach =  BuildConfig.reach.maxReachLevel3; break;
             }
 
+            EffortlessBuilding.log("before "+this.mirrorSettings.radius);
+
             if (this.mirrorSettings != null)
                 this.mirrorSettings.radius = reach / 2;
             if (this.radialMirrorSettings != null)
                 this.radialMirrorSettings.radius = reach / 2;
+
+            EffortlessBuilding.log("after "+this.mirrorSettings.radius);
+        }
+    }
+
+    public static void handleNewPlayer(EntityPlayer player){
+        if (getModifierSettings(player) == null) {
+            setModifierSettings(player, new ModifierSettings());
+        }
+
+        //Only on server
+        if (!player.world.isRemote) {
+            //Send to client
+            ModifierSettingsMessage msg = new ModifierSettingsMessage(getModifierSettings(player));
+            EffortlessBuilding.packetHandler.sendTo(msg, (EntityPlayerMP) player);
         }
     }
 }

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

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

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

@@ -1,15 +1,14 @@
 package nl.requios.effortlessbuilding.buildmodifier;
 
 import net.minecraft.block.Block;
-import net.minecraft.block.BlockState;
-import net.minecraft.block.Blocks;
-import net.minecraft.entity.player.PlayerEntity;
-import net.minecraft.item.BlockItem;
+import net.minecraft.block.state.IBlockState;
+import net.minecraft.entity.player.EntityPlayer;
+import net.minecraft.item.Item;
+import net.minecraft.item.ItemBlock;
 import net.minecraft.item.ItemStack;
-import net.minecraft.util.Direction;
+import net.minecraft.util.EnumFacing;
 import net.minecraft.util.math.BlockPos;
-import net.minecraft.util.math.vector.Vector3d;
-import net.minecraft.world.server.ServerWorld;
+import net.minecraft.util.math.Vec3d;
 import nl.requios.effortlessbuilding.BuildConfig;
 import nl.requios.effortlessbuilding.EffortlessBuilding;
 import nl.requios.effortlessbuilding.helper.FixedStack;
@@ -23,71 +22,53 @@ public class UndoRedo {
 
     //Undo and redo stacks per player
     //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 final Map<UUID, FixedStack<BlockSet>> undoStacksServer = new HashMap<>();
-	private static final Map<UUID, FixedStack<BlockSet>> redoStacksClient = new HashMap<>();
-	private static final Map<UUID, FixedStack<BlockSet>> redoStacksServer = new HashMap<>();
+    private static Map<UUID, FixedStack<BlockSet>> undoStacksClient = new HashMap<>();
+    private static Map<UUID, FixedStack<BlockSet>> undoStacksServer = new HashMap<>();
+    private static Map<UUID, FixedStack<BlockSet>> redoStacksClient = new HashMap<>();
+    private static Map<UUID, FixedStack<BlockSet>> redoStacksServer = new HashMap<>();
 
     //add to undo stack
-	public static void addUndo(PlayerEntity player, BlockSet blockSet) {
-		Map<UUID, FixedStack<BlockSet>> undoStacks = player.level.isClientSide ? undoStacksClient : undoStacksServer;
-
-		//Assert coordinates is as long as previous and new blockstate lists
-		if (blockSet.getCoordinates().size() != blockSet.getPreviousBlockStates().size() ||
-			blockSet.getCoordinates().size() != blockSet.getNewBlockStates().size()) {
-			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());
-		}
-
-		//Warn if previous and new blockstate are equal
-		//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: {}.",
-//                        i, blockSet.getPreviousBlockStates().get(i));
-//            }
-//        }
+    public static void addUndo(EntityPlayer player, BlockSet blockSet) {
+        Map<UUID, FixedStack<BlockSet>> undoStacks = player.world.isRemote ? undoStacksClient : undoStacksServer;
 
         //If no stack exists, make one
-		if (!undoStacks.containsKey(player.getUUID())) {
-			undoStacks.put(player.getUUID(), new FixedStack<>(new BlockSet[BuildConfig.survivalBalancers.undoStackSize.get()]));
+        if (!undoStacks.containsKey(player.getUniqueID())) {
+            undoStacks.put(player.getUniqueID(), new FixedStack<>(new BlockSet[BuildConfig.survivalBalancers.undoStackSize]));
         }
 
-		undoStacks.get(player.getUUID()).push(blockSet);
+        undoStacks.get(player.getUniqueID()).push(blockSet);
     }
 
-	private static void addRedo(PlayerEntity player, BlockSet blockSet) {
-		Map<UUID, FixedStack<BlockSet>> redoStacks = player.level.isClientSide ? redoStacksClient : redoStacksServer;
-
-		//(No asserts necessary, it's private)
+    private static void addRedo(EntityPlayer player, BlockSet blockSet) {
+        Map<UUID, FixedStack<BlockSet>> redoStacks = player.world.isRemote ? redoStacksClient : redoStacksServer;
 
         //If no stack exists, make one
-		if (!redoStacks.containsKey(player.getUUID())) {
-			redoStacks.put(player.getUUID(), new FixedStack<>(new BlockSet[BuildConfig.survivalBalancers.undoStackSize.get()]));
+        if (!redoStacks.containsKey(player.getUniqueID())) {
+            redoStacks.put(player.getUniqueID(), new FixedStack<>(new BlockSet[BuildConfig.survivalBalancers.undoStackSize]));
         }
 
-		redoStacks.get(player.getUUID()).push(blockSet);
+        redoStacks.get(player.getUniqueID()).push(blockSet);
     }
 
-	public static boolean undo(PlayerEntity player) {
-		Map<UUID, FixedStack<BlockSet>> undoStacks = player.level.isClientSide ? undoStacksClient : undoStacksServer;
+    public static boolean undo(EntityPlayer player) {
+        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;
 
         BlockSet blockSet = undoStack.pop();
         List<BlockPos> coordinates = blockSet.getCoordinates();
-		List<BlockState> previousBlockStates = blockSet.getPreviousBlockStates();
-		List<BlockState> newBlockStates = blockSet.getNewBlockStates();
-		Vector3d hitVec = blockSet.getHitVec();
+        List<IBlockState> previousBlockStates = blockSet.getPreviousBlockStates();
+        List<IBlockState> newBlockStates = blockSet.getNewBlockStates();
+        Vec3d hitVec = blockSet.getHitVec();
 
         //Find up to date itemstacks in player inventory
         List<ItemStack> itemStacks = findItemStacksInInventory(player, previousBlockStates);
 
-		if (player.level.isClientSide) {
+        if (player.world.isRemote) {
             BlockPreviewRenderer.onBlocksBroken(coordinates, itemStacks, newBlockStates, blockSet.getSecondPos(), blockSet.getFirstPos());
         } else {
             //break all those blocks, reset to what they were
@@ -95,30 +76,24 @@ public class UndoRedo {
                 BlockPos coordinate = coordinates.get(i);
                 ItemStack itemStack = itemStacks.get(i);
 
-				if (previousBlockStates.get(i).equals(newBlockStates.get(i))) continue;
-
                 //get blockstate from itemstack
-				BlockState previousBlockState = Blocks.AIR.defaultBlockState();
-				if (itemStack.getItem() instanceof BlockItem) {
-					previousBlockState = ((BlockItem) itemStack.getItem()).getBlock().defaultBlockState();
+                IBlockState previousBlockState = Block.getBlockById(0).getDefaultState();
+                if (itemStack.getItem() instanceof ItemBlock) {
+                    previousBlockState = ((ItemBlock) itemStack.getItem()).getBlock().getDefaultState();
                 }
 
-				if (player.level.isLoaded(coordinate)) {
+                if (player.world.isBlockLoaded(coordinate, true)) {
                     //check itemstack empty
                     if (itemStack.isEmpty()) {
                         itemStack = findItemStackInInventory(player, previousBlockStates.get(i));
                         //get blockstate from new itemstack
-						if (!itemStack.isEmpty() && itemStack.getItem() instanceof BlockItem) {
-							previousBlockState = ((BlockItem) itemStack.getItem()).getBlock().defaultBlockState();
-						} else {
-							if (previousBlockStates.get(i).getBlock() != Blocks.AIR)
-								EffortlessBuilding.logTranslate(player, "", previousBlockStates.get(i).getBlock().getDescriptionId(), " not found in inventory", true);
-							previousBlockState = Blocks.AIR.defaultBlockState();
+                        if (!itemStack.isEmpty() && itemStack.getItem() instanceof ItemBlock) {
+                            previousBlockState = ((ItemBlock) itemStack.getItem()).getBlock().getDefaultState();
                         }
                     }
-					if (itemStack.isEmpty()) SurvivalHelper.breakBlock(player.level, player, coordinate, true);
+                    if (itemStack.isEmpty()) SurvivalHelper.breakBlock(player.world, player, coordinate, true);
                     //if previousBlockState is air, placeBlock will set it to air
-					SurvivalHelper.placeBlock(player.level, player, coordinate, previousBlockState, itemStack, Direction.UP, hitVec, true, false, false);
+                    SurvivalHelper.placeBlock(player.world, player, coordinate, previousBlockState, itemStack, EnumFacing.UP, hitVec, true, false, false);
                 }
             }
         }
@@ -129,55 +104,43 @@ public class UndoRedo {
         return true;
     }
 
-	public static boolean redo(PlayerEntity player) {
-		Map<UUID, FixedStack<BlockSet>> redoStacks = player.level.isClientSide ? redoStacksClient : redoStacksServer;
+    public static boolean redo(EntityPlayer player) {
+        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;
 
         BlockSet blockSet = redoStack.pop();
         List<BlockPos> coordinates = blockSet.getCoordinates();
-		List<BlockState> previousBlockStates = blockSet.getPreviousBlockStates();
-		List<BlockState> newBlockStates = blockSet.getNewBlockStates();
-		Vector3d hitVec = blockSet.getHitVec();
+        List<IBlockState> newBlockStates = blockSet.getNewBlockStates();
+        Vec3d hitVec = blockSet.getHitVec();
 
         //Find up to date itemstacks in player inventory
         List<ItemStack> itemStacks = findItemStacksInInventory(player, newBlockStates);
 
-		if (player.level.isClientSide) {
+        if (player.world.isRemote) {
             BlockPreviewRenderer.onBlocksPlaced(coordinates, itemStacks, newBlockStates, blockSet.getFirstPos(), blockSet.getSecondPos());
         } else {
             //place blocks
             for (int i = 0; i < coordinates.size(); i++) {
                 BlockPos coordinate = coordinates.get(i);
+                IBlockState newBlockState = newBlockStates.get(i);
                 ItemStack itemStack = itemStacks.get(i);
 
-				if (previousBlockStates.get(i).equals(newBlockStates.get(i))) continue;
-
-				//get blockstate from itemstack
-				BlockState newBlockState = Blocks.AIR.defaultBlockState();
-				if (itemStack.getItem() instanceof BlockItem) {
-					newBlockState = ((BlockItem) itemStack.getItem()).getBlock().defaultBlockState();
-				}
-
-				if (player.level.isLoaded(coordinate)) {
+                if (player.world.isBlockLoaded(coordinate, true)) {
                     //check itemstack empty
                     if (itemStack.isEmpty()) {
                         itemStack = findItemStackInInventory(player, newBlockStates.get(i));
                         //get blockstate from new itemstack
-						if (!itemStack.isEmpty() && itemStack.getItem() instanceof BlockItem) {
-							newBlockState = ((BlockItem) itemStack.getItem()).getBlock().defaultBlockState();
-						} else {
-							if (newBlockStates.get(i).getBlock() != Blocks.AIR)
-								EffortlessBuilding.logTranslate(player, "", newBlockStates.get(i).getBlock().getDescriptionId(), " not found in inventory", true);
-							newBlockState = Blocks.AIR.defaultBlockState();
+                        if (!itemStack.isEmpty() && itemStack.getItem() instanceof ItemBlock) {
+                            newBlockState = ((ItemBlock) itemStack.getItem()).getBlock().getDefaultState();
                         }
                     }
-					if (itemStack.isEmpty()) SurvivalHelper.breakBlock(player.level, player, coordinate, true);
-					SurvivalHelper.placeBlock(player.level, player, coordinate, newBlockState, itemStack, Direction.UP, hitVec, true, false, false);
+                    if (itemStack.isEmpty()) SurvivalHelper.breakBlock(player.world, player, coordinate, true);
+                    SurvivalHelper.placeBlock(player.world, player, coordinate, newBlockState, itemStack, EnumFacing.UP, hitVec, true, false, false);
                 }
             }
         }
@@ -188,48 +151,39 @@ public class UndoRedo {
         return true;
     }
 
-	public static void clear(PlayerEntity player) {
-		Map<UUID, FixedStack<BlockSet>> undoStacks = player.level.isClientSide ? undoStacksClient : undoStacksServer;
-		Map<UUID, FixedStack<BlockSet>> redoStacks = player.level.isClientSide ? redoStacksClient : redoStacksServer;
-		if (undoStacks.containsKey(player.getUUID())) {
-			undoStacks.get(player.getUUID()).clear();
+    public static void clear(EntityPlayer player) {
+        Map<UUID, FixedStack<BlockSet>> undoStacks = player.world.isRemote ? undoStacksClient : undoStacksServer;
+        Map<UUID, FixedStack<BlockSet>> redoStacks = player.world.isRemote ? redoStacksClient : redoStacksServer;
+        if (undoStacks.containsKey(player.getUniqueID())) {
+            undoStacks.get(player.getUniqueID()).clear();
         }
-		if (redoStacks.containsKey(player.getUUID())) {
-			redoStacks.get(player.getUUID()).clear();
+        if (redoStacks.containsKey(player.getUniqueID())) {
+            redoStacks.get(player.getUniqueID()).clear();
         }
     }
 
-	private static List<ItemStack> findItemStacksInInventory(PlayerEntity player, List<BlockState> blockStates) {
+    private static List<ItemStack> findItemStacksInInventory(EntityPlayer player, List<IBlockState> blockStates) {
         List<ItemStack> itemStacks = new ArrayList<>(blockStates.size());
-		for (BlockState blockState : blockStates) {
+        for (IBlockState blockState : blockStates) {
             itemStacks.add(findItemStackInInventory(player, blockState));
         }
         return itemStacks;
     }
 
-	private static ItemStack findItemStackInInventory(PlayerEntity player, BlockState blockState) {
+    private static ItemStack findItemStackInInventory(EntityPlayer player, IBlockState blockState) {
         ItemStack itemStack = ItemStack.EMPTY;
-		if (blockState == null) return itemStack;
 
         //First try previousBlockStates
-		//TODO try to find itemstack with right blockstate first
-		// then change line 103 back (get state from item)
         itemStack = InventoryHelper.findItemStackInInventory(player, blockState.getBlock());
 
-
         //then anything it drops
         if (itemStack.isEmpty()) {
-			//Cannot check drops on clientside because loot tables are server only
-			if (!player.level.isClientSide) {
-				List<ItemStack> itemsDropped = Block.getDrops(blockState, (ServerWorld) player.level, BlockPos.ZERO, null);
-				for (ItemStack itemStackDropped : itemsDropped) {
-					if (itemStackDropped.getItem() instanceof BlockItem) {
-						Block block = ((BlockItem) itemStackDropped.getItem()).getBlock();
+            Item itemDropped = blockState.getBlock().getItemDropped(blockState, player.world.rand, 10);
+            if (itemDropped instanceof ItemBlock) {
+                Block block = ((ItemBlock) itemDropped).getBlock();
                 itemStack = InventoryHelper.findItemStackInInventory(player, block);
             }
         }
-			}
-		}
 
         //then air
         //(already empty)

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

@@ -1,38 +1,42 @@
 package nl.requios.effortlessbuilding.capability;
 
-import net.minecraft.nbt.CompoundNBT;
-import net.minecraft.util.Direction;
+import net.minecraft.nbt.NBTTagCompound;
+import net.minecraft.util.EnumFacing;
 import net.minecraftforge.common.capabilities.Capability;
 import net.minecraftforge.common.capabilities.ICapabilitySerializable;
-import net.minecraftforge.common.util.LazyOptional;
 import net.minecraftforge.items.CapabilityItemHandler;
 import net.minecraftforge.items.IItemHandler;
 import net.minecraftforge.items.ItemStackHandler;
-import nl.requios.effortlessbuilding.item.RandomizerBagItem;
+import nl.requios.effortlessbuilding.item.ItemRandomizerBag;
 
 import javax.annotation.Nonnull;
 import javax.annotation.Nullable;
 
-public class ItemHandlerCapabilityProvider implements ICapabilitySerializable<CompoundNBT> {
-	IItemHandler itemHandler;
+public class ItemHandlerCapabilityProvider implements ICapabilitySerializable<NBTTagCompound> {
+    IItemHandler itemHandler = new ItemStackHandler(ItemRandomizerBag.INV_SIZE);
 
-	public ItemHandlerCapabilityProvider(int size) {
-		itemHandler = new ItemStackHandler(size);
+    @Override
+    public boolean hasCapability(@Nonnull Capability<?> capability, @Nullable EnumFacing facing) {
+        if (capability == CapabilityItemHandler.ITEM_HANDLER_CAPABILITY)
+            return true;
+        return false;
     }
 
-	@Nonnull
+    @Nullable
     @Override
-	public <T> LazyOptional<T> getCapability(@Nonnull Capability<T> cap, @Nullable Direction side) {
-		return CapabilityItemHandler.ITEM_HANDLER_CAPABILITY.orEmpty(cap, LazyOptional.of(() -> itemHandler));
+    public <T> T getCapability(@Nonnull Capability<T> capability, @Nullable EnumFacing facing) {
+        if (capability == CapabilityItemHandler.ITEM_HANDLER_CAPABILITY)
+            return (T) itemHandler;
+        return null;
     }
 
     @Override
-	public CompoundNBT serializeNBT() {
+    public NBTTagCompound serializeNBT() {
         return ((ItemStackHandler) itemHandler).serializeNBT();
     }
 
     @Override
-	public void deserializeNBT(CompoundNBT nbt) {
+    public void deserializeNBT(NBTTagCompound nbt) {
         ((ItemStackHandler) itemHandler).deserializeNBT(nbt);
     }
 }

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

@@ -1,23 +1,20 @@
 package nl.requios.effortlessbuilding.capability;
 
-import net.minecraft.nbt.CompoundNBT;
-import net.minecraft.nbt.INBT;
-import net.minecraft.util.Direction;
+import net.minecraft.nbt.NBTBase;
+import net.minecraft.nbt.NBTTagCompound;
+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.event.entity.player.PlayerEvent;
-import net.minecraftforge.eventbus.api.SubscribeEvent;
 import net.minecraftforge.fml.common.Mod;
+import net.minecraftforge.fml.common.eventhandler.SubscribeEvent;
 import nl.requios.effortlessbuilding.buildmode.BuildModes;
 
 import javax.annotation.Nonnull;
 import javax.annotation.Nullable;
 
-import static nl.requios.effortlessbuilding.buildmode.ModeSettingsManager.ModeSettings;
-
-import nl.requios.effortlessbuilding.buildmode.ModeSettingsManager.ModeSettings;
+import static nl.requios.effortlessbuilding.buildmode.ModeSettingsManager.*;
 
 @Mod.EventBusSubscriber
 public class ModeCapabilityManager {
@@ -25,16 +22,6 @@ public class ModeCapabilityManager {
     @CapabilityInject(IModeCapability.class)
     public final static Capability<IModeCapability> modeCapability = null;
 
-	// Allows for the capability to persist after death.
-	@SubscribeEvent
-	public static void clonePlayer(PlayerEvent.Clone event) {
-		LazyOptional<IModeCapability> original = event.getOriginal().getCapability(modeCapability, null);
-		LazyOptional<IModeCapability> clone = event.getEntity().getCapability(modeCapability, null);
-		clone.ifPresent(cloneModeCapability ->
-			original.ifPresent(originalModeCapability ->
-				cloneModeCapability.setModeData(originalModeCapability.getModeData())));
-	}
-
     public interface IModeCapability {
         ModeSettings getModeData();
 
@@ -57,12 +44,12 @@ public class ModeCapabilityManager {
 
     public static class Storage implements Capability.IStorage<IModeCapability> {
         @Override
-		public INBT writeNBT(Capability<IModeCapability> capability, IModeCapability instance, Direction side) {
-			CompoundNBT compound = new CompoundNBT();
+        public NBTBase writeNBT(Capability<IModeCapability> capability, IModeCapability instance, EnumFacing side) {
+            NBTTagCompound compound = new NBTTagCompound();
             ModeSettings modeSettings = instance.getModeData();
             if (modeSettings == null) modeSettings = new ModeSettings();
 
-			//compound.putInteger("buildMode", modeSettings.getBuildMode().ordinal());
+            //compound.setInteger("buildMode", modeSettings.getBuildMode().ordinal());
 
             //TODO add mode settings
 
@@ -70,8 +57,8 @@ public class ModeCapabilityManager {
         }
 
         @Override
-		public void readNBT(Capability<IModeCapability> capability, IModeCapability instance, Direction side, INBT nbt) {
-			CompoundNBT compound = (CompoundNBT) nbt;
+        public void readNBT(Capability<IModeCapability> capability, IModeCapability instance, EnumFacing side, NBTBase nbt) {
+            NBTTagCompound compound = (NBTTagCompound) nbt;
 
             //BuildModes.BuildModeEnum buildMode = BuildModes.BuildModeEnum.values()[compound.getInteger("buildMode")];
 
@@ -82,24 +69,36 @@ public class ModeCapabilityManager {
         }
     }
 
-	public static class Provider implements ICapabilitySerializable<INBT> {
+    public static class Provider implements ICapabilitySerializable<NBTBase> {
         IModeCapability inst = modeCapability.getDefaultInstance();
 
-		@Nonnull
         @Override
-		public <T> LazyOptional<T> getCapability(@Nonnull Capability<T> cap, @Nullable Direction side) {
-			return modeCapability.orEmpty(cap, LazyOptional.of(() -> inst));
+        public boolean hasCapability(@Nonnull Capability<?> capability, @Nullable EnumFacing facing) {
+            return capability == modeCapability;
         }
 
         @Override
-		public INBT serializeNBT() {
+        public <T> T getCapability(@Nonnull Capability<T> capability, @Nullable EnumFacing facing) {
+            if (capability == modeCapability) return modeCapability.<T>cast(inst);
+            return null;
+        }
+
+        @Override
+        public NBTBase serializeNBT() {
             return modeCapability.getStorage().writeNBT(modeCapability, inst, null);
         }
 
         @Override
-		public void deserializeNBT(INBT nbt) {
+        public void deserializeNBT(NBTBase nbt) {
             modeCapability.getStorage().readNBT(modeCapability, inst, null, nbt);
         }
+    }
 
+    // Allows for the capability to persist after death.
+    @SubscribeEvent
+    public static void clonePlayer(PlayerEvent.Clone event) {
+        IModeCapability original = event.getOriginal().getCapability(modeCapability, null);
+        IModeCapability clone = event.getEntity().getCapability(modeCapability, null);
+        clone.setModeData(original.getModeData());
     }
 }

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

@@ -1,17 +1,16 @@
 package nl.requios.effortlessbuilding.capability;
 
-import net.minecraft.nbt.CompoundNBT;
-import net.minecraft.nbt.INBT;
-import net.minecraft.util.Direction;
+import net.minecraft.nbt.NBTBase;
+import net.minecraft.nbt.NBTTagCompound;
+import net.minecraft.util.EnumFacing;
 import net.minecraft.util.math.BlockPos;
-import net.minecraft.util.math.vector.Vector3d;
+import net.minecraft.util.math.Vec3d;
 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;
 import net.minecraftforge.fml.common.Mod;
+import net.minecraftforge.fml.common.eventhandler.SubscribeEvent;
 import nl.requios.effortlessbuilding.buildmodifier.Array;
 import nl.requios.effortlessbuilding.buildmodifier.Mirror;
 import nl.requios.effortlessbuilding.buildmodifier.RadialMirror;
@@ -19,9 +18,7 @@ import nl.requios.effortlessbuilding.buildmodifier.RadialMirror;
 import javax.annotation.Nonnull;
 import javax.annotation.Nullable;
 
-import static nl.requios.effortlessbuilding.buildmodifier.ModifierSettingsManager.ModifierSettings;
-
-import nl.requios.effortlessbuilding.buildmodifier.ModifierSettingsManager.ModifierSettings;
+import static nl.requios.effortlessbuilding.buildmodifier.ModifierSettingsManager.*;
 
 @Mod.EventBusSubscriber
 public class ModifierCapabilityManager {
@@ -29,16 +26,6 @@ public class ModifierCapabilityManager {
     @CapabilityInject(IModifierCapability.class)
     public final static Capability<IModifierCapability> modifierCapability = null;
 
-	// Allows for the capability to persist after death.
-	@SubscribeEvent
-	public static void clonePlayer(PlayerEvent.Clone event) {
-		LazyOptional<IModifierCapability> original = event.getOriginal().getCapability(modifierCapability, null);
-		LazyOptional<IModifierCapability> clone = event.getEntity().getCapability(modifierCapability, null);
-		clone.ifPresent(cloneModifierCapability ->
-			original.ifPresent(originalModifierCapability ->
-				cloneModifierCapability.setModifierData(originalModifierCapability.getModifierData())));
-	}
-
     public interface IModifierCapability {
         ModifierSettings getModifierData();
 
@@ -61,68 +48,68 @@ public class ModifierCapabilityManager {
 
     public static class Storage implements Capability.IStorage<IModifierCapability> {
         @Override
-		public INBT writeNBT(Capability<IModifierCapability> capability, IModifierCapability instance, Direction side) {
-			CompoundNBT compound = new CompoundNBT();
+        public NBTBase writeNBT(Capability<IModifierCapability> capability, IModifierCapability instance, EnumFacing side) {
+            NBTTagCompound compound = new NBTTagCompound();
             ModifierSettings modifierSettings = instance.getModifierData();
             if (modifierSettings == null) modifierSettings = new ModifierSettings();
 
             //MIRROR
             Mirror.MirrorSettings m = modifierSettings.getMirrorSettings();
             if (m == null) m = new Mirror.MirrorSettings();
-			compound.putBoolean("mirrorEnabled", m.enabled);
-			compound.putDouble("mirrorPosX", m.position.x);
-			compound.putDouble("mirrorPosY", m.position.y);
-			compound.putDouble("mirrorPosZ", m.position.z);
-			compound.putBoolean("mirrorX", m.mirrorX);
-			compound.putBoolean("mirrorY", m.mirrorY);
-			compound.putBoolean("mirrorZ", m.mirrorZ);
-			compound.putInt("mirrorRadius", m.radius);
-			compound.putBoolean("mirrorDrawLines", m.drawLines);
-			compound.putBoolean("mirrorDrawPlanes", m.drawPlanes);
+            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.setInteger("mirrorRadius", m.radius);
+            compound.setBoolean("mirrorDrawLines", m.drawLines);
+            compound.setBoolean("mirrorDrawPlanes", m.drawPlanes);
 
             //ARRAY
             Array.ArraySettings a = modifierSettings.getArraySettings();
             if (a == null) a = new Array.ArraySettings();
-			compound.putBoolean("arrayEnabled", a.enabled);
-			compound.putInt("arrayOffsetX", a.offset.getX());
-			compound.putInt("arrayOffsetY", a.offset.getY());
-			compound.putInt("arrayOffsetZ", a.offset.getZ());
-			compound.putInt("arrayCount", a.count);
+            compound.setBoolean("arrayEnabled", a.enabled);
+            compound.setInteger("arrayOffsetX", a.offset.getX());
+            compound.setInteger("arrayOffsetY", a.offset.getY());
+            compound.setInteger("arrayOffsetZ", a.offset.getZ());
+            compound.setInteger("arrayCount", a.count);
 
-			compound.putInt("reachUpgrade", modifierSettings.getReachUpgrade());
+            compound.setInteger("reachUpgrade", modifierSettings.getReachUpgrade());
 
-			//compound.putBoolean("quickReplace", buildSettings.doQuickReplace()); dont save quickreplace
+            //compound.setBoolean("quickReplace", buildSettings.doQuickReplace()); dont save quickreplace
 
             //RADIAL MIRROR
             RadialMirror.RadialMirrorSettings r = modifierSettings.getRadialMirrorSettings();
             if (r == null) r = new RadialMirror.RadialMirrorSettings();
-			compound.putBoolean("radialMirrorEnabled", r.enabled);
-			compound.putDouble("radialMirrorPosX", r.position.x);
-			compound.putDouble("radialMirrorPosY", r.position.y);
-			compound.putDouble("radialMirrorPosZ", r.position.z);
-			compound.putInt("radialMirrorSlices", r.slices);
-			compound.putBoolean("radialMirrorAlternate", r.alternate);
-			compound.putInt("radialMirrorRadius", r.radius);
-			compound.putBoolean("radialMirrorDrawLines", r.drawLines);
-			compound.putBoolean("radialMirrorDrawPlanes", r.drawPlanes);
+            compound.setBoolean("radialMirrorEnabled", r.enabled);
+            compound.setDouble("radialMirrorPosX", r.position.x);
+            compound.setDouble("radialMirrorPosY", r.position.y);
+            compound.setDouble("radialMirrorPosZ", r.position.z);
+            compound.setInteger("radialMirrorSlices", r.slices);
+            compound.setBoolean("radialMirrorAlternate", r.alternate);
+            compound.setInteger("radialMirrorRadius", r.radius);
+            compound.setBoolean("radialMirrorDrawLines", r.drawLines);
+            compound.setBoolean("radialMirrorDrawPlanes", r.drawPlanes);
 
             return compound;
         }
 
         @Override
-		public void readNBT(Capability<IModifierCapability> capability, IModifierCapability instance, Direction side, INBT nbt) {
-			CompoundNBT compound = (CompoundNBT) nbt;
+        public void readNBT(Capability<IModifierCapability> capability, IModifierCapability instance, EnumFacing side, NBTBase nbt) {
+            NBTTagCompound compound = (NBTTagCompound) nbt;
 
             //MIRROR
             boolean mirrorEnabled = compound.getBoolean("mirrorEnabled");
-			Vector3d mirrorPosition = new Vector3d(
+            Vec3d mirrorPosition = new Vec3d(
                     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");
+            int mirrorRadius = compound.getInteger("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);
@@ -130,25 +117,25 @@ public class ModifierCapabilityManager {
             //ARRAY
             boolean arrayEnabled = compound.getBoolean("arrayEnabled");
             BlockPos arrayOffset = new BlockPos(
-				compound.getInt("arrayOffsetX"),
-				compound.getInt("arrayOffsetY"),
-				compound.getInt("arrayOffsetZ"));
-			int arrayCount = compound.getInt("arrayCount");
+                    compound.getInteger("arrayOffsetX"),
+                    compound.getInteger("arrayOffsetY"),
+                    compound.getInteger("arrayOffsetZ"));
+            int arrayCount = compound.getInteger("arrayCount");
             Array.ArraySettings arraySettings = new Array.ArraySettings(arrayEnabled, arrayOffset, arrayCount);
 
-			int reachUpgrade = compound.getInt("reachUpgrade");
+            int reachUpgrade = compound.getInteger("reachUpgrade");
 
             //boolean quickReplace = compound.getBoolean("quickReplace"); //dont load quickreplace
 
             //RADIAL MIRROR
             boolean radialMirrorEnabled = compound.getBoolean("radialMirrorEnabled");
-			Vector3d radialMirrorPosition = new Vector3d(
+            Vec3d radialMirrorPosition = new Vec3d(
                     compound.getDouble("radialMirrorPosX"),
                     compound.getDouble("radialMirrorPosY"),
                     compound.getDouble("radialMirrorPosZ"));
-			int radialMirrorSlices = compound.getInt("radialMirrorSlices");
+            int radialMirrorSlices = compound.getInteger("radialMirrorSlices");
             boolean radialMirrorAlternate = compound.getBoolean("radialMirrorAlternate");
-			int radialMirrorRadius = compound.getInt("radialMirrorRadius");
+            int radialMirrorRadius = compound.getInteger("radialMirrorRadius");
             boolean radialMirrorDrawLines = compound.getBoolean("radialMirrorDrawLines");
             boolean radialMirrorDrawPlanes = compound.getBoolean("radialMirrorDrawPlanes");
             RadialMirror.RadialMirrorSettings radialMirrorSettings = new RadialMirror.RadialMirrorSettings(radialMirrorEnabled, radialMirrorPosition,
@@ -159,25 +146,36 @@ public class ModifierCapabilityManager {
         }
     }
 
-	public static class Provider implements ICapabilitySerializable<INBT> {
-
+    public static class Provider implements ICapabilitySerializable<NBTBase> {
         IModifierCapability inst = modifierCapability.getDefaultInstance();
 
-		@Nonnull
         @Override
-		public <T> LazyOptional<T> getCapability(@Nonnull Capability<T> cap, @Nullable Direction side) {
-			return modifierCapability.orEmpty(cap, LazyOptional.of(() -> inst));
+        public boolean hasCapability(@Nonnull Capability<?> capability, @Nullable EnumFacing facing) {
+            return capability == modifierCapability;
         }
 
         @Override
-		public INBT serializeNBT() {
+        public <T> T getCapability(@Nonnull Capability<T> capability, @Nullable EnumFacing facing) {
+            if (capability == modifierCapability) return modifierCapability.<T>cast(inst);
+            return null;
+        }
+
+        @Override
+        public NBTBase serializeNBT() {
             return modifierCapability.getStorage().writeNBT(modifierCapability, inst, null);
         }
 
         @Override
-		public void deserializeNBT(INBT nbt) {
+        public void deserializeNBT(NBTBase nbt) {
             modifierCapability.getStorage().readNBT(modifierCapability, inst, null, nbt);
         }
+    }
 
+    // Allows for the capability to persist after death.
+    @SubscribeEvent
+    public static void clonePlayer(PlayerEvent.Clone event) {
+        IModifierCapability original = event.getOriginal().getCapability(modifierCapability, null);
+        IModifierCapability clone = event.getEntity().getCapability(modifierCapability, null);
+        clone.setModifierData(original.getModifierData());
     }
 }

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

@@ -1,43 +1,46 @@
 package nl.requios.effortlessbuilding.command;
 
-import com.mojang.brigadier.CommandDispatcher;
-import com.mojang.brigadier.arguments.IntegerArgumentType;
-import net.minecraft.command.CommandSource;
-import net.minecraft.command.Commands;
-import net.minecraft.entity.player.ServerPlayerEntity;
-import net.minecraft.util.text.StringTextComponent;
-import net.minecraftforge.fml.network.PacketDistributor;
+import net.minecraft.command.CommandBase;
+import net.minecraft.command.CommandException;
+import net.minecraft.command.ICommandSender;
+import net.minecraft.command.WrongUsageException;
+import net.minecraft.entity.player.EntityPlayerMP;
+import net.minecraft.server.MinecraftServer;
+import net.minecraft.util.text.TextComponentString;
 import nl.requios.effortlessbuilding.EffortlessBuilding;
 import nl.requios.effortlessbuilding.buildmodifier.ModifierSettingsManager;
 import nl.requios.effortlessbuilding.network.ModifierSettingsMessage;
-import nl.requios.effortlessbuilding.network.PacketHandler;
 
-public class CommandReach {
-
-	public static void register(CommandDispatcher<CommandSource> dispatcher) {
-		dispatcher.register(Commands.literal("reach").then(Commands.literal("set").then(Commands.argument("level", IntegerArgumentType.integer(0, 3)).executes((context) -> {
-			return setReachLevel(context.getSource().getPlayerOrException(), IntegerArgumentType.getInteger(context, "level"));
-		}))).then(Commands.literal("get").executes((context -> {
-			return getReachLevel(context.getSource().getPlayerOrException());
-		}))));
+public class CommandReach extends CommandBase {
+    @Override
+    public String getName() {
+        return "reach";
     }
 
-	private static int setReachLevel(ServerPlayerEntity player, int level) {
-		ModifierSettingsManager.ModifierSettings modifierSettings = ModifierSettingsManager.getModifierSettings(player);
-		modifierSettings.setReachUpgrade(level);
-		ModifierSettingsManager.setModifierSettings(player, modifierSettings);
-		//Send to client
-		PacketHandler.INSTANCE.send(PacketDistributor.PLAYER.with(() -> player), new ModifierSettingsMessage(modifierSettings));
-
-		player.sendMessage(new StringTextComponent("Reach level of " + player.getName().getString() + " set to " + modifierSettings.getReachUpgrade()), player.getUUID());
-
-		return 1;
+    @Override
+    public String getUsage(ICommandSender sender) {
+        return "commands.reach.usage";
     }
 
-	private static int getReachLevel(ServerPlayerEntity player) {
+    @Override
+    public void execute(MinecraftServer server, ICommandSender sender, String[] args) throws CommandException {
+        EntityPlayerMP player = (EntityPlayerMP) sender;
+        if (args.length != 1) {
             int reachUpgrade = ModifierSettingsManager.getModifierSettings(player).getReachUpgrade();
             EffortlessBuilding.log(player, "Current reach: level "+reachUpgrade);
+            throw new WrongUsageException("commands.reach.usage");
+        }
 
-		return 1;
+        if (sender instanceof EntityPlayerMP) {
+            //Set reach level to args[0]
+            ModifierSettingsManager.ModifierSettings modifierSettings = ModifierSettingsManager.getModifierSettings(player);
+            modifierSettings.setReachUpgrade(Integer.valueOf(args[0]));
+            ModifierSettingsManager.setModifierSettings(player, modifierSettings);
+            //Send to client
+            EffortlessBuilding.packetHandler.sendTo(new ModifierSettingsMessage(modifierSettings), player);
+
+            sender.sendMessage(new TextComponentString("Reach level of " + sender.getName() + " set to " + modifierSettings
+                    .getReachUpgrade()));
+        }
     }
 }

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

@@ -0,0 +1,13 @@
+package nl.requios.effortlessbuilding.compatibility;
+
+import mod.chiselsandbits.core.ClientSide;
+import mod.chiselsandbits.helpers.ChiselToolType;
+import net.minecraft.util.EnumHand;
+
+public class ActiveChiselsAndBitsProxy implements IChiselsAndBitsProxy {
+    @Override
+    public boolean isHoldingChiselTool(EnumHand hand) {
+        ChiselToolType toolType = ClientSide.instance.getHeldToolType(hand);
+        return toolType != null && toolType.hasMenu();
+    }
+}

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

@@ -1,25 +1,47 @@
 package nl.requios.effortlessbuilding.compatibility;
 
-import net.minecraft.block.BlockState;
-import net.minecraft.item.BlockItem;
+import net.minecraft.block.state.IBlockState;
 import net.minecraft.item.Item;
+import net.minecraft.item.ItemBlock;
 import net.minecraft.item.ItemStack;
+import net.minecraftforge.fml.common.Loader;
+import net.minecraftforge.fml.common.registry.GameRegistry;
+import net.minecraftforge.items.CapabilityItemHandler;
 import net.minecraftforge.items.IItemHandler;
-import nl.requios.effortlessbuilding.item.AbstractRandomizerBagItem;
+import nl.requios.effortlessbuilding.item.ItemRandomizerBag;
 
 public class CompatHelper {
+    // 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 void setup() {
+    public static IChiselsAndBitsProxy chiselsAndBitsProxy;
 
+    public static void postInit() {
+        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();
+        }
     }
 
     // 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 BlockItem)
+        if (item instanceof ItemBlock)
             return true;
-		return item instanceof AbstractRandomizerBagItem;
+        if ((item instanceof ItemRandomizerBag))
+            return true;
+        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
@@ -27,36 +49,64 @@ public class CompatHelper {
     public static ItemStack getItemBlockFromStack(ItemStack proxy) {
         Item proxyItem = proxy.getItem();
 
-		if (proxyItem instanceof BlockItem)
+        if (proxyItem instanceof ItemBlock)
             return proxy;
 
         //Randomizer Bag
-		if (proxyItem instanceof AbstractRandomizerBagItem) {
+        if (proxyItem instanceof ItemRandomizerBag) {
             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));
-				}
+            while (!(itemStack.getItem() instanceof ItemBlock || itemStack.isEmpty())) {
+                if (itemStack.getItem() instanceof ItemRandomizerBag)
+                    itemStack = ItemRandomizerBag.pickRandomStack(ItemRandomizerBag.getBagInventory(itemStack));
             }
             return itemStack;
         }
 
+        //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);
+        }
+
         return ItemStack.EMPTY;
     }
 
-	public static ItemStack getItemBlockByState(ItemStack stack, BlockState state) {
-		if (state == null) return ItemStack.EMPTY;
-
-		Item blockItem = Item.byBlock(state.getBlock());
-		if (stack.getItem() instanceof BlockItem)
+    public static ItemStack getItemBlockByState(ItemStack stack, IBlockState state) {
+        Item blockItem = Item.getItemFromBlock(state.getBlock());
+        if(stack.getItem() instanceof ItemBlock)
             return stack;
-		else if (stack.getItem() instanceof AbstractRandomizerBagItem) {
-			AbstractRandomizerBagItem randomizerBagItem = (AbstractRandomizerBagItem) stack.getItem();
-			IItemHandler bagInventory = randomizerBagItem.getBagInventory(stack);
-			return randomizerBagItem.findStack(bagInventory, blockItem);
+        else if(stack.getItem() instanceof ItemRandomizerBag) {
+            IItemHandler bagInventory = ItemRandomizerBag.getBagInventory(stack);
+            return ItemRandomizerBag.findStack(bagInventory, blockItem);
+        } 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;
     }
+
+    // Handle IItemHandler slot stacks not being modifiable. We must call IItemHandler#extractItem,
+    // because the ItemStack returned by IItemHandler#getStackInSlot isn't modifiable.
+    public static void shrinkStack(ItemStack origStack, ItemStack curStack) {
+        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) {
+        IItemHandler handler = stack.getCapability(CapabilityItemHandler.ITEM_HANDLER_CAPABILITY, null);
+        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/compatibility/DummyChiselsAndBitsProxy.java

@@ -0,0 +1,10 @@
+package nl.requios.effortlessbuilding.compatibility;
+
+import net.minecraft.util.EnumHand;
+
+public class DummyChiselsAndBitsProxy implements IChiselsAndBitsProxy {
+    @Override
+    public boolean isHoldingChiselTool(EnumHand hand) {
+        return false;
+    }
+}

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

@@ -0,0 +1,7 @@
+package nl.requios.effortlessbuilding.compatibility;
+
+import net.minecraft.util.EnumHand;
+
+public interface IChiselsAndBitsProxy {
+    boolean isHoldingChiselTool(EnumHand hand);
+}

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

@@ -1,149 +0,0 @@
-package nl.requios.effortlessbuilding.gui;
-
-import net.minecraft.entity.player.PlayerEntity;
-import net.minecraft.entity.player.PlayerInventory;
-import net.minecraft.inventory.container.ClickType;
-import net.minecraft.inventory.container.Container;
-import net.minecraft.inventory.container.ContainerType;
-import net.minecraft.inventory.container.Slot;
-import net.minecraft.item.ItemStack;
-import net.minecraft.network.PacketBuffer;
-import net.minecraft.util.Hand;
-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 Container {
-
-	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(ContainerType<?> type, int id){
-		super(type, id);
-		bagInventory = null;
-	}
-
-	//Client
-	public DiamondRandomizerBagContainer(int id, PlayerInventory playerInventory, PacketBuffer packetBuffer) {
-		this(id, playerInventory);
-	}
-
-	//Server?
-	public DiamondRandomizerBagContainer(int containerId, PlayerInventory playerInventory) {
-		this(containerId, playerInventory, new ItemStackHandler(DiamondRandomizerBagItem.INV_SIZE));
-	}
-
-	public DiamondRandomizerBagContainer(int containerId, PlayerInventory 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(PlayerEntity 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(PlayerEntity 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
-	 * @return
-	 */
-	@Override
-	public ItemStack clicked(int slot, int dragType, ClickType clickTypeIn, PlayerEntity 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(Hand.MAIN_HAND))) {
-			//Do nothing;
-			return ItemStack.EMPTY;
-		}
-		return super.clicked(slot, dragType, clickTypeIn, player);
-	}
-
-	/**
-	 * Callback for when the crafting gui is closed.
-	 */
-	@Override
-	public void removed(PlayerEntity player) {
-		super.removed(player);
-		if (!player.level.isClientSide) {
-			broadcastChanges();
-		}
-	}
-}

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

@@ -1,47 +0,0 @@
-package nl.requios.effortlessbuilding.gui;
-
-import com.mojang.blaze3d.matrix.MatrixStack;
-import com.mojang.blaze3d.systems.RenderSystem;
-import net.minecraft.client.gui.screen.inventory.ContainerScreen;
-import net.minecraft.entity.player.PlayerInventory;
-import net.minecraft.util.ResourceLocation;
-import net.minecraft.util.text.ITextComponent;
-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 ContainerScreen<DiamondRandomizerBagContainer> {
-	private static final ResourceLocation guiTextures =
-			new ResourceLocation(EffortlessBuilding.MODID, "textures/gui/container/diamondrandomizerbag.png");
-
-	public DiamondRandomizerBagScreen(DiamondRandomizerBagContainer randomizerBagContainer, PlayerInventory playerInventory, ITextComponent title) {
-		super(randomizerBagContainer, playerInventory, title);
-		imageHeight = 167;
-	}
-
-	@Override
-	public void render(MatrixStack ms, int mouseX, int mouseY, float partialTicks) {
-		renderBackground(ms);
-		super.render(ms, mouseX, mouseY, partialTicks);
-		this.renderTooltip(ms, mouseX, mouseY);
-	}
-
-	@Override
-	protected void renderLabels(MatrixStack ms, int mouseX, int mouseY) {
-		font.draw(ms, this.title, 8, 6, 0x404040);
-		font.draw(ms, inventory.getDisplayName(), 8, imageHeight - 96 + 2, 0x404040);
-	}
-
-	@Override
-	protected void renderBg(MatrixStack ms, float partialTicks, int mouseX, int mouseY) {
-		RenderSystem.color3f(1.0F, 1.0F, 1.0F);
-		minecraft.getTextureManager().bind(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,147 +0,0 @@
-package nl.requios.effortlessbuilding.gui;
-
-import net.minecraft.entity.player.PlayerEntity;
-import net.minecraft.entity.player.PlayerInventory;
-import net.minecraft.inventory.container.ClickType;
-import net.minecraft.inventory.container.Container;
-import net.minecraft.inventory.container.ContainerType;
-import net.minecraft.inventory.container.Slot;
-import net.minecraft.item.ItemStack;
-import net.minecraft.network.PacketBuffer;
-import net.minecraft.util.Hand;
-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 Container {
-
-	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(ContainerType<?> type, int id){
-		super(type, id);
-		bagInventory = null;
-	}
-
-	//Client
-	public GoldenRandomizerBagContainer(int id, PlayerInventory playerInventory, PacketBuffer packetBuffer) {
-		this(id, playerInventory);
-	}
-
-	//Server?
-	public GoldenRandomizerBagContainer(int containerId, PlayerInventory playerInventory) {
-		this(containerId, playerInventory, new ItemStackHandler(GoldenRandomizerBagItem.INV_SIZE));
-	}
-
-	public GoldenRandomizerBagContainer(int containerId, PlayerInventory 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(PlayerEntity 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(PlayerEntity 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
-	 * @return
-	 */
-	@Override
-	public ItemStack clicked(int slot, int dragType, ClickType clickTypeIn, PlayerEntity 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(Hand.MAIN_HAND))) {
-			//Do nothing;
-			return ItemStack.EMPTY;
-		}
-		return super.clicked(slot, dragType, clickTypeIn, player);
-	}
-
-	/**
-	 * Callback for when the crafting gui is closed.
-	 */
-	@Override
-	public void removed(PlayerEntity player) {
-		super.removed(player);
-		if (!player.level.isClientSide) {
-			broadcastChanges();
-		}
-	}
-}

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

@@ -1,47 +0,0 @@
-package nl.requios.effortlessbuilding.gui;
-
-import com.mojang.blaze3d.matrix.MatrixStack;
-import com.mojang.blaze3d.systems.RenderSystem;
-import net.minecraft.client.gui.screen.inventory.ContainerScreen;
-import net.minecraft.entity.player.PlayerInventory;
-import net.minecraft.util.ResourceLocation;
-import net.minecraft.util.text.ITextComponent;
-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 ContainerScreen<GoldenRandomizerBagContainer> {
-	private static final ResourceLocation guiTextures =
-			new ResourceLocation(EffortlessBuilding.MODID, "textures/gui/container/goldenrandomizerbag.png");
-
-	public GoldenRandomizerBagScreen(GoldenRandomizerBagContainer randomizerBagContainer, PlayerInventory playerInventory, ITextComponent title) {
-		super(randomizerBagContainer, playerInventory, title);
-		imageHeight = 134;
-	}
-
-	@Override
-	public void render(MatrixStack ms, int mouseX, int mouseY, float partialTicks) {
-		renderBackground(ms);
-		super.render(ms, mouseX, mouseY, partialTicks);
-		this.renderTooltip(ms, mouseX, mouseY);
-	}
-
-	@Override
-	protected void renderLabels(MatrixStack ms, int mouseX, int mouseY) {
-		font.draw(ms, this.title, 8, 6, 0x404040);
-		font.draw(ms, inventory.getDisplayName(), 8, imageHeight - 96 + 2, 0x404040);
-	}
-
-	@Override
-	protected void renderBg(MatrixStack ms, float partialTicks, int mouseX, int mouseY) {
-		RenderSystem.color3f(1.0F, 1.0F, 1.0F);
-		minecraft.getTextureManager().bind(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,93 +1,75 @@
 package nl.requios.effortlessbuilding.gui;
 
-import net.minecraft.entity.player.PlayerEntity;
-import net.minecraft.entity.player.PlayerInventory;
-import net.minecraft.inventory.container.ClickType;
-import net.minecraft.inventory.container.Container;
-import net.minecraft.inventory.container.ContainerType;
-import net.minecraft.inventory.container.Slot;
+import net.minecraft.entity.player.EntityPlayer;
+import net.minecraft.entity.player.InventoryPlayer;
+import net.minecraft.inventory.ClickType;
+import net.minecraft.inventory.Container;
+import net.minecraft.inventory.Slot;
 import net.minecraft.item.ItemStack;
-import net.minecraft.network.PacketBuffer;
-import net.minecraft.util.Hand;
+import net.minecraft.util.EnumHand;
 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.RandomizerBagItem;
+import nl.requios.effortlessbuilding.item.ItemRandomizerBag;
 
 public class RandomizerBagContainer extends Container {
 
-	private static final int INV_START = RandomizerBagItem.INV_SIZE,
-			INV_END = INV_START + 26,
-			HOTBAR_START = INV_END + 1,
-			HOTBAR_END = HOTBAR_START + 8;
     private final IItemHandler bagInventory;
+    private final int sizeInventory;
 
-	public RandomizerBagContainer(ContainerType<?> type, int id){
-		super(type, id);
-		bagInventory = null;
-	}
+    private static final int INV_START = ItemRandomizerBag.INV_SIZE, INV_END = INV_START + 26,
+            HOTBAR_START = INV_END + 1, HOTBAR_END = HOTBAR_START + 8;
 
-	//Client
-	public RandomizerBagContainer(int id, PlayerInventory playerInventory, PacketBuffer packetBuffer) {
-		this(id, playerInventory);
-	}
-
-	//Server?
-	public RandomizerBagContainer(int containerId, PlayerInventory playerInventory) {
-		this(containerId, playerInventory, new ItemStackHandler(RandomizerBagItem.INV_SIZE));
-	}
-
-	public RandomizerBagContainer(int containerId, PlayerInventory playerInventory, IItemHandler inventory) {
-		super(EffortlessBuilding.RANDOMIZER_BAG_CONTAINER.get(), containerId);
-		bagInventory = inventory;
-
-		for (int i = 0; i < RandomizerBagItem.INV_SIZE; ++i) {
-			this.addSlot(new SlotItemHandler(bagInventory, i, 44 + (18 * i), 20));
+    public RandomizerBagContainer(InventoryPlayer parInventoryPlayer, IItemHandler parIInventory) {
+        bagInventory = parIInventory;
+        sizeInventory = bagInventory.getSlots();
+        for (int i = 0; i < sizeInventory; ++i) {
+            this.addSlotToContainer(new SlotItemHandler(bagInventory, i, 44 + (18 * i), 20));
         }
 
         // add player inventory slots
-		for (int i = 0; i < 3; ++i) {
+        int i;
+        for (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));
+                addSlotToContainer(new Slot(parInventoryPlayer, 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));
+        for (i = 0; i < 9; ++i) {
+            addSlotToContainer(new Slot(parInventoryPlayer, i, 8 + i * 18, 109));
         }
     }
 
     @Override
-	public boolean stillValid(PlayerEntity playerIn) {
+    public boolean canInteractWith(EntityPlayer playerIn) {
         return true;
     }
 
     @Override
-	public Slot getSlot(int parSlotIndex) {
-		if (parSlotIndex >= slots.size())
-			parSlotIndex = slots.size() - 1;
+    public Slot getSlot(int parSlotIndex)
+    {
+        if(parSlotIndex >= inventorySlots.size())
+            parSlotIndex = inventorySlots.size() - 1;
         return super.getSlot(parSlotIndex);
     }
 
     @Override
-	public ItemStack quickMoveStack(PlayerEntity playerIn, int slotIndex) {
+    public ItemStack transferStackInSlot(EntityPlayer playerIn, int slotIndex) {
         ItemStack itemstack = ItemStack.EMPTY;
-		Slot slot = this.slots.get(slotIndex);
+        Slot slot = this.inventorySlots.get(slotIndex);
 
-		if (slot != null && slot.hasItem()) {
-			ItemStack itemstack1 = slot.getItem();
+        if (slot != null && slot.getHasStack()) {
+            ItemStack itemstack1 = slot.getStack();
             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)) {
+                if (!this.mergeItemStack(itemstack1, INV_START, HOTBAR_END + 1, true)) {
                     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
             else {
@@ -96,16 +78,17 @@ public class RandomizerBagContainer extends Container {
                  */
                 if (slotIndex >= INV_START) {
                     // place in custom inventory
-					if (!this.moveItemStackTo(itemstack1, 0, INV_START, false)) {
+                    if (!this.mergeItemStack(itemstack1, 0, INV_START, false)) {
                         return ItemStack.EMPTY;
                     }
                 }
+
             }
 
             if (itemstack1.getCount() == 0) {
-				slot.set(ItemStack.EMPTY);
+                slot.putStack(ItemStack.EMPTY);
             } else {
-				slot.setChanged();
+                slot.onSlotChanged();
             }
 
             if (itemstack1.getCount() == itemstack.getCount()) {
@@ -122,26 +105,29 @@ public class RandomizerBagContainer extends Container {
      * 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
-	 * @return
      */
     @Override
-	public ItemStack clicked(int slot, int dragType, ClickType clickTypeIn, PlayerEntity player) {
+    public ItemStack slotClick(int slot, int dragType, ClickType clickTypeIn, EntityPlayer 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(Hand.MAIN_HAND))) {
-			//Do nothing;
+        if (slot >= 0 && getSlot(slot) != null && getSlot(slot).getStack().equals(player.getHeldItem(EnumHand.MAIN_HAND))) {
             return ItemStack.EMPTY;
         }
-		return super.clicked(slot, dragType, clickTypeIn, player);
+        return super.slotClick(slot, dragType, clickTypeIn, player);
     }
 
     /**
      * Callback for when the crafting gui is closed.
      */
-	@Override
-	public void removed(PlayerEntity player) {
-		super.removed(player);
-		if (!player.level.isClientSide) {
-			broadcastChanges();
-		}
-	}
+//    @Override
+//    public void onContainerClosed(EntityPlayer player)
+//    {
+//        if(player.inventory.getItemStack() != null)
+//        {
+//            player.entityDropItem(player.inventory.getItemStack(), 0.5f);
+//        }
+//        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.fml.relauncher.Side;
+import net.minecraftforge.fml.relauncher.SideOnly;
+import net.minecraftforge.items.IItemHandler;
+import nl.requios.effortlessbuilding.EffortlessBuilding;
+
+@SideOnly(Side.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 drawScreen(int mouseX, int mouseY, float partialTicks) {
+        drawDefaultBackground();
+        super.drawScreen(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().getUnformattedText(), 8, ySize - 96 + 2, 0x404040);
+    }
+
+    @Override
+    protected void drawGuiContainerBackgroundLayer(float partialTicks, int mouseX, int mouseY) {
+        GlStateManager.color(1.0F, 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,41 @@
+package nl.requios.effortlessbuilding.gui;
+
+import net.minecraft.entity.player.EntityPlayer;
+import net.minecraft.world.World;
+import net.minecraftforge.fml.common.network.IGuiHandler;
+import net.minecraftforge.fml.relauncher.Side;
+import net.minecraftforge.fml.relauncher.SideOnly;
+import net.minecraftforge.items.CapabilityItemHandler;
+import net.minecraftforge.items.IItemHandler;
+import nl.requios.effortlessbuilding.EffortlessBuilding;
+
+import javax.annotation.Nullable;
+
+public class RandomizerBagGuiHandler implements IGuiHandler {
+    @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
+            IItemHandler capability = player.getHeldItemMainhand().hasCapability(CapabilityItemHandler.ITEM_HANDLER_CAPABILITY, null) ?
+                    player.getHeldItemMainhand().getCapability(CapabilityItemHandler.ITEM_HANDLER_CAPABILITY, null) :
+                    player.getHeldItemOffhand().getCapability(CapabilityItemHandler.ITEM_HANDLER_CAPABILITY, null);
+            return new RandomizerBagContainer(player.inventory, capability);
+        }
+        return null;
+    }
+
+    @Nullable
+    @Override
+    @SideOnly(Side.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
+            IItemHandler capability = player.getHeldItemMainhand().hasCapability(CapabilityItemHandler.ITEM_HANDLER_CAPABILITY, null) ?
+                    player.getHeldItemMainhand().getCapability(CapabilityItemHandler.ITEM_HANDLER_CAPABILITY, null) :
+                    player.getHeldItemOffhand().getCapability(CapabilityItemHandler.ITEM_HANDLER_CAPABILITY, null);
+            return new RandomizerBagGuiContainer(player.inventory, capability);
+        }
+        return null;
+    }
+}

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

@@ -1,47 +0,0 @@
-package nl.requios.effortlessbuilding.gui;
-
-import com.mojang.blaze3d.matrix.MatrixStack;
-import com.mojang.blaze3d.systems.RenderSystem;
-import net.minecraft.client.gui.screen.inventory.ContainerScreen;
-import net.minecraft.entity.player.PlayerInventory;
-import net.minecraft.util.ResourceLocation;
-import net.minecraft.util.text.ITextComponent;
-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 ContainerScreen<RandomizerBagContainer> {
-	private static final ResourceLocation guiTextures =
-		new ResourceLocation(EffortlessBuilding.MODID, "textures/gui/container/randomizerbag.png");
-
-	public RandomizerBagScreen(RandomizerBagContainer randomizerBagContainer, PlayerInventory playerInventory, ITextComponent title) {
-		super(randomizerBagContainer, playerInventory, title);//new TranslationTextComponent("effortlessbuilding.screen.randomizer_bag"));
-		imageHeight = 134;
-	}
-
-	@Override
-	public void render(MatrixStack ms, int mouseX, int mouseY, float partialTicks) {
-		renderBackground(ms);
-		super.render(ms, mouseX, mouseY, partialTicks);
-		this.renderTooltip(ms, mouseX, mouseY);
-	}
-
-	@Override
-	protected void renderLabels(MatrixStack ms, int mouseX, int mouseY) {
-		font.draw(ms, this.title, 8, 6, 0x404040);
-		font.draw(ms, inventory.getDisplayName(), 8, imageHeight - 96 + 2, 0x404040);
-	}
-
-	@Override
-	protected void renderBg(MatrixStack ms, float partialTicks, int mouseX, int mouseY) {
-		RenderSystem.color3f(1.0F, 1.0F, 1.0F);
-		minecraft.getTextureManager().bind(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,311 +0,0 @@
-package nl.requios.effortlessbuilding.gui.buildmode;
-
-import com.mojang.blaze3d.matrix.MatrixStack;
-import com.mojang.blaze3d.platform.GlStateManager;
-import com.mojang.blaze3d.systems.RenderSystem;
-import mcp.MethodsReturnNonnullByDefault;
-import net.minecraft.client.Minecraft;
-import net.minecraft.client.audio.SimpleSound;
-import net.minecraft.client.gui.screen.Screen;
-import net.minecraft.client.gui.widget.button.Button;
-import net.minecraft.client.gui.widget.list.ExtendedList;
-import net.minecraft.client.renderer.BufferBuilder;
-import net.minecraft.client.renderer.Tessellator;
-import net.minecraft.client.renderer.vertex.DefaultVertexFormats;
-import net.minecraft.util.SoundEvents;
-import net.minecraft.util.math.MathHelper;
-import net.minecraft.util.text.ITextComponent;
-import net.minecraft.util.text.StringTextComponent;
-import net.minecraft.util.text.TranslationTextComponent;
-import net.minecraftforge.api.distmarker.Dist;
-import net.minecraftforge.api.distmarker.OnlyIn;
-import net.minecraftforge.fml.client.gui.widget.ExtendedButton;
-import net.minecraftforge.fml.client.gui.widget.Slider;
-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(new TranslationTextComponent("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);
-		this.children.add(shaderTypeList);
-		//TODO set selected name
-		ITextComponent currentShaderName = ShaderType.DISSOLVE_BLUE.name;
-		shaderTypeButton = new ExtendedButton(right - 180, yy, 180, 20, currentShaderName, (button) -> {
-			showShaderList = !showShaderList;
-		});
-		addButton(shaderTypeButton);
-
-		yy += 50;
-		Slider slider = new Slider(right - 200, yy, 200, 20, StringTextComponent.EMPTY, StringTextComponent.EMPTY, 0.5, 2.0, 1.0, true, true, (button) -> {
-
-		});
-		addButton(slider);
-
-		closeButton = new ExtendedButton(left + 50, bottom - 20, 180, 20, new StringTextComponent("Done"), (button) -> this.minecraft.player.closeContainer());
-		addButton(closeButton);
-	}
-
-	@Override
-	public void tick() {
-		super.tick();
-	}
-
-	@Override
-	public void render(MatrixStack 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 ITextComponent name;
-
-		ShaderType(ITextComponent name) {
-			this.name = name;
-		}
-
-		ShaderType(String name) {
-			this.name = new StringTextComponent(name);
-		}
-	}
-
-	//Inspired by LanguageScreen
-	@OnlyIn(Dist.CLIENT)
-	class ShaderTypeList extends ExtendedList<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(SimpleSound.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 AbstractList, disabled parts
-		@Override
-		public void render(MatrixStack ms, int p_render_1_, int p_render_2_, float p_render_3_) {
-			this.renderBackground(ms);
-			int i = this.getScrollbarPosition();
-			int j = i + 6;
-			Tessellator tessellator = Tessellator.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.color4f(1.0F, 1.0F, 1.0F, 1.0F);
-			float f = 32.0F;
-			bufferbuilder.begin(7, DefaultVertexFormats.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, k, l, 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.disableAlphaTest();
-			RenderSystem.shadeModel(7425);
-			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 = MathHelper.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(7, DefaultVertexFormats.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(7, DefaultVertexFormats.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(7, DefaultVertexFormats.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.shadeModel(7424);
-			RenderSystem.enableAlphaTest();
-			RenderSystem.disableBlend();
-		}
-
-		public int getMaxScroll() {
-			return Math.max(0, this.getMaxPosition() - (this.y1 - this.y0 - 4));
-		}
-
-		@OnlyIn(Dist.CLIENT)
-		public class ShaderTypeEntry extends ExtendedList.AbstractListEntry<ShaderTypeEntry> {
-			private final ShaderType shaderType;
-
-			public ShaderTypeEntry(ShaderType shaderType) {
-				this.shaderType = shaderType;
-			}
-
-			@Override
-			public void render(MatrixStack 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;
-				}
-			}
-		}
-	}
-}

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

@@ -1,543 +1,89 @@
 package nl.requios.effortlessbuilding.gui.buildmode;
 
-import com.mojang.blaze3d.matrix.MatrixStack;
-import com.mojang.blaze3d.systems.RenderSystem;
-import mcp.MethodsReturnNonnullByDefault;
-import net.minecraft.client.Minecraft;
-import net.minecraft.client.audio.SimpleSound;
-import net.minecraft.client.gui.screen.Screen;
-import net.minecraft.client.renderer.BufferBuilder;
-import net.minecraft.client.renderer.Tessellator;
-import net.minecraft.client.renderer.texture.AtlasTexture;
-import net.minecraft.client.renderer.texture.TextureAtlasSprite;
-import net.minecraft.client.renderer.vertex.DefaultVertexFormats;
+import java.util.ArrayList;
+import java.util.concurrent.TimeUnit;
+
 import net.minecraft.client.resources.I18n;
 import net.minecraft.client.settings.KeyBinding;
-import net.minecraft.entity.player.PlayerEntity;
-import net.minecraft.util.Direction;
-import net.minecraft.util.SoundCategory;
-import net.minecraft.util.SoundEvents;
-import net.minecraft.util.math.vector.Vector4f;
 import net.minecraft.util.text.TextFormatting;
-import net.minecraft.util.text.TranslationTextComponent;
 import nl.requios.effortlessbuilding.EffortlessBuilding;
-import nl.requios.effortlessbuilding.ModClientEventHandler;
 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 java.util.ArrayList;
+import com.google.common.base.Stopwatch;
 
-import static nl.requios.effortlessbuilding.buildmode.ModeOptions.*;
+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 nl.requios.effortlessbuilding.buildmode.BuildModes.BuildModeEnum;
-import nl.requios.effortlessbuilding.buildmode.ModeOptions.ActionEnum;
-import nl.requios.effortlessbuilding.buildmode.ModeOptions.OptionEnum;
+import static nl.requios.effortlessbuilding.buildmode.BuildModes.*;
 
 /**
- * Initially from Chisels and Bits by AlgorithmX2
- * <a href="https://github.com/AlgorithmX2/Chisels-and-Bits/blob/1.12/src/main/java/mod/chiselsandbits/client/gui/ChiselsAndBitsMenu.java">Link</a>
+ * 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
-@MethodsReturnNonnullByDefault
-public class RadialMenu extends Screen {
-
+    private final float TIME_SCALE = 0.01f;
     public static final RadialMenu instance = new RadialMenu();
 
-	private final Vector4f radialButtonColor = new Vector4f(0f, 0f, 0f, .5f);
-	private final Vector4f sideButtonColor = new Vector4f(.5f, .5f, .5f, .5f);
-	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;
-	private final int watermarkTextColor = 0x88888888;
-	private final int descriptionTextColor = 0xdd888888;
-	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;
-
+    private float visibility = 0.0f;
+    private Stopwatch lastChange = Stopwatch.createStarted();
     public BuildModeEnum switchTo = null;
-	public ActionEnum doAction = null;
-	public boolean performedActionUsingMouse;
+    public ModeOptions.ActionEnum doAction = null;
+    public boolean actionUsed = false;
 
-	private float visibility;
+    private float clampVis(final float f) {
+        return Math.max( 0.0f, Math.min( 1.0f, f ) );
+    }
 
-	public RadialMenu() {
-		super(new TranslationTextComponent("effortlessbuilding.screen.radial_menu"));
+    public void raiseVisibility() {
+        visibility = clampVis( visibility + lastChange.elapsed( TimeUnit.MILLISECONDS ) * TIME_SCALE );
+        lastChange = Stopwatch.createStarted();
+    }
+
+    public void decreaseVisibility() {
+        visibility = clampVis( visibility - lastChange.elapsed( TimeUnit.MILLISECONDS ) * TIME_SCALE );
+        lastChange = Stopwatch.createStarted();
+    }
+
+    public void setVisibility(float visibility) {
+        this.visibility = visibility;
     }
 
     public boolean isVisible() {
-		return Minecraft.getInstance().screen instanceof RadialMenu;
+        return visibility > 0.001;
     }
 
-	@Override
-	protected void init() {
-		super.init();
-		performedActionUsingMouse = false;
-		visibility = 0f;
-	}
-
-	@Override
-	public void tick() {
-		super.tick();
-
-		if (!ClientProxy.isKeybindDown(2)) {
-			onClose();
-		}
-	}
-
-	@Override
-	public void render(MatrixStack ms, final int mouseX, final int mouseY, final float partialTicks) {
-		BuildModeEnum currentBuildMode = ModeSettingsManager.getModeSettings(minecraft.player).getBuildMode();
-
-		RenderSystem.pushMatrix();
-		RenderSystem.translatef(0.0F, 0.0F, 200.0F);
-
-		visibility += fadeSpeed * partialTicks;
-		if (visibility > 1f) visibility = 1f;
-
-		final int startColor = (int) (visibility * 98) << 24;
-		final int endColor = (int) (visibility * 128) << 24;
-
-		fillGradient(ms, 0, 0, width, height, startColor, endColor);
-
-		RenderSystem.disableTexture();
-		RenderSystem.enableBlend();
-		RenderSystem.disableAlphaTest();
-		RenderSystem.blendFuncSeparate(GL11.GL_SRC_ALPHA, GL11.GL_ONE_MINUS_SRC_ALPHA, 1, 0);
-		RenderSystem.shadeModel(GL11.GL_SMOOTH);
-		final Tessellator tessellator = Tessellator.getInstance();
-		final BufferBuilder buffer = tessellator.getBuilder();
-
-		buffer.begin(GL11.GL_QUADS, DefaultVertexFormats.POSITION_COLOR);
-
-		final double middleX = width / 2.0;
-		final double middleY = height / 2.0;
-
-		//Fix for high def (retina) displays: use custom mouse coordinates
-		//Borrowed from GameRenderer::updateCameraAndRender
-		Minecraft mc = Minecraft.getInstance();
-		int mouseXX = (int) (mc.mouseHandler.xpos() * (double) mc.getWindow().getGuiScaledWidth() / (double) mc.getWindow().getScreenWidth());
-		int mouseYY = (int) (mc.mouseHandler.ypos() * (double) mc.getWindow().getGuiScaledHeight() / (double) mc.getWindow().getScreenHeight());
-
-		final double mouseXCenter = mouseXX - middleX;
-		final double mouseYCenter = mouseYY - middleY;
-		double mouseRadians = Math.atan2(mouseYCenter, mouseXCenter);
-
-		final double quarterCircle = Math.PI / 2.0;
-
-		if (mouseRadians < -quarterCircle) {
-			mouseRadians = mouseRadians + Math.PI * 2;
-		}
-
-		final ArrayList<MenuRegion> modes = new ArrayList<MenuRegion>();
-		final ArrayList<MenuButton> buttons = new ArrayList<MenuButton>();
-
-		//Add build modes
-		for (final BuildModeEnum mode : BuildModeEnum.values()) {
-			modes.add(new MenuRegion(mode));
-		}
-
-		//Add actions
-		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));
-//		buttons.add(new MenuButton(ActionEnum.OPEN_PLAYER_SETTINGS.name, ActionEnum.OPEN_PLAYER_SETTINGS, -buttonDistance - 26 - 13, 13, Direction.DOWN));
-		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));
-
-		//Add buildmode dependent options
-		OptionEnum[] options = currentBuildMode.options;
-		for (int i = 0; i < options.length; i++) {
-			for (int j = 0; j < options[i].actions.length; j++) {
-				ActionEnum action = options[i].actions[j];
-				buttons.add(new MenuButton(action.name, action, buttonDistance + j * 26, -13 + i * 39, Direction.DOWN));
-			}
-		}
-
-		switchTo = null;
-		doAction = null;
-
-		//Draw buildmode backgrounds
-		drawRadialButtonBackgrounds(currentBuildMode, buffer, middleX, middleY, mouseXCenter, mouseYCenter, mouseRadians,
-				quarterCircle, modes);
-
-		//Draw action backgrounds
-		drawSideButtonBackgrounds(buffer, middleX, middleY, mouseXCenter, mouseYCenter, buttons);
-
-		tessellator.end();
-
-		drawIcons(buffer, middleX, middleY, mc, modes, buttons);
-
-		tessellator.end();
-
-		drawTexts(ms, currentBuildMode, middleX, middleY, modes, buttons, options);
-
-		RenderSystem.popMatrix();
-	}
-
-	private void drawRadialButtonBackgrounds(BuildModeEnum currentBuildMode, BufferBuilder buffer, double middleX, double middleY,
-											 double mouseXCenter, double mouseYCenter, double mouseRadians, double quarterCircle, ArrayList<MenuRegion> modes) {
-		if (!modes.isEmpty()) {
-			final int totalModes = Math.max(3, modes.size());
-			final double fragment = Math.PI * 0.005;
-			final double fragment2 = Math.PI * 0.0025;
-			final double perObject = 2.0 * Math.PI / totalModes;
-
-			for (int i = 0; i < modes.size(); i++) {
-				MenuRegion menuRegion = modes.get(i);
-				final double beginRadians = i * perObject - quarterCircle;
-				final double endRadians = (i + 1) * perObject - quarterCircle;
-
-				menuRegion.x1 = Math.cos(beginRadians);
-				menuRegion.x2 = Math.cos(endRadians);
-				menuRegion.y1 = Math.sin(beginRadians);
-				menuRegion.y2 = Math.sin(endRadians);
-
-				final double x1m1 = Math.cos(beginRadians + fragment) * ringInnerEdge;
-				final double x2m1 = Math.cos(endRadians - fragment) * ringInnerEdge;
-				final double y1m1 = Math.sin(beginRadians + fragment) * ringInnerEdge;
-				final double y2m1 = Math.sin(endRadians - fragment) * ringInnerEdge;
-
-				final double x1m2 = Math.cos(beginRadians + fragment2) * ringOuterEdge;
-				final double x2m2 = Math.cos(endRadians - fragment2) * ringOuterEdge;
-				final double y1m2 = Math.sin(beginRadians + fragment2) * ringOuterEdge;
-				final double y2m2 = Math.sin(endRadians - fragment2) * ringOuterEdge;
-
-				final boolean isSelected = currentBuildMode.ordinal() == i;
-				final boolean isMouseInQuad = inTriangle(x1m1, y1m1, x2m2, y2m2, x2m1, y2m1, mouseXCenter, mouseYCenter)
-											  || inTriangle(x1m1, y1m1, x1m2, y1m2, x2m2, y2m2, mouseXCenter, mouseYCenter);
-				final boolean isHighlighted = beginRadians <= mouseRadians && mouseRadians <= endRadians && isMouseInQuad;
-
-				Vector4f color = radialButtonColor;
-				if (isSelected) color = selectedColor;
-				if (isHighlighted) color = highlightColor;
-				if (isSelected && isHighlighted) color = highlightSelectedColor;
-
-				if (isHighlighted) {
-					menuRegion.highlighted = true;
-					switchTo = menuRegion.mode;
-				}
-
-				buffer.vertex(middleX + x1m1, middleY + y1m1, getBlitOffset()).color(color.x(), color.y(), color.z(), color.w()).endVertex();
-				buffer.vertex(middleX + x2m1, middleY + y2m1, getBlitOffset()).color(color.x(), color.y(), color.z(), color.w()).endVertex();
-				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();
-
-				//Category line
-				color = menuRegion.mode.category.color;
-				final double categoryLineOuterEdge = ringInnerEdge + categoryLineWidth;
-
-				final double x1m3 = Math.cos(beginRadians + fragment) * categoryLineOuterEdge;
-				final double y1m3 = Math.sin(beginRadians + fragment) * categoryLineOuterEdge;
-				final double x2m3 = Math.cos(endRadians - fragment) * categoryLineOuterEdge;
-				final double y2m3 = Math.sin(endRadians - fragment) * categoryLineOuterEdge;
-
-				buffer.vertex(middleX + x1m1, middleY + y1m1, getBlitOffset()).color(color.x(), color.y(), color.z(), color.w()).endVertex();
-				buffer.vertex(middleX + x2m1, middleY + y2m1, getBlitOffset()).color(color.x(), color.y(), color.z(), color.w()).endVertex();
-				buffer.vertex(middleX + x2m3, middleY + y2m3, getBlitOffset()).color(color.x(), color.y(), color.z(), color.w()).endVertex();
-				buffer.vertex(middleX + x1m3, middleY + y1m3, getBlitOffset()).color(color.x(), color.y(), color.z(), color.w()).endVertex();
-			}
-		}
-	}
-
-	private void drawSideButtonBackgrounds(BufferBuilder buffer, double middleX, double middleY, double mouseXCenter, double mouseYCenter, ArrayList<MenuButton> buttons) {
-		for (final MenuButton btn : buttons) {
-
-			final boolean isSelected =
-					btn.action == getBuildSpeed() ||
-					btn.action == getFill() ||
-					btn.action == getCubeFill() ||
-					btn.action == getRaisedEdge() ||
-					btn.action == getLineThickness() ||
-					btn.action == getCircleStart();
-
-			final boolean isHighlighted = btn.x1 <= mouseXCenter && btn.x2 >= mouseXCenter && btn.y1 <= mouseYCenter && btn.y2 >= mouseYCenter;
-
-			Vector4f color = sideButtonColor;
-			if (isSelected) color = selectedColor;
-			if (isHighlighted) color = highlightColor;
-			if (isSelected && isHighlighted) color = highlightSelectedColor;
-
-			if (isHighlighted) {
-				btn.highlighted = true;
-				doAction = btn.action;
-			}
-
-			buffer.vertex(middleX + btn.x1, middleY + btn.y1, getBlitOffset()).color(color.x(), color.y(), color.z(), color.w()).endVertex();
-			buffer.vertex(middleX + btn.x1, middleY + btn.y2, getBlitOffset()).color(color.x(), color.y(), color.z(), color.w()).endVertex();
-			buffer.vertex(middleX + btn.x2, middleY + btn.y2, getBlitOffset()).color(color.x(), color.y(), color.z(), color.w()).endVertex();
-			buffer.vertex(middleX + btn.x2, middleY + btn.y1, getBlitOffset()).color(color.x(), color.y(), color.z(), color.w()).endVertex();
-		}
-	}
-
-	private void drawIcons(BufferBuilder buffer, double middleX, double middleY, Minecraft mc, ArrayList<MenuRegion> modes, ArrayList<MenuButton> buttons) {
-		RenderSystem.shadeModel(GL11.GL_FLAT);
-
-		RenderSystem.translatef(0f, 0f, 5f);
-		RenderSystem.enableTexture();
-		RenderSystem.color3f(1f, 1f, 1f);
-		RenderSystem.disableBlend();
-		RenderSystem.enableAlphaTest();
-		mc.getTextureManager().bind(AtlasTexture.LOCATION_BLOCKS);
-
-		buffer.begin(GL11.GL_QUADS, DefaultVertexFormats.POSITION_TEX_COLOR);
-
-		//Draw buildmode icons
-		for (final MenuRegion menuRegion : modes) {
-
-			final double x = (menuRegion.x1 + menuRegion.x2) * 0.5 * (ringOuterEdge * 0.55 + 0.45 * ringInnerEdge);
-			final double y = (menuRegion.y1 + menuRegion.y2) * 0.5 * (ringOuterEdge * 0.55 + 0.45 * ringInnerEdge);
-
-			final TextureAtlasSprite sprite = ModClientEventHandler.getBuildModeIcon(menuRegion.mode);
-
-			final double x1 = x - 8;
-			final double x2 = x + 8;
-			final double y1 = y - 8;
-			final double y2 = y + 8;
-
-			final float f = 1f;
-			final float a = 1f;
-
-			final double u1 = 0;
-			final double u2 = 16;
-			final double v1 = 0;
-			final double v2 = 16;
-
-			buffer.vertex(middleX + x1, middleY + y1, getBlitOffset()).uv(sprite.getU(u1), sprite.getV(v1)).color(f, f, f, a).endVertex();
-			buffer.vertex(middleX + x1, middleY + y2, getBlitOffset()).uv(sprite.getU(u1), sprite.getV(v2)).color(f, f, f, a).endVertex();
-			buffer.vertex(middleX + x2, middleY + y2, getBlitOffset()).uv(sprite.getU(u2), sprite.getV(v2)).color(f, f, f, a).endVertex();
-			buffer.vertex(middleX + x2, middleY + y1, getBlitOffset()).uv(sprite.getU(u2), sprite.getV(v1)).color(f, f, f, a).endVertex();
-		}
-
-		//Draw action icons
-		for (final MenuButton button : buttons) {
-
-			final float f = 1f;
-			final float a = 1f;
-
-			final double u1 = 0;
-			final double u2 = 16;
-			final double v1 = 0;
-			final double v2 = 16;
-
-			final TextureAtlasSprite sprite = ModClientEventHandler.getModeOptionIcon(button.action);
-
-			final double btnmiddleX = (button.x1 + button.x2) / 2 + 0.01;
-			final double btnmiddleY = (button.y1 + button.y2) / 2 + 0.01;
-			final double btnx1 = btnmiddleX - 8;
-			final double btnx2 = btnmiddleX + 8;
-			final double btny1 = btnmiddleY - 8;
-			final double btny2 = btnmiddleY + 8;
-
-			buffer.vertex(middleX + btnx1, middleY + btny1, getBlitOffset()).uv(sprite.getU(u1), sprite.getV(v1)).color(f, f, f, a).endVertex();
-			buffer.vertex(middleX + btnx1, middleY + btny2, getBlitOffset()).uv(sprite.getU(u1), sprite.getV(v2)).color(f, f, f, a).endVertex();
-			buffer.vertex(middleX + btnx2, middleY + btny2, getBlitOffset()).uv(sprite.getU(u2), sprite.getV(v2)).color(f, f, f, a).endVertex();
-			buffer.vertex(middleX + btnx2, middleY + btny1, getBlitOffset()).uv(sprite.getU(u2), sprite.getV(v1)).color(f, f, f, a).endVertex();
-		}
-	}
-
-	private void drawTexts(MatrixStack 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);
-
-		//Draw option strings
-		for (int i = 0; i < currentBuildMode.options.length; i++) {
-			OptionEnum option = options[i];
-			font.drawShadow(ms, I18n.get(option.name), (int) (middleX + buttonDistance - 9), (int) middleY - 37 + i * 39, optionTextColor);
-		}
-
-		String credits = "Effortless Building";
-		font.drawShadow(ms, credits, width - font.width(credits) - 4, height - 10, watermarkTextColor);
-
-		//Draw buildmode text
-		for (final MenuRegion menuRegion : modes) {
-
-			if (menuRegion.highlighted) {
-				final double x = (menuRegion.x1 + menuRegion.x2) * 0.5;
-				final double y = (menuRegion.y1 + menuRegion.y2) * 0.5;
-
-				int fixed_x = (int) (x * textDistance);
-				final int fixed_y = (int) (y * textDistance) - font.lineHeight / 2;
-				String text = I18n.get(menuRegion.mode.getNameKey());
-
-				if (x <= -0.2) {
-					fixed_x -= font.width(text);
-				} else if (-0.2 <= x && x <= 0.2) {
-					fixed_x -= font.width(text) / 2;
-				}
-
-				font.drawShadow(ms, text, (int) middleX + fixed_x, (int) middleY + fixed_y, whiteTextColor);
-
-				//Draw description
-				text = I18n.get(menuRegion.mode.getDescriptionKey());
-				font.drawShadow(ms, text, (int) middleX - font.width(text) / 2f, (int) middleY + descriptionHeight, descriptionTextColor);
-			}
-		}
-
-		//Draw action text
-		for (final MenuButton button : buttons) {
-			if (button.highlighted) {
-				String text = TextFormatting.AQUA + button.name;
-
-				//Add keybind in brackets
-				String keybind = findKeybind(button, currentBuildMode);
-				String keybindFormatted = "";
-				if (!keybind.isEmpty())
-					keybindFormatted = TextFormatting.GRAY + "(" + WordUtils.capitalizeFully(keybind) + ")";
-
-				if (button.textSide == Direction.WEST) {
-
-					font.draw(ms, text, (int) (middleX + button.x1 - 8) - font.width(text),
-							(int) (middleY + button.y1 + 6), whiteTextColor);
-
-				} else if (button.textSide == Direction.EAST) {
-
-					font.draw(ms, text, (int) (middleX + button.x2 + 8),
-							(int) (middleY + button.y1 + 6), whiteTextColor);
-
-				} else if (button.textSide == Direction.UP || button.textSide == Direction.NORTH) {
-
-					font.draw(ms, keybindFormatted, (int) (middleX + (button.x1 + button.x2) * 0.5 - font.width(keybindFormatted) * 0.5),
-							(int) (middleY + button.y1 - 26), whiteTextColor);
-
-					font.draw(ms, text, (int) (middleX + (button.x1 + button.x2) * 0.5 - font.width(text) * 0.5),
-							(int) (middleY + button.y1 - 14), whiteTextColor);
-
-				} else if (button.textSide == Direction.DOWN || button.textSide == Direction.SOUTH) {
-
-					font.draw(ms, text, (int) (middleX + (button.x1 + button.x2) * 0.5 - font.width(text) * 0.5),
-							(int) (middleY + button.y1 + 26), whiteTextColor);
-
-					font.draw(ms, keybindFormatted, (int) (middleX + (button.x1 + button.x2) * 0.5 - font.width(keybindFormatted) * 0.5),
-							(int) (middleY + button.y1 + 38), whiteTextColor);
-
-				}
-
-			}
-		}
-	}
-
-	private String findKeybind(MenuButton button, BuildModeEnum currentBuildMode){
-		String result = "";
-		int keybindingIndex = -1;
-		if (button.action == ActionEnum.UNDO) keybindingIndex = 3;
-		if (button.action == ActionEnum.REDO) keybindingIndex = 4;
-		if (button.action == ActionEnum.REPLACE) keybindingIndex = 1;
-		if (button.action == ActionEnum.OPEN_MODIFIER_SETTINGS) keybindingIndex = 0;
-
-		if (keybindingIndex != -1) {
-			KeyBinding keyMap = ClientProxy.keyBindings[keybindingIndex];
-
-			if (!keyMap.getKeyModifier().name().equals("none")) {
-				result = keyMap.getKeyModifier().name() + " ";
-			}
-			result += I18n.get(keyMap.getKey().getName());
-		}
-
-		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]) {
-				result = I18n.get(ClientProxy.keyBindings[5].getKey().getName());
-				if (result.equals("Left Control")) result = "Ctrl";
-			}
-		}
-		return result;
-	}
-
-	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);
-		final double bc = (x2 - x) * (y3 - y) - (x3 - x) * (y2 - y);
-		final double ca = (x3 - x) * (y1 - y) - (x1 - x) * (y3 - y);
-		return sign(ab) == sign(bc) && sign(bc) == sign(ca);
-	}
-
-	private int sign(final double n) {
-		return n > 0 ? 1 : -1;
-	}
-
-	@Override
-	public boolean isPauseScreen() {
-		return false;
-	}
-
-	@Override
-	public boolean mouseClicked(double mouseX, double mouseY, int mouseButton) {
-		performAction(true);
-
-		return super.mouseClicked(mouseX, mouseY, mouseButton);
-	}
-
-	@Override
-	public void onClose() {
-		super.onClose();
-		//After onClose so it can open another screen
-		if (!performedActionUsingMouse) performAction(false);
-	}
-
-	private void performAction(boolean fromMouseClick) {
-		PlayerEntity player = Minecraft.getInstance().player;
-
-		ModeSettingsManager.ModeSettings modeSettings = ModeSettingsManager.getModeSettings(player);
-
-		if (switchTo != null) {
-			playRadialMenuSound();
-
-			modeSettings.setBuildMode(switchTo);
-			ModeSettingsManager.setModeSettings(player, modeSettings);
-			PacketHandler.INSTANCE.sendToServer(new ModeSettingsMessage(modeSettings));
-
-			EffortlessBuilding.log(player, I18n.get(modeSettings.getBuildMode().getNameKey()), true);
-
-			if (fromMouseClick) performedActionUsingMouse = true;
-		}
-
-		//Perform button action
-		ModeOptions.ActionEnum action = doAction;
-		if (action != null) {
-			playRadialMenuSound();
-
-			ModeOptions.performAction(player, action);
-			PacketHandler.INSTANCE.sendToServer(new ModeActionMessage(action));
-
-			if (fromMouseClick) performedActionUsingMouse = true;
-		}
-	}
-
-	public static void playRadialMenuSound() {
-		final float volume = 0.1f;
-		if (volume >= 0.0001f) {
-			SimpleSound sound = new SimpleSound(SoundEvents.UI_BUTTON_CLICK, SoundCategory.MASTER, volume, 1.0f, Minecraft.getInstance().player.blockPosition());
-			Minecraft.getInstance().getSoundManager().play(sound);
-		}
+    public void configure(final int scaledWidth, final int scaledHeight ) {
+        mc = Minecraft.getMinecraft();
+        fontRenderer = mc.fontRenderer;
+        width = scaledWidth;
+        height = scaledHeight;
     }
 
     private static class MenuButton {
 
-		public final ActionEnum action;
         public double x1, x2;
         public double y1, y2;
         public boolean highlighted;
-		public String name;
-		public Direction textSide;
 
-		public MenuButton(final String name, final ActionEnum action, final double x, final double y,
-						  final Direction textSide) {
-			this.name = I18n.get(name);
+        public final ModeOptions.ActionEnum action;
+        public String name;
+        public EnumFacing textSide;
+
+        public MenuButton(final String name, final ModeOptions.ActionEnum action, final double x, final double y,
+                final EnumFacing textSide) {
+            this.name = I18n.format(name);
             this.action = action;
             x1 = x - 10;
             x2 = x + 10;
@@ -561,5 +107,378 @@ public class RadialMenu extends Screen {
 
     }
 
+    @Override
+    public void drawScreen(final int mouseX, final int mouseY, final float partialTicks) {
+        if (!isVisible()) return;
+
+        BuildModeEnum currentBuildMode = ModeSettingsManager.getModeSettings(Minecraft.getMinecraft().player).getBuildMode();
+
+        GlStateManager.pushMatrix();
+        GlStateManager.translate( 0.0F, 0.0F, 200.0F );
+
+        final int startColor = (int) ( visibility * 98 ) << 24;
+        final int endColor = (int) ( visibility * 128 ) << 24;
+
+        drawGradientRect(0, 0, width, height, startColor, endColor);
+
+        GlStateManager.disableTexture2D();
+        GlStateManager.enableBlend();
+        GlStateManager.disableAlpha();
+        GlStateManager.tryBlendFuncSeparate(GL11.GL_SRC_ALPHA, GL11.GL_ONE_MINUS_SRC_ALPHA, 1, 0);
+        GlStateManager.shadeModel(GL11.GL_SMOOTH);
+        final Tessellator tessellator = Tessellator.getInstance();
+        final BufferBuilder buffer = tessellator.getBuffer();
+
+        buffer.begin(GL11.GL_QUADS, DefaultVertexFormats.POSITION_COLOR);
+
+        final double middleX = width / 2.0;
+        final double middleY = height / 2.0;
+
+        final double mouseXCenter = mouseX - middleX;
+        final double mouseYCenter = mouseY - middleY;
+        double mouseRadians = Math.atan2(mouseYCenter, mouseXCenter);
+
+        final double ringInnerEdge = 20;
+        final double ringOuterEdge = 50;
+        final double textDistance = 60;
+        final double buttonDistance = 90;
+        final double quarterCircle = Math.PI / 2.0;
+
+        if ( mouseRadians < -quarterCircle ) {
+            mouseRadians = mouseRadians + Math.PI * 2;
+        }
+
+        final ArrayList<MenuRegion> modes = new ArrayList<MenuRegion>();
+        final ArrayList<MenuButton> buttons = new ArrayList<MenuButton>();
+
+        //Add build modes
+        for (final BuildModeEnum mode : BuildModeEnum.values()) {
+            modes.add(new MenuRegion(mode));
+        }
+
+        //Add actions
+        buttons.add(new MenuButton(ModeOptions.ActionEnum.UNDO.name, ModeOptions.ActionEnum.UNDO, -buttonDistance - 26, -13, EnumFacing.UP));
+        buttons.add(new MenuButton(ModeOptions.ActionEnum.REDO.name, ModeOptions.ActionEnum.REDO, -buttonDistance, -13, EnumFacing.UP));
+        buttons.add(new MenuButton(ModeOptions.ActionEnum.OPEN_MODIFIER_SETTINGS.name, ModeOptions.ActionEnum.OPEN_MODIFIER_SETTINGS, -buttonDistance - 26, 13, EnumFacing.DOWN));
+        buttons.add(new MenuButton(ModeOptions.ActionEnum.REPLACE.name, ModeOptions.ActionEnum.REPLACE, -buttonDistance, 13, EnumFacing.DOWN));
+
+        //Add buildmode dependent options
+        ModeOptions.ActionEnum[] options = currentBuildMode.options;
+        for (int i = 0; i < options.length; i++) {
+            ModeOptions.ActionEnum action = options[i];
+            buttons.add(new MenuButton(action.name, action, buttonDistance + i * 26, -13, EnumFacing.DOWN));
+        }
+
+        switchTo = null;
+        doAction = null;
+
+        //Draw buildmode backgrounds
+        if (!modes.isEmpty()) {
+            final int totalModes = Math.max( 3, modes.size() );
+            int currentMode = 0;
+            final double fragment = Math.PI * 0.005;
+            final double fragment2 = Math.PI * 0.0025;
+            final double perObject = 2.0 * Math.PI / totalModes;
+
+            for (int i = 0; i < modes.size(); i++) {
+                MenuRegion menuRegion = modes.get(i);
+                final double beginRadians = currentMode * perObject - quarterCircle;
+                final double endRadians = (currentMode + 1) * perObject - quarterCircle;
+
+                menuRegion.x1 = Math.cos(beginRadians);
+                menuRegion.x2 = Math.cos(endRadians);
+                menuRegion.y1 = Math.sin(beginRadians);
+                menuRegion.y2 = Math.sin(endRadians);
+
+                final double x1m1 = Math.cos(beginRadians + fragment) * ringInnerEdge;
+                final double x2m1 = Math.cos(endRadians - fragment) * ringInnerEdge;
+                final double y1m1 = Math.sin(beginRadians + fragment) * ringInnerEdge;
+                final double y2m1 = Math.sin(endRadians - fragment) * ringInnerEdge;
+
+                final double x1m2 = Math.cos(beginRadians + fragment2) * ringOuterEdge;
+                final double x2m2 = Math.cos(endRadians - fragment2) * ringOuterEdge;
+                final double y1m2 = Math.sin(beginRadians + fragment2) * ringOuterEdge;
+                final double y2m2 = Math.sin(endRadians - fragment2) * ringOuterEdge;
+
+                float r = 0.0f;
+                float g = 0.0f;
+                float b = 0.0f;
+                float a = 0.5f;
+
+                //check if current mode
+                int buildMode = currentBuildMode.ordinal();
+                if (buildMode == i) {
+                    r = 0f;
+                    g = 0.5f;
+                    b = 1f;
+                    a = 0.5f;
+                    //menuRegion.highlighted = true; //draw text
+                }
+
+                //check if mouse is over this region
+                final boolean isMouseInQuad = inTriangle(x1m1, y1m1, x2m2, y2m2, x2m1, y2m1, mouseXCenter, mouseYCenter)
+                                              || inTriangle(x1m1, y1m1, x1m2, y1m2, x2m2, y2m2, mouseXCenter, mouseYCenter);
+
+                if (beginRadians <= mouseRadians && mouseRadians <= endRadians && isMouseInQuad) {
+                    r = 0.6f;
+                    g = 0.8f;
+                    b = 1f;
+                    a = 0.6f;
+                    menuRegion.highlighted = true;
+                    switchTo = menuRegion.mode;
+                }
+
+                buffer.pos(middleX + x1m1, middleY + y1m1, zLevel).color(r, g, b, a).endVertex();
+                buffer.pos(middleX + x2m1, middleY + y2m1, zLevel).color(r, g, b, a).endVertex();
+                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();
+
+                currentMode++;
+            }
+        }
+
+        //Draw action backgrounds
+        for (final MenuButton btn : buttons) {
+            float r = 0.5f;
+            float g = 0.5f;
+            float b = 0.5f;
+            float a = 0.5f;
+
+            //highlight when active option
+            if (btn.action == ModeOptions.getBuildSpeed() ||
+                btn.action == ModeOptions.getFill() ||
+                btn.action == ModeOptions.getCubeFill() ||
+                btn.action == ModeOptions.getRaisedEdge() ||
+                btn.action == ModeOptions.getLineThickness()) {
+                r = 0.0f;
+                g = 0.5f;
+                b = 1f;
+                a = 0.6f;
+            }
+
+            //highlight when mouse over
+            if (btn.x1 <= mouseXCenter && btn.x2 >= mouseXCenter && btn.y1 <= mouseYCenter && btn.y2 >= mouseYCenter) {
+                r = 0.6f;
+                g = 0.8f;
+                b = 1f;
+                a = 0.6f;
+                btn.highlighted = true;
+                doAction = btn.action;
+            }
+
+            buffer.pos(middleX + btn.x1, middleY + btn.y1, zLevel).color(r, g, b, a).endVertex();
+            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();
+        }
+
+        tessellator.draw();
+
+        GlStateManager.shadeModel(GL11.GL_FLAT);
+
+        GlStateManager.translate(0f, 0f, 5f);
+        GlStateManager.enableTexture2D();
+        GlStateManager.color(1f, 1f, 1f, 1f);
+        GlStateManager.disableBlend();
+        GlStateManager.enableAlpha();
+        GlStateManager.bindTexture(Minecraft.getMinecraft().getTextureMapBlocks().getGlTextureId());
+
+        buffer.begin(GL11.GL_QUADS, DefaultVertexFormats.POSITION_TEX_COLOR);
+
+        //Draw buildmode icons
+        for (final MenuRegion menuRegion : modes) {
+
+            final double x = (menuRegion.x1 + menuRegion.x2) * 0.5 * (ringOuterEdge * 0.6 + 0.4 * ringInnerEdge);
+            final double y = (menuRegion.y1 + menuRegion.y2) * 0.5 * (ringOuterEdge * 0.6 + 0.4 * ringInnerEdge);
+
+            final TextureAtlasSprite sprite = ClientProxy.getBuildModeIcon(menuRegion.mode);
+
+            final double x1 = x - 8;
+            final double x2 = x + 8;
+            final double y1 = y - 8;
+            final double y2 = y + 8;
+
+            final float f = 1f;
+            final float a = 1f;
+
+            final double u1 = 0;
+            final double u2 = 16;
+            final double v1 = 0;
+            final double v2 = 16;
+
+            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 icons
+        for (final MenuButton button : buttons) {
+
+            final float f = 1f;
+            final float a = 1f;
+
+            final double u1 = 0;
+            final double u2 = 16;
+            final double v1 = 0;
+            final double v2 = 16;
+
+            final TextureAtlasSprite sprite = ClientProxy.getModeOptionIcon(button.action);
+
+            final double btnmiddleX = (button.x1 + button.x2) / 2 + 0.01;
+            final double btnmiddleY = (button.y1 + button.y2) / 2 + 0.01;
+            final double btnx1 = btnmiddleX - 8;
+            final double btnx2 = btnmiddleX + 8;
+            final double btny1 = btnmiddleY - 8;
+            final double btny2 = btnmiddleY + 8;
+
+            buffer.pos(middleX + btnx1, middleY + btny1, zLevel).tex(sprite.getInterpolatedU(u1), sprite.getInterpolatedV(v1)).color(f, f, f, a).endVertex();
+            buffer.pos(middleX + btnx1, middleY + btny2, zLevel).tex(sprite.getInterpolatedU(u1), sprite.getInterpolatedV(v2)).color(f, f, f, a).endVertex();
+            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();
+        }
+
+        tessellator.draw();
+
+        //Draw strings
+        //fontRenderer.drawStringWithShadow("Actions", (int) (middleX - buttonDistance - 13) - fontRenderer.getStringWidth("Actions") * 0.5f, (int) middleY - 38, 0xffffffff);
+        String title = "";
+        if (currentBuildMode.options.length > 0) {
+            switch (currentBuildMode.options[0]) {
+                case NORMAL_SPEED:
+                case FAST_SPEED:
+                    title = I18n.format("effortlessbuilding.action.build_speed");
+                    break;
+                case FULL:
+                case HOLLOW:
+                case CUBE_FULL:
+                case CUBE_HOLLOW:
+                case CUBE_SKELETON:
+                    title = I18n.format("effortlessbuilding.action.filling");
+                    break;
+                case SHORT_EDGE:
+                case LONG_EDGE:
+                    title = I18n.format("effortlessbuilding.action.raised_edge");
+                    break;
+                case THICKNESS_1:
+                case THICKNESS_3:
+                case THICKNESS_5:
+                    title = I18n.format("effortlessbuilding.action.thickness");
+                    break;
+            }
+        }
+        fontRenderer.drawStringWithShadow(title, (int) (middleX + buttonDistance - 9), (int) middleY - 37, 0xeeeeeeff);
+
+        String credits = "Effortless Building";
+        fontRenderer.drawStringWithShadow(credits, width - fontRenderer.getStringWidth(credits) - 4, height - 10, 0x88888888);
+
+        //Draw buildmode text
+        for (final MenuRegion menuRegion : modes) {
+
+            if (menuRegion.highlighted) {
+                final double x = (menuRegion.x1 + menuRegion.x2) * 0.5;
+                final double y = (menuRegion.y1 + menuRegion.y2) * 0.5;
+
+                int fixed_x = (int) (x * textDistance);
+                final int fixed_y = (int) (y * textDistance) - fontRenderer.FONT_HEIGHT / 2;
+                final String text = I18n.format(menuRegion.mode.name);
+
+                if ( x <= -0.2 ) {
+                    fixed_x -= fontRenderer.getStringWidth(text);
+                } else if ( -0.2 <= x && x <= 0.2 ) {
+                    fixed_x -= fontRenderer.getStringWidth(text) / 2;
+                }
+
+                fontRenderer.drawStringWithShadow(text, (int) middleX + fixed_x, (int) middleY + fixed_y, 0xffffffff);
+            }
+        }
+
+        //Draw action text
+        for (final MenuButton button : buttons) {
+            if (button.highlighted) {
+                String text = TextFormatting.AQUA + button.name;
+                int wrap = 120;
+                String keybind = "";
+                String keybindFormatted = "";
+
+                //Add keybind in brackets
+                if (button.action == ModeOptions.ActionEnum.UNDO) {
+                    keybind = ClientProxy.keyBindings[4].getDisplayName();
+                }
+                if (button.action == ModeOptions.ActionEnum.REDO) {
+                    keybind = ClientProxy.keyBindings[5].getDisplayName();
+                }
+                if (button.action == ModeOptions.ActionEnum.REPLACE) {
+                    keybind = ClientProxy.keyBindings[1].getDisplayName();
+                }
+                if (button.action == ModeOptions.ActionEnum.OPEN_MODIFIER_SETTINGS) {
+                    keybind = ClientProxy.keyBindings[0].getDisplayName();
+                }
+                if (!keybind.isEmpty()) keybindFormatted = TextFormatting.GRAY + "(" + WordUtils.capitalizeFully(keybind) + ")";
+
+                if (button.textSide == EnumFacing.WEST) {
+
+                    fontRenderer.drawSplitString( text, (int) (middleX + button.x1 - 8 ) - fontRenderer.getStringWidth(text),
+                            (int) (middleY + button.y1 + 6), wrap, 0xffffffff);
+
+                } else if (button.textSide == EnumFacing.EAST) {
+
+                    fontRenderer.drawSplitString(text, (int) (middleX + button.x2 + 8),
+                            (int) (middleY + button.y1 + 6 ), wrap, 0xffffffff);
+
+                } else if (button.textSide == EnumFacing.UP || button.textSide == EnumFacing.NORTH) {
+
+                    fontRenderer.drawSplitString( keybindFormatted, (int) (middleX + (button.x1 + button.x2) * 0.5 - fontRenderer.getStringWidth(keybindFormatted) * 0.5),
+                            (int) (middleY + button.y1 - 26), wrap,0xffffffff);
+
+                    fontRenderer.drawSplitString( text, (int) (middleX + (button.x1 + button.x2) * 0.5 - fontRenderer.getStringWidth(text) * 0.5),
+                            (int) (middleY + button.y1 - 14), wrap,0xffffffff);
+
+                } else if (button.textSide == EnumFacing.DOWN || button.textSide == EnumFacing.SOUTH) {
+
+                    fontRenderer.drawSplitString(text, (int) (middleX + (button.x1 + button.x2) * 0.5 - fontRenderer.getStringWidth(text) * 0.5),
+                            (int) (middleY + button.y1 + 26), wrap, 0xffffffff);
+
+                    fontRenderer.drawSplitString(keybindFormatted, (int) (middleX + (button.x1 + button.x2) * 0.5 - fontRenderer.getStringWidth(keybindFormatted) * 0.5),
+                            (int) (middleY + button.y1 + 38), wrap, 0xffffffff);
+
+                }
+
+            }
+        }
+
+        GlStateManager.popMatrix();
+    }
+
+    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);
+        final double bc = (x2 - x) * (y3 - y) - (x3 - x) * (y2 - y);
+        final double ca = (x3 - x) * (y1 - y) - (x1 - x) * (y3 - y);
+        return sign(ab) == sign(bc) && sign(bc) == sign(ca);
+    }
+
+    private int sign(final double n) {
+        return n > 0 ? 1 : -1;
+    }
+
+    /**
+     * Called when the mouse is clicked. Args : mouseX, mouseY, clickedButton
+     */
+    @Override
+    protected void mouseClicked(int mouseX, int mouseY, int mouseButton ) {
+        EffortlessBuilding.log("mouse clicked");
+
+//        KeyBinding.updateKeyBindState();
+//        KeyBinding.setKeyBindState(ClientProxy.keyBindings[3].getKeyCode(), true);
+
+//        if (mouseButton == 0) {
+//            this.mc.displayGuiScreen(null);
+//
+//            if (this.mc.currentScreen == null) {
+//                this.mc.setIngameFocus();
+//            }
+//        }
+    }
 }
 

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

@@ -1,31 +1,27 @@
 package nl.requios.effortlessbuilding.gui.buildmodifier;
 
-import com.mojang.blaze3d.matrix.MatrixStack;
-import net.minecraft.client.gui.screen.Screen;
-import net.minecraft.client.gui.widget.Widget;
+import net.minecraft.client.gui.GuiButton;
+import net.minecraft.client.gui.GuiScreen;
 import net.minecraft.util.math.BlockPos;
-import net.minecraft.util.text.StringTextComponent;
 import net.minecraft.util.text.TextFormatting;
-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<>();
 
-	private GuiCheckBoxFixed buttonArrayEnabled;
+    private GuiCheckBox buttonArrayEnabled;
     private GuiNumberField textArrayOffsetX, textArrayOffsetY, textArrayOffsetZ, textArrayCount;
 
     public ArraySettingsGui(GuiScrollPane scrollPane) {
@@ -33,39 +29,33 @@ public class ArraySettingsGui extends GuiCollapsibleScrollEntry {
     }
 
     @Override
-	public void init(List<Widget> buttons) {
-		super.init(buttons);
+    public int initGui(int id, List<GuiButton> buttonList) {
+        id = super.initGui(id, buttonList);
 
         int y = top;
-		buttonArrayEnabled = new GuiCheckBoxFixed(left - 15 + 8, y, "", false) {
-			@Override
-			public void onClick(double mouseX, double mouseY) {
-				super.onClick(mouseX, mouseY);
-				setCollapsed(!buttonArrayEnabled.isChecked());
-			}
-		};
-		buttons.add(buttonArrayEnabled);
+        buttonArrayEnabled = new GuiCheckBox(id++, left - 15 + 8, y, "", false);
+        buttonList.add(buttonArrayEnabled);
 
         y = top + 20;
-		textArrayOffsetX = new GuiNumberField(font, buttons, left + 70, y, 50, 18);
+        textArrayOffsetX = new GuiNumberField(id++, id++, id++, fontRenderer, buttonList, left + 70, y, 50, 18);
         textArrayOffsetX.setNumber(0);
-		textArrayOffsetX.setTooltip(new StringTextComponent("How much each copy is shifted."));
+        textArrayOffsetX.setTooltip("How much each copy is shifted.");
         arrayNumberFieldList.add(textArrayOffsetX);
 
-		textArrayOffsetY = new GuiNumberField(font, buttons, left + 140, y, 50, 18);
+        textArrayOffsetY = new GuiNumberField(id++, id++, id++, fontRenderer, buttonList, left + 140, y, 50, 18);
         textArrayOffsetY.setNumber(0);
-		textArrayOffsetY.setTooltip(new StringTextComponent("How much each copy is shifted."));
+        textArrayOffsetY.setTooltip("How much each copy is shifted.");
         arrayNumberFieldList.add(textArrayOffsetY);
 
-		textArrayOffsetZ = new GuiNumberField(font, buttons, left + 210, y, 50, 18);
+        textArrayOffsetZ = new GuiNumberField(id++, id++, id++, fontRenderer, buttonList, left + 210, y, 50, 18);
         textArrayOffsetZ.setNumber(0);
-		textArrayOffsetZ.setTooltip(new StringTextComponent("How much each copy is shifted."));
+        textArrayOffsetZ.setTooltip("How much each copy is shifted.");
         arrayNumberFieldList.add(textArrayOffsetZ);
 
         y = top + 50;
-		textArrayCount = new GuiNumberField(font, buttons, left + 55, y, 50, 18);
+        textArrayCount = new GuiNumberField(id++, id++, id++, fontRenderer, buttonList, left + 55, y, 50, 18);
         textArrayCount.setNumber(5);
-		textArrayCount.setTooltip(new StringTextComponent("How many copies should be made."));
+        textArrayCount.setTooltip("How many copies should be made.");
         arrayNumberFieldList.add(textArrayCount);
 
         ModifierSettingsManager.ModifierSettings modifierSettings = ModifierSettingsManager.getModifierSettings(mc.player);
@@ -79,80 +69,102 @@ public class ArraySettingsGui extends GuiCollapsibleScrollEntry {
         }
 
         setCollapsed(!buttonArrayEnabled.isChecked());
+
+        return id;
     }
 
+    @Override
     public void updateScreen() {
+        super.updateScreen();
         arrayNumberFieldList.forEach(GuiNumberField::update);
     }
 
     @Override
-	public void drawEntry(MatrixStack 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) {
+        super.drawEntry(slotIndex, x, y, listWidth, slotHeight, mouseX, mouseY, isSelected, partialTicks);
+
         int yy = y;
         int offset = 8;
 
-		buttonArrayEnabled.render(ms, mouseX, mouseY, partialTicks);
+        buttonArrayEnabled.drawButton(this.mc, mouseX, mouseY, partialTicks);
         if (buttonArrayEnabled.isChecked()) {
             buttonArrayEnabled.y = yy;
-			font.draw(ms, "Array enabled", left + offset, yy + 2, 0xFFFFFF);
+            fontRenderer.drawString("Array enabled", left + offset, yy + 2, 0xFFFFFF, true);
 
             yy = y + 20;
-			font.draw(ms, "Offset", left + offset, yy + 5, 0xFFFFFF);
-			font.draw(ms, "X", left + 50 + offset, yy + 5, 0xFFFFFF);
+            fontRenderer.drawString("Offset", left + offset, yy + 5, 0xFFFFFF, true);
+            fontRenderer.drawString("X", left + 50 + offset, yy + 5, 0xFFFFFF, true);
             textArrayOffsetX.y = yy;
-			font.draw(ms, "Y", left + 120 + offset, yy + 5, 0xFFFFFF);
+            fontRenderer.drawString("Y", left + 120 + offset, yy + 5, 0xFFFFFF, true);
             textArrayOffsetY.y = yy;
-			font.draw(ms, "Z", left + 190 + offset, yy + 5, 0xFFFFFF);
+            fontRenderer.drawString("Z", left + 190 + offset, yy + 5, 0xFFFFFF, true);
             textArrayOffsetZ.y = yy;
 
             yy = y + 50;
-			font.draw(ms, "Count", left + offset, yy + 5, 0xFFFFFF);
+            fontRenderer.drawString("Count", left + offset, yy + 5, 0xFFFFFF, true);
             textArrayCount.y = yy;
 
             int currentReach = Math.max(-1, getArrayReach());
             int maxReach = ReachHelper.getMaxReach(mc.player);
             TextFormatting reachColor = isCurrentReachValid(currentReach, maxReach) ? TextFormatting.GRAY : TextFormatting.RED;
             String reachText = "Reach: " + reachColor + currentReach + TextFormatting.GRAY + "/" + TextFormatting.GRAY + maxReach;
-			font.draw(ms, reachText, left + 176 + offset, yy + 5, 0xFFFFFF);
+            fontRenderer.drawString(reachText, left + 176 + offset, yy + 5, 0xFFFFFF, true);
 
-			arrayNumberFieldList.forEach(numberField -> numberField.drawNumberField(ms, mouseX, mouseY, partialTicks));
+            arrayNumberFieldList.forEach(numberField -> numberField.drawNumberField(this.mc, mouseX, mouseY, partialTicks));
         } else {
             buttonArrayEnabled.y = yy;
-			font.draw(ms, "Array disabled", left + offset, yy + 2, 0x999999);
+            fontRenderer.drawString("Array disabled", left + offset, yy + 2, 0x999999, true);
         }
 
     }
 
-	public void drawTooltip(MatrixStack ms, Screen guiScreen, int mouseX, int mouseY) {
+    public void drawTooltip(GuiScreen guiScreen, int mouseX, int mouseY) {
         //Draw tooltips last
-		if (buttonArrayEnabled.isChecked()) {
-			arrayNumberFieldList.forEach(numberField -> numberField.drawTooltip(ms, scrollPane.parent, mouseX, mouseY));
+        if (buttonArrayEnabled.isChecked())
+        {
+            arrayNumberFieldList.forEach(numberField -> numberField.drawTooltip(scrollPane.parent, mouseX, mouseY));
         }
     }
 
     @Override
-	public boolean charTyped(char typedChar, int keyCode) {
-		super.charTyped(typedChar, keyCode);
-		for (GuiNumberField numberField : arrayNumberFieldList) {
-			numberField.charTyped(typedChar, keyCode);
+    public void updatePosition(int slotIndex, int x, int y, float partialTicks) {
+        super.updatePosition(slotIndex, x, y, partialTicks);
+    }
+
+    @Override
+    public void keyTyped(char typedChar, int keyCode) throws IOException {
+        super.keyTyped(typedChar, keyCode);
+        for (GuiNumberField numberField : arrayNumberFieldList) {
+            numberField.keyTyped(typedChar, keyCode);
         }
-		return true;
     }
 
     @Override
     public boolean mousePressed(int slotIndex, int mouseX, int mouseY, int mouseEvent, int relativeX, int relativeY) {
+        super.mousePressed(slotIndex, mouseX, mouseY, mouseEvent, relativeX, relativeY);
         arrayNumberFieldList.forEach(numberField -> numberField.mouseClicked(mouseX, mouseY, mouseEvent));
 
         boolean insideArrayEnabledLabel = mouseX >= left && mouseX < right && relativeY >= -2 && relativeY < 12;
 
         if (insideArrayEnabledLabel) {
-			buttonArrayEnabled.playDownSound(this.mc.getSoundManager());
-			buttonArrayEnabled.onClick(mouseX, mouseY);
+            buttonArrayEnabled.setIsChecked(!buttonArrayEnabled.isChecked());
+            buttonArrayEnabled.playPressSound(this.mc.getSoundHandler());
+            actionPerformed(buttonArrayEnabled);
         }
 
         return true;
     }
 
+    @Override
+    public void actionPerformed(GuiButton button) {
+        super.actionPerformed(button);
+        if (button == buttonArrayEnabled) {
+            setCollapsed(!buttonArrayEnabled.isChecked());
+        }
+        arrayNumberFieldList.forEach(numberField -> numberField.actionPerformed(button));
+    }
+
     public Array.ArraySettings getArraySettings() {
         boolean arrayEnabled = buttonArrayEnabled.isChecked();
         BlockPos arrayOffset = new BlockPos(0, 0, 0);
@@ -183,7 +195,8 @@ public class ArraySettingsGui extends GuiCollapsibleScrollEntry {
     }
 
     private int getArrayReach() {
-		try {
+        try
+        {
             //find largest offset
             double x = Math.abs(textArrayOffsetX.getNumber());
             double y = Math.abs(textArrayOffsetY.getNumber());

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

@@ -1,37 +1,35 @@
 package nl.requios.effortlessbuilding.gui.buildmodifier;
 
-import com.mojang.blaze3d.matrix.MatrixStack;
-import net.minecraft.client.gui.screen.Screen;
-import net.minecraft.client.gui.widget.Widget;
-import net.minecraft.client.gui.widget.button.Button;
+import net.minecraft.client.gui.GuiButton;
+import net.minecraft.client.gui.GuiScreen;
 import net.minecraft.util.ResourceLocation;
-import net.minecraft.util.math.vector.Vector3d;
-import net.minecraft.util.text.StringTextComponent;
+import net.minecraft.util.math.Vec3d;
 import net.minecraft.util.text.TextFormatting;
-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;
 
-@SuppressWarnings("Duplicates")
-@OnlyIn(Dist.CLIENT)
 public class MirrorSettingsGui extends GuiCollapsibleScrollEntry {
 
     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<GuiNumberField> mirrorNumberFieldList = new ArrayList<>();
 
     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 boolean drawPlanes, drawLines, toggleOdd;
 
@@ -40,97 +38,64 @@ public class MirrorSettingsGui extends GuiCollapsibleScrollEntry {
     }
 
     @Override
-	public void init(List<Widget> buttonList) {
-		super.init(buttonList);
+    public int initGui(int id, List<GuiButton> buttonList) {
+        id = super.initGui(id, buttonList);
 
         int y = top - 2;
-		buttonMirrorEnabled = new GuiCheckBoxFixed(left - 15 + 8, y, "", false) {
-			@Override
-			public void onClick(double mouseX, double mouseY) {
-				super.onClick(mouseX, mouseY);
-				setCollapsed(!buttonMirrorEnabled.isChecked());
-			}
-		};
+        buttonMirrorEnabled = new GuiCheckBox(id++, left - 15 + 8, y, "", false);
         buttonList.add(buttonMirrorEnabled);
 
         y = top + 18;
-		textMirrorPosX = new GuiNumberField(font, buttonList, left + 58, y, 62, 18);
+        textMirrorPosX = new GuiNumberField(id++, id++, id++, fontRenderer, buttonList, left + 58, y, 62, 18);
         textMirrorPosX.setNumber(0);
         textMirrorPosX.setTooltip(
-			Arrays.asList(new StringTextComponent("The position of the mirror."), new StringTextComponent("For odd numbered builds add 0.5.").withStyle(TextFormatting.GRAY)));
+                Arrays.asList("The position of the mirror.", TextFormatting.GRAY + "For odd numbered builds add 0.5."));
         mirrorNumberFieldList.add(textMirrorPosX);
 
-		textMirrorPosY = new GuiNumberField(font, buttonList, left + 138, y, 62, 18);
+        textMirrorPosY = new GuiNumberField(id++, id++, id++, fontRenderer, buttonList, left + 138, y, 62, 18);
         textMirrorPosY.setNumber(64);
-		textMirrorPosY.setTooltip(Arrays.asList(new StringTextComponent("The position of the mirror."), new StringTextComponent("For odd numbered builds add 0.5.").withStyle(TextFormatting.GRAY)));
+        textMirrorPosY.setTooltip(Arrays.asList("The position of the mirror.", TextFormatting.GRAY + "For odd numbered builds add 0.5."));
         mirrorNumberFieldList.add(textMirrorPosY);
 
-		textMirrorPosZ = new GuiNumberField(font, buttonList, left + 218, y, 62, 18);
+        textMirrorPosZ = new GuiNumberField(id++, id++, id++, fontRenderer, buttonList, left + 218, y, 62, 18);
         textMirrorPosZ.setNumber(0);
-		textMirrorPosZ.setTooltip(Arrays.asList(new StringTextComponent("The position of the mirror."), new StringTextComponent("For odd numbered builds add 0.5.").withStyle(TextFormatting.GRAY)));
+        textMirrorPosZ.setTooltip(Arrays.asList("The position of the mirror.", TextFormatting.GRAY + "For odd numbered builds add 0.5."));
         mirrorNumberFieldList.add(textMirrorPosZ);
 
         y = top + 50;
-		buttonMirrorX = new GuiCheckBoxFixed(left + 60, y, " X", true);
+        buttonMirrorX = new GuiCheckBox(id++, left + 60, y, " X", true);
         mirrorButtonList.add(buttonMirrorX);
 
-		buttonMirrorY = new GuiCheckBoxFixed(left + 100, y, " Y", false);
+        buttonMirrorY = new GuiCheckBox(id++, left + 100, y, " Y", false);
         mirrorButtonList.add(buttonMirrorY);
 
-		buttonMirrorZ = new GuiCheckBoxFixed(left + 140, y, " Z", false);
+        buttonMirrorZ = new GuiCheckBox(id++, left + 140, y, " Z", false);
         mirrorButtonList.add(buttonMirrorZ);
 
         y = top + 47;
-		textMirrorRadius = new GuiNumberField(font, buttonList, left + 218, y, 62, 18);
+        textMirrorRadius = new GuiNumberField(id++, id++, id++, fontRenderer, buttonList, left + 218, y, 62, 18);
         textMirrorRadius.setNumber(50);
         //TODO change to diameter (remove /2)
-		textMirrorRadius.setTooltip(Arrays.asList(new StringTextComponent("How far the mirror reaches in any direction."),
-			new StringTextComponent("Max: ").withStyle(TextFormatting.GRAY).append(new StringTextComponent(String.valueOf(ReachHelper.getMaxReach(mc.player) / 2)).withStyle(TextFormatting.GOLD)),
-			new StringTextComponent("Upgradeable in survival with reach upgrades.").withStyle(TextFormatting.GRAY)));
+        textMirrorRadius.setTooltip(Arrays.asList("How far the mirror reaches in any direction.",
+                TextFormatting.GRAY + "Max: " + TextFormatting.GOLD + ReachHelper.getMaxReach(mc.player) / 2,
+                TextFormatting.GRAY + "Upgradeable in survival with reach upgrades."));
         mirrorNumberFieldList.add(textMirrorRadius);
 
         y = top + 72;
-		buttonCurrentPosition = new GuiIconButton(left + 5, y, 0, 0, BUILDING_ICONS, button -> {
-			Vector3d pos = new Vector3d(Math.floor(mc.player.getX()) + 0.5, Math.floor(mc.player.getY()) + 0.5, Math.floor(mc.player.getZ()) + 0.5);
-			textMirrorPosX.setNumber(pos.x);
-			textMirrorPosY.setNumber(pos.y);
-			textMirrorPosZ.setNumber(pos.z);
-		});
-		buttonCurrentPosition.setTooltip(new StringTextComponent("Set mirror position to current player position"));
+        buttonCurrentPosition = new GuiIconButton(id++, left + 5, y, 0, 0, BUILDING_ICONS);
+        buttonCurrentPosition.setTooltip("Set mirror position to current player position");
         mirrorIconButtonList.add(buttonCurrentPosition);
 
-		buttonToggleOdd = new GuiIconButton(left + 35, y, 0, 20, BUILDING_ICONS, button -> {
-			toggleOdd = !toggleOdd;
-			buttonToggleOdd.setUseAlternateIcon(toggleOdd);
-			if (toggleOdd) {
-				buttonToggleOdd.setTooltip(Arrays.asList(new StringTextComponent("Set mirror position to corner of block"), new StringTextComponent("for even numbered builds")));
-				textMirrorPosX.setNumber(textMirrorPosX.getNumber() + 0.5);
-				textMirrorPosY.setNumber(textMirrorPosY.getNumber() + 0.5);
-				textMirrorPosZ.setNumber(textMirrorPosZ.getNumber() + 0.5);
-			} else {
-				buttonToggleOdd.setTooltip(Arrays.asList(new StringTextComponent("Set mirror position to middle of block"), new StringTextComponent("for odd numbered builds")));
-				textMirrorPosX.setNumber(Math.floor(textMirrorPosX.getNumber()));
-				textMirrorPosY.setNumber(Math.floor(textMirrorPosY.getNumber()));
-				textMirrorPosZ.setNumber(Math.floor(textMirrorPosZ.getNumber()));
-			}
-		});
-		buttonToggleOdd.setTooltip(Arrays.asList(new StringTextComponent("Set mirror position to middle of block"), new StringTextComponent("for odd numbered builds")));
+        buttonToggleOdd = new GuiIconButton(id++, left + 35, y, 0, 20, BUILDING_ICONS);
+        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 -> {
-			drawLines = !drawLines;
-			buttonDrawLines.setUseAlternateIcon(drawLines);
-			buttonDrawLines.setTooltip(new StringTextComponent(drawLines ? "Hide lines" : "Show lines"));
-		});
-		buttonDrawLines.setTooltip(new StringTextComponent("Show lines"));
+        buttonDrawLines = new GuiIconButton(id++, left + 65, y, 0, 40, BUILDING_ICONS);
+        buttonDrawLines.setTooltip("Show lines");
         mirrorIconButtonList.add(buttonDrawLines);
 
-		buttonDrawPlanes = new GuiIconButton(left + 95, y, 0, 60, BUILDING_ICONS, button -> {
-			drawPlanes = !drawPlanes;
-			buttonDrawPlanes.setUseAlternateIcon(drawPlanes);
-			buttonDrawPlanes.setTooltip(new StringTextComponent(drawPlanes ? "Hide area" : "Show area"));
-		});
-		buttonDrawPlanes.setTooltip(new StringTextComponent("Show area"));
+        buttonDrawPlanes = new GuiIconButton(id++, left + 95, y, 0, 60, BUILDING_ICONS);
+        buttonDrawPlanes.setTooltip("Show area");
         mirrorIconButtonList.add(buttonDrawPlanes);
 
         ModifierSettingsManager.ModifierSettings modifierSettings = ModifierSettingsManager.getModifierSettings(mc.player);
@@ -148,14 +113,14 @@ public class MirrorSettingsGui extends GuiCollapsibleScrollEntry {
             drawPlanes = m.drawPlanes;
             buttonDrawLines.setUseAlternateIcon(drawLines);
             buttonDrawPlanes.setUseAlternateIcon(drawPlanes);
-			buttonDrawLines.setTooltip(new StringTextComponent(drawLines ? "Hide lines" : "Show lines"));
-			buttonDrawPlanes.setTooltip(new StringTextComponent(drawPlanes ? "Hide area" : "Show area"));
+            buttonDrawLines.setTooltip(drawLines ? "Hide lines" : "Show lines");
+            buttonDrawPlanes.setTooltip(drawPlanes ? "Hide area" : "Show area");
             if (textMirrorPosX.getNumber() == Math.floor(textMirrorPosX.getNumber())) {
                 toggleOdd = false;
-				buttonToggleOdd.setTooltip(Arrays.asList(new StringTextComponent("Set mirror position to middle of block"), new StringTextComponent("for odd numbered builds")));
+                buttonToggleOdd.setTooltip(Arrays.asList("Set mirror position to middle of block", "for odd numbered builds"));
             } else {
                 toggleOdd = true;
-				buttonToggleOdd.setTooltip(Arrays.asList(new StringTextComponent("Set mirror position to corner of block"), new StringTextComponent("for even numbered builds")));
+                buttonToggleOdd.setTooltip(Arrays.asList("Set mirror position to corner of block", "for even numbered builds"));
             }
             buttonToggleOdd.setUseAlternateIcon(toggleOdd);
         }
@@ -164,6 +129,8 @@ public class MirrorSettingsGui extends GuiCollapsibleScrollEntry {
         buttonList.addAll(mirrorIconButtonList);
 
         setCollapsed(!buttonMirrorEnabled.isChecked());
+
+        return id;
     }
 
     @Override
@@ -173,32 +140,33 @@ public class MirrorSettingsGui extends GuiCollapsibleScrollEntry {
     }
 
     @Override
-	public void drawEntry(MatrixStack 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) {
+        super.drawEntry(slotIndex, x, y, listWidth, slotHeight, mouseX, mouseY, isSelected, partialTicks);
 
         int yy = y;
         int offset = 8;
 
-		buttonMirrorEnabled.render(ms, mouseX, mouseY, partialTicks);
+        buttonMirrorEnabled.drawButton(this.mc, mouseX, mouseY, partialTicks);
         if (buttonMirrorEnabled.isChecked()) {
             buttonMirrorEnabled.y = yy;
-			font.draw(ms, "Mirror enabled", left + offset, yy + 2, 0xFFFFFF);
+            fontRenderer.drawString("Mirror enabled", left + offset, yy + 2, 0xFFFFFF, true);
 
             yy = y + 18;
-			font.draw(ms, "Position", left + offset, yy + 5, 0xFFFFFF);
-			font.draw(ms, "X", left + 40 + offset, yy + 5, 0xFFFFFF);
+            fontRenderer.drawString("Position", left + offset, yy + 5, 0xFFFFFF, true);
+            fontRenderer.drawString("X", left + 40 + offset, yy + 5, 0xFFFFFF, true);
             textMirrorPosX.y = yy;
-			font.draw(ms, "Y", left + 120 + offset, yy + 5, 0xFFFFFF);
+            fontRenderer.drawString("Y", left + 120 + offset, yy + 5, 0xFFFFFF, true);
             textMirrorPosY.y = yy;
-			font.draw(ms, "Z", left + 200 + offset, yy + 5, 0xFFFFFF);
+            fontRenderer.drawString("Z", left + 200 + offset, yy + 5, 0xFFFFFF, true);
             textMirrorPosZ.y = yy;
 
             yy = y + 50;
-			font.draw(ms, "Direction", left + offset, yy + 2, 0xFFFFFF);
+            fontRenderer.drawString("Direction", left + offset, yy + 2, 0xFFFFFF, true);
             buttonMirrorX.y = yy;
             buttonMirrorY.y = yy;
             buttonMirrorZ.y = yy;
-			font.draw(ms, "Radius", left + 176 + offset, yy + 2, 0xFFFFFF);
+            fontRenderer.drawString("Radius", left + 176 + offset, yy + 2, 0xFFFFFF, true);
             textMirrorRadius.y = yy - 3;
 
             yy = y + 72;
@@ -207,53 +175,100 @@ public class MirrorSettingsGui extends GuiCollapsibleScrollEntry {
             buttonDrawLines.y = yy;
             buttonDrawPlanes.y = yy;
 
-			mirrorButtonList.forEach(button -> button.render(ms, mouseX, mouseY, partialTicks));
-			mirrorIconButtonList.forEach(button -> button.render(ms, mouseX, mouseY, partialTicks));
-			mirrorNumberFieldList.forEach(numberField -> numberField.drawNumberField(ms, mouseX, mouseY, partialTicks));
+            mirrorButtonList.forEach(button -> button.drawButton(this.mc, mouseX, mouseY, partialTicks));
+            mirrorIconButtonList.forEach(button -> button.drawButton(this.mc, mouseX, mouseY, partialTicks));
+            mirrorNumberFieldList.forEach(numberField -> numberField.drawNumberField(this.mc, mouseX, mouseY, partialTicks));
         } else {
             buttonMirrorEnabled.y = yy;
-			font.draw(ms, "Mirror disabled", left + offset, yy + 2, 0x999999);
+            fontRenderer.drawString("Mirror disabled", left + offset, yy + 2, 0x999999, true);
         }
 
     }
 
-	public void drawTooltip(MatrixStack ms, Screen guiScreen, int mouseX, int mouseY) {
+    public void drawTooltip(GuiScreen 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));
+        if (buttonMirrorEnabled.isChecked())
+        {
+            mirrorIconButtonList.forEach(iconButton -> iconButton.drawTooltip(scrollPane.parent, mouseX, mouseY));
+            mirrorNumberFieldList.forEach(numberField -> numberField.drawTooltip(scrollPane.parent, mouseX, mouseY));
         }
     }
 
     @Override
-	public boolean charTyped(char typedChar, int keyCode) {
-		super.charTyped(typedChar, keyCode);
-		for (GuiNumberField numberField : mirrorNumberFieldList) {
-			numberField.charTyped(typedChar, keyCode);
+    public void updatePosition(int slotIndex, int x, int y, float partialTicks) {
+        super.updatePosition(slotIndex, x, y, partialTicks);
+    }
+
+    @Override
+    public void keyTyped(char typedChar, int keyCode) throws IOException {
+        super.keyTyped(typedChar, keyCode);
+        for (GuiNumberField numberField : mirrorNumberFieldList) {
+            numberField.keyTyped(typedChar, keyCode);
         }
-		return true;
     }
 
     @Override
     public boolean mousePressed(int slotIndex, int mouseX, int mouseY, int mouseEvent, int relativeX, int relativeY) {
+        super.mousePressed(slotIndex, mouseX, mouseY, mouseEvent, relativeX, relativeY);
         mirrorNumberFieldList.forEach(numberField -> numberField.mouseClicked(mouseX, mouseY, mouseEvent));
 
         boolean insideMirrorEnabledLabel = mouseX >= left && mouseX < right && relativeY >= -2 && relativeY < 12;
 
         if (insideMirrorEnabledLabel) {
-			buttonMirrorEnabled.playDownSound(this.mc.getSoundManager());
-			buttonMirrorEnabled.onClick(mouseX, mouseY);
+            buttonMirrorEnabled.setIsChecked(!buttonMirrorEnabled.isChecked());
+            buttonMirrorEnabled.playPressSound(this.mc.getSoundHandler());
+            actionPerformed(buttonMirrorEnabled);
         }
 
         return true;
     }
 
+    @Override
+    public void actionPerformed(GuiButton button) {
+        super.actionPerformed(button);
+        if (button == buttonMirrorEnabled) {
+            setCollapsed(!buttonMirrorEnabled.isChecked());
+        }
+        if (button == buttonCurrentPosition) {
+            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);
+            textMirrorPosY.setNumber(pos.y);
+            textMirrorPosZ.setNumber(pos.z);
+        }
+        if (button == buttonToggleOdd) {
+            toggleOdd = !toggleOdd;
+            buttonToggleOdd.setUseAlternateIcon(toggleOdd);
+            if (toggleOdd) {
+                buttonToggleOdd.setTooltip(Arrays.asList("Set mirror position to corner of block", "for even numbered builds"));
+                textMirrorPosX.setNumber(textMirrorPosX.getNumber() + 0.5);
+                textMirrorPosY.setNumber(textMirrorPosY.getNumber() + 0.5);
+                textMirrorPosZ.setNumber(textMirrorPosZ.getNumber() + 0.5);
+            } else {
+                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()));
+                textMirrorPosZ.setNumber(Math.floor(textMirrorPosZ.getNumber()));
+            }
+        }
+        if (button == buttonDrawLines) {
+            drawLines = !drawLines;
+            buttonDrawLines.setUseAlternateIcon(drawLines);
+            buttonDrawLines.setTooltip(drawLines ? "Hide lines" : "Show lines");
+        }
+        if (button == buttonDrawPlanes) {
+            drawPlanes = !drawPlanes;
+            buttonDrawPlanes.setUseAlternateIcon(drawPlanes);
+            buttonDrawPlanes.setTooltip(drawPlanes ? "Hide area" : "Show area");
+        }
+        mirrorNumberFieldList.forEach(numberField -> numberField.actionPerformed(button));
+    }
+
     public Mirror.MirrorSettings getMirrorSettings() {
         boolean mirrorEnabled = buttonMirrorEnabled.isChecked();
 
-		Vector3d mirrorPos = new Vector3d(0, 64, 0);
+        Vec3d mirrorPos = new Vec3d(0, 64, 0);
         try {
-			mirrorPos = new Vector3d(textMirrorPosX.getNumber(), textMirrorPosY.getNumber(), textMirrorPosZ.getNumber());
+            mirrorPos = new Vec3d(textMirrorPosX.getNumber(), textMirrorPosY.getNumber(), textMirrorPosZ.getNumber());
         } catch (NumberFormatException | NullPointerException ex) {
             EffortlessBuilding.log(mc.player, "Mirror position not a valid number.");
         }

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

@@ -1,13 +1,7 @@
 package nl.requios.effortlessbuilding.gui.buildmodifier;
 
-import com.mojang.blaze3d.matrix.MatrixStack;
-import net.minecraft.client.Minecraft;
-import net.minecraft.client.gui.screen.Screen;
-import net.minecraft.client.gui.widget.button.Button;
-import net.minecraft.util.text.StringTextComponent;
-import net.minecraft.util.text.TranslationTextComponent;
-import net.minecraftforge.api.distmarker.Dist;
-import net.minecraftforge.api.distmarker.OnlyIn;
+import net.minecraft.client.gui.GuiButton;
+import net.minecraft.client.gui.GuiScreen;
 import nl.requios.effortlessbuilding.EffortlessBuilding;
 import nl.requios.effortlessbuilding.buildmodifier.Array;
 import nl.requios.effortlessbuilding.buildmodifier.Mirror;
@@ -15,96 +9,89 @@ import nl.requios.effortlessbuilding.buildmodifier.ModifierSettingsManager;
 import nl.requios.effortlessbuilding.buildmodifier.RadialMirror;
 import nl.requios.effortlessbuilding.gui.elements.GuiScrollPane;
 import nl.requios.effortlessbuilding.network.ModifierSettingsMessage;
-import nl.requios.effortlessbuilding.network.PacketHandler;
 import nl.requios.effortlessbuilding.proxy.ClientProxy;
 
-@OnlyIn(Dist.CLIENT)
-public class ModifierSettingsGui extends Screen {
+import java.io.IOException;
+
+public class ModifierSettingsGui extends GuiScreen {
 
     private GuiScrollPane scrollPane;
-	private Button buttonClose;
+    private GuiButton buttonClose;
 
     private MirrorSettingsGui mirrorSettingsGui;
     private ArraySettingsGui arraySettingsGui;
     private RadialMirrorSettingsGui radialMirrorSettingsGui;
 
-	public ModifierSettingsGui() {
-		super(new TranslationTextComponent("effortlessbuilding.screen.modifier_settings"));
-	}
-
     @Override
     //Create buttons and labels and add them to buttonList/labelList
-	protected void init() {
-		scrollPane = new GuiScrollPane(this, font, 8, height - 30);
+    public void initGui() {
+        int id = 0;
+
+        scrollPane = new GuiScrollPane(this, fontRenderer, 8, height - 30);
 
         mirrorSettingsGui = new MirrorSettingsGui(scrollPane);
-		scrollPane.AddListEntry(mirrorSettingsGui);
+        scrollPane.listEntries.add(mirrorSettingsGui);
 
         arraySettingsGui = new ArraySettingsGui(scrollPane);
-		scrollPane.AddListEntry(arraySettingsGui);
+        scrollPane.listEntries.add(arraySettingsGui);
 
         radialMirrorSettingsGui = new RadialMirrorSettingsGui(scrollPane);
-		scrollPane.AddListEntry(radialMirrorSettingsGui);
+        scrollPane.listEntries.add(radialMirrorSettingsGui);
 
-		scrollPane.init(buttons);
+        id = scrollPane.initGui(id, buttonList);
 
         //Close button
         int y = height - 26;
-		buttonClose = new Button(width / 2 - 100, y, 200, 20, new StringTextComponent("Close"), (button) -> {
-			Minecraft.getInstance().player.closeContainer();
-		});
-		buttons.add(buttonClose);
+        buttonClose = new GuiButton(id++, width / 2 - 100, y, "Close");
+        buttonList.add(buttonClose);
+
     }
 
     @Override
     //Process general logic, i.e. hide buttons
-	public void tick() {
+    public void updateScreen() {
         scrollPane.updateScreen();
-
-		handleMouseInput();
     }
 
     @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
-	public void render(MatrixStack ms, int mouseX, int mouseY, float partialTicks) {
-		this.renderBackground(ms);
+    public void drawScreen(int mouseX, int mouseY, float partialTicks) {
+        this.drawDefaultBackground();
 
-		scrollPane.render(ms, mouseX, mouseY, partialTicks);
+        scrollPane.drawScreen(mouseX, mouseY, partialTicks);
 
-		buttonClose.render(ms, mouseX, mouseY, partialTicks);
+        buttonClose.drawButton(this.mc, mouseX, mouseY, partialTicks);
 
-		scrollPane.drawTooltip(ms, this, mouseX, mouseY);
-	}
-
-
-	@Override
-	public boolean charTyped(char typedChar, int keyCode) {
-		super.charTyped(typedChar, keyCode);
-		scrollPane.charTyped(typedChar, keyCode);
-		if (keyCode == ClientProxy.keyBindings[0].getKey().getValue()) {
-			minecraft.player.closeContainer();
-		}
-		return false;
+        scrollPane.drawTooltip(this, mouseX, mouseY);
     }
 
     @Override
-	public boolean mouseClicked(double mouseX, double mouseY, int mouseButton) {
+    protected void keyTyped(char typedChar, int keyCode) throws IOException {
+        super.keyTyped(typedChar, keyCode);
+        scrollPane.keyTyped(typedChar, keyCode);
+        if (keyCode == ClientProxy.keyBindings[0].getKeyCode()) {
+            mc.player.closeScreen();
+        }
+    }
+
+    @Override
+    protected void mouseClicked(int mouseX, int mouseY, int mouseButton) throws IOException {
         super.mouseClicked(mouseX, mouseY, mouseButton);
-		buttons.forEach(button -> button.mouseClicked(mouseX, mouseY, mouseButton));
-		return scrollPane.mouseClicked(mouseX, mouseY, mouseButton);
+        scrollPane.mouseClicked(mouseX, mouseY, mouseButton);
     }
 
     @Override
-	public boolean mouseReleased(double mouseX, double mouseY, int state) {
-		if (state != 0 || !scrollPane.mouseReleased(mouseX, mouseY, state)) {
-			return super.mouseReleased(mouseX, mouseY, state);
+    protected void mouseReleased(int mouseX, int mouseY, int state) {
+        if (state != 0 || !scrollPane.mouseReleased(mouseX, mouseY, state))
+        {
+            super.mouseReleased(mouseX, mouseY, state);
         }
-		return false;
     }
 
-	public void handleMouseInput() {
-		//super.handleMouseInput();
+    @Override
+    public void handleMouseInput() throws IOException {
+        super.handleMouseInput();
         scrollPane.handleMouseInput();
 
         //Scrolling numbers
@@ -114,7 +101,16 @@ public class ModifierSettingsGui extends Screen {
     }
 
     @Override
-	public void removed() {
+    protected void actionPerformed(GuiButton button) {
+        //check what button and action type (left/right click)
+        if (button == buttonClose) {
+            mc.player.closeScreen();
+        }
+        scrollPane.actionPerformed(button);
+    }
+
+    @Override
+    public void onGuiClosed() {
         scrollPane.onGuiClosed();
 
         //save everything
@@ -122,22 +118,20 @@ public class ModifierSettingsGui extends Screen {
         Array.ArraySettings a = arraySettingsGui.getArraySettings();
         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();
         modifierSettings.setMirrorSettings(m);
         modifierSettings.setArraySettings(a);
         modifierSettings.setRadialMirrorSettings(r);
 
         //Sanitize
-		String error = ModifierSettingsManager.sanitize(modifierSettings, minecraft.player);
-		if (!error.isEmpty()) EffortlessBuilding.log(minecraft.player, error);
+        String error = ModifierSettingsManager.sanitize(modifierSettings, mc.player);
+        if (!error.isEmpty()) EffortlessBuilding.log(mc.player, error);
 
-		ModifierSettingsManager.setModifierSettings(minecraft.player, modifierSettings);
+        ModifierSettingsManager.setModifierSettings(mc.player, modifierSettings);
 
         //Send to server
-		PacketHandler.INSTANCE.sendToServer(new ModifierSettingsMessage(modifierSettings));
-
-		Minecraft.getInstance().mouseHandler.grabMouse();
+        EffortlessBuilding.packetHandler.sendToServer(new ModifierSettingsMessage(modifierSettings));
     }
 
 }

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

@@ -1,37 +1,35 @@
 package nl.requios.effortlessbuilding.gui.buildmodifier;
 
-import com.mojang.blaze3d.matrix.MatrixStack;
-import net.minecraft.client.gui.screen.Screen;
-import net.minecraft.client.gui.widget.Widget;
-import net.minecraft.client.gui.widget.button.Button;
+import net.minecraft.client.gui.GuiButton;
+import net.minecraft.client.gui.GuiScreen;
 import net.minecraft.util.ResourceLocation;
-import net.minecraft.util.math.vector.Vector3d;
-import net.minecraft.util.text.StringTextComponent;
+import net.minecraft.util.math.Vec3d;
 import net.minecraft.util.text.TextFormatting;
-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;
 
-@SuppressWarnings("Duplicates")
-@OnlyIn(Dist.CLIENT)
 public class RadialMirrorSettingsGui extends GuiCollapsibleScrollEntry {
 
     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<GuiNumberField> radialMirrorNumberFieldList = new ArrayList<>();
 
     private GuiNumberField textRadialMirrorPosX, textRadialMirrorPosY, textRadialMirrorPosZ, textRadialMirrorSlices, textRadialMirrorRadius;
-	private GuiCheckBoxFixed buttonRadialMirrorEnabled, buttonRadialMirrorAlternate;
+    private GuiCheckBox buttonRadialMirrorEnabled, buttonRadialMirrorAlternate;
     private GuiIconButton buttonCurrentPosition, buttonToggleOdd, buttonDrawPlanes, buttonDrawLines;
     private boolean drawPlanes, drawLines, toggleOdd;
 
@@ -40,96 +38,64 @@ public class RadialMirrorSettingsGui extends GuiCollapsibleScrollEntry {
     }
 
     @Override
-	public void init(List<Widget> buttonList) {
-		super.init(buttonList);
+    public int initGui(int id, List<GuiButton> buttonList) {
+        id = super.initGui(id, buttonList);
 
         int y = top - 2;
-		buttonRadialMirrorEnabled = new GuiCheckBoxFixed(left - 15 + 8, y, "", false) {
-			@Override
-			public void onClick(double mouseX, double mouseY) {
-				super.onClick(mouseX, mouseY);
-				setCollapsed(!buttonRadialMirrorEnabled.isChecked());
-			}
-		};
+        buttonRadialMirrorEnabled = new GuiCheckBox(id++, left - 15 + 8, y, "", false);
         buttonList.add(buttonRadialMirrorEnabled);
 
         y = top + 18;
-		textRadialMirrorPosX = new GuiNumberField(font, buttonList, left + 58, y, 62, 18);
+        textRadialMirrorPosX = new GuiNumberField(id++, id++, id++, fontRenderer, buttonList, left + 58, y, 62, 18);
         textRadialMirrorPosX.setNumber(0);
         textRadialMirrorPosX.setTooltip(
-			Arrays.asList(new StringTextComponent("The position of the radial mirror."), new StringTextComponent("For odd numbered builds add 0.5.").withStyle(TextFormatting.GRAY)));
+                Arrays.asList("The position of the radial mirror.", TextFormatting.GRAY + "For odd numbered builds add 0.5."));
         radialMirrorNumberFieldList.add(textRadialMirrorPosX);
 
-		textRadialMirrorPosY = new GuiNumberField(font, buttonList, left + 138, y, 62, 18);
+        textRadialMirrorPosY = new GuiNumberField(id++, id++, id++, fontRenderer, buttonList, left + 138, y, 62, 18);
         textRadialMirrorPosY.setNumber(64);
-		textRadialMirrorPosY.setTooltip(Arrays.asList(new StringTextComponent("The position of the radial mirror."), new StringTextComponent("For odd numbered builds add 0.5.").withStyle(TextFormatting.GRAY)));
+        textRadialMirrorPosY.setTooltip(Arrays.asList("The position of the radial mirror.", TextFormatting.GRAY + "For odd numbered builds add 0.5."));
         radialMirrorNumberFieldList.add(textRadialMirrorPosY);
 
-		textRadialMirrorPosZ = new GuiNumberField(font, buttonList, left + 218, y, 62, 18);
+        textRadialMirrorPosZ = new GuiNumberField(id++, id++, id++, fontRenderer, buttonList, left + 218, y, 62, 18);
         textRadialMirrorPosZ.setNumber(0);
-		textRadialMirrorPosZ.setTooltip(Arrays.asList(new StringTextComponent("The position of the radial mirror."), new StringTextComponent("For odd numbered builds add 0.5.").withStyle(TextFormatting.GRAY)));
+        textRadialMirrorPosZ.setTooltip(Arrays.asList("The position of the radial mirror.", TextFormatting.GRAY + "For odd numbered builds add 0.5."));
         radialMirrorNumberFieldList.add(textRadialMirrorPosZ);
 
         y = top + 47;
-		textRadialMirrorSlices = new GuiNumberField(font, buttonList, left + 55, y, 50, 18);
+        textRadialMirrorSlices = new GuiNumberField(id++, id++, id++, fontRenderer, buttonList, left + 55, y, 50, 18);
         textRadialMirrorSlices.setNumber(4);
-		textRadialMirrorSlices.setTooltip(Arrays.asList(new StringTextComponent("The number of repeating slices."), new StringTextComponent("Minimally 2.").withStyle(TextFormatting.GRAY)));
+        textRadialMirrorSlices.setTooltip(Arrays.asList("The number of repeating slices.", TextFormatting.GRAY + "Minimally 2."));
         radialMirrorNumberFieldList.add(textRadialMirrorSlices);
 
-		textRadialMirrorRadius = new GuiNumberField(font, buttonList, left + 218, y, 62, 18);
+        textRadialMirrorRadius = new GuiNumberField(id++, id++, id++, fontRenderer, buttonList, left + 218, y, 62, 18);
         textRadialMirrorRadius.setNumber(50);
         //TODO change to diameter (remove /2)
-		textRadialMirrorRadius.setTooltip(Arrays.asList(new StringTextComponent("How far the radial mirror reaches from its center position."),
-			new StringTextComponent("Max: ").withStyle(TextFormatting.GRAY).append(new StringTextComponent(String.valueOf(ReachHelper.getMaxReach(mc.player) / 2)).withStyle(TextFormatting.GOLD)),
-			new StringTextComponent("Upgradeable in survival with reach upgrades.").withStyle(TextFormatting.GRAY)));
+        textRadialMirrorRadius.setTooltip(Arrays.asList("How far the radial mirror reaches from its center position.",
+                TextFormatting.GRAY + "Max: " + TextFormatting.GOLD + ReachHelper.getMaxReach(mc.player) / 2,
+                TextFormatting.GRAY + "Upgradeable in survival with reach upgrades."));
         radialMirrorNumberFieldList.add(textRadialMirrorRadius);
 
+
         y = top + 72;
-		buttonCurrentPosition = new GuiIconButton(left + 5, y, 0, 0, BUILDING_ICONS, button -> {
-			Vector3d pos = new Vector3d(Math.floor(mc.player.getX()) + 0.5, Math.floor(mc.player.getY()) + 0.5, Math.floor(mc.player.getZ()) + 0.5);
-			textRadialMirrorPosX.setNumber(pos.x);
-			textRadialMirrorPosY.setNumber(pos.y);
-			textRadialMirrorPosZ.setNumber(pos.z);
-		});
-		buttonCurrentPosition.setTooltip(new StringTextComponent("Set radial mirror position to current player position"));
+        buttonCurrentPosition = new GuiIconButton(id++, left + 5, y, 0, 0, BUILDING_ICONS);
+        buttonCurrentPosition.setTooltip("Set radial mirror position to current player position");
         radialMirrorIconButtonList.add(buttonCurrentPosition);
 
-		buttonToggleOdd = new GuiIconButton(left + 35, y, 0, 20, BUILDING_ICONS, button -> {
-			toggleOdd = !toggleOdd;
-			buttonToggleOdd.setUseAlternateIcon(toggleOdd);
-			if (toggleOdd) {
-				buttonToggleOdd.setTooltip(Arrays.asList(new StringTextComponent("Set mirror position to corner of block"), new StringTextComponent("for even numbered builds")));
-				textRadialMirrorPosX.setNumber(textRadialMirrorPosX.getNumber() + 0.5);
-				textRadialMirrorPosY.setNumber(textRadialMirrorPosY.getNumber() + 0.5);
-				textRadialMirrorPosZ.setNumber(textRadialMirrorPosZ.getNumber() + 0.5);
-			} else {
-				buttonToggleOdd.setTooltip(Arrays.asList(new StringTextComponent("Set mirror position to middle of block"), new StringTextComponent("for odd numbered builds")));
-				textRadialMirrorPosX.setNumber(Math.floor(textRadialMirrorPosX.getNumber()));
-				textRadialMirrorPosY.setNumber(Math.floor(textRadialMirrorPosY.getNumber()));
-				textRadialMirrorPosZ.setNumber(Math.floor(textRadialMirrorPosZ.getNumber()));
-			}
-		});
-		buttonToggleOdd.setTooltip(Arrays.asList(new StringTextComponent("Set radial mirror position to middle of block"), new StringTextComponent("for odd numbered builds")));
+        buttonToggleOdd = new GuiIconButton(id++, left + 35, y, 0, 20, BUILDING_ICONS);
+        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 -> {
-			drawLines = !drawLines;
-			buttonDrawLines.setUseAlternateIcon(drawLines);
-			buttonDrawLines.setTooltip(new StringTextComponent(drawLines ? "Hide lines" : "Show lines"));
-		});
-		buttonDrawLines.setTooltip(new StringTextComponent("Show lines"));
+        buttonDrawLines = new GuiIconButton(id++, left + 65, y, 0, 40, BUILDING_ICONS);
+        buttonDrawLines.setTooltip("Show lines");
         radialMirrorIconButtonList.add(buttonDrawLines);
 
-		buttonDrawPlanes = new GuiIconButton(left + 95, y, 0, 60, BUILDING_ICONS, button -> {
-			drawPlanes = !drawPlanes;
-			buttonDrawPlanes.setUseAlternateIcon(drawPlanes);
-			buttonDrawPlanes.setTooltip(new StringTextComponent(drawPlanes ? "Hide area" : "Show area"));
-		});
-		buttonDrawPlanes.setTooltip(new StringTextComponent("Show area"));
+        buttonDrawPlanes = new GuiIconButton(id++, left + 95, y, 0, 60, BUILDING_ICONS);
+        buttonDrawPlanes.setTooltip("Show area");
         radialMirrorIconButtonList.add(buttonDrawPlanes);
 
         y = top + 76;
-		buttonRadialMirrorAlternate = new GuiCheckBoxFixed(left + 140, y, " Alternate", false);
+        buttonRadialMirrorAlternate = new GuiCheckBox(id++, left + 140, y, " Alternate", false);
         radialMirrorButtonList.add(buttonRadialMirrorAlternate);
 
         ModifierSettingsManager.ModifierSettings modifierSettings = ModifierSettingsManager.getModifierSettings(mc.player);
@@ -146,14 +112,14 @@ public class RadialMirrorSettingsGui extends GuiCollapsibleScrollEntry {
             drawPlanes = r.drawPlanes;
             buttonDrawLines.setUseAlternateIcon(drawLines);
             buttonDrawPlanes.setUseAlternateIcon(drawPlanes);
-			buttonDrawLines.setTooltip(new StringTextComponent(drawLines ? "Hide lines" : "Show lines"));
-			buttonDrawPlanes.setTooltip(new StringTextComponent(drawPlanes ? "Hide area" : "Show area"));
+            buttonDrawLines.setTooltip(drawLines ? "Hide lines" : "Show lines");
+            buttonDrawPlanes.setTooltip(drawPlanes ? "Hide area" : "Show area");
             if (textRadialMirrorPosX.getNumber() == Math.floor(textRadialMirrorPosX.getNumber())) {
                 toggleOdd = false;
-				buttonToggleOdd.setTooltip(Arrays.asList(new StringTextComponent("Set radial mirror position to middle of block"), new StringTextComponent("for odd numbered builds")));
+                buttonToggleOdd.setTooltip(Arrays.asList("Set radial mirror position to middle of block", "for odd numbered builds"));
             } else {
                 toggleOdd = true;
-				buttonToggleOdd.setTooltip(Arrays.asList(new StringTextComponent("Set radial mirror position to corner of block"), new StringTextComponent("for even numbered builds")));
+                buttonToggleOdd.setTooltip(Arrays.asList("Set radial mirror position to corner of block", "for even numbered builds"));
             }
             buttonToggleOdd.setUseAlternateIcon(toggleOdd);
         }
@@ -162,38 +128,42 @@ public class RadialMirrorSettingsGui extends GuiCollapsibleScrollEntry {
         buttonList.addAll(radialMirrorIconButtonList);
 
         setCollapsed(!buttonRadialMirrorEnabled.isChecked());
+
+        return id;
     }
 
+    @Override
     public void updateScreen() {
+        super.updateScreen();
         radialMirrorNumberFieldList.forEach(GuiNumberField::update);
     }
 
-
     @Override
-	public void drawEntry(MatrixStack 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) {
+        super.drawEntry(slotIndex, x, y, listWidth, slotHeight, mouseX, mouseY, isSelected, partialTicks);
 
         int yy = y;
         int offset = 8;
 
-		buttonRadialMirrorEnabled.render(ms, mouseX, mouseY, partialTicks);
+        buttonRadialMirrorEnabled.drawButton(this.mc, mouseX, mouseY, partialTicks);
         if (buttonRadialMirrorEnabled.isChecked()) {
             buttonRadialMirrorEnabled.y = yy;
-			font.draw(ms, "Radial mirror enabled", left + offset, yy + 2, 0xFFFFFF);
+            fontRenderer.drawString("Radial mirror enabled", left + offset, yy + 2, 0xFFFFFF, true);
 
             yy = y + 18;
-			font.draw(ms, "Position", left + offset, yy + 5, 0xFFFFFF);
-			font.draw(ms, "X", left + 40 + offset, yy + 5, 0xFFFFFF);
+            fontRenderer.drawString("Position", left + offset, yy + 5, 0xFFFFFF, true);
+            fontRenderer.drawString("X", left + 40 + offset, yy + 5, 0xFFFFFF, true);
             textRadialMirrorPosX.y = yy;
-			font.draw(ms, "Y", left + 120 + offset, yy + 5, 0xFFFFFF);
+            fontRenderer.drawString("Y", left + 120 + offset, yy + 5, 0xFFFFFF, true);
             textRadialMirrorPosY.y = yy;
-			font.draw(ms, "Z", left + 200 + offset, yy + 5, 0xFFFFFF);
+            fontRenderer.drawString("Z", left + 200 + offset, yy + 5, 0xFFFFFF, true);
             textRadialMirrorPosZ.y = yy;
 
             yy = y + 50;
-			font.draw(ms, "Slices", left + offset, yy + 2, 0xFFFFFF);
+            fontRenderer.drawString("Slices", left + offset, yy + 2, 0xFFFFFF, true);
             textRadialMirrorSlices.y = yy - 3;
-			font.draw(ms, "Radius", left + 176 + offset, yy + 2, 0xFFFFFF);
+            fontRenderer.drawString("Radius", left + 176 + offset, yy + 2, 0xFFFFFF, true);
             textRadialMirrorRadius.y = yy - 3;
 
             yy = y + 72;
@@ -205,54 +175,101 @@ public class RadialMirrorSettingsGui extends GuiCollapsibleScrollEntry {
             yy = y + 76;
             buttonRadialMirrorAlternate.y = yy;
 
-			radialMirrorButtonList.forEach(button -> button.render(ms, mouseX, mouseY, partialTicks));
-			radialMirrorIconButtonList.forEach(button -> button.render(ms, mouseX, mouseY, partialTicks));
+            radialMirrorButtonList.forEach(button -> button.drawButton(this.mc, mouseX, mouseY, partialTicks));
+            radialMirrorIconButtonList.forEach(button -> button.drawButton(this.mc, mouseX, mouseY, partialTicks));
             radialMirrorNumberFieldList
-				.forEach(numberField -> numberField.drawNumberField(ms, mouseX, mouseY, partialTicks));
+                    .forEach(numberField -> numberField.drawNumberField(this.mc, mouseX, mouseY, partialTicks));
         } else {
             buttonRadialMirrorEnabled.y = yy;
-			font.draw(ms, "Radial mirror disabled", left + offset, yy + 2, 0x999999);
+            fontRenderer.drawString("Radial mirror disabled", left + offset, yy + 2, 0x999999, true);
         }
 
     }
 
-	public void drawTooltip(MatrixStack ms, Screen guiScreen, int mouseX, int mouseY) {
+    public void drawTooltip(GuiScreen guiScreen, int mouseX, int mouseY) {
         //Draw tooltips last
-		if (buttonRadialMirrorEnabled.isChecked()) {
-			radialMirrorIconButtonList.forEach(iconButton -> iconButton.drawTooltip(ms, scrollPane.parent, mouseX, mouseY));
-			radialMirrorNumberFieldList.forEach(numberField -> numberField.drawTooltip(ms, scrollPane.parent, mouseX, mouseY));
+        if (buttonRadialMirrorEnabled.isChecked())
+        {
+            radialMirrorIconButtonList.forEach(iconButton -> iconButton.drawTooltip(scrollPane.parent, mouseX, mouseY));
+            radialMirrorNumberFieldList.forEach(numberField -> numberField.drawTooltip(scrollPane.parent, mouseX, mouseY));
         }
     }
 
     @Override
-	public boolean charTyped(char typedChar, int keyCode) {
-		super.charTyped(typedChar, keyCode);
-		for (GuiNumberField numberField : radialMirrorNumberFieldList) {
-			numberField.charTyped(typedChar, keyCode);
+    public void updatePosition(int slotIndex, int x, int y, float partialTicks) {
+        super.updatePosition(slotIndex, x, y, partialTicks);
+    }
+
+    @Override
+    public void keyTyped(char typedChar, int keyCode) throws IOException {
+        super.keyTyped(typedChar, keyCode);
+        for (GuiNumberField numberField : radialMirrorNumberFieldList) {
+            numberField.keyTyped(typedChar, keyCode);
         }
-		return true;
     }
 
     @Override
     public boolean mousePressed(int slotIndex, int mouseX, int mouseY, int mouseEvent, int relativeX, int relativeY) {
+        super.mousePressed(slotIndex, mouseX, mouseY, mouseEvent, relativeX, relativeY);
         radialMirrorNumberFieldList.forEach(numberField -> numberField.mouseClicked(mouseX, mouseY, mouseEvent));
 
         boolean insideRadialMirrorEnabledLabel = mouseX >= left && mouseX < right && relativeY >= -2 && relativeY < 12;
 
         if (insideRadialMirrorEnabledLabel) {
-			buttonRadialMirrorEnabled.playDownSound(this.mc.getSoundManager());
-			buttonRadialMirrorEnabled.onClick(mouseX, mouseY);
+            buttonRadialMirrorEnabled.setIsChecked(!buttonRadialMirrorEnabled.isChecked());
+            buttonRadialMirrorEnabled.playPressSound(this.mc.getSoundHandler());
+            actionPerformed(buttonRadialMirrorEnabled);
         }
 
         return true;
     }
 
+    @Override
+    public void actionPerformed(GuiButton button) {
+        super.actionPerformed(button);
+        if (button == buttonRadialMirrorEnabled) {
+            setCollapsed(!buttonRadialMirrorEnabled.isChecked());
+        }
+        if (button == buttonCurrentPosition) {
+            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);
+            textRadialMirrorPosY.setNumber(pos.y);
+            textRadialMirrorPosZ.setNumber(pos.z);
+        }
+        if (button == buttonToggleOdd) {
+            toggleOdd = !toggleOdd;
+            buttonToggleOdd.setUseAlternateIcon(toggleOdd);
+            if (toggleOdd) {
+                buttonToggleOdd.setTooltip(Arrays.asList("Set mirror position to corner of block", "for even numbered builds"));
+                textRadialMirrorPosX.setNumber(textRadialMirrorPosX.getNumber() + 0.5);
+                textRadialMirrorPosY.setNumber(textRadialMirrorPosY.getNumber() + 0.5);
+                textRadialMirrorPosZ.setNumber(textRadialMirrorPosZ.getNumber() + 0.5);
+            } else {
+                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()));
+                textRadialMirrorPosZ.setNumber(Math.floor(textRadialMirrorPosZ.getNumber()));
+            }
+        }
+        if (button == buttonDrawLines) {
+            drawLines = !drawLines;
+            buttonDrawLines.setUseAlternateIcon(drawLines);
+            buttonDrawLines.setTooltip(drawLines ? "Hide lines" : "Show lines");
+        }
+        if (button == buttonDrawPlanes) {
+            drawPlanes = !drawPlanes;
+            buttonDrawPlanes.setUseAlternateIcon(drawPlanes);
+            buttonDrawPlanes.setTooltip(drawPlanes ? "Hide area" : "Show area");
+        }
+        radialMirrorNumberFieldList.forEach(numberField -> numberField.actionPerformed(button));
+    }
+
     public RadialMirror.RadialMirrorSettings getRadialMirrorSettings() {
         boolean radialMirrorEnabled = buttonRadialMirrorEnabled.isChecked();
 
-		Vector3d radialMirrorPos = new Vector3d(0, 64, 0);
+        Vec3d radialMirrorPos = new Vec3d(0, 64, 0);
         try {
-			radialMirrorPos = new Vector3d(textRadialMirrorPosX.getNumber(), textRadialMirrorPosY.getNumber(), textRadialMirrorPosZ
+            radialMirrorPos = new Vec3d(textRadialMirrorPosX.getNumber(), textRadialMirrorPosY.getNumber(), textRadialMirrorPosZ
                     .getNumber());
         } catch (NumberFormatException | NullPointerException ex) {
             EffortlessBuilding.log(mc.player, "Radial mirror position not a valid number.");

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

@@ -1,62 +0,0 @@
-package nl.requios.effortlessbuilding.gui.elements;
-
-import com.mojang.blaze3d.matrix.MatrixStack;
-import net.minecraft.client.Minecraft;
-import net.minecraft.client.gui.widget.button.Button;
-import net.minecraft.util.text.StringTextComponent;
-import net.minecraftforge.fml.client.gui.GuiUtils;
-
-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, new StringTextComponent(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(MatrixStack 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;
-			GuiUtils.drawContinuousTexturedBox(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,20 +1,17 @@
 package nl.requios.effortlessbuilding.gui.elements;
 
-import com.mojang.blaze3d.matrix.MatrixStack;
 import net.minecraft.client.Minecraft;
 import net.minecraft.client.gui.FontRenderer;
-import net.minecraft.client.gui.screen.Screen;
-import net.minecraft.client.gui.widget.Widget;
-import net.minecraftforge.api.distmarker.Dist;
-import net.minecraftforge.api.distmarker.OnlyIn;
+import net.minecraft.client.gui.GuiButton;
+import net.minecraft.client.gui.GuiScreen;
 
+import java.io.IOException;
 import java.util.List;
 
-@OnlyIn(Dist.CLIENT)
 public abstract class GuiCollapsibleScrollEntry implements GuiScrollPane.IScrollEntry {
 
     public GuiScrollPane scrollPane;
-	protected FontRenderer font;
+    protected FontRenderer fontRenderer;
     protected Minecraft mc;
 
     protected boolean isCollapsed = true;
@@ -22,24 +19,35 @@ public abstract class GuiCollapsibleScrollEntry implements GuiScrollPane.IScroll
 
     public GuiCollapsibleScrollEntry(GuiScrollPane scrollPane) {
         this.scrollPane = scrollPane;
-		this.font = scrollPane.font;
-		this.mc = Minecraft.getInstance();
+        this.fontRenderer = scrollPane.fontRenderer;
+        this.mc = scrollPane.parent.mc;
     }
 
     @Override
-	public void init(List<Widget> buttonList) {
-		left = scrollPane.getWidth() / 2 - 140;
-		right = scrollPane.getWidth() / 2 + 140;
-		top = scrollPane.getHeight() / 2 - 100;
-		bottom = scrollPane.getHeight() / 2 + 100;
+    public int initGui(int id, List<GuiButton> buttonList) {
+
+        left = scrollPane.width / 2 - 140;
+        right = scrollPane.width / 2 + 140;
+        top = scrollPane.height / 2 - 100;
+        bottom = scrollPane.height / 2 + 100;
+
+        return id;
     }
 
     @Override
     public void updateScreen() {
+
     }
 
     @Override
-	public void drawTooltip(MatrixStack ms, Screen guiScreen, 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) {
+
+    }
+
+    @Override
+    public void drawTooltip(GuiScreen guiScreen, int mouseX, int mouseY) {
+
     }
 
     @Override
@@ -48,8 +56,8 @@ public abstract class GuiCollapsibleScrollEntry implements GuiScrollPane.IScroll
     }
 
     @Override
-	public boolean charTyped(char eventChar, int eventKey) {
-		return false;
+    public void keyTyped(char eventChar, int eventKey) throws IOException {
+
     }
 
     @Override
@@ -62,8 +70,14 @@ public abstract class GuiCollapsibleScrollEntry implements GuiScrollPane.IScroll
 
     }
 
+    @Override
+    public void actionPerformed(GuiButton button) {
+
+    }
+
     @Override
     public void onGuiClosed() {
+
     }
 
     @Override

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

@@ -1,35 +1,27 @@
 package nl.requios.effortlessbuilding.gui.elements;
 
-import com.mojang.blaze3d.matrix.MatrixStack;
 import net.minecraft.client.Minecraft;
-import net.minecraft.client.gui.screen.Screen;
-import net.minecraft.client.gui.widget.button.Button;
+import net.minecraft.client.gui.GuiButton;
+import net.minecraft.client.gui.GuiScreen;
 import net.minecraft.util.ResourceLocation;
-import net.minecraft.util.text.ITextComponent;
-import net.minecraft.util.text.StringTextComponent;
-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 Button {
+public class GuiIconButton extends GuiButton {
 
     private final ResourceLocation resourceLocation;
     private final int iconX, iconY, iconWidth, iconHeight, iconAltX, iconAltY;
-	List<ITextComponent> tooltip = new ArrayList<>();
+    List<String> tooltip = new ArrayList<>();
     private boolean useAltIcon = false;
 
-	public GuiIconButton(int x, int y, int iconX, int iconY, ResourceLocation resourceLocation, Button.IPressable onPress) {
-		this(x, y, 20, 20, iconX, iconY, 20, 20, 20, 0, resourceLocation, onPress);
+    public GuiIconButton(int buttonId, int x, int y, int iconX, int iconY, ResourceLocation resourceLocation) {
+        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.IPressable onPress) {
-		super(x, y, width, height, StringTextComponent.EMPTY, 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(buttonId, x, y, width, height, "");
         this.iconX = iconX;
         this.iconY = iconY;
         this.iconWidth = iconWidth;
@@ -39,11 +31,11 @@ public class GuiIconButton extends Button {
         this.resourceLocation = resourceLocation;
     }
 
-	public void setTooltip(ITextComponent tooltip) {
-		setTooltip(Collections.singletonList(tooltip));
+    public void setTooltip(String tooltip) {
+        setTooltip(Arrays.asList(tooltip));
     }
 
-	public void setTooltip(List<ITextComponent> tooltip) {
+    public void setTooltip(List<String> tooltip) {
         this.tooltip = tooltip;
     }
 
@@ -52,29 +44,32 @@ public class GuiIconButton extends Button {
     }
 
     @Override
-	public void render(MatrixStack ms, int mouseX, int mouseY, float partialTicks) {
-		super.render(ms, mouseX, mouseY, partialTicks);
-		if (this.visible) {
-			this.isHovered = mouseX >= this.x && mouseY >= this.y && mouseX < this.x + this.width && mouseY < this.y + this.height;
-			Minecraft.getInstance().getTextureManager().bind(this.resourceLocation);
+    public void drawButton(Minecraft mc, int mouseX, int mouseY, float partialTicks) {
+        super.drawButton(mc, mouseX, mouseY, partialTicks);
+        if (this.visible)
+        {
+            this.hovered = mouseX >= this.x && mouseY >= this.y && mouseX < this.x + this.width && mouseY < this.y + this.height;
+            mc.getTextureManager().bindTexture(this.resourceLocation);
             int currentIconX = this.iconX;
             int currentIconY = this.iconY;
 
-			if (useAltIcon) {
+            if (useAltIcon)
+            {
                 currentIconX += iconAltX;
                 currentIconY += iconAltY;
             }
 
-			//Draws a textured rectangle at the current z-value. Used to be drawTexturedModalRect in Gui.
-			this.blit(ms, this.x, this.y, currentIconX, currentIconY, this.iconWidth, this.iconHeight);
+            this.drawTexturedModalRect(this.x, this.y, currentIconX, currentIconY, this.iconWidth, this.iconHeight);
         }
     }
 
-	public void drawTooltip(MatrixStack 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;
 
         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,87 +1,59 @@
 package nl.requios.effortlessbuilding.gui.elements;
 
-import com.mojang.blaze3d.matrix.MatrixStack;
-import mcp.MethodsReturnNonnullByDefault;
-import net.minecraft.client.gui.AbstractGui;
-import net.minecraft.client.gui.FontRenderer;
-import net.minecraft.client.gui.screen.Screen;
-import net.minecraft.client.gui.widget.TextFieldWidget;
-import net.minecraft.client.gui.widget.Widget;
-import net.minecraft.client.gui.widget.button.Button;
-import net.minecraft.util.text.ITextComponent;
-import net.minecraft.util.text.StringTextComponent;
+import net.minecraft.client.Minecraft;
+import net.minecraft.client.gui.*;
 import net.minecraft.util.text.TextFormatting;
-import net.minecraftforge.api.distmarker.Dist;
-import net.minecraftforge.api.distmarker.OnlyIn;
 
-import javax.annotation.ParametersAreNonnullByDefault;
+import java.io.IOException;
 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
-@MethodsReturnNonnullByDefault
-public class GuiNumberField extends AbstractGui {
+public class GuiNumberField extends Gui {
 
     public int x, y, width, height;
     public int buttonWidth = 10;
 
-	protected TextFieldWidget textField;
-	protected Button minusButton, plusButton;
+    protected GuiTextField textField;
+    protected GuiButton minusButton, plusButton;
 
-	List<ITextComponent> tooltip = new ArrayList<>();
+    List<String> tooltip = new ArrayList<>();
 
-	public GuiNumberField(FontRenderer font, List<Widget> buttonList, int x, int y, int width, int height) {
+    public GuiNumberField(int id1, int id2, int id3, FontRenderer fontRenderer,
+                          List<GuiButton> buttonList, int x, int y, int width, int height) {
         this.x = x;
         this.y = y;
         this.width = width;
         this.height = height;
 
-		textField = new TextFieldWidget(font, x + buttonWidth + 1, y + 1, width - 2 * buttonWidth - 2, height - 2, StringTextComponent.EMPTY);
-		minusButton = new Button(x, y - 1, buttonWidth, height + 2, new StringTextComponent("-"), button -> {
-			float valueChanged = 1f;
-			if (Screen.hasControlDown()) valueChanged = 5f;
-			if (Screen.hasShiftDown()) valueChanged = 10f;
-
-			setNumber(getNumber() - valueChanged);
-		});
-		plusButton = new Button(x + width - buttonWidth, y - 1, buttonWidth, height + 2, new StringTextComponent("+"), button -> {
-			float valueChanged = 1f;
-			if (Screen.hasControlDown()) valueChanged = 5f;
-			if (Screen.hasShiftDown()) valueChanged = 10f;
-
-			setNumber(getNumber() + valueChanged);
-		});
+        textField = new GuiTextField(id1, fontRenderer, x + buttonWidth + 1, y + 1, width - 2 * buttonWidth - 2, height - 2);
+        minusButton = new GuiButton(id2, x, y - 1, buttonWidth, height + 2, "-");
+        plusButton  = new GuiButton(id3, x + width - buttonWidth, y - 1, buttonWidth, height + 2, "+");
 
         buttonList.add(minusButton);
         buttonList.add(plusButton);
     }
 
-	public double getNumber() {
-		if (textField.getValue().isEmpty()) return 0;
-		try {
-			return DecimalFormat.getInstance().parse(textField.getValue()).doubleValue();
-		} catch (ParseException e) {
-			return 0;
-		}
-	}
-
     public void setNumber(double number) {
-		textField.setValue(DecimalFormat.getInstance().format(number));
+        DecimalFormat format = new DecimalFormat("0.#");
+        textField.setText(format.format(number));
     }
 
-	public void setTooltip(ITextComponent tooltip) {
-		setTooltip(Collections.singletonList(tooltip));
+    public double getNumber() {
+        if (textField.getText().isEmpty()) return 0;
+        return Double.parseDouble(textField.getText());
     }
 
-	public void setTooltip(List<ITextComponent> tooltip) {
+    public void setTooltip(String tooltip) {
+        setTooltip(Arrays.asList(tooltip));
+    }
+
+    public void setTooltip(List<String> tooltip) {
         this.tooltip = tooltip;
     }
 
-	public boolean mouseClicked(double mouseX, double mouseY, int mouseButton) {
+    public boolean mouseClicked(int mouseX, int mouseY, int mouseButton) {
         boolean result = textField.mouseClicked(mouseX, mouseY, mouseButton);
 
         //Check if clicked inside textfield
@@ -89,72 +61,78 @@ public class GuiNumberField extends AbstractGui {
 
         //Rightclicked inside textfield
         if (flag && mouseButton == 1) {
-			textField.setValue("");
-			textField.setFocus(true);
+            textField.setText("");
+            textField.setFocused(true);
             result = true;
         }
 
         return result;
     }
 
-	public void drawNumberField(MatrixStack ms, int mouseX, int mouseY, float partialTicks) {
+    public void drawNumberField(Minecraft mc, int mouseX, int mouseY, float partialTicks) {
         textField.y = y + 1;
         minusButton.y = y - 1;
         plusButton.y = y - 1;
 
-		textField.render(ms, mouseX, mouseY, partialTicks);
-		minusButton.render(ms, mouseX, mouseY, partialTicks);
-		plusButton.render(ms, mouseX, mouseY, partialTicks);
+        textField.drawTextBox();
+        minusButton.drawButton(mc, mouseX, mouseY, partialTicks);
+        plusButton.drawButton(mc, mouseX, mouseY, partialTicks);
     }
 
-	public void drawTooltip(MatrixStack 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 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;
 
-		// List<String> textLines = new ArrayList<>();
-
-		List<ITextComponent> textLines = new ArrayList<>();
-
+        List<String> textLines = new ArrayList<>();
 
         if (insideTextField) {
+            if (!tooltip.isEmpty())
                 textLines.addAll(tooltip);
 //            textLines.add(TextFormatting.GRAY + "Tip: try scrolling.");
         }
 
         if (insideMinusButton) {
-			textLines.add(new StringTextComponent("Hold ").append(new StringTextComponent("shift ").withStyle(TextFormatting.AQUA)).append("for ")
-				.append(new StringTextComponent("10").withStyle(TextFormatting.RED)));
-			textLines.add(new StringTextComponent("Hold ").append(new StringTextComponent("ctrl ").withStyle(TextFormatting.AQUA)).append("for ")
-				.append(new StringTextComponent("5").withStyle(TextFormatting.RED)));
+            textLines.add("Hold " + TextFormatting.AQUA + "shift " + TextFormatting.RESET + "for " + TextFormatting.RED + "10");
+            textLines.add("Hold " + TextFormatting.AQUA + "ctrl " + TextFormatting.RESET + "for " + TextFormatting.RED + "5");
         }
 
         if (insidePlusButton) {
-			textLines.add(new StringTextComponent("Hold ").append(new StringTextComponent("shift ").withStyle(TextFormatting.DARK_GREEN)).append("for ")
-				.append(new StringTextComponent("10").withStyle(TextFormatting.RED)));
-			textLines.add(new StringTextComponent("Hold ").append(new StringTextComponent("ctrl ").withStyle(TextFormatting.DARK_GREEN)).append("for ")
-				.append(new StringTextComponent("5").withStyle(TextFormatting.RED)));
+            textLines.add("Hold " + TextFormatting.AQUA + "shift " + TextFormatting.RESET + "for " + TextFormatting.DARK_GREEN + "10");
+            textLines.add("Hold " + TextFormatting.AQUA + "ctrl " + TextFormatting.RESET + "for " + TextFormatting.DARK_GREEN + "5");
         }
 
-		screen.renderComponentTooltip(ms, textLines, mouseX - 10, mouseY + 25);
+        guiScreen.drawHoveringText(textLines, mouseX - 10, mouseY + 25);
 
     }
 
+    public void actionPerformed(GuiButton button) {
+        float valueChanged = 1f;
+        if (GuiScreen.isCtrlKeyDown()) valueChanged = 5f;
+        if (GuiScreen.isShiftKeyDown()) valueChanged = 10f;
+
+        if (button == minusButton) {
+            setNumber(getNumber() - valueChanged);
+        }
+        if (button == plusButton) {
+            setNumber(getNumber() + valueChanged);
+        }
+    }
+
     public void update() {
-		textField.tick();
+        textField.updateCursorCounter();
     }
 
-	public boolean charTyped(char typedChar, int keyCode) {
-		if (!textField.isFocused()) return false;
+    public void keyTyped(char typedChar, int keyCode) throws IOException {
+        if (!textField.isFocused()) return;
 //        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);
+            textField.textboxKeyTyped(typedChar, keyCode);
 //        }
     }
 
     //Scroll inside textfield to change number
-	//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,191 +1,185 @@
 package nl.requios.effortlessbuilding.gui.elements;
 
-import com.mojang.blaze3d.matrix.MatrixStack;
-import com.mojang.blaze3d.platform.GlStateManager;
-import com.mojang.blaze3d.systems.RenderSystem;
-import mcp.MethodsReturnNonnullByDefault;
 import net.minecraft.client.Minecraft;
 import net.minecraft.client.gui.FontRenderer;
-import net.minecraft.client.gui.IGuiEventListener;
-import net.minecraft.client.gui.screen.Screen;
-import net.minecraft.client.gui.widget.Widget;
+import net.minecraft.client.gui.GuiButton;
+import net.minecraft.client.gui.GuiListExtended;
+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.vertex.DefaultVertexFormats;
 import net.minecraft.util.math.MathHelper;
-import net.minecraftforge.api.distmarker.Dist;
-import net.minecraftforge.api.distmarker.OnlyIn;
-import net.minecraftforge.common.MinecraftForge;
+import net.minecraftforge.fml.relauncher.Side;
+import net.minecraftforge.fml.relauncher.SideOnly;
+import org.lwjgl.input.Mouse;
 
-import javax.annotation.ParametersAreNonnullByDefault;
+import java.io.IOException;
 import java.util.ArrayList;
 import java.util.List;
 
-@OnlyIn(Dist.CLIENT)
-@MethodsReturnNonnullByDefault
-@ParametersAreNonnullByDefault
-public class GuiScrollPane extends SlotGui {
+@SideOnly(Side.CLIENT)
+public class GuiScrollPane extends GuiListExtended {
 
-	public Screen parent;
-	public FontRenderer font;
-	private final List<IScrollEntry> listEntries;
-	private float scrollMultiplier = 1f;
+    public GuiScreen parent;
+    public FontRenderer fontRenderer;
+    public List<IScrollEntry> listEntries;
 
-	private int mouseX;
-	private int mouseY;
-
-	public GuiScrollPane(Screen parent, FontRenderer font, int top, int bottom) {
-		super(Minecraft.getInstance(), parent.width, parent.height, top, bottom, 100);
+    public GuiScrollPane(GuiScreen parent, FontRenderer fontRenderer, int top, int bottom) {
+        super(parent.mc, parent.width, parent.height, top, bottom, 100);
         this.parent = parent;
-		this.font = font;
-		this.renderSelection = false;
+        this.fontRenderer = fontRenderer;
+        this.setShowSelectionBox(false);
         listEntries = new ArrayList<>();
-		MinecraftForge.EVENT_BUS.register(this);
-	}
-
-	public IScrollEntry getListEntry(int index) {
-		return listEntries.get(index);
-	}
-
-	public void AddListEntry(IScrollEntry listEntry) {
-		listEntries.add(listEntry);
     }
 
     @Override
-	protected int getItemCount() {
+    public IGuiListEntry getListEntry(int index) {
+        return listEntries.get(index);
+    }
+
+    @Override
+    protected int getSize() {
         return listEntries.size();
     }
 
     @Override
-	protected boolean isSelectedItem(int slotIndex) {
-		return false;
-	}
-
-	@Override
-	protected int getScrollbarPosition() {
+    protected int getScrollBarX() {
         //return width / 2 + 140 + 10;
         return width - 15;
     }
 
     @Override
-	public int getRowWidth() {
+    public int getListWidth() {
         return 280;
     }
 
     //Removed background
     @Override
-	public void render(MatrixStack ms, int mouseXIn, int mouseYIn, float partialTicks) {
-		if (this.visible) {
+    public void drawScreen(int mouseXIn, int mouseYIn, float partialTicks)
+    {
+        if (this.visible)
+        {
             this.mouseX = mouseXIn;
             this.mouseY = mouseYIn;
-			this.renderBackground();
-			int scrollbarLeft = this.getScrollbarPosition();
-			int scrollbarRight = scrollbarLeft + 6;
-			this.capYPosition();
+            int scrollBarLeft = this.getScrollBarX();
+            int scrollBarRight = scrollBarLeft + 6;
+            this.bindAmountScrolled();
+            GlStateManager.disableLighting();
+            GlStateManager.disableFog();
 
             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;
-			int insideTop = this.y0 + 4 - (int) this.yo;
-			if (this.renderHeader) {
-				this.renderHeader(insideLeft, insideTop, tessellator);
+            if (this.hasListHeader) {
+                this.drawListHeader(insideLeft, insideTop, tessellator);
             }
 
             //All entries
-			this.renderList(ms, insideLeft, insideTop, mouseXIn, mouseYIn, partialTicks);
-			RenderSystem.disableDepthTest();
+            this.drawSelectionBox(insideLeft, insideTop, mouseXIn, mouseYIn, partialTicks);
+            GlStateManager.disableDepth();
 
             //Dirt overlays on top and bottom
-//            this.renderHoleBackground(0, this.y0, 255, 255);
-//            this.renderHoleBackground(this.y1, this.height, 255, 255);
+//            this.overlayBackground(0, this.top, 255, 255);
+//            this.overlayBackground(this.bottom, 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.disableAlphaTest();
-			RenderSystem.shadeModel(7425);
-			RenderSystem.disableTexture();
+            GlStateManager.enableBlend();
+            GlStateManager.tryBlendFuncSeparate(GlStateManager.SourceFactor.SRC_ALPHA, GlStateManager.DestFactor.ONE_MINUS_SRC_ALPHA, GlStateManager.SourceFactor.ZERO, GlStateManager.DestFactor.ONE);
+            GlStateManager.disableAlpha();
+            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.x1, (double)(this.y0 + 4), 0.0D).tex(1.0D, 1.0D).color(0, 0, 0, 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.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 + 5), 0.0D).tex(0.0D, 1.0D).color(100, 100, 100, 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.right, (double)this.top, 0.0D).tex(1.0D, 0.0D).color(100, 100, 100, 100).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.x1, (double)this.y1, 0.0D).tex(1.0D, 1.0D).color(0, 0, 0, 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.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, 0.0D).tex(0.0D, 1.0D).color(20, 20, 20, 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.right, (double)(this.top - 1), 0.0D).tex(1.0D, 0.0D).color(20, 20, 20, 255).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();
+
+//            //bottom fade
+//            bufferbuilder.begin(7, DefaultVertexFormats.POSITION_TEX_COLOR);
+//            bufferbuilder.pos((double)this.left, (double)this.bottom, 0.0D).tex(0.0D, 1.0D).color(10, 10, 10, 100).endVertex();
+//            bufferbuilder.pos((double)this.right, (double)this.bottom, 0.0D).tex(1.0D, 1.0D).color(10, 10, 10, 100).endVertex();
+//            bufferbuilder.pos((double)this.right, (double)(this.bottom - 5), 0.0D).tex(1.0D, 0.0D).color(10, 10, 10, 0).endVertex();
+//            bufferbuilder.pos((double)this.left, (double)(this.bottom - 5), 0.0D).tex(0.0D, 0.0D).color(10, 10, 10, 0).endVertex();
+//            tessellator.draw();
+
+//            //bottom line
+//            bufferbuilder.begin(7, DefaultVertexFormats.POSITION_TEX_COLOR);
+//            bufferbuilder.pos((double)this.left, (double)(this.bottom + 1), 0.0D).tex(0.0D, 1.0D).color(20, 20, 20, 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.pos((double)this.right, (double)this.bottom, 0.0D).tex(1.0D, 0.0D).color(20, 20, 20, 255).endVertex();
+//            bufferbuilder.pos((double)this.left, (double)this.bottom, 0.0D).tex(0.0D, 0.0D).color(20, 20, 20, 255).endVertex();
 //            tessellator.draw();
 
             //Draw scrollbar
             int maxScroll = this.getMaxScroll();
-			if (maxScroll > 0) {
-				int k1 = (int) ((float) ((this.y1 - this.y0) * (this.y1 - this.y0)) / (float) this.getMaxPosition());
-				k1 = MathHelper.clamp(k1, 32, this.y1 - this.y0 - 8);
-				int l1 = (int) this.yo * (this.y1 - this.y0 - k1) / maxScroll + this.y0;
-				if (l1 < this.y0) {
-					l1 = this.y0;
+            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;
+
+                if (l1 < this.top)
+                {
+                    l1 = this.top;
                 }
 
                 bufferbuilder.begin(7, DefaultVertexFormats.POSITION_TEX_COLOR);
-				bufferbuilder.vertex(scrollbarLeft, this.y1, 0.0F).uv(0.0F, 1.0F).color(0, 0, 0, 255).endVertex();
-				bufferbuilder.vertex(scrollbarRight, this.y1, 0.0F).uv(1.0F, 1.0F).color(0, 0, 0, 255).endVertex();
-				bufferbuilder.vertex(scrollbarRight, this.y0, 0.0F).uv(1.0F, 0.0F).color(0, 0, 0, 255).endVertex();
-				bufferbuilder.vertex(scrollbarLeft, this.y0, 0.0F).uv(0.0F, 0.0F).color(0, 0, 0, 255).endVertex();
-				tessellator.end();
+                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.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.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();
+
                 bufferbuilder.begin(7, DefaultVertexFormats.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();
+                bufferbuilder.pos((double)scrollBarLeft, (double)(l1 + k1 - 1), 0.0D).tex(0.0D, 1.0D).color(192, 192, 192, 255).endVertex();
+                bufferbuilder.pos((double)(scrollBarRight - 1), (double)(l1 + k1 - 1), 0.0D).tex(1.0D, 1.0D).color(192, 192, 192, 255).endVertex();
+                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();
             }
 
-			//this.renderDecorations(mouseXIn, mouseYIn);
-			RenderSystem.enableTexture();
-			RenderSystem.shadeModel(7424);
-			RenderSystem.enableAlphaTest();
-			RenderSystem.disableBlend();
+            GlStateManager.enableTexture2D();
+            GlStateManager.shadeModel(7424);
+            GlStateManager.enableAlpha();
+            GlStateManager.disableBlend();
         }
     }
 
     //SLOTHEIGHT MODIFICATIONS
     //SlotHeight is still relied on for determining how much to scroll
     @Override
-	protected int getMaxPosition() {
+    protected int getContentHeight() {
         //Add every entry height
-		int height = this.headerHeight;
+        int height = this.headerPadding;
         for (IScrollEntry entry : listEntries) {
             height += entry.getHeight();
         }
         return height;
     }
 
-	@Override
-	protected void renderBackground() {
-
-	}
-
-	@Override
-	protected void renderItem(MatrixStack ms, int slotIndex, int xPos, int yPos, int heightIn, int mouseXIn, int mouseYIn, float partialTicks) {
-		this.getListEntry(slotIndex).drawEntry(ms, slotIndex, xPos, yPos, this.getRowWidth(), heightIn, mouseXIn, mouseYIn,
-			this.getSlotIndexFromScreenCoords(mouseXIn, mouseYIn) == slotIndex, partialTicks);
-	}
-
-	public int getMaxPosition(int count) {
+    public int getContentHeight(int count) {
         //Add all count entry heights
-		int height = this.headerHeight;
+        int height = this.headerPadding;
         for (int i = 0; i < count; i++) {
             IScrollEntry entry = listEntries.get(i);
             height += entry.getHeight();
@@ -193,36 +187,33 @@ public class GuiScrollPane extends SlotGui {
         return height;
     }
 
-	public int getSlotIndexFromScreenCoords(double posX, double posY) {
-		int left = this.x0 + (this.width - this.getRowWidth()) / 2;
-		int right = this.x0 + (this.width + this.getRowWidth()) / 2;
-		double relativeMouseY = getRelativeMouseY(mouseY, 0);
+    @Override
+    public int getSlotIndexFromScreenCoords(int posX, int posY) {
+        int left = this.left + (this.width - this.getListWidth()) / 2;
+        int right = this.left + (this.width + this.getListWidth()) / 2;
+        int 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.getScrollbarPosition() && posX >= left && posX <= right && i >= 0 &&
-					relativeMouseY >= 0 && i < this.getItemCount() ? i : -1;
+                return posX < this.getScrollBarX() && posX >= left && posX <= right && i >= 0 &&
+                       relativeMouseY >= 0 && i < this.getSize() ? i : -1;
             relativeMouseY -= entry.getHeight();
         }
         return -1;
     }
 
     @Override
-	public List<? extends IGuiEventListener> children() {
-		return null;
-	}
-
-	@Override
-	public boolean mouseClicked(double mouseX, double mouseY, int button) {
+    public boolean mouseClicked(int mouseX, int mouseY, int mouseEvent)
+    {
         int selectedSlot = this.getSlotIndexFromScreenCoords(mouseX, mouseY);
-		double relativeX = getRelativeMouseX(mouseX);
+        int 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);
+            int relativeY = getRelativeMouseY(mouseY, i);
+            this.getListEntry(i).mousePressed(selectedSlot, mouseX, mouseY, mouseEvent, relativeX, relativeY);
         }
 
 
@@ -247,52 +238,60 @@ public class GuiScrollPane extends SlotGui {
     }
 
     @Override
-	public boolean mouseReleased(double mouseX, double mouseY, int button) {
-		for (int i = 0; i < this.getItemCount(); ++i) {
-			double relativeX = getRelativeMouseX(mouseX);
-			double relativeY = getRelativeMouseY(mouseY, i);
-			this.getListEntry(i).mouseReleased(i, (int) mouseX, (int) mouseY, button, (int) relativeX, (int) relativeY);
+    public boolean mouseReleased(int x, int y, int mouseEvent)
+    {
+        for (int i = 0; i < this.getSize(); ++i)
+        {
+            int relativeX = getRelativeMouseX(mouseX);
+            int relativeY = getRelativeMouseY(mouseY, i);
+            this.getListEntry(i).mouseReleased(i, x, y, mouseEvent, relativeX, relativeY);
         }
 
-		this.visible = true;
+        this.setEnabled(true);
         return false;
     }
 
+    @Override
     public void handleMouseInput() {
-		if (this.isMouseInList(this.mouseX, this.mouseY)) {
-			if (minecraft.mouseHandler.isLeftPressed() && this.mouseY >= this.y0 &&
-				this.mouseY <= this.y1) {
-				int i = this.x0 + (this.width - this.getRowWidth()) / 2;
-				int j = this.x0 + (this.width + this.getRowWidth()) / 2;
+        if (this.isMouseYWithinSlotBounds(this.mouseY)) {
+            if (Mouse.getEventButton() == 0 && Mouse.getEventButtonState() && this.mouseY >= this.top &&
+                this.mouseY <= this.bottom) {
+                int i = this.left + (this.width - this.getListWidth()) / 2;
+                int j = this.left + (this.width + this.getListWidth()) / 2;
                 int slotIndex = getSlotIndexFromScreenCoords(this.mouseX, this.mouseY);
-				double relativeMouseY = getRelativeMouseY(mouseY, slotIndex);
+                int relativeMouseY = getRelativeMouseY(mouseY, slotIndex);
 
                 if (slotIndex > -1) {
-					this.mouseClicked(this.mouseX, this.mouseY, 0);
+                    this.elementClicked(slotIndex, false, this.mouseX, this.mouseY);
+                    this.selectedElement = slotIndex;
                 } else if (this.mouseX >= i && this.mouseX <= j && relativeMouseY < 0) {
-					this.clickedHeader(this.mouseX - i, this.mouseY - this.y0 + (int) this.yo - 4);
+                    this.clickedHeader(this.mouseX - i, this.mouseY - this.top + (int) this.amountScrolled - 4);
                 }
             }
 
-			if (minecraft.mouseHandler.isLeftPressed() && this.isVisible()) {
-				if (this.yDrag == -1) {
+            if (Mouse.isButtonDown(0) && this.getEnabled()) {
+                if (this.initialClickY == -1) {
                     boolean flag1 = true;
 
-					if (this.mouseY >= this.y0 && this.mouseY <= this.y1) {
-						int i2 = this.x0 + (this.width - this.getRowWidth()) / 2;
-						int j2 = this.x0 + (this.width + this.getRowWidth()) / 2;
+                    if (this.mouseY >= this.top && this.mouseY <= this.bottom) {
+                        int i2 = this.left + (this.width - this.getListWidth()) / 2;
+                        int j2 = this.left + (this.width + this.getListWidth()) / 2;
                         int slotIndex = getSlotIndexFromScreenCoords(this.mouseX, this.mouseY);
-						double relativeMouseY = getRelativeMouseY(mouseY, slotIndex);
+                        int relativeMouseY = getRelativeMouseY(mouseY, slotIndex);
 
                         if (slotIndex > -1) {
-							this.mouseClicked(slotIndex, this.mouseX, this.mouseY);
+                            boolean flag = slotIndex == this.selectedElement &&
+                                           Minecraft.getSystemTime() - this.lastClicked < 250L;
+                            this.elementClicked(slotIndex, flag, this.mouseX, this.mouseY);
+                            this.selectedElement = slotIndex;
+                            this.lastClicked = Minecraft.getSystemTime();
                         } else if (this.mouseX >= i2 && this.mouseX <= j2 && relativeMouseY < 0) {
                             this.clickedHeader(this.mouseX - i2,
-								this.mouseY - this.y0 + (int) this.yo - 4);
+                                    this.mouseY - this.top + (int) this.amountScrolled - 4);
                             flag1 = false;
                         }
 
-						int i3 = this.getScrollbarPosition();
+                        int i3 = this.getScrollBarX();
                         int j1 = i3 + 6;
 
                         if (this.mouseX >= i3 && this.mouseX <= j1) {
@@ -303,44 +302,56 @@ public class GuiScrollPane extends SlotGui {
                                 maxScroll = 1;
                             }
 
-							int l1 = (int) ((float) ((this.y1 - this.y0) * (this.y1 - this.y0)) /
-								(float) this.getMaxPosition());
-							l1 = MathHelper.clamp(l1, 32, this.y1 - this.y0 - 8);
-							this.scrollMultiplier /= (float) (this.y1 - this.y0 - l1) / (float) maxScroll;
+                            int l1 = (int) ((float) ((this.bottom - this.top) * (this.bottom - this.top)) /
+                                            (float) this.getContentHeight());
+                            l1 = MathHelper.clamp(l1, 32, this.bottom - this.top - 8);
+                            this.scrollMultiplier /= (float) (this.bottom - this.top - l1) / (float) maxScroll;
                         } else {
                             this.scrollMultiplier = 1.0F;
                         }
 
                         if (flag1) {
-							this.yDrag = this.mouseY;
+                            this.initialClickY = this.mouseY;
                         } else {
-							this.yDrag = -2;
+                            this.initialClickY = -2;
                         }
                     } else {
-						this.yDrag = -2;
+                        this.initialClickY = -2;
                     }
-				} else if (this.yDrag >= 0) {
-					this.yo -= (float) (this.mouseY - this.yDrag) * this.scrollMultiplier;
-					this.yDrag = this.mouseY;
+                } else if (this.initialClickY >= 0) {
+                    this.amountScrolled -= (float) (this.mouseY - this.initialClickY) * this.scrollMultiplier;
+                    this.initialClickY = this.mouseY;
                 }
             } else {
-				this.yDrag = -1;
+                this.initialClickY = -1;
             }
 
+            int i2 = Mouse.getEventDWheel();
+
+            if (i2 != 0) {
+                if (i2 > 0) {
+                    i2 = -1;
+                } else if (i2 < 0) {
+                    i2 = 1;
+                }
+
+                this.amountScrolled += (float) (i2 * this.slotHeight / 2);
+            }
         }
     }
 
     //Draw in center if it fits
     @Override
-	protected void renderList(MatrixStack ms, int insideLeft, int insideTop, int mouseXIn, int mouseYIn, float partialTicks) {
-		int itemCount = this.getItemCount();
+    protected void drawSelectionBox(int insideLeft, int insideTop, int mouseXIn, int mouseYIn, float partialTicks)
+    {
+        int size = this.getSize();
         Tessellator tessellator = Tessellator.getInstance();
-		BufferBuilder bufferbuilder = tessellator.getBuilder();
+        BufferBuilder bufferbuilder = tessellator.getBuffer();
 
         //Find y to start with
-		int y = this.headerHeight + insideTop;
-		int contentHeight = getMaxPosition();
-		int insideHeight = this.y1 - this.y0 - 4;
+        int y = this.headerPadding + insideTop;
+        int contentHeight = getContentHeight();
+        int insideHeight = this.bottom - this.top - 4;
 
         if (contentHeight < insideHeight) {
             //it fits, so we can center it vertically
@@ -348,66 +359,67 @@ public class GuiScrollPane extends SlotGui {
         }
 
         //Draw all entries
-		for (int i = 0; i < itemCount; ++i) {
+        for (int i = 0; i < size; ++i)
+        {
             int entryHeight = listEntries.get(i).getHeight();
             int entryHeight2 = entryHeight - 4;
 
-			if (y > this.y1 || y + entryHeight2 < this.y0) {
-				this.updateItemPosition(i, insideLeft, y, partialTicks);
+            if (y > this.bottom || y + entryHeight2 < this.top)
+            {
+                this.updateItemPos(i, insideLeft, y, partialTicks);
             }
 
-			if (this.renderSelection && this.isSelectedItem(i)) {
-				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.color4f(f, f, f, 1.0F);
-				bufferbuilder.begin(7, DefaultVertexFormats.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.color4f(0.0F, 0.0F, 0.0F, 1.0F);
-				bufferbuilder.begin(7, DefaultVertexFormats.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();
+            if (this.showSelectionBox && this.isSelected(i))
+            {
+                int i1 = this.left + this.width / 2 - this.getListWidth() / 2;
+                int j1 = this.left + this.width / 2 + this.getListWidth() / 2;
+                GlStateManager.color(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();
             }
 
-			this.renderItem(ms, i, insideLeft, y, entryHeight2, mouseXIn, mouseYIn, partialTicks);
+            this.drawSlot(i, insideLeft, y, entryHeight2, mouseXIn, mouseYIn, partialTicks);
             y += entryHeight;
         }
     }
 
-	private double getRelativeMouseX(double mouseX) {
-		int j = this.x0 + this.width / 2 - this.getRowWidth() / 2 + 2;
+    private int getRelativeMouseX(int mouseX) {
+        int j = this.left + this.width / 2 - this.getListWidth() / 2 + 2;
         return mouseX - j;
     }
 
-	private double getRelativeMouseY(double mouseY, int contentIndex) {
-		int k = this.y0 + 4 - this.getScroll() + getMaxPosition(contentIndex) + this.headerHeight;
-		double relativeMouseY = mouseY - k;
+    private int getRelativeMouseY(int mouseY, int contentIndex) {
+        int k = this.top + 4 - this.getAmountScrolled() + getContentHeight(contentIndex) + this.headerPadding;
+        int relativeMouseY = mouseY - k;
 
         //Content might be centered, adjust relative mouse y accordingly
-		int contentHeight = getMaxPosition();
-		int insideHeight = this.y1 - this.y0 - 4;
+        int contentHeight = getContentHeight();
+        int insideHeight = this.bottom - this.top - 4;
 
         if (contentHeight < insideHeight) {
             //it fits, so we can center it vertically
-			relativeMouseY -= (insideHeight - contentHeight) / 2f;
+            relativeMouseY -= (insideHeight - contentHeight) / 2;
         }
         return relativeMouseY;
     }
 
     //PASSTHROUGHS
-	public void init(List<Widget> buttonList) {
+    public int initGui(int id, List<GuiButton> buttonList) {
         for (IScrollEntry entry : this.listEntries) {
-			entry.init(buttonList);
+            id = entry.initGui(id, buttonList);
         }
+        registerScrollButtons(id++, id++);
+        return id;
     }
 
     public void updateScreen() {
@@ -415,16 +427,19 @@ public class GuiScrollPane extends SlotGui {
             entry.updateScreen();
     }
 
-	public void drawTooltip(MatrixStack ms, Screen guiScreen, int mouseX, int mouseY) {
+    public void drawTooltip(GuiScreen guiScreen, int mouseX, int mouseY) {
         for (IScrollEntry entry : this.listEntries)
-			entry.drawTooltip(ms, guiScreen, mouseX, mouseY);
+            entry.drawTooltip(guiScreen, mouseX, mouseY);
     }
 
-	@Override
-	public boolean charTyped(char eventChar, int eventKey) {
+    public void keyTyped(char eventChar, int eventKey) throws IOException {
         for (IScrollEntry entry : this.listEntries)
-			entry.charTyped(eventChar, eventKey);
-		return false;
+            entry.keyTyped(eventChar, eventKey);
+    }
+
+    public void actionPerformed(GuiButton button) {
+        for (IScrollEntry entry : this.listEntries)
+            entry.actionPerformed(button);
     }
 
     public void onGuiClosed() {
@@ -432,41 +447,19 @@ public class GuiScrollPane extends SlotGui {
             entry.onGuiClosed();
     }
 
-	//Make protected values available
-	public int getWidth() {
-		return width;
-	}
-
-	public int getHeight() {
-		return height;
-	}
-
-	public interface IScrollEntry {
-		void init(List<Widget> buttonList);
+    public interface IScrollEntry extends GuiListExtended.IGuiListEntry {
+        int initGui(int id, List<GuiButton> buttonList);
 
         void updateScreen();
 
-		void drawTooltip(MatrixStack ms, Screen guiScreen, int mouseX, int mouseY);
+        void drawTooltip(GuiScreen guiScreen, int mouseX, int mouseY);
 
-		boolean charTyped(char eventChar, int eventKey);
+        void keyTyped(char eventChar, int eventKey) throws IOException;
+
+        void actionPerformed(GuiButton button);
 
         void onGuiClosed();
 
         int getHeight();
-
-		void updatePosition(int slotIndex, int x, int y, float partialTicks);
-
-		void drawEntry(MatrixStack ms, 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
-		 * clicked and the list should not be dragged.
-		 */
-		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
-		 */
-		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,263 +0,0 @@
-package nl.requios.effortlessbuilding.gui.elements;
-
-import com.mojang.blaze3d.matrix.MatrixStack;
-import com.mojang.blaze3d.systems.RenderSystem;
-import mcp.MethodsReturnNonnullByDefault;
-import net.minecraft.client.Minecraft;
-import net.minecraft.client.gui.FocusableGui;
-import net.minecraft.client.gui.IGuiEventListener;
-import net.minecraft.client.gui.IRenderable;
-import net.minecraft.client.renderer.BufferBuilder;
-import net.minecraft.client.renderer.Tessellator;
-import net.minecraft.client.renderer.vertex.DefaultVertexFormats;
-import net.minecraft.util.math.MathHelper;
-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 FocusableGui implements IRenderable {
-	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 IGuiEventListener> 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(MatrixStack 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_, Tessellator 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 = MathHelper.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 = MathHelper.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(MatrixStack 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 = MathHelper.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(MatrixStack 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();
-		Tessellator tessellator = Tessellator.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.color4f(f, f, f, 1.0F);
-				bufferbuilder.begin(7, DefaultVertexFormats.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.color4f(0.0F, 0.0F, 0.0F, 1.0F);
-				bufferbuilder.begin(7, DefaultVertexFormats.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,9 +1,11 @@
 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 final int size;
+    private T[] stack;
+    private int size;
     private int top;
     private int filled = 0; //how many valid items are in the stack
 

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

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

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

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

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

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

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

@@ -1,22 +1,26 @@
 package nl.requios.effortlessbuilding.helper;
 
-import net.minecraft.advancements.CriteriaTriggers;
-import net.minecraft.block.*;
+import net.minecraft.block.Block;
+import net.minecraft.block.BlockLiquid;
+import net.minecraft.block.BlockSlab;
+import net.minecraft.block.SoundType;
 import net.minecraft.block.material.Material;
+import net.minecraft.block.properties.IProperty;
+import net.minecraft.block.state.IBlockState;
 import net.minecraft.entity.Entity;
-import net.minecraft.entity.player.PlayerEntity;
-import net.minecraft.entity.player.ServerPlayerEntity;
-import net.minecraft.item.BlockItem;
+import net.minecraft.entity.player.EntityPlayer;
+import net.minecraft.init.Blocks;
+import net.minecraft.item.ItemBlock;
+import net.minecraft.item.ItemSlab;
 import net.minecraft.item.ItemStack;
-import net.minecraft.util.CachedBlockInfo;
-import net.minecraft.util.Direction;
-import net.minecraft.util.Hand;
+import net.minecraft.util.EnumFacing;
+import net.minecraft.util.EnumHand;
 import net.minecraft.util.SoundCategory;
+import net.minecraft.util.math.AxisAlignedBB;
 import net.minecraft.util.math.BlockPos;
-import net.minecraft.util.math.shapes.VoxelShape;
-import net.minecraft.util.math.vector.Vector3d;
+import net.minecraft.util.math.Vec3d;
+import net.minecraft.world.IBlockAccess;
 import net.minecraft.world.World;
-import net.minecraftforge.common.ToolType;
 import nl.requios.effortlessbuilding.BuildConfig;
 import nl.requios.effortlessbuilding.buildmodifier.ModifierSettingsManager;
 import nl.requios.effortlessbuilding.compatibility.CompatHelper;
@@ -29,15 +33,15 @@ public class SurvivalHelper {
     //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.
     //Based on ItemBlock#onItemUse
-	public static boolean placeBlock(World world, PlayerEntity player, BlockPos pos, BlockState blockState,
-									 ItemStack origstack, Direction facing, Vector3d hitVec, boolean skipPlaceCheck,
+    public static boolean placeBlock(World world, EntityPlayer player, BlockPos pos, IBlockState blockState,
+                                     ItemStack origstack, EnumFacing facing, Vec3d hitVec, boolean skipPlaceCheck,
                                      boolean skipCollisionCheck, boolean playSound) {
-		if (!world.isLoaded(pos)) return false;
+        if (!world.isBlockLoaded(pos, true)) return false;
         ItemStack itemstack = origstack;
 
         if (blockState.getBlock().isAir(blockState, world, pos) || itemstack.isEmpty()) {
             dropBlock(world, player, pos);
-			world.removeBlock(pos, false);
+            world.setBlockToAir(pos);
             return true;
         }
 
@@ -46,9 +50,9 @@ public class SurvivalHelper {
         if (CompatHelper.isItemBlockProxy(itemstack))
             itemstack = CompatHelper.getItemBlockByState(itemstack, blockState);
 
-		if (!(itemstack.getItem() instanceof BlockItem))
+        if (!(itemstack.getItem() instanceof ItemBlock))
             return false;
-		Block block = ((BlockItem) itemstack.getItem()).getBlock();
+        Block block = ((ItemBlock) itemstack.getItem()).getBlock();
 
 
         //More manual with ItemBlock#placeBlockAt
@@ -56,25 +60,18 @@ public class SurvivalHelper {
             //Drop existing block
             dropBlock(world, player, pos);
 
-			//TryPlace sets block with offset and reduces itemstack count in creative, so we copy only parts of it
-//            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;
-			BlockItem.updateCustomBlockEntityTag(world, player, pos, itemstack); //Actually BlockItem::onBlockPlaced but that is protected
-			block.setPlacedBy(world, pos, blockState, player, itemstack);
-			if (player instanceof ServerPlayerEntity) {
-				CriteriaTriggers.PLACED_BLOCK.trigger((ServerPlayerEntity) player, pos, itemstack);
-			}
+            boolean placed = ((ItemBlock) itemstack.getItem()).placeBlockAt(itemstack, player, world, pos, facing, (float) hitVec.x, (float) hitVec.y, (float) hitVec.z, blockState);
+            if (!placed) return false;
 
-			BlockState afterState = world.getBlockState(pos);
+            IBlockState afterState = world.getBlockState(pos);
 
             if (playSound) {
                 SoundType soundtype = afterState.getBlock().getSoundType(afterState, world, pos, player);
                 world.playSound(null, pos, soundtype.getPlaceSound(), SoundCategory.BLOCKS, (soundtype.getVolume() + 1.0F) / 2.0F, soundtype.getPitch() * 0.8F);
             }
 
-			if (!player.isCreative() && Block.byItem(itemstack.getItem()) == block) {
-				itemstack.shrink(1);
+            if (!player.isCreative() && Block.getBlockFromItem(itemstack.getItem()) == block) {
+                CompatHelper.shrinkStack(origstack, itemstack);
             }
 
             return true;
@@ -108,8 +105,8 @@ public class SurvivalHelper {
 
     //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
-	public static boolean breakBlock(World world, PlayerEntity player, BlockPos pos, boolean skipChecks) {
-		if (!world.isLoaded(pos) && !world.isEmptyBlock(pos)) return false;
+    public static boolean breakBlock(World world, EntityPlayer player, BlockPos pos, boolean skipChecks) {
+        if (!world.isBlockLoaded(pos, false)) return false;
 
         //Check if can break
         if (skipChecks || canBreak(world, player, pos)) {
@@ -120,22 +117,22 @@ public class SurvivalHelper {
             dropBlock(world, player, pos);
 
             //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.setBlockToAir(pos);
             return true;
         }
         return false;
     }
 
     //Gives items directly to player
-	public static void dropBlock(World world, PlayerEntity player, BlockPos pos) {
+    public static void dropBlock(World world, EntityPlayer player, BlockPos pos){
         if (player.isCreative()) return;
 
-		BlockState blockState = world.getBlockState(pos);
+        IBlockState blockState = world.getBlockState(pos);
         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
 
@@ -170,7 +167,6 @@ public class SurvivalHelper {
     /**
      * Check if player can place a block.
      * Turn randomizer bag into itemstack inside before.
-	 *
      * @param world
      * @param player
      * @param pos
@@ -180,17 +176,17 @@ public class SurvivalHelper {
      * @param sidePlacedOn
      * @return Whether the player may place the block at pos with itemstack
      */
-	public static boolean canPlace(World world, PlayerEntity player, BlockPos pos, BlockState newBlockState, ItemStack itemStack, boolean skipCollisionCheck, Direction sidePlacedOn) {
+    public static boolean canPlace(World world, EntityPlayer player, BlockPos pos, IBlockState newBlockState, ItemStack itemStack, boolean skipCollisionCheck, EnumFacing sidePlacedOn) {
 
         //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
             return false;
         }
 
-		Block block = ((BlockItem) itemStack.getItem()).getBlock();
+        Block block = ((ItemBlock) itemStack.getItem()).getBlock();
 
         return !itemStack.isEmpty() && canPlayerEdit(player, world, pos, itemStack) &&
                mayPlace(world, block, newBlockState, pos, skipCollisionCheck, sidePlacedOn, player) &&
@@ -198,53 +194,52 @@ public class SurvivalHelper {
     }
 
     //Can be harvested with hand? (or in creative)
-	private static boolean canReplace(World world, PlayerEntity player, BlockPos pos) {
+    private static boolean canReplace(World world, EntityPlayer player, BlockPos pos){
         if (player.isCreative()) return true;
 
-		BlockState state = world.getBlockState(pos);
+        IBlockState state = world.getBlockState(pos);
+        state = state.getBlock().getActualState(state, world, pos);
 
-		switch (BuildConfig.survivalBalancers.quickReplaceMiningLevel.get()) {
-			case -1:
-				return !state.requiresCorrectToolForDrops();
-			case 0:
-				return state.getBlock().getHarvestLevel(state) <= 0;
-			case 1:
-				return state.getBlock().getHarvestLevel(state) <= 1;
-			case 2:
-				return state.getBlock().getHarvestLevel(state) <= 2;
-			case 3:
-				return state.getBlock().getHarvestLevel(state) <= 3;
+        switch (BuildConfig.survivalBalancers.quickReplaceMiningLevel) {
+            case -1: return state.getMaterial().isToolNotRequired();
+            case 0: return state.getBlock().getHarvestLevel(state) <= 0;
+            case 1: return state.getBlock().getHarvestLevel(state) <= 1;
+            case 2: return state.getBlock().getHarvestLevel(state) <= 2;
+            case 3: return state.getBlock().getHarvestLevel(state) <= 3;
         }
 
         return false;
     }
 
     //From EntityPlayer#canPlayerEdit
-	private static boolean canPlayerEdit(PlayerEntity player, World world, BlockPos pos, ItemStack stack) {
-		if (!world.mayInteract(player, pos)) return false;
-
-		if (player.abilities.mayBuild) {
+    private static boolean canPlayerEdit(EntityPlayer player, World world, BlockPos pos, ItemStack stack)
+    {
+        if (player.capabilities.allowEdit)
+        {
             //True in creative and survival mode
             return true;
-		} else {
+        }
+        else
+        {
             //Adventure mode
-			CachedBlockInfo blockworldstate = new CachedBlockInfo(world, pos, false);
-			return stack.hasAdventureModePlaceTagForBlock(world.getTagManager(), blockworldstate);
-
+            Block block = world.getBlockState(pos).getBlock();
+            return stack.canPlaceOn(block) || stack.canEditBlocks();
         }
     }
 
     //From World#mayPlace
-	private static boolean mayPlace(World 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);
+    private static boolean mayPlace(World world, Block blockIn, IBlockState newBlockState, BlockPos pos, boolean skipCollisionCheck, EnumFacing sidePlacedOn, @Nullable Entity placer)
+    {
+        IBlockState iblockstate1 = world.getBlockState(pos);
+        AxisAlignedBB axisalignedbb = skipCollisionCheck ? Block.NULL_AABB : blockIn.getDefaultState().getCollisionBoundingBox(world, pos);
 
-		if (voxelShape != null && !world.isUnobstructed(placer, voxelShape)) {
+        if (axisalignedbb != Block.NULL_AABB && !world.checkNoEntityCollision(axisalignedbb.offset(pos)))
+        {
             return false;
         }
 
         //Check if double slab
-		if (placer != null && doesBecomeDoubleSlab(((PlayerEntity) placer), pos, sidePlacedOn)) {
+        if (placer != null && doesBecomeDoubleSlab(((EntityPlayer) placer), pos, sidePlacedOn)) {
             return true;
         }
 
@@ -254,25 +249,25 @@ public class SurvivalHelper {
             return false;
         }
 
-		//TODO 1.14 check what Material.CIRCUITS has become
-		if (iblockstate1.getMaterial() == Material.BUILDABLE_GLASS && blockIn == Blocks.ANVIL) {
+        if (iblockstate1.getMaterial() == Material.CIRCUITS && blockIn == Blocks.ANVIL)
+        {
             return true;
         }
 
         //Check quickreplace
-		if (placer instanceof PlayerEntity && ModifierSettingsManager.getModifierSettings(((PlayerEntity) placer)).doQuickReplace()) {
+        if (placer instanceof EntityPlayer && ModifierSettingsManager.getModifierSettings(((EntityPlayer) placer)).doQuickReplace()) {
             return true;
         }
 
-		//TODO 1.13 replaceable
-		return iblockstate1.getMaterial().isReplaceable() /*&& canPlaceBlockOnSide(world, pos, sidePlacedOn)*/;
+        return iblockstate1.getBlock().isReplaceable(world, pos) && blockIn.canPlaceBlockOnSide(world, pos, sidePlacedOn);
     }
 
 
+
     //Can break using held tool? (or in creative)
-	public static boolean canBreak(World world, PlayerEntity player, BlockPos pos) {
-		BlockState blockState = world.getBlockState(pos);
-		if (!world.getFluidState(pos).isEmpty()) return false;
+    public static boolean canBreak(World world, EntityPlayer player, BlockPos pos) {
+        IBlockState blockState = world.getBlockState(pos);
+        if (blockState.getBlock() instanceof BlockLiquid) return false;
 
         if (player.isCreative()) return true;
 
@@ -280,57 +275,60 @@ public class SurvivalHelper {
     }
 
     //From ForgeHooks#canHarvestBlock
-	public static boolean canHarvestBlock(@Nonnull Block block, @Nonnull PlayerEntity player, @Nonnull World world, @Nonnull BlockPos pos) {
-		BlockState state = world.getBlockState(pos);
+    public static boolean canHarvestBlock(@Nonnull Block block, @Nonnull EntityPlayer player, @Nonnull IBlockAccess world, @Nonnull BlockPos pos)
+    {
+        IBlockState state = world.getBlockState(pos);
+        state = state.getBlock().getActualState(state, world, pos);
 
         //Dont break bedrock
-		if (state.getDestroySpeed(world, pos) < 0) {
+        if (state.getBlockHardness((World) world, pos) < 0) {
             return false;
         }
 
-		if (!state.requiresCorrectToolForDrops()) {
+        if (state.getMaterial().isToolNotRequired())
+        {
             return true;
         }
 
-		ItemStack stack = player.getMainHandItem();
-		ToolType tool = block.getHarvestTool(state);
-		if (stack.isEmpty() || tool == null) {
-			return player.hasCorrectToolForDrops(state);
+        ItemStack stack = player.getHeldItemMainhand();
+        String tool = block.getHarvestTool(state);
+        if (stack.isEmpty() || tool == null)
+        {
+            return player.canHarvestBlock(state);
         }
 
-		if (stack.getDamageValue() >= stack.getMaxDamage()) return false;
+        if (stack.getItemDamage() >= stack.getMaxDamage()) return false;
 
         int toolLevel = stack.getItem().getHarvestLevel(stack, tool, player, state);
-		if (toolLevel < 0) {
-			return player.hasCorrectToolForDrops(state);
+        if (toolLevel < 0)
+        {
+            return player.canHarvestBlock(state);
         }
 
         return toolLevel >= block.getHarvestLevel(state);
     }
 
-	public static boolean doesBecomeDoubleSlab(PlayerEntity player, BlockPos pos, Direction facing) {
-		BlockState placedBlockState = player.level.getBlockState(pos);
+    public static boolean doesBecomeDoubleSlab(EntityPlayer player, BlockPos pos, EnumFacing facing) {
+        IBlockState placedBlockState = player.world.getBlockState(pos);
 
-		ItemStack itemstack = player.getItemInHand(Hand.MAIN_HAND);
+        ItemStack itemstack = player.getHeldItem(EnumHand.MAIN_HAND);
         if (CompatHelper.isItemBlockProxy(itemstack))
             itemstack = CompatHelper.getItemBlockFromStack(itemstack);
 
-		if (itemstack.isEmpty() || !(itemstack.getItem() instanceof BlockItem) || !(((BlockItem) itemstack.getItem()).getBlock() instanceof SlabBlock))
-			return false;
-		SlabBlock heldSlab = (SlabBlock) ((BlockItem) itemstack.getItem()).getBlock();
+        if (itemstack.isEmpty() || !(itemstack.getItem() instanceof ItemSlab)) return false;
+        BlockSlab heldSlab = (BlockSlab) ((ItemSlab) 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);
-//
-//            Comparable<?> heldVariant = heldSlab.getTypeForItem(itemstack);
-//
-//            if ((facing == EnumFacing.UP && placedHalf == BlockSlab.EnumBlockHalf.BOTTOM || facing == EnumFacing.DOWN && placedHalf == BlockSlab.EnumBlockHalf.TOP) && placedVariant == heldVariant)
-//            {
-//                return true;
-//            }
+            IProperty<?> variantProperty = heldSlab.getVariantProperty();
+            Comparable<?> placedVariant = placedBlockState.getValue(variantProperty);
+            BlockSlab.EnumBlockHalf placedHalf = placedBlockState.getValue(BlockSlab.HALF);
+
+            Comparable<?> heldVariant = heldSlab.getTypeForItem(itemstack);
+
+            if ((facing == EnumFacing.UP && placedHalf == BlockSlab.EnumBlockHalf.BOTTOM || facing == EnumFacing.DOWN && placedHalf == BlockSlab.EnumBlockHalf.TOP) && placedVariant == heldVariant)
+            {
+                return true;
+            }
         }
         return false;
     }

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

@@ -1,221 +0,0 @@
-package nl.requios.effortlessbuilding.item;
-
-import mcp.MethodsReturnNonnullByDefault;
-import net.minecraft.block.Block;
-import net.minecraft.block.BlockState;
-import net.minecraft.client.util.ITooltipFlag;
-import net.minecraft.entity.player.PlayerEntity;
-import net.minecraft.entity.player.ServerPlayerEntity;
-import net.minecraft.fluid.Fluids;
-import net.minecraft.inventory.container.INamedContainerProvider;
-import net.minecraft.item.*;
-import net.minecraft.nbt.CompoundNBT;
-import net.minecraft.util.ActionResult;
-import net.minecraft.util.ActionResultType;
-import net.minecraft.util.Direction;
-import net.minecraft.util.Hand;
-import net.minecraft.util.math.BlockPos;
-import net.minecraft.util.math.BlockRayTraceResult;
-import net.minecraft.util.math.vector.Vector3d;
-import net.minecraft.util.text.ITextComponent;
-import net.minecraft.util.text.StringTextComponent;
-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.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;
-
-@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(ItemGroup.TAB_TOOLS).stacksTo(1));
-    }
-
-    public abstract int getInventorySize();
-
-    public abstract INamedContainerProvider 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 ActionResultType useOn(ItemUseContext ctx) {
-        PlayerEntity player = ctx.getPlayer();
-        World world = ctx.getLevel();
-        BlockPos pos = ctx.getClickedPos();
-        Direction facing = ctx.getClickedFace();
-        ItemStack item = ctx.getItemInHand();
-        Vector3d hitVec = ctx.getClickLocation();
-
-        if (player == null) return ActionResultType.FAIL;
-
-        if (ctx.getPlayer() != null && ctx.getPlayer().isShiftKeyDown()) { //ctx.isPlacerSneaking()
-            if (world.isClientSide) return ActionResultType.SUCCESS;
-            //Open inventory
-            NetworkHooks.openGui((ServerPlayerEntity) player, getContainerProvider(item));
-        } else {
-            if (world.isClientSide) return ActionResultType.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 ActionResultType.FAIL;
-            }
-
-            //Use item
-            //Get bag inventory
-            //TODO offhand support
-            ItemStack bag = player.getItemInHand(Hand.MAIN_HAND);
-            IItemHandler bagInventory = getBagInventory(bag);
-            if (bagInventory == null)
-                return ActionResultType.FAIL;
-
-            ItemStack toPlace = pickRandomStack(bagInventory);
-            if (toPlace.isEmpty()) return ActionResultType.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);
-            }
-
-            BlockItemUseContext blockItemUseContext = new BlockItemUseContext(new ItemUseContext(player, Hand.MAIN_HAND, new BlockRayTraceResult(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 ActionResultType.SUCCESS;
-    }
-
-    @Override
-    public ActionResult<ItemStack> use(World world, PlayerEntity player, Hand hand) {
-        ItemStack bag = player.getItemInHand(hand);
-
-        if (player.isShiftKeyDown()) {
-            if (world.isClientSide) return new ActionResult<>(ActionResultType.SUCCESS, bag);
-            //Open inventory
-            NetworkHooks.openGui((ServerPlayerEntity) player, getContainerProvider(bag));
-        } else {
-            //Use item
-            //Get bag inventory
-            IItemHandler bagInventory = getBagInventory(bag);
-            if (bagInventory == null)
-                return new ActionResult<>(ActionResultType.FAIL, bag);
-
-            ItemStack toUse = pickRandomStack(bagInventory);
-            if (toUse.isEmpty()) return new ActionResult<>(ActionResultType.FAIL, bag);
-
-            return toUse.use(world, player, hand);
-        }
-        return new ActionResult<>(ActionResultType.PASS, bag);
-    }
-
-    @Override
-    public int getUseDuration(ItemStack p_77626_1_) {
-        return 1;
-    }
-
-    @Nullable
-    @Override
-    public ICapabilityProvider initCapabilities(ItemStack stack, @Nullable CompoundNBT nbt) {
-        return new ItemHandlerCapabilityProvider(getInventorySize());
-    }
-
-    @Override
-    public void appendHoverText(ItemStack stack, @Nullable World world, List<ITextComponent> tooltip, ITooltipFlag flag) {
-        tooltip.add(new StringTextComponent(TextFormatting.BLUE + "Rightclick" + TextFormatting.GRAY + " to place a random block"));
-        tooltip.add(new StringTextComponent(TextFormatting.BLUE + "Sneak + rightclick" + TextFormatting.GRAY + " to open inventory"));
-        if (world != null && world.players().size() > 1) {
-            tooltip.add(new StringTextComponent(TextFormatting.YELLOW + "Experimental on servers: may lose inventory"));
-        }
-    }
-
-    @Override
-    public String getDescriptionId() {
-        return this.getRegistryName().toString();
-    }
-}

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

@@ -1,46 +0,0 @@
-package nl.requios.effortlessbuilding.item;
-
-import net.minecraft.entity.player.PlayerEntity;
-import net.minecraft.entity.player.PlayerInventory;
-import net.minecraft.inventory.container.Container;
-import net.minecraft.inventory.container.INamedContainerProvider;
-import net.minecraft.item.ItemStack;
-import net.minecraft.util.text.ITextComponent;
-import net.minecraft.util.text.TranslationTextComponent;
-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 INamedContainerProvider getContainerProvider(ItemStack bag) {
-        return new ContainerProvider(bag);
-    }
-
-    public static class ContainerProvider implements INamedContainerProvider {
-
-        private final ItemStack bag;
-
-        public ContainerProvider(ItemStack bag) {
-            this.bag = bag;
-        }
-
-        @Override
-        public ITextComponent getDisplayName() {
-            return new TranslationTextComponent("effortlessbuilding:diamond_randomizer_bag");
-        }
-
-        @Nullable
-        @Override
-        public Container createMenu(int containerId, PlayerInventory playerInventory, PlayerEntity player) {
-            return new DiamondRandomizerBagContainer(containerId, playerInventory, ((AbstractRandomizerBagItem)bag.getItem()).getBagInventory(bag));
-        }
-    }
-}

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

@@ -1,46 +0,0 @@
-package nl.requios.effortlessbuilding.item;
-
-import net.minecraft.entity.player.PlayerEntity;
-import net.minecraft.entity.player.PlayerInventory;
-import net.minecraft.inventory.container.Container;
-import net.minecraft.inventory.container.INamedContainerProvider;
-import net.minecraft.item.ItemStack;
-import net.minecraft.util.text.ITextComponent;
-import net.minecraft.util.text.TranslationTextComponent;
-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 INamedContainerProvider getContainerProvider(ItemStack bag) {
-        return new ContainerProvider(bag);
-    }
-
-    public static class ContainerProvider implements INamedContainerProvider {
-
-        private final ItemStack bag;
-
-        public ContainerProvider(ItemStack bag) {
-            this.bag = bag;
-        }
-
-        @Override
-        public ITextComponent getDisplayName() {
-            return new TranslationTextComponent("effortlessbuilding:golden_randomizer_bag");
-        }
-
-        @Nullable
-        @Override
-        public Container createMenu(int containerId, PlayerInventory playerInventory, PlayerEntity player) {
-            return new GoldenRandomizerBagContainer(containerId, playerInventory, ((AbstractRandomizerBagItem)bag.getItem()).getBagInventory(bag));
-        }
-    }
-}

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

@@ -0,0 +1,197 @@
+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.creativetab.CreativeTabs;
+import net.minecraft.entity.player.EntityPlayer;
+import net.minecraft.item.Item;
+import net.minecraft.item.ItemStack;
+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.TextFormatting;
+import net.minecraft.world.World;
+import net.minecraftforge.common.capabilities.ICapabilityProvider;
+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.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() {
+        this.setRegistryName(EffortlessBuilding.MODID, "randomizer_bag");
+        this.setTranslationKey(this.getRegistryName().toString());
+
+        this.maxStackSize = 1;
+        this.setCreativeTab(CreativeTabs.TOOLS);
+    }
+
+    @Override
+    public EnumActionResult onItemUse(EntityPlayer player, World world, BlockPos pos, EnumHand hand, EnumFacing facing, float hitX, float hitY, float hitZ) {
+
+        if (player.isSneaking()) {
+            if (world.isRemote) return EnumActionResult.SUCCESS;
+            //Open inventory
+            player.openGui(EffortlessBuilding.instance, EffortlessBuilding.RANDOMIZER_BAG_GUI, world, 0, 0, 0);
+        } else {
+            if (world.isRemote) return EnumActionResult.SUCCESS;
+            //Use item
+            //Get bag inventory
+            ItemStack bag = player.getHeldItem(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);
+
+            if (!world.getBlockState(pos).getBlock().isReplaceable(world, pos)) {
+                pos = pos.offset(facing);
+            }
+
+            IBlockState blockState = Block.getBlockFromItem(toPlace.getItem()).getStateForPlacement(world, pos, facing,
+                    hitX, hitY, hitZ, toPlace.getMetadata(), player, hand);
+
+            SurvivalHelper.placeBlock(world, player, pos, blockState, toPlace, facing, new Vec3d(hitX, hitY, hitZ), 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
+            player.openGui(EffortlessBuilding.instance, EffortlessBuilding.RANDOMIZER_BAG_GUI, world, 0, 0, 0);
+        } 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) {
+        if (!bag.hasCapability(CapabilityItemHandler.ITEM_HANDLER_CAPABILITY, null)) return null;
+        return bag.getCapability(CapabilityItemHandler.ITEM_HANDLER_CAPABILITY, 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 getMaxItemUseDuration(ItemStack stack) {
+        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<String> tooltip, ITooltipFlag flag) {
+        tooltip.add(TextFormatting.BLUE + "Rightclick" + TextFormatting.GRAY + " to place a random block");
+        tooltip.add(TextFormatting.BLUE + "Sneak + rightclick" + TextFormatting.GRAY + " to open inventory");
+    }
+
+    @Override
+    public String getTranslationKey() {
+        return super.getTranslationKey();
+    }
+
+    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,67 @@
+package nl.requios.effortlessbuilding.item;
+
+import net.minecraft.client.util.ITooltipFlag;
+import net.minecraft.creativetab.CreativeTabs;
+import net.minecraft.entity.EntityLivingBase;
+import net.minecraft.entity.player.EntityPlayer;
+import net.minecraft.item.Item;
+import net.minecraft.item.ItemStack;
+import net.minecraft.util.*;
+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() {
+        this.setRegistryName(EffortlessBuilding.MODID, "reach_upgrade1");
+        this.setTranslationKey(this.getRegistryName().toString());
+
+        this.maxStackSize = 1;
+        this.setCreativeTab(CreativeTabs.TOOLS);
+    }
+
+    @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<String> tooltip, ITooltipFlag flag) {
+        tooltip.add(TextFormatting.GRAY + "Consume to increase reach to " + TextFormatting.BLUE + BuildConfig.reach.maxReachLevel1);
+    }
+
+    @Override
+    public String getTranslationKey() {
+        return super.getTranslationKey();
+    }
+}

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

@@ -0,0 +1,71 @@
+package nl.requios.effortlessbuilding.item;
+
+import net.minecraft.client.util.ITooltipFlag;
+import net.minecraft.creativetab.CreativeTabs;
+import net.minecraft.entity.player.EntityPlayer;
+import net.minecraft.item.Item;
+import net.minecraft.item.ItemStack;
+import net.minecraft.util.*;
+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() {
+        this.setRegistryName(EffortlessBuilding.MODID, "reach_upgrade2");
+        this.setTranslationKey(this.getRegistryName().toString());
+
+        this.maxStackSize = 1;
+        this.setCreativeTab(CreativeTabs.TOOLS);
+    }
+
+    @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<String> tooltip, ITooltipFlag flag) {
+        tooltip.add(TextFormatting.GRAY + "Consume to increase reach to " + TextFormatting.BLUE + BuildConfig.reach.maxReachLevel2);
+        tooltip.add(TextFormatting.GRAY + "Previous upgrades need to be consumed first");
+    }
+
+    @Override
+    public String getTranslationKey() {
+        return super.getTranslationKey();
+    }
+}

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

@@ -0,0 +1,74 @@
+package nl.requios.effortlessbuilding.item;
+
+import net.minecraft.client.util.ITooltipFlag;
+import net.minecraft.creativetab.CreativeTabs;
+import net.minecraft.entity.player.EntityPlayer;
+import net.minecraft.item.Item;
+import net.minecraft.item.ItemStack;
+import net.minecraft.util.*;
+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() {
+        this.setRegistryName(EffortlessBuilding.MODID, "reach_upgrade3");
+        this.setTranslationKey(this.getRegistryName().toString());
+
+        this.maxStackSize = 1;
+        this.setCreativeTab(CreativeTabs.TOOLS);
+    }
+
+    @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<String> tooltip, ITooltipFlag flag) {
+        tooltip.add(TextFormatting.GRAY + "Consume to increase reach to " + TextFormatting.BLUE + BuildConfig.reach.maxReachLevel3);
+        tooltip.add(TextFormatting.GRAY + "Previous upgrades need to be consumed first");
+    }
+
+    @Override
+    public String getTranslationKey() {
+        return super.getTranslationKey();
+    }
+}

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

@@ -1,46 +0,0 @@
-package nl.requios.effortlessbuilding.item;
-
-import net.minecraft.entity.player.PlayerEntity;
-import net.minecraft.entity.player.PlayerInventory;
-import net.minecraft.inventory.container.Container;
-import net.minecraft.inventory.container.INamedContainerProvider;
-import net.minecraft.item.ItemStack;
-import net.minecraft.util.text.ITextComponent;
-import net.minecraft.util.text.TranslationTextComponent;
-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 INamedContainerProvider getContainerProvider(ItemStack bag) {
-		return new ContainerProvider(bag);
-	}
-
-	public static class ContainerProvider implements INamedContainerProvider {
-
-		private final ItemStack bag;
-
-		public ContainerProvider(ItemStack bag) {
-			this.bag = bag;
-		}
-
-		@Override
-		public ITextComponent getDisplayName() {
-			return new TranslationTextComponent("effortlessbuilding:randomizer_bag");
-		}
-
-		@Nullable
-		@Override
-		public Container createMenu(int containerId, PlayerInventory playerInventory, PlayerEntity 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 mcp.MethodsReturnNonnullByDefault;
-import net.minecraft.client.util.ITooltipFlag;
-import net.minecraft.entity.player.PlayerEntity;
-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.StringTextComponent;
-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 javax.annotation.ParametersAreNonnullByDefault;
-import java.util.List;
-
-@ParametersAreNonnullByDefault
-@MethodsReturnNonnullByDefault
-public class ReachUpgrade1Item extends Item {
-
-	public ReachUpgrade1Item() {
-		super(new Item.Properties().tab(ItemGroup.TAB_TOOLS).stacksTo(1));
-	}
-
-	@Override
-	public ActionResult<ItemStack> use(World world, PlayerEntity player, Hand 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 ActionResult<>(ActionResultType.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 ActionResult<>(ActionResultType.PASS, player.getItemInHand(hand));
-	}
-
-	@Override
-	public void appendHoverText(ItemStack stack, @Nullable World world, List<ITextComponent> tooltip, ITooltipFlag flag) {
-		tooltip.add(new StringTextComponent(TextFormatting.GRAY + "Consume to increase reach to " + TextFormatting.BLUE + BuildConfig.reach.maxReachLevel1.get()));
-	}
-
-	@Override
-	public String getDescriptionId() {
-		return this.getRegistryName().toString();
-	}
-}

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

@@ -1,74 +0,0 @@
-package nl.requios.effortlessbuilding.item;
-
-import mcp.MethodsReturnNonnullByDefault;
-import net.minecraft.client.util.ITooltipFlag;
-import net.minecraft.entity.player.PlayerEntity;
-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.StringTextComponent;
-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 javax.annotation.ParametersAreNonnullByDefault;
-import java.util.List;
-
-@ParametersAreNonnullByDefault
-@MethodsReturnNonnullByDefault
-public class ReachUpgrade2Item extends Item {
-
-	public ReachUpgrade2Item() {
-		super(new Item.Properties().tab(ItemGroup.TAB_TOOLS).stacksTo(1));
-	}
-
-	@Override
-	public ActionResult<ItemStack> use(World world, PlayerEntity player, Hand 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 ActionResult<>(ActionResultType.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 ActionResult<>(ActionResultType.PASS, player.getItemInHand(hand));
-	}
-
-	@Override
-	public void appendHoverText(ItemStack stack, @Nullable World world, List<ITextComponent> tooltip, ITooltipFlag flag) {
-		tooltip.add(new StringTextComponent(TextFormatting.GRAY + "Consume to increase reach to " + TextFormatting.BLUE + BuildConfig.reach.maxReachLevel2.get()));
-		tooltip.add(new StringTextComponent(TextFormatting.GRAY + "Previous upgrades need to be consumed first"));
-	}
-
-	@Override
-	public String getDescriptionId() {
-		return this.getRegistryName().toString();
-	}
-}

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

@@ -1,77 +0,0 @@
-package nl.requios.effortlessbuilding.item;
-
-import mcp.MethodsReturnNonnullByDefault;
-import net.minecraft.client.util.ITooltipFlag;
-import net.minecraft.entity.player.PlayerEntity;
-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.StringTextComponent;
-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 javax.annotation.ParametersAreNonnullByDefault;
-import java.util.List;
-
-@ParametersAreNonnullByDefault
-@MethodsReturnNonnullByDefault
-public class ReachUpgrade3Item extends Item {
-
-	public ReachUpgrade3Item() {
-		super(new Item.Properties().tab(ItemGroup.TAB_TOOLS).stacksTo(1));
-	}
-
-	@Override
-	public ActionResult<ItemStack> use(World world, PlayerEntity player, Hand 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 ActionResult<>(ActionResultType.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 ActionResult<>(ActionResultType.PASS, player.getItemInHand(hand));
-	}
-
-	@Override
-	public void appendHoverText(ItemStack stack, @Nullable World world, List<ITextComponent> tooltip, ITooltipFlag flag) {
-		tooltip.add(new StringTextComponent(TextFormatting.GRAY + "Consume to increase reach to " + TextFormatting.BLUE + BuildConfig.reach.maxReachLevel3.get()));
-		tooltip.add(new StringTextComponent(TextFormatting.GRAY + "Previous upgrades need to be consumed first"));
-	}
-
-	@Override
-	public String getDescriptionId() {
-		return this.getRegistryName().toString();
-	}
-}

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

@@ -1,91 +0,0 @@
-package nl.requios.effortlessbuilding.network;
-
-import net.minecraft.block.Block;
-import net.minecraft.block.BlockState;
-import net.minecraft.entity.player.PlayerEntity;
-import net.minecraft.network.PacketBuffer;
-import net.minecraft.util.math.BlockPos;
-import net.minecraft.util.math.vector.Vector3d;
-import net.minecraftforge.fml.LogicalSide;
-import net.minecraftforge.fml.network.NetworkEvent;
-import nl.requios.effortlessbuilding.EffortlessBuilding;
-import nl.requios.effortlessbuilding.buildmodifier.BlockSet;
-import nl.requios.effortlessbuilding.buildmodifier.UndoRedo;
-
-import java.util.ArrayList;
-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 final BlockState previousBlockState;
-	private final BlockState newBlockState;
-
-	public AddUndoMessage() {
-		coordinate = BlockPos.ZERO;
-		previousBlockState = null;
-		newBlockState = null;
-	}
-
-	public AddUndoMessage(BlockPos coordinate, BlockState previousBlockState, BlockState newBlockState) {
-		this.coordinate = coordinate;
-		this.previousBlockState = previousBlockState;
-		this.newBlockState = newBlockState;
-	}
-
-	public static void encode(AddUndoMessage message, PacketBuffer buf) {
-		buf.writeInt(message.coordinate.getX());
-		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(PacketBuffer buf) {
-		BlockPos coordinate = new BlockPos(buf.readInt(), buf.readInt(), buf.readInt());
-		BlockState previousBlockState = Block.stateById(buf.readInt());
-		BlockState newBlockState = Block.stateById(buf.readInt());
-		return new AddUndoMessage(coordinate, previousBlockState, newBlockState);
-	}
-
-	public BlockPos getCoordinate() {
-		return coordinate;
-	}
-
-	public BlockState getPreviousBlockState() {
-		return previousBlockState;
-	}
-
-	public BlockState getNewBlockState() {
-		return newBlockState;
-	}
-
-	public static class Handler {
-		public static void handle(AddUndoMessage message, Supplier<NetworkEvent.Context> ctx) {
-			ctx.get().enqueueWork(() -> {
-				if (ctx.get().getDirection().getReceptionSide() == LogicalSide.CLIENT) {
-					//Received clientside
-
-					PlayerEntity player = EffortlessBuilding.proxy.getPlayerEntityFromContext(ctx);
-					//Add to undo stack clientside
-					//Only the appropriate player that needs to add this to the undo stack gets this message
-					UndoRedo.addUndo(player, new BlockSet(
-						new ArrayList<BlockPos>() {{
-							add(message.getCoordinate());
-						}},
-						new ArrayList<BlockState>() {{
-							add(message.getPreviousBlockState());
-						}},
-						new ArrayList<BlockState>() {{
-							add(message.getNewBlockState());
-						}},
-						new Vector3d(0, 0, 0),
-						message.getCoordinate(), message.getCoordinate()));
-				}
-			});
-			ctx.get().setPacketHandled(true);
-		}
-	}
-}

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

@@ -1,65 +1,40 @@
 package nl.requios.effortlessbuilding.network;
 
-import net.minecraft.network.PacketBuffer;
-import net.minecraft.util.Direction;
+import io.netty.buffer.ByteBuf;
+import net.minecraft.util.EnumFacing;
 import net.minecraft.util.math.BlockPos;
-import net.minecraft.util.math.BlockRayTraceResult;
 import net.minecraft.util.math.RayTraceResult;
-import net.minecraft.util.math.vector.Vector3d;
-import net.minecraftforge.fml.LogicalSide;
-import net.minecraftforge.fml.network.NetworkEvent;
+import net.minecraft.util.math.Vec3d;
+import net.minecraftforge.fml.common.network.simpleimpl.IMessage;
+import net.minecraftforge.fml.common.network.simpleimpl.IMessageHandler;
+import net.minecraftforge.fml.common.network.simpleimpl.MessageContext;
+import net.minecraftforge.fml.relauncher.Side;
+import nl.requios.effortlessbuilding.EffortlessBuilding;
 import nl.requios.effortlessbuilding.buildmode.BuildModes;
-
-import java.util.function.Supplier;
+import nl.requios.effortlessbuilding.buildmodifier.BuildModifiers;
 
 /***
  * Sends a message to the server indicating that a player wants to break a block
  */
-public class BlockBrokenMessage {
+public class BlockBrokenMessage implements IMessage {
 
-	private final boolean blockHit;
-	private final BlockPos blockPos;
-	private final Direction sideHit;
-	private final Vector3d hitVec;
+    private boolean blockHit;
+    private BlockPos blockPos;
+    private EnumFacing sideHit;
+    private Vec3d hitVec;
 
     public BlockBrokenMessage() {
         this.blockHit = false;
-		this.blockPos = BlockPos.ZERO;
-		this.sideHit = Direction.UP;
-		this.hitVec = new Vector3d(0, 0, 0);
+        this.blockPos = BlockPos.ORIGIN;
+        this.sideHit = EnumFacing.UP;
+        this.hitVec = new Vec3d(0, 0, 0);
     }
 
-	public BlockBrokenMessage(BlockRayTraceResult result) {
-		this.blockHit = result.getType() == RayTraceResult.Type.BLOCK;
+    public BlockBrokenMessage(RayTraceResult result) {
+        this.blockHit = result.typeOfHit == RayTraceResult.Type.BLOCK;
         this.blockPos = result.getBlockPos();
-		this.sideHit = result.getDirection();
-		this.hitVec = result.getLocation();
-	}
-
-	public BlockBrokenMessage(boolean blockHit, BlockPos blockPos, Direction sideHit, Vector3d hitVec) {
-		this.blockHit = blockHit;
-		this.blockPos = blockPos;
-		this.sideHit = sideHit;
-		this.hitVec = hitVec;
-	}
-
-	public static void encode(BlockBrokenMessage message, PacketBuffer buf) {
-		buf.writeBoolean(message.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(PacketBuffer buf) {
-		boolean blockHit = buf.readBoolean();
-		BlockPos blockPos = new BlockPos(buf.readInt(), buf.readInt(), buf.readInt());
-		Direction sideHit = Direction.from3DDataValue(buf.readInt());
-		Vector3d hitVec = new Vector3d(buf.readDouble(), buf.readDouble(), buf.readDouble());
-		return new BlockBrokenMessage(blockHit, blockPos, sideHit, hitVec);
+        this.sideHit = result.sideHit;
+        this.hitVec = result.hitVec;
     }
 
     public boolean isBlockHit() {
@@ -70,23 +45,51 @@ public class BlockBrokenMessage {
         return blockPos;
     }
 
-	public Direction getSideHit() {
+    public EnumFacing getSideHit() {
         return sideHit;
     }
 
-	public Vector3d getHitVec() {
+    public Vec3d getHitVec() {
         return hitVec;
     }
 
-	public static class Handler {
-		public static void handle(BlockBrokenMessage message, Supplier<NetworkEvent.Context> ctx) {
-			ctx.get().enqueueWork(() -> {
-				if (ctx.get().getDirection().getReceptionSide() == LogicalSide.SERVER) {
+    @Override
+    public void toBytes(ByteBuf buf) {
+        buf.writeBoolean(blockHit);
+        buf.writeInt(blockPos.getX());
+        buf.writeInt(blockPos.getY());
+        buf.writeInt(blockPos.getZ());
+        buf.writeInt(sideHit.getIndex());
+        buf.writeDouble(hitVec.x);
+        buf.writeDouble(hitVec.y);
+        buf.writeDouble(hitVec.z);
+    }
+
+    @Override
+    public void fromBytes(ByteBuf buf) {
+        blockHit = buf.readBoolean();
+        blockPos = new BlockPos(buf.readInt(), buf.readInt(), buf.readInt());
+        sideHit = EnumFacing.byIndex(buf.readInt());
+        hitVec = new Vec3d(buf.readDouble(), buf.readDouble(), buf.readDouble());
+    }
+
+    // The params of the IMessageHandler are <REQ, REPLY>
+    public static class MessageHandler implements IMessageHandler<BlockBrokenMessage, IMessage> {
+        // Do note that the default constructor is required, but implicitly defined in this case
+
+        @Override
+        public IMessage onMessage(BlockBrokenMessage message, MessageContext ctx) {
+            //EffortlessBuilding.log("message received on " + ctx.side + " side");
+
+            if (ctx.side == Side.SERVER) {
                 //Received serverside
-					BuildModes.onBlockBrokenMessage(ctx.get().getSender(), message);
-				}
+                EffortlessBuilding.proxy.getThreadListenerFromContext(ctx).addScheduledTask(() -> {
+                    BuildModes.onBlockBrokenMessage(ctx.getServerHandler().player, message);
                 });
-			ctx.get().setPacketHandled(true);
+            }
+            // No response packet
+            return null;
         }
     }
+
 }

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

@@ -1,75 +1,48 @@
 package nl.requios.effortlessbuilding.network;
 
-import net.minecraft.network.PacketBuffer;
-import net.minecraft.util.Direction;
+import io.netty.buffer.ByteBuf;
+import net.minecraft.util.EnumFacing;
 import net.minecraft.util.math.BlockPos;
-import net.minecraft.util.math.BlockRayTraceResult;
 import net.minecraft.util.math.RayTraceResult;
-import net.minecraft.util.math.vector.Vector3d;
-import net.minecraftforge.fml.LogicalSide;
-import net.minecraftforge.fml.network.NetworkEvent;
+import net.minecraft.util.math.Vec3d;
+import net.minecraftforge.fml.common.network.simpleimpl.IMessage;
+import net.minecraftforge.fml.common.network.simpleimpl.IMessageHandler;
+import net.minecraftforge.fml.common.network.simpleimpl.MessageContext;
+import net.minecraftforge.fml.relauncher.Side;
+import nl.requios.effortlessbuilding.EffortlessBuilding;
 import nl.requios.effortlessbuilding.buildmode.BuildModes;
+import nl.requios.effortlessbuilding.buildmodifier.BuildModifiers;
+import nl.requios.effortlessbuilding.proxy.ClientProxy;
 import nl.requios.effortlessbuilding.render.BlockPreviewRenderer;
 
-import java.util.function.Supplier;
-
 /***
  * Sends a message to the server indicating that a player wants to place a block.
  * Received clientside: server has placed blocks and its letting the client know.
  */
-public class BlockPlacedMessage {
+public class BlockPlacedMessage implements IMessage {
 
-	private final boolean blockHit;
-	private final BlockPos blockPos;
-	private final Direction sideHit;
-	private final Vector3d hitVec;
-	private final boolean placeStartPos; //prevent double placing in normal mode
+    private boolean blockHit;
+    private BlockPos blockPos;
+    private EnumFacing sideHit;
+    private Vec3d hitVec;
+    private boolean placeStartPos; //prevent double placing in normal mode
 
     public BlockPlacedMessage() {
         this.blockHit = false;
-		this.blockPos = BlockPos.ZERO;
-		this.sideHit = Direction.UP;
-		this.hitVec = new Vector3d(0, 0, 0);
+        this.blockPos = BlockPos.ORIGIN;
+        this.sideHit = EnumFacing.UP;
+        this.hitVec = new Vec3d(0, 0, 0);
         this.placeStartPos = true;
     }
 
-	public BlockPlacedMessage(BlockRayTraceResult result, boolean placeStartPos) {
-		this.blockHit = result.getType() == RayTraceResult.Type.BLOCK;
+    public BlockPlacedMessage(RayTraceResult result, boolean placeStartPos) {
+        this.blockHit = result.typeOfHit == RayTraceResult.Type.BLOCK;
         this.blockPos = result.getBlockPos();
-		this.sideHit = result.getDirection();
-		this.hitVec = result.getLocation();
+        this.sideHit = result.sideHit;
+        this.hitVec = result.hitVec;
         this.placeStartPos = placeStartPos;
     }
 
-	public BlockPlacedMessage(boolean blockHit, BlockPos blockPos, Direction sideHit, Vector3d hitVec, boolean placeStartPos) {
-		this.blockHit = blockHit;
-		this.blockPos = blockPos;
-		this.sideHit = sideHit;
-		this.hitVec = hitVec;
-		this.placeStartPos = placeStartPos;
-	}
-
-	public static void encode(BlockPlacedMessage message, PacketBuffer buf) {
-		buf.writeBoolean(message.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(PacketBuffer buf) {
-		boolean blockHit = buf.readBoolean();
-		BlockPos blockPos = new BlockPos(buf.readInt(), buf.readInt(), buf.readInt());
-		Direction sideHit = Direction.from3DDataValue(buf.readInt());
-		Vector3d hitVec = new Vector3d(buf.readDouble(), buf.readDouble(), buf.readDouble());
-		boolean placeStartPos = buf.readBoolean();
-		return new BlockPlacedMessage(blockHit, blockPos, sideHit, hitVec, placeStartPos);
-	}
-
     public boolean isBlockHit() {
         return blockHit;
     }
@@ -78,11 +51,11 @@ public class BlockPlacedMessage {
         return blockPos;
     }
 
-	public Direction getSideHit() {
+    public EnumFacing getSideHit() {
         return sideHit;
     }
 
-	public Vector3d getHitVec() {
+    public Vec3d getHitVec() {
         return hitVec;
     }
 
@@ -90,19 +63,51 @@ public class BlockPlacedMessage {
         return placeStartPos;
     }
 
-	public static class Handler {
-		public static void handle(BlockPlacedMessage message, Supplier<NetworkEvent.Context> ctx) {
-			ctx.get().enqueueWork(() -> {
-				if (ctx.get().getDirection().getReceptionSide() == LogicalSide.CLIENT) {
+    @Override
+    public void toBytes(ByteBuf buf) {
+        buf.writeBoolean(blockHit);
+        buf.writeInt(blockPos.getX());
+        buf.writeInt(blockPos.getY());
+        buf.writeInt(blockPos.getZ());
+        buf.writeInt(sideHit.getIndex());
+        buf.writeDouble(hitVec.x);
+        buf.writeDouble(hitVec.y);
+        buf.writeDouble(hitVec.z);
+        buf.writeBoolean(placeStartPos);
+    }
+
+    @Override
+    public void fromBytes(ByteBuf buf) {
+        blockHit = buf.readBoolean();
+        blockPos = new BlockPos(buf.readInt(), buf.readInt(), buf.readInt());
+        sideHit = EnumFacing.byIndex(buf.readInt());
+        hitVec = new Vec3d(buf.readDouble(), buf.readDouble(), buf.readDouble());
+        placeStartPos = buf.readBoolean();
+    }
+
+    // The params of the IMessageHandler are <REQ, REPLY>
+    public static class MessageHandler implements IMessageHandler<BlockPlacedMessage, IMessage> {
+        // Do note that the default constructor is required, but implicitly defined in this case
+
+        @Override
+        public IMessage onMessage(BlockPlacedMessage message, MessageContext ctx) {
+            //EffortlessBuilding.log("message received on " + ctx.side + " side");
+
+            if (ctx.side == Side.CLIENT){
                 //Received clientside
+                EffortlessBuilding.proxy.getThreadListenerFromContext(ctx).addScheduledTask(() -> {
                     //Nod RenderHandler to do the dissolve shader effect
                     BlockPreviewRenderer.onBlocksPlaced();
+                });
+                return null;
             } else {
                 //Received serverside
-					BuildModes.onBlockPlacedMessage(ctx.get().getSender(), message);
-				}
+                EffortlessBuilding.proxy.getThreadListenerFromContext(ctx).addScheduledTask(() -> {
+                    BuildModes.onBlockPlacedMessage(ctx.getServerHandler().player, message);
                 });
-			ctx.get().setPacketHandled(true);
+                // No response packet
+                return null;
+            }
         }
     }
 }

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

@@ -1,33 +1,45 @@
 package nl.requios.effortlessbuilding.network;
 
-import net.minecraft.entity.player.PlayerEntity;
-import net.minecraft.network.PacketBuffer;
-import net.minecraftforge.fml.network.NetworkEvent;
+import io.netty.buffer.ByteBuf;
+import net.minecraft.entity.player.EntityPlayer;
+import net.minecraft.util.IThreadListener;
+import net.minecraftforge.fml.common.network.simpleimpl.IMessage;
+import net.minecraftforge.fml.common.network.simpleimpl.IMessageHandler;
+import net.minecraftforge.fml.common.network.simpleimpl.MessageContext;
 import nl.requios.effortlessbuilding.EffortlessBuilding;
 import nl.requios.effortlessbuilding.buildmode.BuildModes;
 
-import java.util.function.Supplier;
-
 /**
  * Sends a message to the server indicating that a buildmode needs to be canceled for a player
  */
-public class CancelModeMessage {
+public class CancelModeMessage implements IMessage {
+
+    @Override
+    public void toBytes(ByteBuf buf) {
 
-	public static void encode(CancelModeMessage message, PacketBuffer buf) {
     }
 
-	public static CancelModeMessage decode(PacketBuffer buf) {
-		return new CancelModeMessage();
+    @Override
+    public void fromBytes(ByteBuf buf) {
+
     }
 
-	public static class Handler {
-		public static void handle(CancelModeMessage message, Supplier<NetworkEvent.Context> ctx) {
-			ctx.get().enqueueWork(() -> {
-				PlayerEntity player = EffortlessBuilding.proxy.getPlayerEntityFromContext(ctx);
+    // The params of the IMessageHandler are <REQ, REPLY>
+    public static class MessageHandler implements IMessageHandler<CancelModeMessage, IMessage> {
+        // Do note that the default constructor is required, but implicitly defined in this case
+
+        @Override
+        public IMessage onMessage(CancelModeMessage message, MessageContext ctx) {
+
+            // Execute the action on the main server thread by adding it as a scheduled task
+            IThreadListener threadListener = EffortlessBuilding.proxy.getThreadListenerFromContext(ctx);
+            threadListener.addScheduledTask(() -> {
+                EntityPlayer player = EffortlessBuilding.proxy.getPlayerEntityFromContext(ctx);
 
                 BuildModes.initializeMode(player);
             });
-			ctx.get().setPacketHandled(true);
+            // No response packet
+            return null;
         }
     }
 }

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

@@ -1,42 +0,0 @@
-package nl.requios.effortlessbuilding.network;
-
-import net.minecraft.entity.player.PlayerEntity;
-import net.minecraft.network.PacketBuffer;
-import net.minecraftforge.fml.LogicalSide;
-import net.minecraftforge.fml.network.NetworkEvent;
-import nl.requios.effortlessbuilding.EffortlessBuilding;
-import nl.requios.effortlessbuilding.buildmodifier.UndoRedo;
-
-import java.util.function.Supplier;
-
-/***
- * Sends a message to the client asking to clear the undo and redo stacks.
- */
-public class ClearUndoMessage {
-
-	public ClearUndoMessage() {
-	}
-
-	public static void encode(ClearUndoMessage message, PacketBuffer buf) {
-
-	}
-
-	public static ClearUndoMessage decode(PacketBuffer buf) {
-		return new ClearUndoMessage();
-	}
-
-	public static class Handler {
-		public static void handle(ClearUndoMessage message, Supplier<NetworkEvent.Context> ctx) {
-			ctx.get().enqueueWork(() -> {
-				if (ctx.get().getDirection().getReceptionSide() == LogicalSide.CLIENT) {
-					//Received clientside
-					PlayerEntity player = EffortlessBuilding.proxy.getPlayerEntityFromContext(ctx);
-
-					//Add to undo stack clientside
-					UndoRedo.clear(player);
-				}
-			});
-			ctx.get().setPacketHandled(true);
-		}
-	}
-}

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

@@ -1,17 +1,22 @@
 package nl.requios.effortlessbuilding.network;
 
-import net.minecraft.entity.player.PlayerEntity;
-import net.minecraft.network.PacketBuffer;
-import net.minecraftforge.fml.network.NetworkEvent;
+import io.netty.buffer.ByteBuf;
+import net.minecraft.entity.player.EntityPlayer;
+import net.minecraft.util.IThreadListener;
+import net.minecraftforge.fml.common.network.simpleimpl.IMessage;
+import net.minecraftforge.fml.common.network.simpleimpl.IMessageHandler;
+import net.minecraftforge.fml.common.network.simpleimpl.MessageContext;
 import nl.requios.effortlessbuilding.EffortlessBuilding;
+import nl.requios.effortlessbuilding.buildmode.BuildModes;
 import nl.requios.effortlessbuilding.buildmode.ModeOptions;
+import nl.requios.effortlessbuilding.buildmode.ModeSettingsManager;
 
-import java.util.function.Supplier;
+import static nl.requios.effortlessbuilding.buildmode.ModeSettingsManager.*;
 
 /**
  * Shares mode settings (see ModeSettingsManager) between server and client
  */
-public class ModeActionMessage {
+public class ModeActionMessage implements IMessage {
 
     private ModeOptions.ActionEnum action;
 
@@ -22,23 +27,36 @@ public class ModeActionMessage {
         this.action = action;
     }
 
-	public static void encode(ModeActionMessage message, PacketBuffer buf) {
-		buf.writeInt(message.action.ordinal());
+    @Override
+    public void toBytes(ByteBuf buf) {
+        buf.writeInt(action.ordinal());
     }
 
-	public static ModeActionMessage decode(PacketBuffer buf) {
-		ModeOptions.ActionEnum action = ModeOptions.ActionEnum.values()[buf.readInt()];
-		return new ModeActionMessage(action);
+    @Override
+    public void fromBytes(ByteBuf buf) {
+        action = ModeOptions.ActionEnum.values()[buf.readInt()];
     }
 
-	public static class Handler {
-		public static void handle(ModeActionMessage message, Supplier<NetworkEvent.Context> ctx) {
-			ctx.get().enqueueWork(() -> {
-				PlayerEntity player = EffortlessBuilding.proxy.getPlayerEntityFromContext(ctx);
+    // The params of the IMessageHandler are <REQ, REPLY>
+    public static class MessageHandler implements IMessageHandler<ModeActionMessage, IMessage> {
+        // Do note that the default constructor is required, but implicitly defined in this case
 
-				ModeOptions.performAction(player, message.action);
+        @Override
+        public IMessage onMessage(ModeActionMessage message, MessageContext ctx) {
+            //EffortlessBuilding.log("message received on " + ctx.side + " side");
+
+            // The value that was sent
+            ModeOptions.ActionEnum action = message.action;
+
+            // Execute the action on the main server thread by adding it as a scheduled task
+            IThreadListener threadListener = EffortlessBuilding.proxy.getThreadListenerFromContext(ctx);
+            threadListener.addScheduledTask(() -> {
+                EntityPlayer player = EffortlessBuilding.proxy.getPlayerEntityFromContext(ctx);
+
+                ModeOptions.performAction(player, action);
             });
-			ctx.get().setPacketHandled(true);
+            // No response packet
+            return null;
         }
     }
 }

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

@@ -1,19 +1,21 @@
 package nl.requios.effortlessbuilding.network;
 
-import net.minecraft.entity.player.PlayerEntity;
-import net.minecraft.network.PacketBuffer;
-import net.minecraftforge.fml.network.NetworkEvent;
+import io.netty.buffer.ByteBuf;
+import net.minecraft.entity.player.EntityPlayer;
+import net.minecraft.util.IThreadListener;
+import net.minecraftforge.fml.common.network.simpleimpl.IMessage;
+import net.minecraftforge.fml.common.network.simpleimpl.IMessageHandler;
+import net.minecraftforge.fml.common.network.simpleimpl.MessageContext;
 import nl.requios.effortlessbuilding.EffortlessBuilding;
 import nl.requios.effortlessbuilding.buildmode.BuildModes;
 import nl.requios.effortlessbuilding.buildmode.ModeSettingsManager;
-import nl.requios.effortlessbuilding.buildmode.ModeSettingsManager.ModeSettings;
 
-import java.util.function.Supplier;
+import static nl.requios.effortlessbuilding.buildmode.ModeSettingsManager.*;
 
 /**
  * Shares mode settings (see ModeSettingsManager) between server and client
  */
-public class ModeSettingsMessage {
+public class ModeSettingsMessage implements IMessage {
 
     private ModeSettings modeSettings;
 
@@ -24,27 +26,41 @@ public class ModeSettingsMessage {
         this.modeSettings = modeSettings;
     }
 
-	public static void encode(ModeSettingsMessage message, PacketBuffer buf) {
-		buf.writeInt(message.modeSettings.getBuildMode().ordinal());
+    @Override
+    public void toBytes(ByteBuf buf) {
+        buf.writeInt(modeSettings.getBuildMode().ordinal());
     }
 
-	public static ModeSettingsMessage decode(PacketBuffer buf) {
+    @Override
+    public void fromBytes(ByteBuf buf) {
         BuildModes.BuildModeEnum buildMode = BuildModes.BuildModeEnum.values()[buf.readInt()];
 
-		return new ModeSettingsMessage(new ModeSettings(buildMode));
+        modeSettings = new ModeSettings(buildMode);
     }
 
-	public static class Handler {
-		public static void handle(ModeSettingsMessage message, Supplier<NetworkEvent.Context> ctx) {
-			ctx.get().enqueueWork(() -> {
-				PlayerEntity player = EffortlessBuilding.proxy.getPlayerEntityFromContext(ctx);
+    // The params of the IMessageHandler are <REQ, REPLY>
+    public static class MessageHandler implements IMessageHandler<ModeSettingsMessage, IMessage> {
+        // Do note that the default constructor is required, but implicitly defined in this case
+
+        @Override
+        public IMessage onMessage(ModeSettingsMessage message, MessageContext ctx) {
+            //EffortlessBuilding.log("message received on " + ctx.side + " side");
+
+            // The value that was sent
+            ModeSettings modeSettings = message.modeSettings;
+
+            // Execute the action on the main server thread by adding it as a scheduled task
+            IThreadListener threadListener = EffortlessBuilding.proxy.getThreadListenerFromContext(ctx);
+            threadListener.addScheduledTask(() -> {
+                EntityPlayer player = EffortlessBuilding.proxy.getPlayerEntityFromContext(ctx);
 
                 // Sanitize
-				ModeSettingsManager.sanitize(message.modeSettings, player);
+                ModeSettingsManager.sanitize(modeSettings, player);
 
-				ModeSettingsManager.setModeSettings(player, message.modeSettings);
+                ModeSettingsManager.setModeSettings(player, modeSettings);
             });
-			ctx.get().setPacketHandled(true);
+            // No response packet
+            return null;
         }
     }
 }