Version update

Fixed saving modifier settings on closing the gui (don't override onClose() but removed()).

.gitignore

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

LICENSE.txt

@@ -0,0 +1,520 @@
+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

@@ -0,0 +1,53 @@
+-------------------------------------------
+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,82 +1,146 @@
 buildscript {
     repositories {
+        maven { url = 'https://files.minecraftforge.net/maven' }
         jcenter()
-        maven { url = "http://files.minecraftforge.net/maven" }
+        mavenCentral()
     }
     dependencies {
-        classpath 'net.minecraftforge.gradle:ForgeGradle:2.3-SNAPSHOT'
+        classpath group: 'net.minecraftforge.gradle', name: 'ForgeGradle', version: '3.+', changing: true
     }
 }
-apply plugin: 'net.minecraftforge.gradle.forge'
+apply plugin: 'net.minecraftforge.gradle'
 // Only edit below this line, the above code adds and enables the necessary things for Forge to be setup.
+apply plugin: 'eclipse'
+apply plugin: 'maven-publish'
 
+version = '1.15.2-2.21'
+group = 'nl.requios.effortlessbuilding' // http://maven.apache.org/guides/mini/guide-naming-conventions.html
+archivesBaseName = 'effortlessbuilding'
 
-version = "1.12.2-2.0"
-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'
-}
+sourceCompatibility = targetCompatibility = compileJava.sourceCompatibility = compileJava.targetCompatibility = '1.8' // Need this here so eclipse task generates correctly.
 
 minecraft {
-    version = "1.12.2-14.23.5.2768"
-    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.
+    // 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 = "stable_39"
+    // Simply re-run your setup task after changing the mappings to update your workspace.
+    mappings channel: 'snapshot', version: '20200514-1.15.1'
     // makeObfSourceJar = false // an Srg named sources jar is made by default. uncomment this to disable.
+    
+    // accessTransformer = file('src/main/resources/META-INF/accesstransformer.cfg')
+
+    // 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
+                }
+            }
         }
 
-repositories {
-	flatDir { dirs 'libs' }
+        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'
+
+            args '--mod', 'effortlessbuilding', '--all', '--output', file('src/generated/resources/')
+
+            mods {
+                effortlessbuilding {
+                    source sourceSets.main
+                }
+            }
+        }
+    }
 }
 
 dependencies {
-    // you may put jars on which you depend on in ./libs
-    // or you may define them like so..
+    // 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.15.2-31.2.0'
+
+    // 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'
 
-    // 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'
+    // These dependencies get remapped to your current MCP mappings
+    // deobf 'com.mod-buildcraft:buildcraft:6.0.8:dev'
 
-    // 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
 
 }
 
-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
-    }
-        
-    // copy everything else except the mcmod.info
-    from(sourceSets.main.resources.srcDirs) {
-        exclude 'mcmod.info'
+// 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")
+        ])
+    }
+}
+
+// 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"
+        }
     }
 }

gradle.properties

@@ -0,0 +1,4 @@
+# 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,6 +1,5 @@
-#Mon Sep 14 12:28:28 PDT 2015
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-2.14-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-4.9-bin.zip

gradlew

@@ -1,4 +1,4 @@
-#!/usr/bin/env bash
+#!/usr/bin/env sh
 
 ##############################################################################
 ##
@@ -6,12 +6,30 @@
 ##
 ##############################################################################
 
-# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
-DEFAULT_JVM_OPTS=""
+# 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
 
 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=""
+
 # Use the maximum available, or set MAX_FD != -1 to use that value.
 MAX_FD="maximum"
 
@@ -30,6 +48,7 @@ die ( ) {
 cygwin=false
 msys=false
 darwin=false
+nonstop=false
 case "`uname`" in
   CYGWIN* )
     cygwin=true
@@ -40,31 +59,11 @@ case "`uname`" in
   MINGW* )
     msys=true
     ;;
+  NONSTOP* )
+    nonstop=true
+    ;;
 esac
 
-# 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.
@@ -90,7 +89,7 @@ location of your Java installation."
 fi
 
 # Increase the maximum file descriptors if we can.
-if [ "$cygwin" = "false" -a "$darwin" = "false" ] ; then
+if [ "$cygwin" = "false" -a "$darwin" = "false" -a "$nonstop" = "false" ] ; then
     MAX_FD_LIMIT=`ulimit -H -n`
     if [ $? -eq 0 ] ; then
         if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ] ; then
@@ -114,6 +113,7 @@ fi
 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`
@@ -154,11 +154,19 @@ if $cygwin ; then
     esac
 fi
 
-# Split up the JVM_OPTS And GRADLE_OPTS values into an array, following the shell quoting and substitution rules
-function splitJvmOpts() {
-    JVM_OPTS=("$@")
+# Escape application args
+save () {
+    for i do printf %s\\n "$i" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/" ; done
+    echo " "
 }
-eval splitJvmOpts $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS
-JVM_OPTS[${#JVM_OPTS[*]}]="-Dorg.gradle.appname=$APP_BASE_NAME"
+APP_ARGS=$(save "$@")
 
-exec "$JAVACMD" "${JVM_OPTS[@]}" -classpath "$CLASSPATH" org.gradle.wrapper.GradleWrapperMain "$@"
+# Collect all arguments for the java command, following the shell quoting and substitution rules
+eval set -- $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS "\"-Dorg.gradle.appname=$APP_BASE_NAME\"" -classpath "\"$CLASSPATH\"" org.gradle.wrapper.GradleWrapperMain "$APP_ARGS"
+
+# by default we should be in the correct project dir, but when run from Finder on Mac, the cwd is wrong
+if [ "$(uname)" = "Darwin" ] && [ "$HOME" = "$PWD" ]; then
+  cd "$(dirname "$0")"
+fi
+
+exec "$JAVACMD" "$@"

gradlew.bat

@@ -8,14 +8,14 @@
 @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 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=
+
 @rem Find java.exe
 if defined JAVA_HOME goto findJavaFromJavaHome
 
@@ -46,10 +46,9 @@ echo location of your Java installation.
 goto fail
 
 :init
-@rem Get command-line arguments, handling Windowz variants
+@rem Get command-line arguments, handling Windows 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.
@@ -60,11 +59,6 @@ set _SKIP=2
 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

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

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

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

@@ -1,58 +1,58 @@
 package nl.requios.effortlessbuilding;
 
 import net.minecraft.block.Block;
-import net.minecraft.entity.player.EntityPlayer;
+import net.minecraft.entity.player.PlayerEntity;
+import net.minecraft.inventory.container.Container;
+import net.minecraft.inventory.container.ContainerType;
 import net.minecraft.item.Item;
 import net.minecraft.util.ResourceLocation;
-import net.minecraft.util.SoundEvent;
-import net.minecraft.util.text.TextComponentString;
+import net.minecraft.util.registry.Registry;
+import net.minecraft.util.text.StringTextComponent;
+import net.minecraftforge.common.MinecraftForge;
 import net.minecraftforge.common.capabilities.CapabilityManager;
-import net.minecraftforge.common.config.Config;
-import net.minecraftforge.common.config.ConfigManager;
+import net.minecraftforge.common.crafting.CraftingHelper;
+import net.minecraftforge.eventbus.api.SubscribeEvent;
+import net.minecraftforge.fml.DistExecutor;
+import net.minecraftforge.fml.ExtensionPoint;
+import net.minecraftforge.fml.ModLoadingContext;
 import net.minecraftforge.fml.common.Mod;
-import net.minecraftforge.fml.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 net.minecraftforge.fml.config.ModConfig;
+import net.minecraftforge.fml.event.lifecycle.FMLClientSetupEvent;
+import net.minecraftforge.fml.event.lifecycle.FMLCommonSetupEvent;
+import net.minecraftforge.fml.event.lifecycle.InterModEnqueueEvent;
+import net.minecraftforge.fml.event.lifecycle.InterModProcessEvent;
+import net.minecraftforge.fml.event.server.FMLServerStartingEvent;
+import net.minecraftforge.fml.javafmlmod.FMLJavaModLoadingContext;
 import 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.RandomizerBagGuiHandler;
+import nl.requios.effortlessbuilding.gui.RandomizerBagContainer;
 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.network.PacketHandler;
+import nl.requios.effortlessbuilding.proxy.ClientProxy;
 import nl.requios.effortlessbuilding.proxy.IProxy;
+import nl.requios.effortlessbuilding.proxy.ServerProxy;
+import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
 
-@Mod(modid = EffortlessBuilding.MODID, name = EffortlessBuilding.NAME, version = EffortlessBuilding.VERSION)
-@Mod.EventBusSubscriber
+// The value here should match an entry in the META-INF/mods.toml file
+@Mod(EffortlessBuilding.MODID)
+@Mod.EventBusSubscriber(bus=Mod.EventBusSubscriber.Bus.MOD)
 public class EffortlessBuilding
 {
     public static final String MODID = "effortlessbuilding";
     public static final String NAME = "Effortless Building";
-    public static final String VERSION = "1.12.2-2.0";
+    public static final String VERSION = "1.15.2-2.21";
 
-    @Mod.Instance(EffortlessBuilding.MODID)
     public static EffortlessBuilding instance;
 
-    public static Logger logger;
+    public static final Logger logger = LogManager.getLogger();
 
-    @SidedProxy(
-        clientSide="nl.requios.effortlessbuilding.proxy.ClientProxy",
-        serverSide="nl.requios.effortlessbuilding.proxy.ServerProxy"
-    )
-    public static IProxy proxy;
-
-    public static final SimpleNetworkWrapper packetHandler = NetworkRegistry.INSTANCE.newSimpleChannel(EffortlessBuilding.MODID);
+    public static IProxy proxy = DistExecutor.runForDist(() -> ClientProxy::new, () -> ServerProxy::new);
 
     public static final ItemRandomizerBag ITEM_RANDOMIZER_BAG = new ItemRandomizerBag();
     public static final ItemReachUpgrade1 ITEM_REACH_UPGRADE_1 = new ItemReachUpgrade1();
@@ -69,70 +69,89 @@ public class EffortlessBuilding
             ITEM_REACH_UPGRADE_3
     };
 
-    public static final int RANDOMIZER_BAG_GUI = 0;
+    public static final ContainerType<RandomizerBagContainer> RANDOMIZER_BAG_CONTAINER = register("randomizer_bag", RandomizerBagContainer::new);
+    public static final ResourceLocation RANDOMIZER_BAG_GUI = new ResourceLocation(EffortlessBuilding.MODID, "randomizer_bag");
 
-    @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();
+    public EffortlessBuilding() {
+        instance = this;
 
-        CapabilityManager.INSTANCE.register(ModifierCapabilityManager.IModifierCapability.class, new ModifierCapabilityManager.Storage(), ModifierCapabilityManager.ModifierCapability.class);
-        CapabilityManager.INSTANCE.register(ModeCapabilityManager.IModeCapability.class, new ModeCapabilityManager.Storage(), ModeCapabilityManager.ModeCapability.class);
+        // Register the setup method for modloading
+        FMLJavaModLoadingContext.get().getModEventBus().addListener(this::setup);
+        // Register the enqueueIMC method for modloading
+        FMLJavaModLoadingContext.get().getModEventBus().addListener(this::enqueueIMC);
+        // Register the processIMC method for modloading
+        FMLJavaModLoadingContext.get().getModEventBus().addListener(this::processIMC);
+        // Register the clientSetup method for modloading
+        FMLJavaModLoadingContext.get().getModEventBus().addListener(this::clientSetup);
 
-        EffortlessBuilding.packetHandler.registerMessage(ModifierSettingsMessage.MessageHandler.class, ModifierSettingsMessage.class, 0, Side.SERVER);
-        EffortlessBuilding.packetHandler.registerMessage(ModifierSettingsMessage.MessageHandler.class, ModifierSettingsMessage.class, 0, Side.CLIENT);
+        //Register config
+        ModLoadingContext.get().registerConfig(ModConfig.Type.COMMON, BuildConfig.spec);
 
-        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(BlockPlacedMessage.MessageHandler.class, BlockPlacedMessage.class, 2, Side.SERVER);
-        EffortlessBuilding.packetHandler.registerMessage(BlockPlacedMessage.MessageHandler.class, BlockPlacedMessage.class, 2, Side.CLIENT);
-
-        EffortlessBuilding.packetHandler.registerMessage(BlockBrokenMessage.MessageHandler.class, BlockBrokenMessage.class, 3, Side.SERVER);
-
-        EffortlessBuilding.packetHandler.registerMessage(CancelModeMessage.MessageHandler.class, CancelModeMessage.class, 4, Side.SERVER);
-
-        EffortlessBuilding.packetHandler.registerMessage(RequestLookAtMessage.MessageHandler.class, RequestLookAtMessage.class, 5, Side.CLIENT);
-
-        proxy.preInit(event);
+        // Register ourselves for server and other game events we are interested in
+        MinecraftForge.EVENT_BUS.register(this);
     }
 
-    @EventHandler
-    // Do your mod setup. Build whatever data structures you care about.
-    // Register network handlers
-    public void init(FMLInitializationEvent event)
+    @SubscribeEvent
+    public void setup(final FMLCommonSetupEvent event)
     {
-        ConfigManager.sync(MODID, Config.Type.INSTANCE);
-        NetworkRegistry.INSTANCE.registerGuiHandler(EffortlessBuilding.instance, new RandomizerBagGuiHandler());
+        CapabilityManager.INSTANCE.register(ModifierCapabilityManager.IModifierCapability.class, new ModifierCapabilityManager.Storage(), ModifierCapabilityManager.ModifierCapability::new);
+        CapabilityManager.INSTANCE.register(ModeCapabilityManager.IModeCapability.class, new ModeCapabilityManager.Storage(), ModeCapabilityManager.ModeCapability::new);
 
-        proxy.init(event);
+        PacketHandler.register();
+
+        //TODO 1.13 config
+//        ConfigManager.sync(MODID, Config.Type.INSTANCE);
+
+        proxy.setup(event);
+
+        CompatHelper.setup();
     }
 
-    @EventHandler
-    // postInit "Handle interaction with other mods, complete your setup based on this."
-    public void postInit(FMLPostInitializationEvent event)
-    {
-        proxy.postInit(event);
-        CompatHelper.postInit();
+    @SubscribeEvent
+    public void clientSetup(final FMLClientSetupEvent event) {
+
+        proxy.clientSetup(event);
     }
 
-    @EventHandler
-    public void serverStarting(FMLServerStartingEvent event)
-    {
-        event.registerServerCommand(new CommandReach());
-        proxy.serverStarting(event);
+    @SubscribeEvent
+    public void enqueueIMC(final InterModEnqueueEvent event) {
+
+        // some example code to dispatch IMC to another mod
+//        InterModComms.sendTo("examplemod", "helloworld", () -> { logger.info("Hello world from the MDK"); return "Hello world";});
+    }
+
+    @SubscribeEvent
+    public void processIMC(final InterModProcessEvent event) {
+
+        // some example code to receive and process InterModComms from other mods
+//        logger.info("Got IMC {}", event.getIMCStream().
+//                map(m->m.getMessageSupplier().get()).
+//                collect(Collectors.toList()));
+    }
+
+    @SubscribeEvent
+    public void onServerStarting(FMLServerStartingEvent event) {
+        CommandReach.register(event.getCommandDispatcher());
+    }
+
+    private static <T extends Container> ContainerType<T> register(String key, ContainerType.IFactory<T> factory) {
+        return Registry.register(Registry.MENU, key, new ContainerType<>(factory));
     }
 
     public static void log(String msg){
         logger.info(msg);
     }
 
-    public static void log(EntityPlayer player, String msg){
+    public static void log(PlayerEntity player, String msg){
         log(player, msg, false);
     }
 
-    public static void log(EntityPlayer player, String msg, boolean actionBar){
-        player.sendStatusMessage(new TextComponentString(msg), actionBar);
+    public static void log(PlayerEntity player, String msg, boolean actionBar){
+        player.sendStatusMessage(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);
     }
 }

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

@@ -1,34 +1,32 @@
 package nl.requios.effortlessbuilding;
 
-import net.minecraft.block.Block;
-import net.minecraft.block.state.IBlockState;
+import net.minecraft.block.BlockState;
+import net.minecraft.block.Blocks;
 import net.minecraft.entity.Entity;
-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.entity.player.PlayerEntity;
+import net.minecraft.entity.player.ServerPlayerEntity;
 import net.minecraft.util.ResourceLocation;
-import net.minecraft.util.SoundEvent;
 import net.minecraft.util.math.BlockPos;
 import net.minecraft.world.World;
-import net.minecraftforge.common.config.Config;
-import net.minecraftforge.common.config.ConfigManager;
+import net.minecraftforge.client.event.TextureStitchEvent;
 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.fml.client.event.ConfigChangedEvent;
+import net.minecraftforge.eventbus.api.SubscribeEvent;
 import net.minecraftforge.fml.common.Mod;
-import net.minecraftforge.fml.common.eventhandler.SubscribeEvent;
+import net.minecraftforge.fml.network.PacketDistributor;
 import nl.requios.effortlessbuilding.buildmode.BuildModes;
 import nl.requios.effortlessbuilding.buildmode.ModeSettingsManager;
 import nl.requios.effortlessbuilding.buildmodifier.BuildModifiers;
 import nl.requios.effortlessbuilding.buildmodifier.ModifierSettingsManager;
+import nl.requios.effortlessbuilding.buildmodifier.UndoRedo;
 import nl.requios.effortlessbuilding.capability.ModeCapabilityManager;
 import nl.requios.effortlessbuilding.capability.ModifierCapabilityManager;
 import nl.requios.effortlessbuilding.helper.ReachHelper;
 import nl.requios.effortlessbuilding.helper.SurvivalHelper;
-import nl.requios.effortlessbuilding.network.BlockPlacedMessage;
+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 java.util.List;
@@ -37,39 +35,23 @@ import java.util.List;
 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 EntityPlayer) {
-            event.addCapability(new ResourceLocation(EffortlessBuilding.MODID, "BuildModifier"), new ModifierCapabilityManager.Provider());
-            event.addCapability(new ResourceLocation(EffortlessBuilding.MODID, "BuildMode"), new ModeCapabilityManager.Provider());
+        if (event.getObject() instanceof PlayerEntity) {
+            event.addCapability(new ResourceLocation(EffortlessBuilding.MODID, "build_modifier"), new ModifierCapabilityManager.Provider());
+            event.addCapability(new ResourceLocation(EffortlessBuilding.MODID, "build_mode"), new ModeCapabilityManager.Provider());
         }
     }
 
-    @SubscribeEvent
-    public static void onConfigChangedEvent(ConfigChangedEvent.OnConfigChangedEvent event)
-    {
-        if (event.getModID().equals(EffortlessBuilding.MODID))
-        {
-            ConfigManager.sync(EffortlessBuilding.MODID, Config.Type.INSTANCE);
-        }
-    }
+    //TODO 1.13 config
+//    @SubscribeEvent
+//    public static void onConfigChangedEvent(ConfigChangedEvent.OnConfigChangedEvent event)
+//    {
+//        if (event.getModID().equals(EffortlessBuilding.MODID))
+//        {
+//            ConfigManager.sync(EffortlessBuilding.MODID, Config.Type.INSTANCE);
+//        }
+//    }
 
 //    @SubscribeEvent
 //    public static void onServerTick(TickEvent.ServerTickEvent event) {
@@ -77,44 +59,65 @@ public class EventHandler
 //    }
 
     @SubscribeEvent
-    //Only called serverside
-    public static void onBlockPlaced(BlockEvent.PlaceEvent event) {
+    //Only called serverside (except with lilypads...)
+    public static void onBlockPlaced(BlockEvent.EntityPlaceEvent event) {
+        if (event.getWorld().isRemote()) return;
+
+        if (!(event.getEntity() instanceof PlayerEntity)) return;
+
         //Cancel event if necessary
-        EntityPlayer player = event.getPlayer();
+        ServerPlayerEntity player = ((ServerPlayerEntity) event.getEntity());
         BuildModes.BuildModeEnum buildMode = ModeSettingsManager.getModeSettings(player).getBuildMode();
         ModifierSettingsManager.ModifierSettings modifierSettings = ModifierSettingsManager.getModifierSettings(player);
 
-        if (buildMode != BuildModes.BuildModeEnum.Normal || modifierSettings.doQuickReplace()) {
+        if (buildMode != BuildModes.BuildModeEnum.NORMAL) {
             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
+            //NORMAL mode, let vanilla handle block placing
             //But modifiers should still work
 
             //Send message to client, which sends message back with raytrace info
-            EffortlessBuilding.packetHandler.sendTo(new RequestLookAtMessage(), (EntityPlayerMP) player);
+            PacketHandler.INSTANCE.send(PacketDistributor.PLAYER.with(() -> player), new RequestLookAtMessage(false));
+            PacketHandler.INSTANCE.send(PacketDistributor.PLAYER.with(() -> player), new AddUndoMessage(event.getPos(), event.getBlockSnapshot().getReplacedBlock(), event.getState()));
         }
+
+//        Stat<ResourceLocation> blocksPlacedStat = StatList.CUSTOM.get(new ResourceLocation(EffortlessBuilding.MODID, "blocks_placed"));
+//        player.getStats().increment(player, blocksPlacedStat, 1);
+//
+//        System.out.println(player.getStats().getValue(blocksPlacedStat));
     }
 
     @SubscribeEvent
     public static void onBlockBroken(BlockEvent.BreakEvent event) {
+        if (event.getWorld().isRemote()) return;
+
         //Cancel event if necessary
         //If cant break far then dont cancel event ever
         BuildModes.BuildModeEnum buildMode = ModeSettingsManager.getModeSettings(event.getPlayer()).getBuildMode();
-        if (buildMode != BuildModes.BuildModeEnum.Normal && ReachHelper.canBreakFar(event.getPlayer())) {
+        if (buildMode != BuildModes.BuildModeEnum.NORMAL && ReachHelper.canBreakFar(event.getPlayer())) {
             event.setCanceled(true);
         } else {
-            //Normal mode, let vanilla handle block breaking
-            //But modifiers should still work
-            BuildModes.onBlockBroken(event);
+            //NORMAL mode, let vanilla handle block breaking
+            //But modifiers and QuickReplace should still work
+            //Dont break the original block yourself, otherwise Tinkers Hammer and Veinminer won't work
+            BuildModes.onBlockBroken(event.getPlayer(), event.getPos(), false);
+
+            //Add to undo stack in client
+            PacketHandler.INSTANCE.send(PacketDistributor.PLAYER.with(() -> (ServerPlayerEntity) event.getPlayer()), new AddUndoMessage(event.getPos(), event.getState(), Blocks.AIR.getDefaultState()));
         }
     }
 
     @SubscribeEvent
     public static void breakSpeed(PlayerEvent.BreakSpeed event) {
         //Disable if config says so
-        if (!BuildConfig.survivalBalancers.increasedMiningTime) return;
+        if (!BuildConfig.survivalBalancers.increasedMiningTime.get()) return;
 
-        EntityPlayer player = event.getEntityPlayer();
+        PlayerEntity player = event.getPlayer();
         World world = player.world;
         BlockPos pos = event.getPos();
 
@@ -128,14 +131,14 @@ public class EventHandler
         for (int i = 1; i < coordinates.size(); i++) {
             BlockPos coordinate = coordinates.get(i);
             //get existing blockstates at those coordinates
-            IBlockState blockState = world.getBlockState(coordinate);
+            BlockState blockState = world.getBlockState(coordinate);
             //add hardness for each blockstate, if can break
             if (SurvivalHelper.canBreak(world, player, coordinate))
                 totalBlockHardness += blockState.getBlockHardness(world, coordinate);
         }
 
         //Grabbing percentage from config
-        float percentage = (float) BuildConfig.survivalBalancers.miningTimePercentage / 100;
+        float percentage = (float) BuildConfig.survivalBalancers.miningTimePercentage.get() / 100;
         totalBlockHardness *= percentage;
         totalBlockHardness += originalBlockHardness;
 
@@ -145,4 +148,62 @@ public class EventHandler
 
         //EffortlessBuilding.log(player, String.valueOf(event.getNewSpeed()));
     }
+
+    @SubscribeEvent
+    public static void onPlayerLoggedIn(PlayerEvent.PlayerLoggedInEvent event) {
+        PlayerEntity player = event.getPlayer();
+        ModifierSettingsManager.handleNewPlayer(player);
+        ModeSettingsManager.handleNewPlayer(player);
+    }
+
+    @SubscribeEvent
+    public static void onPlayerLoggedOut(PlayerEvent.PlayerLoggedOutEvent event) {
+        PlayerEntity player = event.getPlayer();
+        if (player.getEntityWorld().isRemote) return;
+
+        UndoRedo.clear(player);
+        PacketHandler.INSTANCE.send(PacketDistributor.PLAYER.with(() -> (ServerPlayerEntity) player), new ClearUndoMessage());
+    }
+
+    @SubscribeEvent
+    public static void onPlayerRespawn(PlayerEvent.PlayerRespawnEvent event) {
+        PlayerEntity player = event.getPlayer();
+        ModifierSettingsManager.handleNewPlayer(player);
+        ModeSettingsManager.handleNewPlayer(player);
+    }
+
+    @SubscribeEvent
+    public static void onPlayerChangedDimension(PlayerEvent.PlayerChangedDimensionEvent event) {
+        PlayerEntity player = event.getPlayer();
+        if (player.getEntityWorld().isRemote) return;
+
+        //Set build mode to normal
+        ModeSettingsManager.ModeSettings modeSettings = ModeSettingsManager.getModeSettings(player);
+        modeSettings.setBuildMode(BuildModes.BuildModeEnum.NORMAL);
+        ModeSettingsManager.setModeSettings(player, modeSettings);
+
+        //Disable modifiers
+        ModifierSettingsManager.ModifierSettings modifierSettings = ModifierSettingsManager.getModifierSettings(player);
+        modifierSettings.getMirrorSettings().enabled = false;
+        modifierSettings.getRadialMirrorSettings().enabled = false;
+        modifierSettings.getArraySettings().enabled = false;
+        ModifierSettingsManager.setModifierSettings(player, modifierSettings);
+
+        ModifierSettingsManager.handleNewPlayer(player);
+        ModeSettingsManager.handleNewPlayer(player);
+
+        UndoRedo.clear(player);
+        PacketHandler.INSTANCE.send(PacketDistributor.PLAYER.with(() -> (ServerPlayerEntity) player), new ClearUndoMessage());
+    }
+
+    @SubscribeEvent
+    public static void onPlayerClone(PlayerEvent.Clone event) {
+        //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));
+    }
 }

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

@@ -0,0 +1,48 @@
+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().getAtlasTexture(AtlasTexture.LOCATION_BLOCKS_TEXTURE).getSprite(buildModeIcons.get(mode));
+    }
+
+    public static TextureAtlasSprite getModeOptionIcon(ModeOptions.ActionEnum action) {
+        return Minecraft.getInstance().getModelManager().getAtlasTexture(AtlasTexture.LOCATION_BLOCKS_TEXTURE).getSprite(modeOptionIcons.get(action));
+    }
+}

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

@@ -0,0 +1,45 @@
+package nl.requios.effortlessbuilding;
+
+import net.minecraft.block.Block;
+import net.minecraft.client.Minecraft;
+import net.minecraft.client.renderer.texture.TextureAtlasSprite;
+import net.minecraft.item.BlockItem;
+import net.minecraft.item.Item;
+import net.minecraft.util.ResourceLocation;
+import net.minecraftforge.api.distmarker.Dist;
+import net.minecraftforge.client.event.TextureStitchEvent;
+import net.minecraftforge.event.RegistryEvent;
+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;
+
+// You can use EventBusSubscriber to automatically subscribe events on the contained class (this is subscribing to the MOD
+// Event bus for receiving Registry Events)
+@Mod.EventBusSubscriber(bus=Mod.EventBusSubscriber.Bus.MOD)
+public class ModEventHandler {
+
+    @SubscribeEvent
+    public static void registerBlocks(RegistryEvent.Register<Block> event) {
+        event.getRegistry().registerAll(EffortlessBuilding.BLOCKS);
+    }
+
+    @SubscribeEvent
+    public static void registerItems(RegistryEvent.Register<Item> event) {
+        event.getRegistry().registerAll(EffortlessBuilding.ITEMS);
+
+        for (Block block : EffortlessBuilding.BLOCKS)
+        {
+            event.getRegistry().register(new BlockItem(block, new Item.Properties()).setRegistryName(block.getRegistryName()));
+        }
+    }
+
+//    @SubscribeEvent
+//    public static void registerContainerTypes(RegistryEvent.Register<ContainerType<?>> event) {
+//        event.getRegistry().register()
+//    }
+
+
+}

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

@@ -0,0 +1,39 @@
+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.Vec3d;
+
+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, Vec3d> hitVecTable = new Hashtable<>();
+
+    @Override
+    public void initialize(PlayerEntity player) {
+        rightClickClientTable.put(player.getUniqueID(), 0);
+        rightClickServerTable.put(player.getUniqueID(), 0);
+        firstPosTable.put(player.getUniqueID(), BlockPos.ZERO);
+        sideHitTable.put(player.getUniqueID(), Direction.UP);
+        hitVecTable.put(player.getUniqueID(), Vec3d.ZERO);
+    }
+
+    @Override
+    public Direction getSideHit(PlayerEntity player) {
+        return sideHitTable.get(player.getUniqueID());
+    }
+
+    @Override
+    public Vec3d getHitVec(PlayerEntity player) {
+        return hitVecTable.get(player.getUniqueID());
+    }
+}

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

@@ -1,15 +1,17 @@
 package nl.requios.effortlessbuilding.buildmode;
 
-import net.minecraft.entity.player.EntityPlayer;
-import net.minecraft.util.EnumFacing;
-import net.minecraft.util.EnumHand;
+import net.minecraft.entity.player.PlayerEntity;
+import net.minecraft.util.Direction;
 import net.minecraft.util.math.BlockPos;
+import net.minecraft.util.math.RayTraceContext;
+import net.minecraft.util.math.RayTraceResult;
 import net.minecraft.util.math.Vec3d;
-import net.minecraftforge.event.world.BlockEvent;
 import nl.requios.effortlessbuilding.EffortlessBuilding;
-import nl.requios.effortlessbuilding.buildmodifier.*;
-import nl.requios.effortlessbuilding.compatibility.CompatHelper;
+import nl.requios.effortlessbuilding.buildmode.buildmodes.*;
+import nl.requios.effortlessbuilding.buildmodifier.BuildModifiers;
+import nl.requios.effortlessbuilding.buildmodifier.ModifierSettingsManager;
 import nl.requios.effortlessbuilding.helper.ReachHelper;
+import nl.requios.effortlessbuilding.helper.SurvivalHelper;
 import nl.requios.effortlessbuilding.network.BlockBrokenMessage;
 import nl.requios.effortlessbuilding.network.BlockPlacedMessage;
 
@@ -18,40 +20,47 @@ import java.util.Dictionary;
 import java.util.Hashtable;
 import java.util.List;
 
+import static nl.requios.effortlessbuilding.buildmode.ModeOptions.*;
+
 public class BuildModes {
 
     //Static variables are shared between client and server in singleplayer
     //We need them separate
-    public static Dictionary<EntityPlayer, Boolean> currentlyBreakingClient = new Hashtable<>();
-    public static Dictionary<EntityPlayer, Boolean> currentlyBreakingServer = new Hashtable<>();
+    public static Dictionary<PlayerEntity, Boolean> currentlyBreakingClient = new Hashtable<>();
+    public static Dictionary<PlayerEntity, Boolean> currentlyBreakingServer = new Hashtable<>();
 
     public enum BuildModeEnum {
-        Normal ("Normal", new Normal()),
-        NormalPlus ("Normal+", new NormalPlus()),
-        Line ("Line", new Line()),
-        Wall ("Wall", new Wall()),
-        Floor ("Floor", new Floor()),
-        DiagonalLine ("", new DiagonalLine()),
-        DiagonalWall ("", new DiagonalWall()),
-        SlopeFloor ("", new SlopeFloor()),
-        Cube ("", new Cube());
+        NORMAL("effortlessbuilding.mode.normal", new Normal()),
+        NORMAL_PLUS("effortlessbuilding.mode.normal_plus", new NormalPlus(), OptionEnum.BUILD_SPEED),
+        LINE("effortlessbuilding.mode.line", new Line() /*, OptionEnum.THICKNESS*/),
+        WALL("effortlessbuilding.mode.wall", new Wall(), OptionEnum.FILL),
+        FLOOR("effortlessbuilding.mode.floor", new Floor(), OptionEnum.FILL),
+        DIAGONAL_LINE("effortlessbuilding.mode.diagonal_line", new DiagonalLine() /*, OptionEnum.THICKNESS*/),
+        DIAGONAL_WALL("effortlessbuilding.mode.diagonal_wall", new DiagonalWall() /*, OptionEnum.FILL*/),
+        SLOPE_FLOOR("effortlessbuilding.mode.slope_floor", new SlopeFloor(), OptionEnum.RAISED_EDGE),
+        CIRCLE("effortlessbuilding.mode.circle", new Circle(), OptionEnum.CIRCLE_START, OptionEnum.FILL),
+        CYLINDER("effortlessbuilding.mode.cylinder", new Cylinder(), OptionEnum.CIRCLE_START, OptionEnum.FILL),
+        SPHERE("effortlessbuilding.mode.sphere", new Sphere(), OptionEnum.CIRCLE_START, OptionEnum.FILL),
+        CUBE("effortlessbuilding.mode.cube", new Cube(), OptionEnum.CUBE_FILL);
 
         public String name;
         public IBuildMode instance;
+        public OptionEnum[] options;
 
-        BuildModeEnum(String name, IBuildMode instance) {
+        BuildModeEnum(String name, IBuildMode instance, OptionEnum... 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(EntityPlayer player, BlockPlacedMessage message) {
+    public static void onBlockPlacedMessage(PlayerEntity player, BlockPlacedMessage message) {
 
         //Check if not in the middle of breaking
-        Dictionary<EntityPlayer, Boolean> currentlyBreaking = player.world.isRemote ? currentlyBreakingClient : currentlyBreakingServer;
+        Dictionary<PlayerEntity, Boolean> currentlyBreaking = player.world.isRemote ? currentlyBreakingClient : currentlyBreakingServer;
         if (currentlyBreaking.get(player) != null && currentlyBreaking.get(player)) {
             //Cancel breaking
             initializeMode(player);
@@ -61,7 +70,6 @@ public class BuildModes {
         ModifierSettingsManager.ModifierSettings modifierSettings = ModifierSettingsManager.getModifierSettings(player);
         ModeSettingsManager.ModeSettings modeSettings = ModeSettingsManager.getModeSettings(player);
         BuildModeEnum buildMode = modeSettings.getBuildMode();
-        int maxReach = ReachHelper.getMaxReach(player);
 
         BlockPos startPos = null;
 
@@ -69,8 +77,10 @@ public class BuildModes {
             startPos = message.getBlockPos();
 
             //Offset in direction of sidehit if not quickreplace and not replaceable
-            boolean replaceable = player.world.getBlockState(startPos).getBlock().isReplaceable(player.world, startPos);
-            if (!modifierSettings.doQuickReplace() && !replaceable) {
+            //TODO 1.13 replaceable
+            boolean replaceable = player.world.getBlockState(startPos).getMaterial().isReplaceable();
+            boolean becomesDoubleSlab = SurvivalHelper.doesBecomeDoubleSlab(player, startPos, message.getSideHit());
+            if (!modifierSettings.doQuickReplace() && !replaceable && !becomesDoubleSlab) {
                 startPos = startPos.offset(message.getSideHit());
             }
 
@@ -80,7 +90,8 @@ public class BuildModes {
             }
 
             //Check if player reach does not exceed startpos
-            if (player.getPosition().distanceSq(startPos) > maxReach * maxReach) {
+            int maxReach = ReachHelper.getMaxReach(player);
+            if (buildMode != BuildModeEnum.NORMAL && player.getPosition().distanceSq(startPos) > maxReach * maxReach) {
                 EffortlessBuilding.log(player, "Placement exceeds your reach.");
                 return;
             }
@@ -101,13 +112,13 @@ public class BuildModes {
             coordinates = coordinates.subList(0, limit);
         }
 
-        EnumFacing sideHit = buildMode.instance.getSideHit(player);
+        Direction sideHit = buildMode.instance.getSideHit(player);
         if (sideHit == null) sideHit = message.getSideHit();
 
         Vec3d hitVec = buildMode.instance.getHitVec(player);
         if (hitVec == null) hitVec = message.getHitVec();
 
-        BuildModifiers.onBlockPlaced(player, coordinates, sideHit, hitVec);
+        BuildModifiers.onBlockPlaced(player, coordinates, sideHit, hitVec, message.getPlaceStartPos());
 
         //Only works when finishing a buildmode is equal to placing some blocks
         //No intermediate blocks allowed
@@ -116,44 +127,48 @@ public class BuildModes {
     }
 
     //Use a network message to break blocks in the distance using clientside mouse input
-    public static void onBlockBrokenMessage(EntityPlayer player, BlockBrokenMessage message) {
-        BlockPos blockPos = message.getBlockPos();
-
-        if (ReachHelper.canBreakFar(player) && message.isBlockHit() &&
-            !CompatHelper.chiselsAndBitsProxy.isHoldingChiselTool(EnumHand.MAIN_HAND)) {
-
-            BlockEvent.BreakEvent event = new BlockEvent.BreakEvent(player.world, blockPos, player.world.getBlockState(blockPos), player);
-            onBlockBroken(event);
-        }
+    public static void onBlockBrokenMessage(PlayerEntity player, BlockBrokenMessage message) {
+        BlockPos startPos = message.isBlockHit() ? message.getBlockPos() : null;
+        onBlockBroken(player, startPos, true);
     }
 
-    public static void onBlockBroken(BlockEvent.BreakEvent event) {
-        EntityPlayer player = event.getPlayer();
-        BlockPos pos = event.getPos();
+    public static void onBlockBroken(PlayerEntity player, BlockPos startPos, boolean breakStartPos) {
 
         //Check if not in the middle of placing
-        Dictionary<EntityPlayer, Boolean> currentlyBreaking = player.world.isRemote ? currentlyBreakingClient : currentlyBreakingServer;
+        Dictionary<PlayerEntity, Boolean> currentlyBreaking = player.world.isRemote ? currentlyBreakingClient : currentlyBreakingServer;
         if (currentlyBreaking.get(player) != null && !currentlyBreaking.get(player)) {
             //Cancel placing
             initializeMode(player);
             return;
         }
 
-        //get coordinates
+        //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
         BuildModeEnum buildMode = modeSettings.getBuildMode();
-        List<BlockPos> coordinates = buildMode.instance.onRightClick(player, pos, EnumFacing.UP, Vec3d.ZERO, true);
+        List<BlockPos> coordinates = buildMode.instance.onRightClick(player, startPos, Direction.UP, Vec3d.ZERO, true);
 
         if (coordinates.isEmpty()) {
             currentlyBreaking.put(player, true);
             return;
         }
 
-        //let buildmodifiers break blocks
-        BuildModifiers.onBlockBroken(player, coordinates);
+        //Let buildmodifiers break blocks
+        BuildModifiers.onBlockBroken(player, coordinates, breakStartPos);
+
+        //Only works when finishing a buildmode is equal to breaking some blocks
+        //No intermediate blocks allowed
+        currentlyBreaking.remove(player);
     }
 
-    public static List<BlockPos> findCoordinates(EntityPlayer player, BlockPos startPos, boolean skipRaytrace) {
+    public static List<BlockPos> findCoordinates(PlayerEntity player, BlockPos startPos, boolean skipRaytrace) {
         List<BlockPos> coordinates = new ArrayList<>();
 
         ModeSettingsManager.ModeSettings modeSettings = ModeSettingsManager.getModeSettings(player);
@@ -162,11 +177,95 @@ public class BuildModes {
         return coordinates;
     }
 
-    public static void initializeMode(EntityPlayer player) {
+    public static void initializeMode(PlayerEntity player) {
         //Resetting mode, so not placing or breaking
-        Dictionary<EntityPlayer, Boolean> currentlyBreaking = player.world.isRemote ? currentlyBreakingClient : currentlyBreakingServer;
+        Dictionary<PlayerEntity, 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.world.isRemote ? currentlyBreakingClient : currentlyBreakingServer;
+        return currentlyBreaking.get(player) != null && !currentlyBreaking.get(player);
+    }
+
+    public static boolean isCurrentlyBreaking(PlayerEntity player) {
+        Dictionary<PlayerEntity, 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.world.isRemote ? currentlyBreakingClient : currentlyBreakingServer;
+        return currentlyBreaking.get(player) != null;
+    }
+
+
+    //-- Common build mode functionality --//
+
+    //Find coordinates on a line bound by a plane
+    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 Vec3d(x, y, z);
+    }
+
+    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 Vec3d(x, y, z);
+    }
+
+    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 Vec3d(x, y, z);
+    }
+
+    //Use this instead of player.getLookVec() in any buildmodes code
+    public static Vec3d getPlayerLookVec(PlayerEntity player){
+        Vec3d lookVec = player.getLookVec();
+        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 Vec3d(x, y, z);
+    } 
+
+    public static boolean isCriteriaValid(Vec3d start, Vec3d look, int reach, PlayerEntity player, boolean skipRaytrace, Vec3d lineBound, Vec3d 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.world.rayTraceBlocks(rayTraceContext);
+            intersects = rayTraceResult != null && rayTraceResult.getType() == RayTraceResult.Type.BLOCK &&
+                         planeBound.subtract(rayTraceResult.getHitVec()).lengthSquared() > 4;
+        }
+
+        return planeBound.subtract(start).dotProduct(look) > 0 &&
+               distToPlayerSq > 2 && distToPlayerSq < reach * reach &&
+               !intersects;
+    }
 }

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

@@ -1,36 +0,0 @@
-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 Cube implements IBuildMode {
-    @Override
-    public void initialize(EntityPlayer player) {
-
-    }
-
-    @Override
-    public List<BlockPos> onRightClick(EntityPlayer player, BlockPos blockPos, EnumFacing sideHit, Vec3d hitVec, boolean skipRaytrace) {
-        return new ArrayList<>();
-    }
-
-    @Override
-    public List<BlockPos> findCoordinates(EntityPlayer player, BlockPos blockPos, boolean skipRaytrace) {
-        return new ArrayList<>();
-    }
-
-    @Override
-    public EnumFacing getSideHit(EntityPlayer player) {
-        return null;
-    }
-
-    @Override
-    public Vec3d getHitVec(EntityPlayer player) {
-        return null;
-    }
-}

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

@@ -1,36 +0,0 @@
-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 DiagonalLine implements IBuildMode {
-    @Override
-    public void initialize(EntityPlayer player) {
-
-    }
-
-    @Override
-    public List<BlockPos> onRightClick(EntityPlayer player, BlockPos blockPos, EnumFacing sideHit, Vec3d hitVec, boolean skipRaytrace) {
-        return new ArrayList<>();
-    }
-
-    @Override
-    public List<BlockPos> findCoordinates(EntityPlayer player, BlockPos blockPos, boolean skipRaytrace) {
-        return new ArrayList<>();
-    }
-
-    @Override
-    public EnumFacing getSideHit(EntityPlayer player) {
-        return null;
-    }
-
-    @Override
-    public Vec3d getHitVec(EntityPlayer player) {
-        return null;
-    }
-}

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

@@ -1,36 +0,0 @@
-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 DiagonalWall implements IBuildMode {
-    @Override
-    public void initialize(EntityPlayer player) {
-
-    }
-
-    @Override
-    public List<BlockPos> onRightClick(EntityPlayer player, BlockPos blockPos, EnumFacing sideHit, Vec3d hitVec, boolean skipRaytrace) {
-        return new ArrayList<>();
-    }
-
-    @Override
-    public List<BlockPos> findCoordinates(EntityPlayer player, BlockPos blockPos, boolean skipRaytrace) {
-        return new ArrayList<>();
-    }
-
-    @Override
-    public EnumFacing getSideHit(EntityPlayer player) {
-        return null;
-    }
-
-    @Override
-    public Vec3d getHitVec(EntityPlayer player) {
-        return null;
-    }
-}

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

@@ -1,146 +0,0 @@
-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
-    Dictionary<UUID, Integer> rightClickClientTable = new Hashtable<>();
-    Dictionary<UUID, Integer> rightClickServerTable = new Hashtable<>();
-    Dictionary<UUID, BlockPos> firstPosTable = new Hashtable<>();
-    Dictionary<UUID, EnumFacing> sideHitTable = new Hashtable<>();
-    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 {
-            //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 {
-            Vec3d look = player.getLookVec();
-            Vec3d start = new Vec3d(player.posX, player.posY + player.getEyeHeight(), player.posZ);
-
-            //try on z axis
-            double y = firstPos.getY();
-
-            //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;
-
-            Vec3d yBound = new Vec3d(x, y, z);
-
-            //distance to player
-            double yDistSquared = yBound.subtract(start).lengthSquared();
-
-
-            int reach = ReachHelper.getPlacementReach(player) * 4; //4 times as much as normal placement reach
-
-            //check if its not behind the player and its not too close and not too far
-            boolean yValid = yBound.subtract(start).dotProduct(look) > 0 &&
-                             yDistSquared > 4 && yDistSquared < reach * reach;
-
-            //select the one that is closest to the player and is valid
-            Vec3d selected = null;
-            if (yValid) selected = yBound;
-
-            if (selected == null) return list;
-
-            //check if it doesnt go through blocks
-            if (!skipRaytrace) {
-                RayTraceResult rayTraceResult = player.world.rayTraceBlocks(start, selected, false, true, false);
-                if (rayTraceResult != null && rayTraceResult.typeOfHit == RayTraceResult.Type.BLOCK) {
-                    //return empty list
-                    return list;
-                }
-            }
-
-            BlockPos secondPos = new BlockPos(selected);
-
-            //Add whole wall
-            //Limit amount of blocks you can place per row
-            int limit = ReachHelper.getMaxBlocksPlacedAtOnce(player);
-
-            int x1 = firstPos.getX(), x2 = secondPos.getX();
-            int y1 = firstPos.getY(), y2 = secondPos.getY();
-            int z1 = firstPos.getZ(), z2 = secondPos.getZ();
-
-            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) {
-
-                    //check if whole row fits within limit
-                    if (Math.abs(y1 - y2) < limit - list.size()) {
-
-                        for (int m = y1; y1 < y2 ? m <= y2 : m >= y2; m += y1 < y2 ? 1 : -1) {
-                            list.add(new BlockPos(l, m, n));
-                        }
-                    }
-                }
-            }
-        }
-
-        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/IBuildMode.java

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

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

@@ -1,222 +0,0 @@
-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
-    Dictionary<UUID, Integer> rightClickClientTable = new Hashtable<>();
-    Dictionary<UUID, Integer> rightClickServerTable = new Hashtable<>();
-    Dictionary<UUID, BlockPos> firstPosTable = new Hashtable<>();
-    Dictionary<UUID, EnumFacing> sideHitTable = new Hashtable<>();
-    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 {
-            //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 {
-            Vec3d look = player.getLookVec();
-            Vec3d start = new Vec3d(player.posX, player.posY + player.getEyeHeight(), player.posZ);
-
-
-
-            //try on x axis
-            double x = firstPos.getX();
-
-            //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;
-
-            Vec3d xBound = new Vec3d(x, y, z);
-            Vec3d xBoundLine = toLongestLine(xBound, firstPos);
-            double xDistToLine = xBoundLine.subtract(xBound).lengthSquared();
-
-            //distance to player
-            double xDistSquared = xBound.subtract(start).lengthSquared();
-
-
-
-            //try on y axis
-            y = firstPos.getY();
-
-            //then x and z are
-            x = (y - start.y) / look.y * look.x + start.x;
-            z = (y - start.y) / look.y * look.z + start.z;
-
-            Vec3d yBound = new Vec3d(x, y, z);
-            Vec3d yBoundLine = toLongestLine(yBound, firstPos);
-            double yDistToLine = yBoundLine.subtract(yBound).lengthSquared();
-
-            //distance to player
-            double yDistSquared = yBound.subtract(start).lengthSquared();
-
-
-
-            //try on z axis
-            z = firstPos.getZ();
-
-            //then x and y are
-            x = (z - start.z) / look.z * look.x + start.x;
-            y = (z - start.z) / look.z * look.y + start.y;
-
-            Vec3d zBound = new Vec3d(x, y, z);
-            Vec3d zBoundLine = toLongestLine(zBound, firstPos);
-            double zDistToLine = zBoundLine.subtract(zBound).lengthSquared();
-
-            //distance to player
-            double zDistSquared = zBound.subtract(start).lengthSquared();
-
-
-
-            int reach = ReachHelper.getPlacementReach(player) * 4; //4 times as much as normal placement reach
-
-            //check if its not behind the player and its not too close and not too far
-            boolean xValid = xBound.subtract(start).dotProduct(look) > 0 &&
-                             xDistSquared > 4 && xDistSquared < reach * reach;
-
-            boolean yValid = yBound.subtract(start).dotProduct(look) > 0 &&
-                             yDistSquared > 4 && yDistSquared < reach * reach;
-
-            boolean zValid = zBound.subtract(start).dotProduct(look) > 0 &&
-                             zDistSquared > 4 && zDistSquared < reach * reach;
-
-            //select the one that is closest (from wall position to its line counterpart) and is valid
-            //TODO: if multiple are very close, choose closest to player
-            Vec3d selected = null;
-            double selectedDistToLine = 0;
-
-            if (xValid) {
-                selected = xBoundLine;
-                selectedDistToLine = xDistToLine;
-            } else if (yValid) {
-                selected = yBoundLine;
-                selectedDistToLine = yDistToLine;
-            } else if (zValid) {
-                selected = zBoundLine;
-                selectedDistToLine = yDistToLine;
-            }
-
-            if (yValid && yDistToLine < selectedDistToLine) selected = yBoundLine;
-            if (zValid && zDistToLine < selectedDistToLine) selected = zBoundLine;
-
-            if (selected == null) return list;
-
-            //check if it doesnt go through blocks
-            if (!skipRaytrace) {
-                RayTraceResult rayTraceResult = player.world.rayTraceBlocks(start, selected, false, true, false);
-                if (rayTraceResult != null && rayTraceResult.typeOfHit == RayTraceResult.Type.BLOCK) {
-                    //return empty list
-                    return list;
-                }
-            }
-
-            BlockPos secondPos = new BlockPos(selected);
-
-            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();
-
-            outerloop:
-            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) {
-                        if (list.size() >= axisLimit) break outerloop;
-                        list.add(new BlockPos(l, m, n));
-                    }
-                }
-            }
-        }
-
-        return list;
-    }
-
-    //Make it 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;
-    }
-
-    @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

@@ -0,0 +1,191 @@
+package nl.requios.effortlessbuilding.buildmode;
+
+import net.minecraft.entity.player.PlayerEntity;
+import net.minecraft.util.text.TextFormatting;
+import nl.requios.effortlessbuilding.EffortlessBuilding;
+import nl.requios.effortlessbuilding.buildmodifier.ModifierSettingsManager;
+import nl.requios.effortlessbuilding.buildmodifier.UndoRedo;
+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"),
+        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;
+        }
+    }
+
+    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;
+    }
+
+    public static ActionEnum getFill() {
+        return fill;
+    }
+
+    public static ActionEnum getCubeFill() {
+        return cubeFill;
+    }
+
+    public static ActionEnum getRaisedEdge() {
+        return raisedEdge;
+    }
+
+    public static ActionEnum getLineThickness() {
+        return lineThickness;
+    }
+
+    public static ActionEnum getCircleStart() {
+        return circleStart;
+    }
+
+    //Called on both client and server
+    public static void performAction(PlayerEntity player, ActionEnum action) {
+        if (action == null) return;
+
+        switch (action) {
+            case UNDO:
+                UndoRedo.undo(player);
+                break;
+            case REDO:
+                UndoRedo.redo(player);
+                break;
+            case REPLACE:
+                ModifierSettingsManager.ModifierSettings modifierSettings = ModifierSettingsManager.getModifierSettings(player);
+                modifierSettings.setQuickReplace(!modifierSettings.doQuickReplace());
+                EffortlessBuilding.log(player, "Set " + TextFormatting.GOLD + "Quick Replace " + TextFormatting.RESET + (
+                        modifierSettings.doQuickReplace() ? "on" : "off"), true);
+                break;
+            case OPEN_MODIFIER_SETTINGS:
+                if (player.world.isRemote)
+                    ClientProxy.openModifierSettings();
+                break;
+            case OPEN_PLAYER_SETTINGS:
+                if (player.world.isRemote)
+                    ClientProxy.openPlayerSettings();
+                break;
+
+            case NORMAL_SPEED:
+                buildSpeed = ActionEnum.NORMAL_SPEED;
+                break;
+            case FAST_SPEED:
+                buildSpeed = ActionEnum.FAST_SPEED;
+                break;
+            case FULL:
+                fill = ActionEnum.FULL;
+                break;
+            case HOLLOW:
+                fill = ActionEnum.HOLLOW;
+                break;
+            case CUBE_FULL:
+                cubeFill = ActionEnum.CUBE_FULL;
+                break;
+            case CUBE_HOLLOW:
+                cubeFill = ActionEnum.CUBE_HOLLOW;
+                break;
+            case CUBE_SKELETON:
+                cubeFill = ActionEnum.CUBE_SKELETON;
+                break;
+            case SHORT_EDGE:
+                raisedEdge = ActionEnum.SHORT_EDGE;
+                break;
+            case LONG_EDGE:
+                raisedEdge = ActionEnum.LONG_EDGE;
+                break;
+            case THICKNESS_1:
+                lineThickness = ActionEnum.THICKNESS_1;
+                break;
+            case THICKNESS_3:
+                lineThickness = ActionEnum.THICKNESS_3;
+                break;
+            case THICKNESS_5:
+                lineThickness = ActionEnum.THICKNESS_5;
+                break;
+            case CIRCLE_START_CENTER:
+                circleStart = ActionEnum.CIRCLE_START_CENTER;
+                break;
+            case CIRCLE_START_CORNER:
+                circleStart = ActionEnum.CIRCLE_START_CORNER;
+                break;
+        }
+
+        if (player.world.isRemote &&
+            action != ActionEnum.REPLACE &&
+            action != ActionEnum.OPEN_MODIFIER_SETTINGS &&
+            action != ActionEnum.OPEN_PLAYER_SETTINGS) {
+
+            EffortlessBuilding.logTranslate(player, "", action.name, "", true);
+        }
+    }
+}

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

@@ -1,51 +1,62 @@
 package nl.requios.effortlessbuilding.buildmode;
 
-import net.minecraft.entity.player.EntityPlayer;
-import net.minecraft.entity.player.EntityPlayerMP;
+import net.minecraft.entity.player.PlayerEntity;
+import net.minecraft.entity.player.ServerPlayerEntity;
+import net.minecraftforge.common.util.LazyOptional;
 import net.minecraftforge.fml.common.Mod;
-import net.minecraftforge.fml.common.eventhandler.SubscribeEvent;
-import net.minecraftforge.fml.common.gameevent.PlayerEvent;
+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
-    public static ModeSettings getModeSettings(EntityPlayer player) {
-        if (player.hasCapability(ModeCapabilityManager.modeCapability, null)) {
-            ModeCapabilityManager.IModeCapability capability = player.getCapability(
-                    ModeCapabilityManager.modeCapability, 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);
             if (capability.getModeData() == null) {
                 capability.setModeData(new ModeSettings());
             }
             return capability.getModeData();
         }
-        throw new IllegalArgumentException("Player does not have modeCapability capability");
+
+        //Player does not have modeCapability capability
+        //Return dummy settings
+        return new ModeSettings();
+//        throw new IllegalArgumentException("Player does not have modeCapability capability");
     }
 
-    public static void setModeSettings(EntityPlayer player, ModeSettings modeSettings) {
+    public static void setModeSettings(PlayerEntity player, ModeSettings modeSettings) {
         if (player == null) {
-            EffortlessBuilding.log("Cannot set buildsettings, player is null");
+            EffortlessBuilding.log("Cannot set buildmode settings, player is null");
             return;
         }
-        if (player.hasCapability(ModeCapabilityManager.modeCapability, null)) {
-            ModeCapabilityManager.IModeCapability capability = player.getCapability(
-                    ModeCapabilityManager.modeCapability, null);
+        LazyOptional<ModeCapabilityManager.IModeCapability> modeCapability =
+                player.getCapability(ModeCapabilityManager.modeCapability, null);
 
+        modeCapability.ifPresent((capability) -> {
             capability.setModeData(modeSettings);
 
-            //Initialize new mode
             BuildModes.initializeMode(player);
-        } else {
-            EffortlessBuilding.log(player, "Saving buildsettings failed.");
+        });
+
+        if (!modeCapability.isPresent()) {
+            EffortlessBuilding.log(player, "Saving buildmode settings failed.");
         }
     }
 
-    public static String sanitize(ModeSettings modeSettings, EntityPlayer player) {
+    public static String sanitize(ModeSettings modeSettings, PlayerEntity player) {
         int maxReach = ReachHelper.getMaxReach(player);
         String error = "";
 
@@ -55,7 +66,7 @@ public class ModeSettingsManager {
     }
 
     public static class ModeSettings {
-        private BuildModes.BuildModeEnum buildMode = BuildModes.BuildModeEnum.Normal;
+        private BuildModes.BuildModeEnum buildMode = BuildModes.BuildModeEnum.NORMAL;
 
         public ModeSettings() {
         }
@@ -73,34 +84,15 @@ public class ModeSettingsManager {
         }
     }
 
-    @SubscribeEvent
-    public static void onPlayerLoggedIn(PlayerEvent.PlayerLoggedInEvent event) {
-        EntityPlayer player = event.player;
-        handleNewPlayer(player);
-    }
-
-    @SubscribeEvent
-    public static void onPlayerRespawn(PlayerEvent.PlayerRespawnEvent event) {
-        EntityPlayer player = event.player;
-        handleNewPlayer(player);
-    }
-
-    @SubscribeEvent
-    public static void onPlayerChangedDimension(PlayerEvent.PlayerChangedDimensionEvent event) {
-        EntityPlayer player = event.player;
-        handleNewPlayer(player);
-    }
-
-    private static void handleNewPlayer(EntityPlayer player){
-        if (getModeSettings(player) == null) {
-            setModeSettings(player, new ModeSettings());
-        }
+    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.world.isRemote) {
             //Send to client
             ModeSettingsMessage msg = new ModeSettingsMessage(getModeSettings(player));
-            EffortlessBuilding.packetHandler.sendTo(msg, (EntityPlayerMP) player);
+            PacketHandler.INSTANCE.send(PacketDistributor.PLAYER.with(() -> (ServerPlayerEntity) player), msg);
         }
     }
 }

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

@@ -1,40 +0,0 @@
-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<>();
-        list.add(blockPos);
-        return list;
-    }
-
-    @Override
-    public List<BlockPos> findCoordinates(EntityPlayer player, BlockPos blockPos, boolean skipRaytrace) {
-        List<BlockPos> list = new ArrayList<>();
-        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

@@ -1,40 +0,0 @@
-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<>();
-        list.add(blockPos);
-        return list;
-    }
-
-    @Override
-    public List<BlockPos> findCoordinates(EntityPlayer player, BlockPos blockPos, boolean skipRaytrace) {
-        List<BlockPos> list = new ArrayList<>();
-        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

@@ -1,36 +0,0 @@
-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 SlopeFloor implements IBuildMode {
-    @Override
-    public void initialize(EntityPlayer player) {
-
-    }
-
-    @Override
-    public List<BlockPos> onRightClick(EntityPlayer player, BlockPos blockPos, EnumFacing sideHit, Vec3d hitVec, boolean skipRaytrace) {
-        return new ArrayList<>();
-    }
-
-    @Override
-    public List<BlockPos> findCoordinates(EntityPlayer player, BlockPos blockPos, boolean skipRaytrace) {
-        return new ArrayList<>();
-    }
-
-    @Override
-    public EnumFacing getSideHit(EntityPlayer player) {
-        return null;
-    }
-
-    @Override
-    public Vec3d getHitVec(EntityPlayer player) {
-        return null;
-    }
-}

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

@@ -0,0 +1,213 @@
+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.Vec3d;
+import nl.requios.effortlessbuilding.helper.ReachHelper;
+
+import java.util.*;
+
+public abstract class ThreeClicksBuildMode extends BaseBuildMode {
+    protected Dictionary<UUID, BlockPos> secondPosTable = 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, PlayerEntity player, boolean skipRaytrace) {
+
+            return BuildModes.isCriteriaValid(start, look, reach, player, skipRaytrace, lineBound, planeBound, distToPlayerSq);
+        }
+    }
+
+    @Override
+    public void initialize(PlayerEntity player) {
+        super.initialize(player);
+        secondPosTable.put(player.getUniqueID(), BlockPos.ZERO);
+    }
+
+    @Override
+    public List<BlockPos> onRightClick(PlayerEntity player, BlockPos blockPos, Direction 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 = findSecondPos(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(PlayerEntity 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 = 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.getUniqueID());
+            BlockPos secondPos = secondPosTable.get(player.getUniqueID());
+
+            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);
+
+    //Finds height after floor has been chosen in buildmodes with 3 clicks
+    public static BlockPos findHeight(PlayerEntity player, BlockPos secondPos, boolean skipRaytrace) {
+        Vec3d look = BuildModes.getPlayerLookVec(player);
+        Vec3d start = new Vec3d(player.getPosX(), player.getPosY() + player.getEyeHeight(), player.getPosZ());
+
+        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);
+    }
+}

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

@@ -0,0 +1,87 @@
+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.Vec3d;
+import nl.requios.effortlessbuilding.EffortlessBuilding;
+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, 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 blocks
+            list = findCoordinates(player, blockPos, skipRaytrace);
+            rightClickTable.put(player.getUniqueID(), 0);
+        }
+
+        return list;
+    }
+
+    @Override
+    public List<BlockPos> findCoordinates(PlayerEntity 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 = 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

@@ -1,179 +0,0 @@
-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
-    Dictionary<UUID, Integer> rightClickClientTable = new Hashtable<>();
-    Dictionary<UUID, Integer> rightClickServerTable = new Hashtable<>();
-    Dictionary<UUID, BlockPos> firstPosTable = new Hashtable<>();
-    Dictionary<UUID, EnumFacing> sideHitTable = new Hashtable<>();
-    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 {
-            //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 {
-            Vec3d look = player.getLookVec();
-            Vec3d start = new Vec3d(player.posX, player.posY + player.getEyeHeight(), player.posZ);
-
-            //try on x axis
-            double x = firstPos.getX();
-
-            //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;
-
-            Vec3d xBound = new Vec3d(x, y, z);
-
-            //distance to player
-            double xDistSquared = xBound.subtract(start).lengthSquared();
-
-            //angle to look
-            //double xAngle = xBound.subtract(new Vec3d(firstPos)).normalize().dotProduct(look);
-
-            //try on z axis
-            z = firstPos.getZ();
-
-            //then x and y are
-            x = (z - start.z) / look.z * look.x + start.x;
-            y = (z - start.z) / look.z * look.y + start.y;
-
-            Vec3d zBound = new Vec3d(x, y, z);
-
-            //distance to player
-            double zDistSquared = zBound.subtract(start).lengthSquared();
-
-            //angle to look
-            //double zAngle = zBound.subtract(new Vec3d(firstPos)).normalize().dotProduct(look);
-
-            int reach = ReachHelper.getPlacementReach(player) * 4; //4 times as much as normal placement reach
-            
-            //check if its not behind the player and its not too close and not too far
-            boolean xValid = xBound.subtract(start).dotProduct(look) > 0 &&
-                             xDistSquared > 4 && xDistSquared < reach * reach;
-            
-            boolean zValid = zBound.subtract(start).dotProduct(look) > 0 &&
-                             zDistSquared > 4 && zDistSquared < reach * reach;
-            
-            //select the one that is closest and is valid
-            Vec3d selected = null;
-            if (xValid)
-                selected = xBound;
-            else if (zValid)
-                selected = zBound;
-            if (zValid && zDistSquared < xDistSquared/*Math.abs(zAngle) < Math.abs(xAngle)*/) selected = zBound;
-
-            if (selected == null) return list;
-
-            //check if it doesnt go through blocks
-            if (!skipRaytrace) {
-                RayTraceResult rayTraceResult = player.world.rayTraceBlocks(start, selected, false, true, false);
-                if (rayTraceResult != null && rayTraceResult.typeOfHit == RayTraceResult.Type.BLOCK) {
-                    //return empty list
-                    return list;
-                }
-            }
-            
-            BlockPos secondPos = new BlockPos(selected);
-
-            //Add whole wall
-            //Limit amount of blocks you can place per row
-            int limit = ReachHelper.getMaxBlocksPlacedAtOnce(player);
-            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;
-            if (x1 - x2 > axisLimit) x2 = x1 - axisLimit;
-            if (y2 - y1 > axisLimit) y2 = y1 + axisLimit;
-            if (y1 - y2 > axisLimit) y2 = y1 - axisLimit;
-            if (z2 - z1 > axisLimit) z2 = z1 + axisLimit;
-            if (z1 - z2 > axisLimit) z2 = z1 - axisLimit;
-
-            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) {
-
-                    //check if whole row fits within limit
-                    if (Math.abs(y1 - y2) < limit - list.size()) {
-
-                        for (int m = y1; y1 < y2 ? m <= y2 : m >= y2; m += y1 < y2 ? 1 : -1) {
-                            list.add(new BlockPos(l, m, n));
-                        }
-                    }
-                }
-            }
-        }
-
-        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/buildmodes/Circle.java

@@ -0,0 +1,88 @@
+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.TwoClicksBuildMode;
+import nl.requios.effortlessbuilding.buildmode.ModeOptions;
+
+import java.util.*;
+
+public class Circle extends TwoClicksBuildMode {
+
+    @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);
+    }
+
+    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);
+    }
+}

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

@@ -0,0 +1,100 @@
+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.*;
+
+public class Cube extends ThreeClicksBuildMode {
+
+    @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);
+    }
+
+    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);
+    }
+}

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

@@ -0,0 +1,50 @@
+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 {
+
+    @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);
+    }
+
+    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;
+    }
+}

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

@@ -0,0 +1,53 @@
+package nl.requios.effortlessbuilding.buildmode.buildmodes;
+
+import net.minecraft.entity.player.PlayerEntity;
+import net.minecraft.util.math.BlockPos;
+import net.minecraft.util.math.Vec3d;
+import nl.requios.effortlessbuilding.buildmode.ThreeClicksBuildMode;
+
+import java.util.ArrayList;
+import java.util.List;
+
+public class DiagonalLine extends ThreeClicksBuildMode {
+
+    @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);
+    }
+
+    //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<>();
+
+        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;
+    }
+}

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

@@ -0,0 +1,51 @@
+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 {
+
+    @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);
+    }
+
+    //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;
+    }
+}

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

@@ -0,0 +1,93 @@
+package nl.requios.effortlessbuilding.buildmode.buildmodes;
+
+import net.minecraft.entity.player.PlayerEntity;
+import net.minecraft.util.math.BlockPos;
+import net.minecraft.util.math.Vec3d;
+import nl.requios.effortlessbuilding.buildmode.BuildModes;
+import nl.requios.effortlessbuilding.buildmode.TwoClicksBuildMode;
+import nl.requios.effortlessbuilding.buildmode.ModeOptions;
+import nl.requios.effortlessbuilding.helper.ReachHelper;
+
+import java.util.*;
+
+public class Floor extends TwoClicksBuildMode {
+
+    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, PlayerEntity player, boolean skipRaytrace) {
+
+            return BuildModes.isCriteriaValid(start, look, reach, player, skipRaytrace, planeBound, planeBound, distToPlayerSq);
+        }
+    }
+
+    @Override
+    protected BlockPos findSecondPos(PlayerEntity player, BlockPos firstPos, boolean skipRaytrace) {
+        return findFloor(player, firstPos, skipRaytrace);
+    }
+
+    public static BlockPos findFloor(PlayerEntity player, BlockPos firstPos, boolean skipRaytrace) {
+        Vec3d look = BuildModes.getPlayerLookVec(player);
+        Vec3d start = new Vec3d(player.getPosX(), player.getPosY() + player.getEyeHeight(), player.getPosZ());
+
+        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);
+    }
+
+    @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);
+    }
+
+    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);
+    }
+}

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

@@ -0,0 +1,148 @@
+package nl.requios.effortlessbuilding.buildmode.buildmodes;
+
+import net.minecraft.entity.player.PlayerEntity;
+import net.minecraft.util.math.BlockPos;
+import net.minecraft.util.math.Vec3d;
+import nl.requios.effortlessbuilding.EffortlessBuilding;
+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 {
+
+    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, PlayerEntity player, boolean skipRaytrace) {
+
+            return BuildModes.isCriteriaValid(start, look, reach, player, skipRaytrace, lineBound, planeBound, distToPlayerSq);
+        }
+
+    }
+
+    @Override
+    protected BlockPos findSecondPos(PlayerEntity player, BlockPos firstPos, boolean skipRaytrace) {
+        return findLine(player, firstPos, skipRaytrace);
+    }
+
+    public static BlockPos findLine(PlayerEntity player, BlockPos firstPos, boolean skipRaytrace) {
+        Vec3d look = BuildModes.getPlayerLookVec(player);
+        Vec3d start = new Vec3d(player.getPosX(), player.getPosY() + player.getEyeHeight(), player.getPosZ());
+
+        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);
+    }
+
+    @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);
+    }
+
+    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));
+        }
+    }
+}

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

@@ -0,0 +1,41 @@
+package nl.requios.effortlessbuilding.buildmode.buildmodes;
+
+import net.minecraft.entity.player.PlayerEntity;
+import net.minecraft.util.Direction;
+import net.minecraft.util.math.BlockPos;
+import net.minecraft.util.math.Vec3d;
+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, Vec3d 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 Vec3d getHitVec(PlayerEntity player) {
+        return null;
+    }
+}

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

@@ -0,0 +1,41 @@
+package nl.requios.effortlessbuilding.buildmode.buildmodes;
+
+import net.minecraft.entity.player.PlayerEntity;
+import net.minecraft.util.Direction;
+import net.minecraft.util.math.BlockPos;
+import net.minecraft.util.math.Vec3d;
+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, Vec3d 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 Vec3d getHitVec(PlayerEntity player) {
+        return null;
+    }
+}

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

@@ -0,0 +1,95 @@
+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 {
+
+    @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);
+    }
+
+    //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;
+    }
+}

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

@@ -0,0 +1,110 @@
+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 {
+
+    @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);
+    }
+
+    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);
+    }
+}

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

@@ -0,0 +1,134 @@
+package nl.requios.effortlessbuilding.buildmode.buildmodes;
+
+import net.minecraft.entity.player.PlayerEntity;
+import net.minecraft.util.math.BlockPos;
+import net.minecraft.util.math.Vec3d;
+import nl.requios.effortlessbuilding.buildmode.BuildModes;
+import nl.requios.effortlessbuilding.buildmode.TwoClicksBuildMode;
+import nl.requios.effortlessbuilding.buildmode.ModeOptions;
+import nl.requios.effortlessbuilding.helper.ReachHelper;
+
+import java.util.*;
+
+public class Wall extends TwoClicksBuildMode {
+
+    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, PlayerEntity player, boolean skipRaytrace) {
+
+            return BuildModes.isCriteriaValid(start, look, reach, player, skipRaytrace, planeBound, planeBound, distToPlayerSq);
+        }
+    }
+
+    @Override
+    protected BlockPos findSecondPos(PlayerEntity player, BlockPos firstPos, boolean skipRaytrace) {
+        return findWall(player, firstPos, skipRaytrace);
+    }
+
+    public static BlockPos findWall(PlayerEntity player, BlockPos firstPos, boolean skipRaytrace) {
+        Vec3d look = BuildModes.getPlayerLookVec(player);
+        Vec3d start = new Vec3d(player.getPosX(), player.getPosY() + player.getEyeHeight(), player.getPosZ());
+
+        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);
+    }
+
+    @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);
+    }
+
+    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);
+    }
+}

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

@@ -1,10 +1,10 @@
 package nl.requios.effortlessbuilding.buildmodifier;
 
-import net.minecraft.block.state.IBlockState;
-import net.minecraft.entity.player.EntityPlayer;
+import net.minecraft.block.BlockState;
+import net.minecraft.entity.player.PlayerEntity;
 import net.minecraft.item.ItemStack;
-import net.minecraft.util.EnumFacing;
-import net.minecraft.util.EnumHand;
+import net.minecraft.util.Direction;
+import net.minecraft.util.Hand;
 import net.minecraft.util.math.BlockPos;
 import net.minecraft.util.math.Vec3d;
 import net.minecraft.util.math.Vec3i;
@@ -18,7 +18,7 @@ public class Array {
 
     public static class ArraySettings{
         public boolean enabled = false;
-        public BlockPos offset = BlockPos.ORIGIN;
+        public BlockPos offset = BlockPos.ZERO;
         public int count = 5;
 
         public ArraySettings() {
@@ -41,7 +41,7 @@ public class Array {
         }
     }
 
-    public static List<BlockPos> findCoordinates(EntityPlayer player, BlockPos startPos) {
+    public static List<BlockPos> findCoordinates(PlayerEntity player, BlockPos startPos) {
         List<BlockPos> coordinates = new ArrayList<>();
 
         //find arraysettings for the player
@@ -59,8 +59,8 @@ public class Array {
         return coordinates;
     }
 
-    public static List<IBlockState> findBlockStates(EntityPlayer player, BlockPos startPos, IBlockState blockState, ItemStack itemStack, List<ItemStack> itemStacks) {
-        List<IBlockState> blockStates = new ArrayList<>();
+    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();
@@ -82,7 +82,7 @@ public class Array {
             if (bagInventory != null) {
                 itemStack = ItemRandomizerBag.pickRandomStack(bagInventory);
                 blockState = BuildModifiers
-                        .getBlockStateFromItem(itemStack, player, startPos, EnumFacing.UP, new Vec3d(0, 0, 0), EnumHand.MAIN_HAND);
+                        .getBlockStateFromItem(itemStack, player, startPos, Direction.UP, new Vec3d(0, 0, 0), Hand.MAIN_HAND);
             }
 
             //blockState = blockState.getBlock().getStateForPlacement(player.world, pos, )

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

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

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

@@ -1,31 +1,31 @@
 package nl.requios.effortlessbuilding.buildmodifier;
 
 import net.minecraft.block.Block;
-import net.minecraft.block.state.IBlockState;
-import net.minecraft.entity.player.EntityPlayer;
-import net.minecraft.entity.player.EntityPlayerMP;
-import net.minecraft.item.ItemBlock;
+import net.minecraft.block.BlockState;
+import net.minecraft.entity.player.PlayerEntity;
+import net.minecraft.block.Blocks;
+import net.minecraft.item.BlockItem;
+import net.minecraft.item.BlockItemUseContext;
 import net.minecraft.item.ItemStack;
-import net.minecraft.util.EnumFacing;
-import net.minecraft.util.EnumHand;
+import net.minecraft.item.ItemUseContext;
+import net.minecraft.util.Direction;
+import net.minecraft.util.Hand;
 import net.minecraft.util.math.BlockPos;
+import net.minecraft.util.math.BlockRayTraceResult;
 import net.minecraft.util.math.Vec3d;
 import net.minecraft.world.World;
-import nl.requios.effortlessbuilding.EffortlessBuilding;
 import nl.requios.effortlessbuilding.compatibility.CompatHelper;
+import nl.requios.effortlessbuilding.helper.InventoryHelper;
 import nl.requios.effortlessbuilding.helper.SurvivalHelper;
 import nl.requios.effortlessbuilding.item.ItemRandomizerBag;
-import nl.requios.effortlessbuilding.network.BlockPlacedMessage;
 import nl.requios.effortlessbuilding.render.BlockPreviewRenderer;
 
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.List;
+import java.util.*;
 
 public class BuildModifiers {
 
     //Called from BuildModes
-    public static void onBlockPlaced(EntityPlayer player, List<BlockPos> startCoordinates, EnumFacing sideHit, Vec3d hitVec) {
+    public static void onBlockPlaced(PlayerEntity player, List<BlockPos> startCoordinates, Direction sideHit, Vec3d hitVec, boolean placeStartPos) {
         World world = player.world;
         ItemRandomizerBag.renewRandomness();
 
@@ -35,57 +35,120 @@ public class BuildModifiers {
         //find coordinates and blockstates
         List<BlockPos> coordinates = findCoordinates(player, startCoordinates);
         List<ItemStack> itemStacks = new ArrayList<>();
-        List<IBlockState> blockStates = findBlockStates(player, startCoordinates, hitVec, sideHit, itemStacks);
+        List<BlockState> blockStates = findBlockStates(player, startCoordinates, hitVec, sideHit, itemStacks);
 
         //check if valid blockstates
         if (blockStates.size() == 0 || coordinates.size() != blockStates.size()) return;
 
-        if (world.isRemote) {
-            BlockPreviewRenderer.onBlocksPlaced();
-            return;
+        //remember previous blockstates for undo
+        List<BlockState> previousBlockStates = new ArrayList<>(coordinates.size());
+        List<BlockState> newBlockStates = new ArrayList<>(coordinates.size());
+        for (BlockPos coordinate : coordinates) {
+            previousBlockStates.add(world.getBlockState(coordinate));
         }
 
+        if (world.isRemote) {
+
+            BlockPreviewRenderer.onBlocksPlaced();
+
+            newBlockStates = blockStates;
+
+        } else {
+
             //place blocks
-        for (int i = 0; i < coordinates.size(); i++) {
+            for (int i = placeStartPos ? 0 : 1; i < coordinates.size(); i++) {
                 BlockPos blockPos = coordinates.get(i);
-            IBlockState blockState = blockStates.get(i);
+                BlockState blockState = blockStates.get(i);
                 ItemStack itemStack = itemStacks.get(i);
 
-            if (world.isBlockLoaded(blockPos, true)) {
+                if (world.isBlockPresent(blockPos)) {
                     //check itemstack empty
+                    if (itemStack.isEmpty()) {
+                        //try to find new stack, otherwise continue
+                        itemStack = InventoryHelper.findItemStackInInventory(player, blockState.getBlock());
                         if (itemStack.isEmpty()) continue;
-                SurvivalHelper.placeBlock(world, player, blockPos, blockState, itemStack, EnumFacing.UP, hitVec, false, false);
+                    }
+                    SurvivalHelper.placeBlock(world, player, blockPos, blockState, itemStack, Direction.UP, hitVec, false, false, false);
                 }
             }
 
+            //find actual new blockstates for undo
+            for (BlockPos coordinate : coordinates) {
+                newBlockStates.add(world.getBlockState(coordinate));
+            }
         }
 
-    public static void onBlockBroken(EntityPlayer player, List<BlockPos> posList) {
+        //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.getDefaultState());
+
+        //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.getDefaultState()) != 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.world;
 
-        List<BlockPos> coordinates = findCoordinates(player, posList);
+        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());
+        for (BlockPos coordinate : coordinates) {
+            previousBlockStates.add(world.getBlockState(coordinate));
+        }
+
         if (world.isRemote) {
             BlockPreviewRenderer.onBlocksBroken();
-            return;
+
+            //list of air blockstates
+            for (int i = 0; i < coordinates.size(); i++) {
+                newBlockStates.add(Blocks.AIR.getDefaultState());
             }
 
+        } else {
+
             //If the player is going to instabreak grass or a plant, only break other instabreaking things
-        boolean onlyInstaBreaking = world.getBlockState(posList.get(0)).getBlockHardness(world, posList.get(0)) == 0f;
+            boolean onlyInstaBreaking = !player.isCreative() &&
+                                        world.getBlockState(startCoordinates.get(0)).getBlockHardness(world, startCoordinates.get(0)) == 0f;
 
             //break all those blocks
-        for (BlockPos coordinate : coordinates) {
-            if (world.isBlockLoaded(coordinate, false)) {
+            for (int i = breakStartPos ? 0 : 1; i < coordinates.size(); i++) {
+                BlockPos coordinate = coordinates.get(i);
+                if (world.isBlockPresent(coordinate) && !world.isAirBlock(coordinate)) {
                     if (!onlyInstaBreaking || world.getBlockState(coordinate).getBlockHardness(world, coordinate) == 0f) {
-                    SurvivalHelper.breakBlock(world, player, coordinate);
-                }
+                        SurvivalHelper.breakBlock(world, player, coordinate, false);
                     }
                 }
             }
 
-    public static List<BlockPos> findCoordinates(EntityPlayer player, List<BlockPos> posList) {
+            //find actual new blockstates for undo
+            for (BlockPos coordinate : coordinates) {
+                newBlockStates.add(world.getBlockState(coordinate));
+            }
+        }
+
+        //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.getDefaultState());
+
+        //add to undo stack
+        BlockPos firstPos = startCoordinates.get(0);
+        BlockPos secondPos = startCoordinates.get(startCoordinates.size() - 1);
+        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) {
         List<BlockPos> coordinates = new ArrayList<>();
         //Add current blocks being placed too
         coordinates.addAll(posList);
@@ -106,18 +169,18 @@ public class BuildModifiers {
         return coordinates;
     }
 
-    public static List<BlockPos> findCoordinates(EntityPlayer player, BlockPos blockPos) {
+    public static List<BlockPos> findCoordinates(PlayerEntity player, BlockPos blockPos) {
         return findCoordinates(player, new ArrayList<>(Arrays.asList(blockPos)));
     }
 
-    public static List<IBlockState> findBlockStates(EntityPlayer player, List<BlockPos> posList, Vec3d hitVec, EnumFacing facing, List<ItemStack> itemStacks) {
-        List<IBlockState> blockStates = new ArrayList<>();
+    public static List<BlockState> findBlockStates(PlayerEntity player, List<BlockPos> posList, Vec3d hitVec, Direction facing, List<ItemStack> itemStacks) {
+        List<BlockState> blockStates = new ArrayList<>();
         itemStacks.clear();
 
         //Get itemstack
-        ItemStack itemStack = player.getHeldItem(EnumHand.MAIN_HAND);
+        ItemStack itemStack = player.getHeldItem(Hand.MAIN_HAND);
         if (itemStack.isEmpty() || !CompatHelper.isItemBlockProxy(itemStack)) {
-            itemStack = player.getHeldItem(EnumHand.OFF_HAND);
+            itemStack = player.getHeldItem(Hand.OFF_HAND);
         }
         if (itemStack.isEmpty() || !CompatHelper.isItemBlockProxy(itemStack)) {
             return blockStates;
@@ -125,22 +188,22 @@ public class BuildModifiers {
 
         //Get ItemBlock stack
         ItemStack itemBlock = ItemStack.EMPTY;
-        if (itemStack.getItem() instanceof ItemBlock) itemBlock = itemStack;
+        if (itemStack.getItem() instanceof BlockItem) itemBlock = itemStack;
         else itemBlock = CompatHelper.getItemBlockFromStack(itemStack);
         ItemRandomizerBag.resetRandomness();
 
         //Add blocks in posList first
         for (BlockPos blockPos : posList) {
-            if (!(itemStack.getItem() instanceof ItemBlock)) itemBlock = CompatHelper.getItemBlockFromStack(itemStack);
-            IBlockState blockState = getBlockStateFromItem(itemBlock, player, blockPos, facing, hitVec, EnumHand.MAIN_HAND);
+            if (!(itemStack.getItem() instanceof BlockItem)) itemBlock = CompatHelper.getItemBlockFromStack(itemStack);
+            BlockState blockState = getBlockStateFromItem(itemBlock, player, blockPos, facing, hitVec, Hand.MAIN_HAND);
             blockStates.add(blockState);
             itemStacks.add(itemBlock);
         }
 
         for (BlockPos blockPos : posList) {
-            IBlockState blockState = getBlockStateFromItem(itemBlock, player, blockPos, facing, hitVec, EnumHand.MAIN_HAND);
+            BlockState blockState = getBlockStateFromItem(itemBlock, player, blockPos, facing, hitVec, Hand.MAIN_HAND);
 
-            List<IBlockState> arrayBlockStates = Array.findBlockStates(player, blockPos, blockState, itemStack, itemStacks);
+            List<BlockState> 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));
@@ -148,7 +211,7 @@ public class BuildModifiers {
             List<BlockPos> arrayCoordinates = Array.findCoordinates(player, blockPos);
             for (int i = 0; i < arrayCoordinates.size(); i++) {
                 BlockPos coordinate = arrayCoordinates.get(i);
-                IBlockState blockState1 = arrayBlockStates.get(i);
+                BlockState blockState1 = arrayBlockStates.get(i);
                 blockStates.addAll(Mirror.findBlockStates(player, coordinate, blockState1, itemStack, itemStacks));
                 blockStates.addAll(RadialMirror.findBlockStates(player, coordinate, blockState1, itemStack, itemStacks));
             }
@@ -173,9 +236,8 @@ public class BuildModifiers {
                modifierSettings.doQuickReplace();
     }
 
-    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);
+    public static BlockState getBlockStateFromItem(ItemStack itemStack, PlayerEntity player, BlockPos blockPos, Direction facing, Vec3d hitVec, Hand hand) {
+        return Block.getBlockFromItem(itemStack.getItem()).getStateForPlacement(new BlockItemUseContext(new ItemUseContext(player, hand, new BlockRayTraceResult(hitVec, facing, blockPos, false))));
     }
 
     //Returns true if equal (or both null)
@@ -183,6 +245,16 @@ public class BuildModifiers {
         if (coordinates1 == null && coordinates2 == null) return true;
         if (coordinates1 == null || coordinates2 == null) return false;
 
-        return coordinates1.equals(coordinates2);
+        //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);
     }
 }

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

@@ -1,14 +1,16 @@
 package nl.requios.effortlessbuilding.buildmodifier;
 
-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.block.*;
+import net.minecraft.block.StairsBlock;
+import net.minecraft.block.DirectionalBlock;
+import net.minecraft.block.SlabBlock;
+import net.minecraft.block.BlockState;
+import net.minecraft.entity.player.PlayerEntity;
 import net.minecraft.item.ItemStack;
-import net.minecraft.util.EnumFacing;
-import net.minecraft.util.EnumHand;
+import net.minecraft.state.properties.Half;
+import net.minecraft.state.properties.SlabType;
+import net.minecraft.util.Direction;
+import net.minecraft.util.Hand;
 import net.minecraft.util.math.BlockPos;
 import net.minecraft.util.math.Vec3d;
 import net.minecraftforge.items.IItemHandler;
@@ -45,7 +47,7 @@ public class Mirror {
         }
     }
     
-    public static List<BlockPos> findCoordinates(EntityPlayer player, BlockPos startPos) {
+    public static List<BlockPos> findCoordinates(PlayerEntity player, BlockPos startPos) {
         List<BlockPos> coordinates = new ArrayList<>();
 
         //find mirrorsettings for the player
@@ -85,8 +87,8 @@ public class Mirror {
         coordinates.add(newBlockPos);
     }
 
-    public static List<IBlockState> findBlockStates(EntityPlayer player, BlockPos startPos, IBlockState blockState, ItemStack itemStack, List<ItemStack> itemStacks) {
-        List<IBlockState> blockStates = new ArrayList<>();
+    public static List<BlockState> findBlockStates(PlayerEntity player, BlockPos startPos, BlockState blockState, ItemStack itemStack, List<ItemStack> itemStacks) {
+        List<BlockState> blockStates = new ArrayList<>();
 
         //find mirrorsettings for the player
         MirrorSettings m = ModifierSettingsManager.getModifierSettings(player).getMirrorSettings();
@@ -98,15 +100,15 @@ public class Mirror {
             bagInventory = ItemRandomizerBag.getBagInventory(itemStack);
         }
 
-        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);
+        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);
 
         return blockStates;
     }
 
-    private static void blockStateMirrorX(EntityPlayer player, MirrorSettings m, BlockPos oldBlockPos, IBlockState oldBlockState,
-                                          IItemHandler bagInventory, ItemStack itemStack, EnumHand hand, List<IBlockState> blockStates, List<ItemStack> itemStacks) {
+    private static void blockStateMirrorX(PlayerEntity player, MirrorSettings m, BlockPos oldBlockPos, BlockState oldBlockState,
+                                          IItemHandler bagInventory, ItemStack itemStack, Hand hand, List<BlockState> blockStates, List<ItemStack> itemStacks) {
         //find mirror position
         double x = m.position.x + (m.position.x - oldBlockPos.getX() - 0.5);
         BlockPos newBlockPos = new BlockPos(x, oldBlockPos.getY(), oldBlockPos.getZ());
@@ -114,11 +116,11 @@ public class Mirror {
         //Randomizer bag synergy
         if (bagInventory != null) {
             itemStack = ItemRandomizerBag.pickRandomStack(bagInventory);
-            oldBlockState = BuildModifiers.getBlockStateFromItem(itemStack, player, oldBlockPos, EnumFacing.UP, new Vec3d(0, 0, 0), hand);
+            oldBlockState = BuildModifiers.getBlockStateFromItem(itemStack, player, oldBlockPos, Direction.UP, new Vec3d(0, 0, 0), hand);
         }
 
         //Find blockstate
-        IBlockState newBlockState = oldBlockState == null ? null : oldBlockState.withMirror(net.minecraft.util.Mirror.FRONT_BACK);
+        BlockState newBlockState = oldBlockState == null ? null : oldBlockState.mirror(net.minecraft.util.Mirror.FRONT_BACK);
 
         //Store blockstate and itemstack
         blockStates.add(newBlockState);
@@ -128,8 +130,8 @@ public class Mirror {
         if (m.mirrorZ) blockStateMirrorZ(player, m, newBlockPos, newBlockState, bagInventory, itemStack, hand, blockStates, 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) {
+    private static void blockStateMirrorY(PlayerEntity player, MirrorSettings m, BlockPos oldBlockPos, BlockState oldBlockState,
+                                          IItemHandler bagInventory, ItemStack itemStack, Hand hand, List<BlockState> blockStates, List<ItemStack> itemStacks) {
         //find mirror position
         double y = m.position.y + (m.position.y - oldBlockPos.getY() - 0.5);
         BlockPos newBlockPos = new BlockPos(oldBlockPos.getX(), y, oldBlockPos.getZ());
@@ -137,11 +139,11 @@ public class Mirror {
         //Randomizer bag synergy
         if (bagInventory != null) {
             itemStack = ItemRandomizerBag.pickRandomStack(bagInventory);
-            oldBlockState = BuildModifiers.getBlockStateFromItem(itemStack, player, oldBlockPos, EnumFacing.UP, new Vec3d(0, 0, 0), hand);
+            oldBlockState = BuildModifiers.getBlockStateFromItem(itemStack, player, oldBlockPos, Direction.UP, new Vec3d(0, 0, 0), hand);
         }
 
         //Find blockstate
-        IBlockState newBlockState = oldBlockState == null ? null : getVerticalMirror(oldBlockState);
+        BlockState newBlockState = oldBlockState == null ? null : getVerticalMirror(oldBlockState);
 
         //Store blockstate and itemstack
         blockStates.add(newBlockState);
@@ -150,8 +152,8 @@ public class Mirror {
         if (m.mirrorZ) blockStateMirrorZ(player, m, newBlockPos, newBlockState, bagInventory, itemStack, hand, blockStates, 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) {
+    private static void blockStateMirrorZ(PlayerEntity player, MirrorSettings m, BlockPos oldBlockPos, BlockState oldBlockState,
+                                          IItemHandler bagInventory, ItemStack itemStack, Hand hand, List<BlockState> blockStates, List<ItemStack> itemStacks) {
         //find mirror position
         double z = m.position.z + (m.position.z - oldBlockPos.getZ() - 0.5);
         BlockPos newBlockPos = new BlockPos(oldBlockPos.getX(), oldBlockPos.getY(), z);
@@ -159,11 +161,11 @@ public class Mirror {
         //Randomizer bag synergy
         if (bagInventory != null) {
             itemStack = ItemRandomizerBag.pickRandomStack(bagInventory);
-            oldBlockState = BuildModifiers.getBlockStateFromItem(itemStack, player, oldBlockPos, EnumFacing.UP, new Vec3d(0, 0, 0), hand);
+            oldBlockState = BuildModifiers.getBlockStateFromItem(itemStack, player, oldBlockPos, Direction.UP, new Vec3d(0, 0, 0), hand);
         }
 
         //Find blockstate
-        IBlockState newBlockState = oldBlockState == null ? null : oldBlockState.withMirror(net.minecraft.util.Mirror.LEFT_RIGHT);
+        BlockState newBlockState = oldBlockState == null ? null : oldBlockState.mirror(net.minecraft.util.Mirror.LEFT_RIGHT);
 
         //Store blockstate and itemstack
         blockStates.add(newBlockState);
@@ -182,41 +184,42 @@ public class Mirror {
         return true;
     }
 
-    private static IBlockState getVerticalMirror(IBlockState blockState) {
+    private static BlockState getVerticalMirror(BlockState blockState) {
         //Stairs
-        if (blockState.getBlock() instanceof BlockStairs) {
-            if (blockState.getValue(BlockStairs.HALF) == BlockStairs.EnumHalf.BOTTOM) {
-                return blockState.withProperty(BlockStairs.HALF, BlockStairs.EnumHalf.TOP);
+        if (blockState.getBlock() instanceof StairsBlock) {
+            if (blockState.get(StairsBlock.HALF) == Half.BOTTOM) {
+                return blockState.with(StairsBlock.HALF, Half.TOP);
             } else {
-                return blockState.withProperty(BlockStairs.HALF, BlockStairs.EnumHalf.BOTTOM);
+                return blockState.with(StairsBlock.HALF, Half.BOTTOM);
             }
         }
 
         //Slabs
-        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);
+        if (blockState.getBlock() instanceof SlabBlock) {
+            if (blockState.get(SlabBlock.TYPE) == SlabType.DOUBLE) {
+                return blockState;
+            } else if (blockState.get(SlabBlock.TYPE) == SlabType.BOTTOM) {
+                return blockState.with(SlabBlock.TYPE, SlabType.TOP);
             } else {
-                return blockState.withProperty(BlockSlab.HALF, BlockSlab.EnumBlockHalf.BOTTOM);
+                return blockState.with(SlabBlock.TYPE, SlabType.BOTTOM);
             }
         }
 
         //Buttons, endrod, observer, piston
-        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);
+        if (blockState.getBlock() instanceof DirectionalBlock) {
+            if (blockState.get(DirectionalBlock.FACING) == Direction.DOWN) {
+                return blockState.with(DirectionalBlock.FACING, Direction.UP);
+            } else if (blockState.get(DirectionalBlock.FACING) == Direction.UP) {
+                return blockState.with(DirectionalBlock.FACING, Direction.DOWN);
             }
         }
 
         //Dispenser, dropper
-        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);
+        if (blockState.getBlock() instanceof DispenserBlock) {
+            if (blockState.get(DispenserBlock.FACING) == Direction.DOWN) {
+                return blockState.with(DispenserBlock.FACING, Direction.UP);
+            } else if (blockState.get(DispenserBlock.FACING) == Direction.UP) {
+                return blockState.with(DispenserBlock.FACING, Direction.DOWN);
             }
         }
 

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

@@ -1,48 +1,62 @@
 package nl.requios.effortlessbuilding.buildmodifier;
 
-import net.minecraft.entity.player.EntityPlayer;
-import net.minecraft.entity.player.EntityPlayerMP;
+import net.minecraft.entity.player.PlayerEntity;
+import net.minecraft.entity.player.ServerPlayerEntity;
+import net.minecraftforge.common.util.LazyOptional;
 import net.minecraftforge.fml.common.Mod;
-import net.minecraftforge.fml.common.eventhandler.SubscribeEvent;
-import net.minecraftforge.fml.common.gameevent.PlayerEvent;
+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
-    public static ModifierSettings getModifierSettings(EntityPlayer player){
-        if (player.hasCapability(ModifierCapabilityManager.modifierCapability, null)) {
-            ModifierCapabilityManager.IModifierCapability capability = player.getCapability(
-                    ModifierCapabilityManager.modifierCapability, 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);
             if (capability.getModifierData() == null) {
                 capability.setModifierData(new ModifierSettings());
             }
             return capability.getModifierData();
         }
-        throw new IllegalArgumentException("Player does not have modifierCapability capability");
+
+        //Player does not have modifierCapability capability
+        //Return dummy settings
+        return new ModifierSettings();
+//        throw new IllegalArgumentException("Player does not have modifierCapability capability");
     }
 
-    public static void setModifierSettings(EntityPlayer player, ModifierSettings modifierSettings) {
+    public static void setModifierSettings(PlayerEntity player, ModifierSettings modifierSettings) {
         if (player == null) {
             EffortlessBuilding.log("Cannot set buildsettings, player is null");
             return;
         }
-        if (player.hasCapability(ModifierCapabilityManager.modifierCapability, null)) {
-            ModifierCapabilityManager.IModifierCapability capability = player.getCapability(
-                    ModifierCapabilityManager.modifierCapability, null);
+
+        LazyOptional<ModifierCapabilityManager.IModifierCapability> modifierCapability =
+                player.getCapability(ModifierCapabilityManager.modifierCapability, null);
+
+        modifierCapability.ifPresent((capability) -> {
             capability.setModifierData(modifierSettings);
-        } else {
+        });
+
+        if (!modifierCapability.isPresent()) {
             EffortlessBuilding.log(player, "Saving buildsettings failed.");
         }
     }
 
-    public static String sanitize(ModifierSettings modifierSettings, EntityPlayer player) {
+    public static String sanitize(ModifierSettings modifierSettings, PlayerEntity player) {
         int maxReach = ReachHelper.getMaxReach(player);
         String error = "";
 
@@ -165,48 +179,28 @@ public class ModifierSettingsManager {
             //Set mirror radius to max
             int reach = 10;
             switch (reachUpgrade) {
-                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;
+                case 0: reach = BuildConfig.reach.maxReachLevel0.get(); break;
+                case 1: reach =  BuildConfig.reach.maxReachLevel1.get(); break;
+                case 2: reach =  BuildConfig.reach.maxReachLevel2.get(); break;
+                case 3: reach =  BuildConfig.reach.maxReachLevel3.get(); break;
             }
 
             if (this.mirrorSettings != null)
                 this.mirrorSettings.radius = reach / 2;
             if (this.radialMirrorSettings != null)
                 this.radialMirrorSettings.radius = reach / 2;
-
         }
     }
 
-    @SubscribeEvent
-    public static void onPlayerLoggedIn(PlayerEvent.PlayerLoggedInEvent event) {
-        EntityPlayer player = event.player;
-        handleNewPlayer(player);
-    }
-
-    @SubscribeEvent
-    public static void onPlayerRespawn(PlayerEvent.PlayerRespawnEvent event) {
-        EntityPlayer player = event.player;
-        handleNewPlayer(player);
-    }
-
-    @SubscribeEvent
-    public static void onPlayerChangedDimension(PlayerEvent.PlayerChangedDimensionEvent event) {
-        EntityPlayer player = event.player;
-        handleNewPlayer(player);
-    }
-
-    private static void handleNewPlayer(EntityPlayer player){
-        if (getModifierSettings(player) == null) {
-            setModifierSettings(player, new ModifierSettings());
-        }
+    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.world.isRemote) {
             //Send to client
             ModifierSettingsMessage msg = new ModifierSettingsMessage(getModifierSettings(player));
-            EffortlessBuilding.packetHandler.sendTo(msg, (EntityPlayerMP) player);
+            PacketHandler.INSTANCE.send(PacketDistributor.PLAYER.with(() -> (ServerPlayerEntity) player), msg);
         }
     }
 }

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

@@ -1,10 +1,10 @@
 package nl.requios.effortlessbuilding.buildmodifier;
 
-import net.minecraft.block.state.IBlockState;
-import net.minecraft.entity.player.EntityPlayer;
+import net.minecraft.block.BlockState;
+import net.minecraft.entity.player.PlayerEntity;
 import net.minecraft.item.ItemStack;
-import net.minecraft.util.EnumFacing;
-import net.minecraft.util.EnumHand;
+import net.minecraft.util.Direction;
+import net.minecraft.util.Hand;
 import net.minecraft.util.Mirror;
 import net.minecraft.util.Rotation;
 import net.minecraft.util.math.BlockPos;
@@ -44,7 +44,7 @@ public class RadialMirror {
         }
     }
 
-    public static List<BlockPos> findCoordinates(EntityPlayer player, BlockPos startPos) {
+    public static List<BlockPos> findCoordinates(PlayerEntity player, BlockPos startPos) {
         List<BlockPos> coordinates = new ArrayList<>();
 
         //find radial mirror settings for the player
@@ -77,8 +77,8 @@ public class RadialMirror {
         return coordinates;
     }
 
-    public static List<IBlockState> findBlockStates(EntityPlayer player, BlockPos startPos, IBlockState blockState, ItemStack itemStack, List<ItemStack> itemStacks) {
-        List<IBlockState> blockStates = new ArrayList<>();
+    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
@@ -105,7 +105,7 @@ public class RadialMirror {
             bagInventory = ItemRandomizerBag.getBagInventory(itemStack);
         }
 
-        IBlockState newBlockState;
+        BlockState newBlockState;
         for (int i = 1; i < r.slices; i++) {
             newBlockState = blockState;
             double curAngle = sliceAngle * i;
@@ -124,7 +124,7 @@ public class RadialMirror {
             if (bagInventory != null) {
                 itemStack = ItemRandomizerBag.pickRandomStack(bagInventory);
                 newBlockState = BuildModifiers
-                        .getBlockStateFromItem(itemStack, player, startPos, EnumFacing.UP, new Vec3d(0, 0, 0), EnumHand.MAIN_HAND);
+                        .getBlockStateFromItem(itemStack, player, startPos, Direction.UP, new Vec3d(0, 0, 0), Hand.MAIN_HAND);
 
                 newBlockState = rotateOriginalBlockState(startAngleToCenter, newBlockState);
             }
@@ -139,43 +139,43 @@ public class RadialMirror {
         return blockStates;
     }
 
-    private static IBlockState rotateOriginalBlockState(double startAngleToCenter, IBlockState blockState) {
-        IBlockState newBlockState = blockState;
+    private static BlockState rotateOriginalBlockState(double startAngleToCenter, BlockState blockState) {
+        BlockState newBlockState = blockState;
 
         if (startAngleToCenter < -0.751 * Math.PI || startAngleToCenter > 0.749 * Math.PI) {
-            newBlockState = blockState.withRotation(Rotation.CLOCKWISE_180);
+            newBlockState = blockState.rotate(Rotation.CLOCKWISE_180);
         } else if (startAngleToCenter < -0.251 * Math.PI) {
-            newBlockState = blockState.withRotation(Rotation.COUNTERCLOCKWISE_90);
+            newBlockState = blockState.rotate(Rotation.COUNTERCLOCKWISE_90);
         } else if (startAngleToCenter > 0.249 * Math.PI) {
-            newBlockState = blockState.withRotation(Rotation.CLOCKWISE_90);
+            newBlockState = blockState.rotate(Rotation.CLOCKWISE_90);
         }
 
         return newBlockState;
     }
 
-    private static IBlockState rotateBlockState(Vec3d relVec, IBlockState blockState, boolean alternate) {
-        IBlockState newBlockState;
+    private static BlockState rotateBlockState(Vec3d 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.withRotation(Rotation.CLOCKWISE_180);
+            newBlockState = blockState.rotate(Rotation.CLOCKWISE_180);
             if (alternate) {
-                newBlockState = newBlockState.withMirror(Mirror.FRONT_BACK);
+                newBlockState = newBlockState.mirror(Mirror.FRONT_BACK);
             }
         } else if (angleToCenter < -0.251 * Math.PI) {
-            newBlockState = blockState.withRotation(Rotation.CLOCKWISE_90);
+            newBlockState = blockState.rotate(Rotation.CLOCKWISE_90);
             if (alternate) {
-                newBlockState = newBlockState.withMirror(Mirror.LEFT_RIGHT);
+                newBlockState = newBlockState.mirror(Mirror.LEFT_RIGHT);
             }
         } else if (angleToCenter > 0.249 * Math.PI) {
-            newBlockState = blockState.withRotation(Rotation.COUNTERCLOCKWISE_90);
+            newBlockState = blockState.rotate(Rotation.COUNTERCLOCKWISE_90);
             if (alternate) {
-                newBlockState = newBlockState.withMirror(Mirror.LEFT_RIGHT);
+                newBlockState = newBlockState.mirror(Mirror.LEFT_RIGHT);
             }
         } else {
             newBlockState = blockState;
             if (alternate) {
-                newBlockState = newBlockState.withMirror(Mirror.FRONT_BACK);
+                newBlockState = newBlockState.mirror(Mirror.FRONT_BACK);
             }
         }
 

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

@@ -0,0 +1,243 @@
+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.Item;
+import net.minecraft.item.ItemStack;
+import net.minecraft.util.Direction;
+import net.minecraft.util.math.BlockPos;
+import net.minecraft.util.math.Vec3d;
+import net.minecraft.world.server.ServerWorld;
+import net.minecraft.world.storage.loot.LootContext;
+import net.minecraft.world.storage.loot.LootParameterSet;
+import nl.requios.effortlessbuilding.BuildConfig;
+import nl.requios.effortlessbuilding.EffortlessBuilding;
+import nl.requios.effortlessbuilding.helper.FixedStack;
+import nl.requios.effortlessbuilding.helper.InventoryHelper;
+import nl.requios.effortlessbuilding.helper.SurvivalHelper;
+import nl.requios.effortlessbuilding.render.BlockPreviewRenderer;
+
+import java.util.*;
+
+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 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.world.isRemote ? 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));
+//            }
+//        }
+
+        //If no stack exists, make one
+        if (!undoStacks.containsKey(player.getUniqueID())) {
+            undoStacks.put(player.getUniqueID(), new FixedStack<>(new BlockSet[BuildConfig.survivalBalancers.undoStackSize.get()]));
+        }
+
+        undoStacks.get(player.getUniqueID()).push(blockSet);
+    }
+
+    private static void addRedo(PlayerEntity player, BlockSet blockSet) {
+        Map<UUID, FixedStack<BlockSet>> redoStacks = player.world.isRemote ? redoStacksClient : redoStacksServer;
+
+        //(No asserts necessary, it's private)
+
+        //If no stack exists, make one
+        if (!redoStacks.containsKey(player.getUniqueID())) {
+            redoStacks.put(player.getUniqueID(), new FixedStack<>(new BlockSet[BuildConfig.survivalBalancers.undoStackSize.get()]));
+        }
+
+        redoStacks.get(player.getUniqueID()).push(blockSet);
+    }
+
+    public static boolean undo(PlayerEntity player) {
+        Map<UUID, FixedStack<BlockSet>> undoStacks = player.world.isRemote ? undoStacksClient : undoStacksServer;
+
+        if (!undoStacks.containsKey(player.getUniqueID())) return false;
+
+        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();
+        Vec3d hitVec = blockSet.getHitVec();
+
+        //Find up to date itemstacks in player inventory
+        List<ItemStack> itemStacks = findItemStacksInInventory(player, previousBlockStates);
+
+        if (player.world.isRemote) {
+            BlockPreviewRenderer.onBlocksBroken(coordinates, itemStacks, newBlockStates, blockSet.getSecondPos(), blockSet.getFirstPos());
+        } else {
+            //break all those blocks, reset to what they were
+            for (int i = 0; i < coordinates.size(); i++) {
+                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.getDefaultState();
+                if (itemStack.getItem() instanceof BlockItem) {
+                    previousBlockState = ((BlockItem) itemStack.getItem()).getBlock().getDefaultState();
+                }
+
+                if (player.world.isBlockPresent(coordinate)) {
+                    //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().getDefaultState();
+                        } else {
+                            if (previousBlockStates.get(i).getBlock() != Blocks.AIR)
+                                EffortlessBuilding.logTranslate(player, "", previousBlockStates.get(i).getBlock().getTranslationKey(), " not found in inventory", true);
+                            previousBlockState = Blocks.AIR.getDefaultState();
+                        }
+                    }
+                    if (itemStack.isEmpty()) SurvivalHelper.breakBlock(player.world, player, coordinate, true);
+                    //if previousBlockState is air, placeBlock will set it to air
+                    SurvivalHelper.placeBlock(player.world, player, coordinate, previousBlockState, itemStack, Direction.UP, hitVec, true, false, false);
+                }
+            }
+        }
+
+        //add to redo
+        addRedo(player, blockSet);
+
+        return true;
+    }
+
+    public static boolean redo(PlayerEntity player) {
+        Map<UUID, FixedStack<BlockSet>> redoStacks = player.world.isRemote ? redoStacksClient : redoStacksServer;
+
+        if (!redoStacks.containsKey(player.getUniqueID())) return false;
+
+        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();
+        Vec3d hitVec = blockSet.getHitVec();
+
+        //Find up to date itemstacks in player inventory
+        List<ItemStack> itemStacks = findItemStacksInInventory(player, newBlockStates);
+
+        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);
+                ItemStack itemStack = itemStacks.get(i);
+
+                if (previousBlockStates.get(i).equals(newBlockStates.get(i))) continue;
+
+                //get blockstate from itemstack
+                BlockState newBlockState = Blocks.AIR.getDefaultState();
+                if (itemStack.getItem() instanceof BlockItem) {
+                    newBlockState = ((BlockItem) itemStack.getItem()).getBlock().getDefaultState();
+                }
+
+                if (player.world.isBlockPresent(coordinate)) {
+                    //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().getDefaultState();
+                        } else {
+                            if (newBlockStates.get(i).getBlock() != Blocks.AIR)
+                                EffortlessBuilding.logTranslate(player, "", newBlockStates.get(i).getBlock().getTranslationKey(), " not found in inventory", true);
+                            newBlockState = Blocks.AIR.getDefaultState();
+                        }
+                    }
+                    if (itemStack.isEmpty()) SurvivalHelper.breakBlock(player.world, player, coordinate, true);
+                    SurvivalHelper.placeBlock(player.world, player, coordinate, newBlockState, itemStack, Direction.UP, hitVec, true, false, false);
+                }
+            }
+        }
+
+        //add to undo
+        addUndo(player, blockSet);
+
+        return true;
+    }
+
+    public static void clear(PlayerEntity 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.getUniqueID())) {
+            redoStacks.get(player.getUniqueID()).clear();
+        }
+    }
+
+    private static List<ItemStack> findItemStacksInInventory(PlayerEntity player, List<BlockState> blockStates) {
+        List<ItemStack> itemStacks = new ArrayList<>(blockStates.size());
+        for (BlockState blockState : blockStates) {
+            itemStacks.add(findItemStackInInventory(player, blockState));
+        }
+        return itemStacks;
+    }
+
+    private static ItemStack findItemStackInInventory(PlayerEntity player, BlockState 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.world.isRemote)
+            {
+                List<ItemStack> itemsDropped = Block.getDrops(blockState, (ServerWorld) player.world, BlockPos.ZERO, null);
+                for (ItemStack itemStackDropped : itemsDropped) {
+                    if (itemStackDropped.getItem() instanceof BlockItem) {
+                        Block block = ((BlockItem) itemStackDropped.getItem()).getBlock();
+                        itemStack = InventoryHelper.findItemStackInInventory(player, block);
+                    }
+                }
+            }
+        }
+
+        //then air
+        //(already empty)
+
+        return itemStack;
+    }
+}

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

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

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

@@ -1,22 +1,21 @@
 package nl.requios.effortlessbuilding.capability;
 
-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.Vec3d;
+import net.minecraft.nbt.CompoundNBT;
+import net.minecraft.nbt.INBT;
+import net.minecraft.util.Direction;
 import net.minecraftforge.common.capabilities.Capability;
 import net.minecraftforge.common.capabilities.CapabilityInject;
 import net.minecraftforge.common.capabilities.ICapabilitySerializable;
+import net.minecraftforge.common.util.LazyOptional;
 import net.minecraftforge.event.entity.player.PlayerEvent;
+import net.minecraftforge.eventbus.api.SubscribeEvent;
 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.*;
+import static nl.requios.effortlessbuilding.buildmode.ModeSettingsManager.ModeSettings;
 
 @Mod.EventBusSubscriber
 public class ModeCapabilityManager {
@@ -46,12 +45,12 @@ public class ModeCapabilityManager {
 
     public static class Storage implements Capability.IStorage<IModeCapability> {
         @Override
-        public NBTBase writeNBT(Capability<IModeCapability> capability, IModeCapability instance, EnumFacing side) {
-            NBTTagCompound compound = new NBTTagCompound();
+        public INBT writeNBT(Capability<IModeCapability> capability, IModeCapability instance, Direction side) {
+            CompoundNBT compound = new CompoundNBT();
             ModeSettings modeSettings = instance.getModeData();
             if (modeSettings == null) modeSettings = new ModeSettings();
 
-            //compound.setInteger("buildMode", modeSettings.getBuildMode().ordinal());
+            //compound.putInteger("buildMode", modeSettings.getBuildMode().ordinal());
 
             //TODO add mode settings
 
@@ -59,48 +58,46 @@ public class ModeCapabilityManager {
         }
 
         @Override
-        public void readNBT(Capability<IModeCapability> capability, IModeCapability instance, EnumFacing side, NBTBase nbt) {
-            NBTTagCompound compound = (NBTTagCompound) nbt;
+        public void readNBT(Capability<IModeCapability> capability, IModeCapability instance, Direction side, INBT nbt) {
+            CompoundNBT compound = (CompoundNBT) nbt;
 
             //BuildModes.BuildModeEnum buildMode = BuildModes.BuildModeEnum.values()[compound.getInteger("buildMode")];
 
             //TODO add mode settings
 
-            ModeSettings modeSettings = new ModeSettings(BuildModes.BuildModeEnum.Normal);
+            ModeSettings modeSettings = new ModeSettings(BuildModes.BuildModeEnum.NORMAL);
             instance.setModeData(modeSettings);
         }
     }
 
-    public static class Provider implements ICapabilitySerializable<NBTBase> {
+    public static class Provider implements ICapabilitySerializable<INBT> {
         IModeCapability inst = modeCapability.getDefaultInstance();
 
+        @Nonnull
         @Override
-        public boolean hasCapability(@Nonnull Capability<?> capability, @Nullable EnumFacing facing) {
-            return capability == modeCapability;
+        public <T> LazyOptional<T> getCapability(@Nonnull Capability<T> cap, @Nullable Direction side) {
+            return modeCapability.orEmpty(cap, LazyOptional.of(() -> inst));
         }
 
         @Override
-        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() {
+        public INBT serializeNBT() {
             return modeCapability.getStorage().writeNBT(modeCapability, inst, null);
         }
 
         @Override
-        public void deserializeNBT(NBTBase nbt) {
+        public void deserializeNBT(INBT 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());
+        LazyOptional<IModeCapability> original = event.getOriginal().getCapability(modeCapability, null);
+        LazyOptional<IModeCapability> clone = event.getEntity().getCapability(modeCapability, null);
+        clone.ifPresent(cloneModeCapability ->
+                original.ifPresent(originalModeCapability ->
+                        cloneModeCapability.setModeData(originalModeCapability.getModeData())));
     }
 }

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

@@ -1,16 +1,17 @@
 package nl.requios.effortlessbuilding.capability;
 
-import net.minecraft.nbt.NBTBase;
-import net.minecraft.nbt.NBTTagCompound;
-import net.minecraft.util.EnumFacing;
+import net.minecraft.nbt.CompoundNBT;
+import net.minecraft.nbt.INBT;
+import net.minecraft.util.Direction;
 import net.minecraft.util.math.BlockPos;
 import net.minecraft.util.math.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;
@@ -48,126 +49,134 @@ public class ModifierCapabilityManager {
 
     public static class Storage implements Capability.IStorage<IModifierCapability> {
         @Override
-        public NBTBase writeNBT(Capability<IModifierCapability> capability, IModifierCapability instance, EnumFacing side) {
-            NBTTagCompound compound = new NBTTagCompound();
+        public INBT writeNBT(Capability<IModifierCapability> capability, IModifierCapability instance, Direction side) {
+            CompoundNBT compound = new CompoundNBT();
             ModifierSettings modifierSettings = instance.getModifierData();
             if (modifierSettings == null) modifierSettings = new ModifierSettings();
 
             //MIRROR
             Mirror.MirrorSettings m = modifierSettings.getMirrorSettings();
             if (m == null) m = new Mirror.MirrorSettings();
-            compound.setBoolean("mirrorEnabled", m.enabled);
-            compound.setDouble("mirrorPosX", m.position.x);
-            compound.setDouble("mirrorPosY", m.position.y);
-            compound.setDouble("mirrorPosZ", m.position.z);
-            compound.setBoolean("mirrorX", m.mirrorX);
-            compound.setBoolean("mirrorY", m.mirrorY);
-            compound.setBoolean("mirrorZ", m.mirrorZ);
-            compound.setInteger("mirrorRadius", m.radius);
-            compound.setBoolean("mirrorDrawLines", m.drawLines);
-            compound.setBoolean("mirrorDrawPlanes", m.drawPlanes);
+            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);
 
             //ARRAY
             Array.ArraySettings a = modifierSettings.getArraySettings();
             if (a == null) a = new Array.ArraySettings();
-            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.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.setInteger("reachUpgrade", modifierSettings.getReachUpgrade());
+            compound.putInt("reachUpgrade", modifierSettings.getReachUpgrade());
 
-            //compound.setBoolean("quickReplace", buildSettings.doQuickReplace()); dont save quickreplace
+            //compound.putBoolean("quickReplace", buildSettings.doQuickReplace()); dont save quickreplace
 
             //RADIAL MIRROR
             RadialMirror.RadialMirrorSettings r = modifierSettings.getRadialMirrorSettings();
             if (r == null) r = new RadialMirror.RadialMirrorSettings();
-            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);
+            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);
 
             return compound;
         }
 
         @Override
-        public void readNBT(Capability<IModifierCapability> capability, IModifierCapability instance, EnumFacing side, NBTBase nbt) {
-            NBTTagCompound compound = (NBTTagCompound) nbt;
+        public void readNBT(Capability<IModifierCapability> capability, IModifierCapability instance, Direction side, INBT nbt) {
+            CompoundNBT compound = (CompoundNBT) nbt;
 
             //MIRROR
             boolean mirrorEnabled = compound.getBoolean("mirrorEnabled");
-            Vec3d mirrorPosition = new Vec3d(compound.getDouble("mirrorPosX"), compound.getDouble("mirrorPosY"), compound.getDouble("mirrorPosZ"));
+            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.getInteger("mirrorRadius");
+            int mirrorRadius = compound.getInt("mirrorRadius");
             boolean mirrorDrawLines = compound.getBoolean("mirrorDrawLines");
             boolean mirrorDrawPlanes = compound.getBoolean("mirrorDrawPlanes");
             Mirror.MirrorSettings mirrorSettings = new Mirror.MirrorSettings(mirrorEnabled, mirrorPosition, mirrorX, mirrorY, mirrorZ, mirrorRadius, mirrorDrawLines, mirrorDrawPlanes);
 
             //ARRAY
             boolean arrayEnabled = compound.getBoolean("arrayEnabled");
-            BlockPos arrayOffset = new BlockPos(compound.getInteger("arrayOffsetX"), compound.getInteger("arrayOffsetY"), compound.getInteger("arrayOffsetZ"));
-            int arrayCount = compound.getInteger("arrayCount");
+            BlockPos arrayOffset = new BlockPos(
+                    compound.getInt("arrayOffsetX"),
+                    compound.getInt("arrayOffsetY"),
+                    compound.getInt("arrayOffsetZ"));
+            int arrayCount = compound.getInt("arrayCount");
             Array.ArraySettings arraySettings = new Array.ArraySettings(arrayEnabled, arrayOffset, arrayCount);
 
-            int reachUpgrade = compound.getInteger("reachUpgrade");
+            int reachUpgrade = compound.getInt("reachUpgrade");
 
             //boolean quickReplace = compound.getBoolean("quickReplace"); //dont load quickreplace
 
             //RADIAL MIRROR
             boolean radialMirrorEnabled = compound.getBoolean("radialMirrorEnabled");
-            Vec3d radialMirrorPosition = new Vec3d(compound.getDouble("radialMirrorPosX"), compound.getDouble("radialMirrorPosY"), compound.getDouble("radialMirrorPosZ"));
-            int radialMirrorSlices = compound.getInteger("radialMirrorSlices");
+            Vec3d radialMirrorPosition = new Vec3d(
+                    compound.getDouble("radialMirrorPosX"),
+                    compound.getDouble("radialMirrorPosY"),
+                    compound.getDouble("radialMirrorPosZ"));
+            int radialMirrorSlices = compound.getInt("radialMirrorSlices");
             boolean radialMirrorAlternate = compound.getBoolean("radialMirrorAlternate");
-            int radialMirrorRadius = compound.getInteger("radialMirrorRadius");
+            int radialMirrorRadius = compound.getInt("radialMirrorRadius");
             boolean radialMirrorDrawLines = compound.getBoolean("radialMirrorDrawLines");
             boolean radialMirrorDrawPlanes = compound.getBoolean("radialMirrorDrawPlanes");
             RadialMirror.RadialMirrorSettings radialMirrorSettings = new RadialMirror.RadialMirrorSettings(radialMirrorEnabled, radialMirrorPosition,
                     radialMirrorSlices, radialMirrorAlternate, radialMirrorRadius, radialMirrorDrawLines, radialMirrorDrawPlanes);
 
-            ModifierSettings
-                    modifierSettings = new ModifierSettings(mirrorSettings, arraySettings, radialMirrorSettings, false, reachUpgrade);
+            ModifierSettings modifierSettings = new ModifierSettings(mirrorSettings, arraySettings, radialMirrorSettings, false, reachUpgrade);
             instance.setModifierData(modifierSettings);
         }
     }
 
-    public static class Provider implements ICapabilitySerializable<NBTBase> {
+    public static class Provider implements ICapabilitySerializable<INBT> {
+
         IModifierCapability inst = modifierCapability.getDefaultInstance();
 
+        @Nonnull
         @Override
-        public boolean hasCapability(@Nonnull Capability<?> capability, @Nullable EnumFacing facing) {
-            return capability == modifierCapability;
+        public <T> LazyOptional<T> getCapability(@Nonnull Capability<T> cap, @Nullable Direction side) {
+            return modifierCapability.orEmpty(cap, LazyOptional.of(() -> inst));
         }
 
         @Override
-        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() {
+        public INBT serializeNBT() {
             return modifierCapability.getStorage().writeNBT(modifierCapability, inst, null);
         }
 
         @Override
-        public void deserializeNBT(NBTBase nbt) {
+        public void deserializeNBT(INBT 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());
+        LazyOptional<IModifierCapability> original = event.getOriginal().getCapability(modifierCapability, null);
+        LazyOptional<IModifierCapability> clone = event.getEntity().getCapability(modifierCapability, null);
+        clone.ifPresent(cloneModifierCapability ->
+                original.ifPresent(originalModifierCapability ->
+                        cloneModifierCapability.setModifierData(originalModifierCapability.getModifierData())));
     }
 }

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

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

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

@@ -1,13 +0,0 @@
-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,94 +1,128 @@
 package nl.requios.effortlessbuilding.compatibility;
 
-import net.minecraft.block.state.IBlockState;
+import net.minecraft.block.BlockState;
+import net.minecraft.entity.player.PlayerEntity;
+import net.minecraft.item.BlockItem;
 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.common.util.LazyOptional;
 import net.minecraftforge.items.CapabilityItemHandler;
 import net.minecraftforge.items.IItemHandler;
+import nl.requios.effortlessbuilding.EffortlessBuilding;
 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 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();
-        }
+    //TODO 1.13 compatibility
+//    // Get a handle to the dank null item instance. This will remain null if the mod doesn't load
+//    // and all checks will fail, so it works.
+//    @GameRegistry.ObjectHolder("danknull:dank_null")
+//    public static final Item dankNullItem = null;
+//
+//    public static IChiselsAndBitsProxy chiselsAndBitsProxy;
+//
+    public static void setup() {
+        //TODO 1.13 compatibility
+//        if (Loader.isModLoaded("chiselsandbits")) {
+//            // reflection to avoid hard dependency
+//            try {
+//                chiselsAndBitsProxy = Class.forName("nl.requios.effortlessbuilding.compatibility.ActiveChiselsAndBitsProxy").asSubclass(ActiveChiselsAndBitsProxy.class).newInstance();
+//            } catch (InstantiationException | IllegalAccessException | ClassNotFoundException e) {
+//                e.printStackTrace();
+//            }
+//        } else {
+//            chiselsAndBitsProxy = new DummyChiselsAndBitsProxy();
+//        }
     }
 
     // Check if the item given is a proxy for blocks. For now, we check for the randomizer bag,
     // /dank/null, or plain old blocks.
     public static boolean isItemBlockProxy(ItemStack stack) {
         Item item = stack.getItem();
-        if(item instanceof ItemBlock)
+        if (item instanceof BlockItem)
             return true;
         if ((item instanceof ItemRandomizerBag))
             return true;
-        if(item == dankNullItem)
-            return true;
+        //TODO 1.13 compatibility
+//        if (item == dankNullItem)
+//            return true;
         return false;
     }
 
     // Get the block to be placed by this proxy. For the /dank/null, it's the slot stack
     // pointed to by nbt integer selectedIndex.
-    public static ItemStack getItemBlockFromStack(ItemStack stack) {
-        Item item = stack.getItem();
-        if(item instanceof ItemRandomizerBag) {
-            return ItemRandomizerBag.pickRandomStack(ItemRandomizerBag.getBagInventory(stack));
-        } else if(item == dankNullItem) {
-            int index = 0;
-            if(stack.hasTagCompound() && stack.getTagCompound().hasKey("selectedIndex"))
-                index = stack.getTagCompound().getInteger("selectedIndex");
-            return stack.getCapability(CapabilityItemHandler.ITEM_HANDLER_CAPABILITY, null).getStackInSlot(index);
+    public static ItemStack getItemBlockFromStack(ItemStack proxy) {
+        Item proxyItem = proxy.getItem();
+
+        if (proxyItem instanceof BlockItem)
+            return proxy;
+
+        //Randomizer Bag
+        if (proxyItem instanceof ItemRandomizerBag) {
+            ItemStack itemStack = proxy;
+            while (!(itemStack.getItem() instanceof BlockItem || itemStack.isEmpty())) {
+                if (itemStack.getItem() instanceof ItemRandomizerBag)
+                    itemStack = ItemRandomizerBag.pickRandomStack(ItemRandomizerBag.getBagInventory(itemStack));
             }
+            return itemStack;
+        }
+
+        //TODO 1.13 compatibility
+        //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, IBlockState state) {
+    public static ItemStack getItemBlockByState(ItemStack stack, BlockState state) {
+        if (state == null) return ItemStack.EMPTY;
+
         Item blockItem = Item.getItemFromBlock(state.getBlock());
-        if(stack.getItem() instanceof ItemBlock)
+        if (stack.getItem() instanceof BlockItem)
             return stack;
         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);
         }
+        //TODO 1.13 compatibility
+//        else if (stack.getItem() == dankNullItem) {
+//            int index = itemHandlerSlotForItem(stack, blockItem);
+//            if (index >= 0)
+//                return stack.getCapability(CapabilityItemHandler.ITEM_HANDLER_CAPABILITY, null).getStackInSlot(index);
+//        }
         return ItemStack.EMPTY;
     }
 
     // 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
+    public static void shrinkStack(ItemStack origStack, ItemStack curStack, PlayerEntity player) {
+        //TODO 1.13 compatibility, offhand support
+        //Hacky way to get the origstack, because given origStack is itemblock stack and never proxy
+//        origStack = player.getHeldItem(EnumHand.MAIN_HAND);
+
+//        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);
+        LazyOptional<IItemHandler> itemHandlerLazyOptional = stack.getCapability(CapabilityItemHandler.ITEM_HANDLER_CAPABILITY, null);
+        IItemHandler handler = itemHandlerLazyOptional.orElse(null);
+
+        if (handler == null) {
+            EffortlessBuilding.logger.warn("Itemblock proxy has no item handler capability!");
+            return -1;
+        }
+
         for (int i = 0; i < handler.getSlots(); i++) {
             ItemStack ref = handler.getStackInSlot(i);
-            if(ref.getItem() instanceof ItemBlock)
+            if (ref.getItem() instanceof BlockItem)
                 if (ref.getItem() == blockItem)
                     return i;
         }

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

@@ -1,10 +0,0 @@
-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

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

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

@@ -1,47 +1,55 @@
 package nl.requios.effortlessbuilding.gui;
 
-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.entity.player.PlayerEntity;
+import net.minecraft.entity.player.PlayerInventory;
+import net.minecraft.inventory.IInventory;
+import net.minecraft.inventory.Inventory;
+import net.minecraft.inventory.container.ClickType;
+import net.minecraft.inventory.container.Container;
+import net.minecraft.inventory.container.Slot;
 import net.minecraft.item.ItemStack;
-import net.minecraft.util.EnumHand;
+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.ItemRandomizerBag;
 
 public class RandomizerBagContainer extends Container {
 
     private final IItemHandler bagInventory;
-    private final int sizeInventory;
 
     private static final int INV_START = ItemRandomizerBag.INV_SIZE, INV_END = INV_START + 26,
             HOTBAR_START = INV_END + 1, HOTBAR_END = HOTBAR_START + 8;
 
-    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));
+    public RandomizerBagContainer(int containerId, PlayerInventory playerInventory) {
+        this(containerId, playerInventory, new ItemStackHandler(ItemRandomizerBag.INV_SIZE));
+    }
+
+    public RandomizerBagContainer(int containerId, PlayerInventory playerInventory, IItemHandler inventory) {
+        super(EffortlessBuilding.RANDOMIZER_BAG_CONTAINER, containerId);
+        bagInventory = inventory;
+
+        for (int i = 0; i < ItemRandomizerBag.INV_SIZE; ++i) {
+            this.addSlot(new SlotItemHandler(bagInventory, i, 44 + (18 * i), 20));
         }
 
         // add player inventory slots
         int i;
         for (i = 0; i < 3; ++i) {
             for (int j = 0; j < 9; ++j) {
-                addSlotToContainer(new Slot(parInventoryPlayer, j + i * 9 + 9, 8 + j * 18, 51 + i * 18));
+                addSlot(new Slot(playerInventory, j + i * 9 + 9, 8 + j * 18, 51 + i * 18));
             }
         }
 
         // add hotbar slots
         for (i = 0; i < 9; ++i) {
-            addSlotToContainer(new Slot(parInventoryPlayer, i, 8 + i * 18, 109));
+            addSlot(new Slot(playerInventory, i, 8 + i * 18, 109));
         }
     }
 
     @Override
-    public boolean canInteractWith(EntityPlayer playerIn) {
+    public boolean canInteractWith(PlayerEntity playerIn) {
         return true;
     }
 
@@ -54,7 +62,7 @@ public class RandomizerBagContainer extends Container {
     }
 
     @Override
-    public ItemStack transferStackInSlot(EntityPlayer playerIn, int slotIndex) {
+    public ItemStack transferStackInSlot(PlayerEntity playerIn, int slotIndex) {
         ItemStack itemstack = ItemStack.EMPTY;
         Slot slot = this.inventorySlots.get(slotIndex);
 
@@ -107,28 +115,24 @@ public class RandomizerBagContainer extends Container {
      * be able to save properly
      */
     @Override
-    public ItemStack slotClick(int slot, int dragType, ClickType clickTypeIn, EntityPlayer player) {
+    public ItemStack slotClick(int slot, int dragType, ClickType clickTypeIn, PlayerEntity player) {
         // this will prevent the player from interacting with the item that opened the inventory:
-        ItemStack clickItemStack = super.slotClick(slot, dragType, clickTypeIn, player);
-        if (slot >= 0 && getSlot(slot) != null && getSlot(slot).getStack() == player.getHeldItem(EnumHand.MAIN_HAND)) {
+        if (slot >= 0 && getSlot(slot) != null && getSlot(slot).getStack().equals(player.getHeldItem(Hand.MAIN_HAND))) {
             return ItemStack.EMPTY;
         }
-        return clickItemStack;
+        return super.slotClick(slot, dragType, clickTypeIn, player);
     }
 
     /**
      * Callback for when the crafting gui is closed.
      */
-//    @Override
-//    public void onContainerClosed(EntityPlayer player)
-//    {
-//        if(player.inventory.getItemStack() != null)
-//        {
-//            player.entityDropItem(player.inventory.getItemStack(), 0.5f);
-//        }
-//        if(!player.world.isRemote)
-//        {
-//            detectAndSendChanges();
-//        }
-//    }
+    @Override
+    public void onContainerClosed(PlayerEntity player)
+    {
+        super.onContainerClosed(player);
+        if(!player.world.isRemote)
+        {
+            detectAndSendChanges();
+        }
+    }
 }

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

@@ -1,49 +0,0 @@
-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

@@ -1,41 +0,0 @@
-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

@@ -0,0 +1,46 @@
+package nl.requios.effortlessbuilding.gui;
+
+import com.mojang.blaze3d.platform.GlStateManager;
+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.minecraft.util.text.TranslationTextComponent;
+import net.minecraftforge.api.distmarker.Dist;
+import net.minecraftforge.api.distmarker.OnlyIn;
+import net.minecraftforge.items.IItemHandler;
+import nl.requios.effortlessbuilding.EffortlessBuilding;
+
+@OnlyIn(Dist.CLIENT)
+public class 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"));
+        ySize = 134;
+    }
+
+    @Override
+    public void render(int mouseX, int mouseY, float partialTicks) {
+        renderBackground();
+        super.render(mouseX, mouseY, partialTicks);
+        this.renderHoveredToolTip(mouseX, mouseY);
+    }
+
+    @Override
+    protected void drawGuiContainerForegroundLayer(int mouseX, int mouseY) {
+        font.drawString(this.title.getFormattedText(), 8, 6, 0x404040);
+        font.drawString(playerInventory.getDisplayName().getFormattedText(), 8, ySize - 96 + 2, 0x404040);
+    }
+
+    @Override
+    protected void drawGuiContainerBackgroundLayer(float partialTicks, int mouseX, int mouseY) {
+        RenderSystem.color3f(1.0F, 1.0F, 1.0F);
+        minecraft.getTextureManager().bindTexture(guiTextures);
+        int marginHorizontal = (width - xSize) / 2;
+        int marginVertical = (height - ySize) / 2;
+        blit(marginHorizontal, marginVertical, 0, 0, xSize, ySize);
+    }
+}

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

@@ -0,0 +1,304 @@
+package nl.requios.effortlessbuilding.gui.buildmode;
+
+import com.mojang.blaze3d.platform.GlStateManager;
+import com.mojang.blaze3d.systems.RenderSystem;
+import net.minecraft.client.Minecraft;
+import net.minecraft.client.audio.SimpleSound;
+import net.minecraft.client.gui.AbstractGui;
+import net.minecraft.client.gui.IGuiEventListener;
+import net.minecraft.client.gui.screen.LanguageScreen;
+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.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;
+
+public class PlayerSettingsGui extends Screen {
+
+    protected int left, right, top, bottom;
+
+    private Button shaderTypeButton;
+    private ShaderTypeList shaderTypeList;
+    private Button closeButton;
+
+    protected boolean showShaderList = false;
+
+    public enum ShaderType {
+        DISSOLVE_BLUE("Dissolve Blue"),
+        DISSOLVE_ORANGE("Dissolve Orange");
+
+        public String name;
+        ShaderType(String name) {
+            this.name = name;
+        }
+    }
+
+    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
+        String 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, "", "", 0.5, 2.0, 1.0, true, true, (button) -> {
+
+        });
+        addButton(slider);
+
+        closeButton = new ExtendedButton(left + 50, bottom - 20, 180, 20, "Done", (button) -> {
+            this.minecraft.player.closeScreen();
+        });
+        addButton(closeButton);
+    }
+
+    @Override
+    public void tick() {
+        super.tick();
+    }
+
+    @Override
+    public void render(int mouseX, int mouseY, float partialTicks) {
+        this.renderBackground();
+
+        int yy = top;
+        font.drawString("Shader type", left, yy + 5, 0xFFFFFF);
+
+        yy += 50;
+        font.drawString("Shader speed", left, yy + 5, 0xFFFFFF);
+
+        super.render(mouseX, mouseY, partialTicks);
+
+        if (showShaderList)
+            this.shaderTypeList.render(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
+    }
+
+    //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().getSoundHandler().play(SimpleSound.master(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;
+        }
+
+        @OnlyIn(Dist.CLIENT)
+        public class ShaderTypeEntry extends ExtendedList.AbstractListEntry<ShaderTypeEntry> {
+            private final ShaderType shaderType;
+
+            public ShaderTypeEntry(ShaderType shaderType) {
+                this.shaderType = shaderType;
+            }
+
+            public void render(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(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;
+                }
+            }
+        }
+
+        //From AbstractList, disabled parts
+        public void render(int p_render_1_, int p_render_2_, float p_render_3_) {
+            this.renderBackground();
+            int i = this.getScrollbarPosition();
+            int j = i + 6;
+            Tessellator tessellator = Tessellator.getInstance();
+            BufferBuilder bufferbuilder = tessellator.getBuffer();
+//            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.pos((double)this.x0, (double)this.y1, 0.0D).color(20, 20, 20, 180).endVertex();
+            bufferbuilder.pos((double)this.x1, (double)this.y1, 0.0D).color(20, 20, 20, 180).endVertex();
+            bufferbuilder.pos((double)this.x1, (double)this.y0, 0.0D).color(20, 20, 20, 180).endVertex();
+            bufferbuilder.pos((double)this.x0, (double)this.y0, 0.0D).color(20, 20, 20, 180).endVertex();
+            tessellator.draw();
+            int k = this.getRowLeft();
+            int l = this.y0 + 4 - (int)this.getScrollAmount();
+            if (this.renderHeader) {
+                this.renderHeader(k, l, tessellator);
+            }
+
+            this.renderList(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.pos((double)i, (double)this.y1, 0.0D).tex(0.0F, 1.0F).color(0, 0, 0, 255).endVertex();
+                bufferbuilder.pos((double)j, (double)this.y1, 0.0D).tex(1.0F, 1.0F).color(0, 0, 0, 255).endVertex();
+                bufferbuilder.pos((double)j, (double)this.y0, 0.0D).tex(1.0F, 0.0F).color(0, 0, 0, 255).endVertex();
+                bufferbuilder.pos((double)i, (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)i, (double)(l1 + k1), 0.0D).tex(0.0F, 1.0F).color(128, 128, 128, 255).endVertex();
+                bufferbuilder.pos((double)j, (double)(l1 + k1), 0.0D).tex(1.0F, 1.0F).color(128, 128, 128, 255).endVertex();
+                bufferbuilder.pos((double)j, (double)l1, 0.0D).tex(1.0F, 0.0F).color(128, 128, 128, 255).endVertex();
+                bufferbuilder.pos((double)i, (double)l1, 0.0D).tex(0.0F, 0.0F).color(128, 128, 128, 255).endVertex();
+                tessellator.draw();
+                bufferbuilder.begin(7, DefaultVertexFormats.POSITION_TEX_COLOR);
+                bufferbuilder.pos((double)i, (double)(l1 + k1 - 1), 0.0D).tex(0.0F, 1.0F).color(192, 192, 192, 255).endVertex();
+                bufferbuilder.pos((double)(j - 1), (double)(l1 + k1 - 1), 0.0D).tex(1.0F, 1.0F).color(192, 192, 192, 255).endVertex();
+                bufferbuilder.pos((double)(j - 1), (double)l1, 0.0D).tex(1.0F, 0.0F).color(192, 192, 192, 255).endVertex();
+                bufferbuilder.pos((double)i, (double)l1, 0.0D).tex(0.0F, 0.0F).color(192, 192, 192, 255).endVertex();
+                tessellator.draw();
+            }
+
+//            this.renderDecorations(p_render_1_, p_render_2_);
+            RenderSystem.enableTexture();
+            RenderSystem.shadeModel(7424);
+            RenderSystem.enableAlphaTest();
+            RenderSystem.disableBlend();
+        }
+
+        private int getMaxScroll() {
+            return Math.max(0, this.getMaxPosition() - (this.y1 - this.y0 - 4));
+        }
+    }
+}

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

@@ -3,29 +3,39 @@ package nl.requios.effortlessbuilding.gui.buildmode;
 import java.util.ArrayList;
 import java.util.concurrent.TimeUnit;
 
+import com.mojang.blaze3d.systems.RenderSystem;
+import net.minecraft.client.gui.screen.Screen;
+import net.minecraft.client.renderer.texture.AtlasTexture;
+import net.minecraft.client.resources.I18n;
+import net.minecraft.client.settings.KeyBinding;
+import net.minecraft.util.Direction;
+import net.minecraft.util.text.ITextComponent;
+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.ModEventHandler;
 import nl.requios.effortlessbuilding.buildmode.ModeSettingsManager;
 import nl.requios.effortlessbuilding.proxy.ClientProxy;
+import org.apache.commons.lang3.text.WordUtils;
 import org.lwjgl.opengl.GL11;
 
 import com.google.common.base.Stopwatch;
 
 import net.minecraft.client.Minecraft;
-import net.minecraft.client.gui.GuiScreen;
 import net.minecraft.client.renderer.BufferBuilder;
-import net.minecraft.client.renderer.GlStateManager;
 import net.minecraft.client.renderer.Tessellator;
 import net.minecraft.client.renderer.texture.TextureAtlasSprite;
 import net.minecraft.client.renderer.vertex.DefaultVertexFormats;
-import net.minecraft.util.EnumFacing;
-import net.minecraftforge.client.model.ModelLoader;
 
 import static nl.requios.effortlessbuilding.buildmode.BuildModes.*;
+import static nl.requios.effortlessbuilding.buildmode.ModeOptions.*;
 
 /**
  * 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 {
+public class RadialMenu extends Screen {
 
     private final float TIME_SCALE = 0.01f;
     public static final RadialMenu instance = new RadialMenu();
@@ -33,9 +43,13 @@ public class RadialMenu extends GuiScreen {
     private float visibility = 0.0f;
     private Stopwatch lastChange = Stopwatch.createStarted();
     public BuildModeEnum switchTo = null;
-    //public ButtonAction doAction = null;
+    public ActionEnum doAction = null;
     public boolean actionUsed = false;
 
+    public RadialMenu() {
+        super(new TranslationTextComponent("effortlessbuilding.screen.radial_menu"));
+    }
+
     private float clampVis(final float f) {
         return Math.max( 0.0f, Math.min( 1.0f, f ) );
     }
@@ -50,13 +64,17 @@ public class RadialMenu extends GuiScreen {
         lastChange = Stopwatch.createStarted();
     }
 
+    public void setVisibility(float visibility) {
+        this.visibility = visibility;
+    }
+
     public boolean isVisible() {
         return visibility > 0.001;
     }
 
     public void configure(final int scaledWidth, final int scaledHeight ) {
-        mc = Minecraft.getMinecraft();
-        fontRenderer = mc.fontRenderer;
+        Minecraft mc = Minecraft.getInstance();
+        font = mc.fontRenderer;
         width = scaledWidth;
         height = scaledHeight;
     }
@@ -67,34 +85,18 @@ public class RadialMenu extends GuiScreen {
         public double y1, y2;
         public boolean highlighted;
 
-        //public final ButtonAction action;
-        public TextureAtlasSprite icon;
-        public int color;
+        public final ActionEnum action;
         public String name;
-        public EnumFacing textSide;
+        public Direction textSide;
 
-        public MenuButton(final String name, /*final ButtonAction action,*/ final double x, final double y,
-                final TextureAtlasSprite ico, final EnumFacing textSide) {
-            this.name = name;
-            //this.action = action;
-            x1 = x;
-            x2 = x + 18;
-            y1 = y;
-            y2 = y + 18;
-            icon = ico;
-            color = 0xffffff;
-            this.textSide = textSide;
-        }
-
-        public MenuButton(final String name, /*final ButtonAction action,*/ final double x, final double y,
-                final int col, final EnumFacing textSide) {
-            this.name = name;
-            //this.action = action;
-            x1 = x;
-            x2 = x + 18;
-            y1 = y;
-            y2 = y + 18;
-            color = col;
+        public MenuButton(final String name, final ActionEnum action, final double x, final double y,
+                final Direction textSide) {
+            this.name = I18n.format(name);
+            this.action = action;
+            x1 = x - 10;
+            x2 = x + 10;
+            y1 = y - 10;
+            y2 = y + 10;
             this.textSide = textSide;
         }
 
@@ -114,28 +116,24 @@ public class RadialMenu extends GuiScreen {
     }
 
     @Override
-    public void drawScreen(final int mouseX, final int mouseY, final float partialTicks) {
-        //TODO chisels compat
-//        final ChiselToolType tool = ClientSide.instance.getHeldToolType( EnumHand.MAIN_HAND );
-//
-//        if ( tool != null )
-//        {
-//            return;
-//        }
+    public void render(final int mouseX, final int mouseY, final float partialTicks) {
+        if (!isVisible()) return;
 
-        GlStateManager.pushMatrix();
-        GlStateManager.translate( 0.0F, 0.0F, 200.0F );
+        BuildModeEnum currentBuildMode = ModeSettingsManager.getModeSettings(Minecraft.getInstance().player).getBuildMode();
+
+        RenderSystem.pushMatrix();
+        RenderSystem.translatef( 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);
+        fillGradient(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);
+        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.getBuffer();
 
@@ -144,13 +142,20 @@ public class RadialMenu extends GuiScreen {
         final double middleX = width / 2.0;
         final double middleY = height / 2.0;
 
-        final double mouseXCenter = mouseX - middleX;
-        final double mouseYCenter = mouseY - middleY;
+        //Fix for high def (retina) displays: use custom mouse coordinates
+        //Borrowed from GameRenderer::updateCameraAndRender
+        Minecraft mc = Minecraft.getInstance();
+        int mouseXX = (int)(mc.mouseHelper.getMouseX() * (double)mc.getMainWindow().getScaledWidth() / (double)mc.getMainWindow().getWidth());
+        int mouseYY = (int)(mc.mouseHelper.getMouseY() * (double)mc.getMainWindow().getScaledHeight() / (double)mc.getMainWindow().getHeight());
+
+        final double mouseXCenter = mouseXX - middleX;
+        final double mouseYCenter = mouseYY - middleY;
         double mouseRadians = Math.atan2(mouseYCenter, mouseXCenter);
 
-        final double ringInnerEdge = 20;
-        final double ringOuterEdge = 50;
-        final double textDistance = 65;
+        final double ringInnerEdge = 30;
+        final double ringOuterEdge = 65;
+        final double textDistance = 75;
+        final double buttonDistance = 105;
         final double quarterCircle = Math.PI / 2.0;
 
         if ( mouseRadians < -quarterCircle ) {
@@ -160,16 +165,31 @@ public class RadialMenu extends GuiScreen {
         final ArrayList<MenuRegion> modes = new ArrayList<MenuRegion>();
         final ArrayList<MenuButton> buttons = new ArrayList<MenuButton>();
 
-//        buttons.add( new MenuButton( "mod.chiselsandbits.other.undo", ButtonAction.UNDO, textDistance, -20, ClientSide.undoIcon, EnumFacing.EAST ) );
-//        buttons.add( new MenuButton( "mod.chiselsandbits.other.redo", ButtonAction.REDO, textDistance, 4, ClientSide.redoIcon, EnumFacing.EAST ) );
-
+        //Add build modes
         for (final BuildModeEnum mode : BuildModeEnum.values()) {
             modes.add(new MenuRegion(mode));
         }
 
-        switchTo = null;
-        //doAction = null;
+        //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 - 13, 13, Direction.DOWN));
+        buttons.add(new MenuButton(ActionEnum.REPLACE.name, ActionEnum.REPLACE, -buttonDistance + 13, 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
         if (!modes.isEmpty()) {
             final int totalModes = Math.max( 3, modes.size() );
             int currentMode = 0;
@@ -203,7 +223,7 @@ public class RadialMenu extends GuiScreen {
                 float a = 0.5f;
 
                 //check if current mode
-                int buildMode = ModeSettingsManager.getModeSettings(Minecraft.getMinecraft().player).getBuildMode().ordinal();
+                int buildMode = currentBuildMode.ordinal();
                 if (buildMode == i) {
                     r = 0f;
                     g = 0.5f;
@@ -217,159 +237,223 @@ public class RadialMenu extends GuiScreen {
                                               || inTriangle(x1m1, y1m1, x1m2, y1m2, x2m2, y2m2, mouseXCenter, mouseYCenter);
 
                 if (beginRadians <= mouseRadians && mouseRadians <= endRadians && isMouseInQuad) {
-                    r = 0.6f;//0.6f;
-                    g = 0.8f;//0.3f;
-                    b = 1f;//0.0f;
+                    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();
+                buffer.pos(middleX + x1m1, middleY + y1m1, getBlitOffset()).color(r, g, b, a).endVertex();
+                buffer.pos(middleX + x2m1, middleY + y2m1, getBlitOffset()).color(r, g, b, a).endVertex();
+                buffer.pos(middleX + x2m2, middleY + y2m2, getBlitOffset()).color(r, g, b, a).endVertex();
+                buffer.pos(middleX + x1m2, middleY + y1m2, getBlitOffset()).color(r, g, b, a).endVertex();
 
                 currentMode++;
             }
         }
 
+        //Draw action backgrounds
         for (final MenuButton btn : buttons) {
-            final float a = 0.5f;
-            float f = 0f;
+            float r = 0.5f;
+            float g = 0.5f;
+            float b = 0.5f;
+            float a = 0.5f;
 
-            if (btn.x1 <= mouseXCenter && btn.x2 >= mouseXCenter && btn.y1 <= mouseYCenter && btn.y2 >= mouseYCenter) {
-                f = 1;
-                btn.highlighted = true;
-                //doAction = btn.action;
+            //highlight when active option
+            if (btn.action == getBuildSpeed() ||
+                btn.action == getFill() ||
+                btn.action == getCubeFill() ||
+                btn.action == getRaisedEdge() ||
+                btn.action == getLineThickness() ||
+                btn.action == getCircleStart()) {
+                r = 0.0f;
+                g = 0.5f;
+                b = 1f;
+                a = 0.6f;
             }
 
-            buffer.pos(middleX + btn.x1, middleY + btn.y1, zLevel).color(f, f, f, a).endVertex();
-            buffer.pos(middleX + btn.x1, middleY + btn.y2, zLevel).color(f, f, f, a).endVertex();
-            buffer.pos(middleX + btn.x2, middleY + btn.y2, zLevel).color(f, f, f, a).endVertex();
-            buffer.pos(middleX + btn.x2, middleY + btn.y1, zLevel).color(f, f, f, a).endVertex();
+            //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, getBlitOffset()).color(r, g, b, a).endVertex();
+            buffer.pos(middleX + btn.x1, middleY + btn.y2, getBlitOffset()).color(r, g, b, a).endVertex();
+            buffer.pos(middleX + btn.x2, middleY + btn.y2, getBlitOffset()).color(r, g, b, a).endVertex();
+            buffer.pos(middleX + btn.x2, middleY + btn.y1, getBlitOffset()).color(r, g, b, a).endVertex();
         }
 
         tessellator.draw();
 
-        GlStateManager.shadeModel(GL11.GL_FLAT);
+        RenderSystem.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());
+        RenderSystem.translatef(0f, 0f, 5f);
+        RenderSystem.enableTexture();
+        RenderSystem.color3f(1f, 1f, 1f);
+        RenderSystem.disableBlend();
+        RenderSystem.enableAlphaTest();
+        mc.getTextureManager().bindTexture(AtlasTexture.LOCATION_BLOCKS_TEXTURE);
 
         buffer.begin(GL11.GL_QUADS, DefaultVertexFormats.POSITION_TEX_COLOR);
 
-        for (final MenuRegion mnuRgn : modes) {
+        //Draw buildmode icons
+        for (final MenuRegion menuRegion : modes) {
 
-            final double x = (mnuRgn.x1 + mnuRgn.x2) * 0.5 * (ringOuterEdge * 0.6 + 0.4 * ringInnerEdge);
-            final double y = (mnuRgn.y1 + mnuRgn.y2) * 0.5 * (ringOuterEdge * 0.6 + 0.4 * ringInnerEdge);
+            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(mnuRgn.mode);
+            final TextureAtlasSprite sprite = ModClientEventHandler.getBuildModeIcon(menuRegion.mode);
 
-            final double scalex = 16 * 0.5;
-            final double scaley = 16 * 0.5;
-            final double x1 = x - scalex;
-            final double x2 = x + scalex;
-            final double y1 = y - scaley;
-            final double y2 = y + scaley;
+            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 = 0f;
-            final double u2 = 16f;
-            final double v1 = 0f;
-            final double v2 = 16f;
-
-            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();
-        }
-
-        for (final MenuButton btn : buttons) {
-
-            final float f = switchTo == null ? 1.0f : 0.5f;
-            final float a = 1.0f;
-
             final double u1 = 0;
             final double u2 = 16;
             final double v1 = 0;
             final double v2 = 16;
 
-            final TextureAtlasSprite sprite = btn.icon == null ? Minecraft.getMinecraft().getTextureMapBlocks().getAtlasSprite(ModelLoader.White.LOCATION.toString()) : btn.icon;
+            buffer.pos(middleX + x1, middleY + y1, getBlitOffset()).tex(sprite.getInterpolatedU(u1), sprite.getInterpolatedV(v1)).color(f, f, f, a).endVertex();
+            buffer.pos(middleX + x1, middleY + y2, getBlitOffset()).tex(sprite.getInterpolatedU(u1), sprite.getInterpolatedV(v2)).color(f, f, f, a).endVertex();
+            buffer.pos(middleX + x2, middleY + y2, getBlitOffset()).tex(sprite.getInterpolatedU(u2), sprite.getInterpolatedV(v2)).color(f, f, f, a).endVertex();
+            buffer.pos(middleX + x2, middleY + y1, getBlitOffset()).tex(sprite.getInterpolatedU(u2), sprite.getInterpolatedV(v1)).color(f, f, f, a).endVertex();
+        }
 
-            final double btnx1 = btn.x1 + 1;
-            final double btnx2 = btn.x2 - 1;
-            final double btny1 = btn.y1 + 1;
-            final double btny2 = btn.y2 - 1;
+        //Draw action icons
+        for (final MenuButton button : buttons) {
 
-            final float red = f * ((btn.color >> 16 & 0xff) / 255.0f);
-            final float green = f * ((btn.color >> 8 & 0xff) / 255.0f);
-            final float blue = f * ((btn.color & 0xff) / 255.0f);
+            final float f = 1f;
+            final float a = 1f;
 
-            buffer.pos(middleX + btnx1, middleY + btny1, zLevel).tex(sprite.getInterpolatedU(u1), sprite.getInterpolatedV(v1)).color(red, green, blue, a).endVertex();
-            buffer.pos(middleX + btnx1, middleY + btny2, zLevel).tex(sprite.getInterpolatedU(u1), sprite.getInterpolatedV(v2)).color(red, green, blue, a).endVertex();
-            buffer.pos(middleX + btnx2, middleY + btny2, zLevel).tex(sprite.getInterpolatedU(u2), sprite.getInterpolatedV(v2)).color(red, green, blue, a).endVertex();
-            buffer.pos(middleX + btnx2, middleY + btny1, zLevel).tex(sprite.getInterpolatedU(u2), sprite.getInterpolatedV(v1)).color(red, green, blue, a).endVertex();
+            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.pos(middleX + btnx1, middleY + btny1, getBlitOffset()).tex(sprite.getInterpolatedU(u1), sprite.getInterpolatedV(v1)).color(f, f, f, a).endVertex();
+            buffer.pos(middleX + btnx1, middleY + btny2, getBlitOffset()).tex(sprite.getInterpolatedU(u1), sprite.getInterpolatedV(v2)).color(f, f, f, a).endVertex();
+            buffer.pos(middleX + btnx2, middleY + btny2, getBlitOffset()).tex(sprite.getInterpolatedU(u2), sprite.getInterpolatedV(v2)).color(f, f, f, a).endVertex();
+            buffer.pos(middleX + btnx2, middleY + btny1, getBlitOffset()).tex(sprite.getInterpolatedU(u2), sprite.getInterpolatedV(v1)).color(f, f, f, a).endVertex();
         }
 
         tessellator.draw();
 
-        for (final MenuRegion mnuRgn : modes) {
+        //Draw strings
+        //font.drawStringWithShadow("Actions", (int) (middleX - buttonDistance - 13) - font.getStringWidth("Actions") * 0.5f, (int) middleY - 38, 0xffffffff);
 
-            if (mnuRgn.highlighted) {
-                final double x = (mnuRgn.x1 + mnuRgn.x2) * 0.5;
-                final double y = (mnuRgn.y1 + mnuRgn.y2) * 0.5;
+        //Draw option strings
+        for (int i = 0; i < currentBuildMode.options.length; i++) {
+            OptionEnum option = options[i];
+            font.drawStringWithShadow(I18n.format(option.name), (int) (middleX + buttonDistance - 9), (int) middleY - 37 + i * 39, 0xeeeeeeff);
+        }
+
+        String credits = "Effortless Building";
+        font.drawStringWithShadow(credits, width - font.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);
-                final String text = mnuRgn.mode.name;
+                final int fixed_y = (int) (y * textDistance) - font.FONT_HEIGHT / 2;
+                final String text = I18n.format(menuRegion.mode.name);
 
                 if ( x <= -0.2 ) {
-                    fixed_x -= fontRenderer.getStringWidth(text);
+                    fixed_x -= font.getStringWidth(text);
                 } else if ( -0.2 <= x && x <= 0.2 ) {
-                    fixed_x -= fontRenderer.getStringWidth(text) / 2;
+                    fixed_x -= font.getStringWidth(text) / 2;
                 }
 
-                fontRenderer.drawStringWithShadow(text, (int) middleX + fixed_x, (int) middleY + fixed_y, 0xffffffff);
+                font.drawStringWithShadow(text, (int) middleX + fixed_x, (int) middleY + fixed_y, 0xffffffff);
             }
         }
 
-        for (final MenuButton btn : buttons) {
-            if (btn.highlighted) {
-                final String text = btn.name;
+        //Draw action text
+        for (final MenuButton button : buttons) {
+            if (button.highlighted) {
+                String text = TextFormatting.AQUA + button.name;
+                int wrap = 120;
+                String keybind = "";
+                String keybindFormatted = "";
 
-                if (btn.textSide == EnumFacing.WEST) {
+                //Add keybind in brackets
+                if (button.action == ActionEnum.UNDO) {
+                    keybind = ClientProxy.keyBindings[4].getLocalizedName();
+                }
+                if (button.action == ActionEnum.REDO) {
+                    keybind = ClientProxy.keyBindings[5].getLocalizedName();
+                }
+                if (button.action == ActionEnum.REPLACE) {
+                    keybind = ClientProxy.keyBindings[1].getLocalizedName();
+                }
+                if (button.action == ActionEnum.OPEN_MODIFIER_SETTINGS) {
+                    keybind = ClientProxy.keyBindings[0].getLocalizedName();
+                }
+                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]) {
+                        keybind = ClientProxy.keyBindings[6].getLocalizedName();
+                        if (keybind.equals("Left Control")) keybind = "Ctrl";
+                    }
+                }
+                if (!keybind.isEmpty()) keybindFormatted = TextFormatting.GRAY + "(" + WordUtils.capitalizeFully(keybind) + ")";
 
-                    fontRenderer.drawStringWithShadow( text, (int) ( middleX + btn.x1 - 8 ) - fontRenderer.getStringWidth( text ),
-                            (int) ( middleY + btn.y1 + 6 ), 0xffffffff );
+                if (button.textSide == Direction.WEST) {
 
-                } else if (btn.textSide == EnumFacing.EAST) {
+                    font.drawSplitString( text, (int) (middleX + button.x1 - 8 ) - font.getStringWidth(text),
+                            (int) (middleY + button.y1 + 6), wrap, 0xffffffff);
 
-                    fontRenderer.drawStringWithShadow( text, (int) ( middleX + btn.x2 + 8 ),
-                            (int) ( middleY + btn.y1 + 6 ), 0xffffffff );
+                } else if (button.textSide == Direction.EAST) {
 
-                } else if (btn.textSide == EnumFacing.UP) {
+                    font.drawSplitString(text, (int) (middleX + button.x2 + 8),
+                            (int) (middleY + button.y1 + 6 ), wrap, 0xffffffff);
 
-                    fontRenderer.drawStringWithShadow( text, (int) ( middleX + ( btn.x1 + btn.x2 ) * 0.5 - fontRenderer.getStringWidth( text ) * 0.5 ),
-                            (int) ( middleY + btn.y1 - 14 ), 0xffffffff );
+                } else if (button.textSide == Direction.UP || button.textSide == Direction.NORTH) {
 
-                } else if (btn.textSide == EnumFacing.DOWN) {
+                    font.drawSplitString( keybindFormatted, (int) (middleX + (button.x1 + button.x2) * 0.5 - font.getStringWidth(keybindFormatted) * 0.5),
+                            (int) (middleY + button.y1 - 26), wrap,0xffffffff);
 
-                    fontRenderer.drawStringWithShadow( text, (int) ( middleX + ( btn.x1 + btn.x2 ) * 0.5 - fontRenderer.getStringWidth( text ) * 0.5 ),
-                            (int) ( middleY + btn.y1 + 24 ), 0xffffffff );
+                    font.drawSplitString( text, (int) (middleX + (button.x1 + button.x2) * 0.5 - font.getStringWidth(text) * 0.5),
+                            (int) (middleY + button.y1 - 14), wrap,0xffffffff);
+
+                } else if (button.textSide == Direction.DOWN || button.textSide == Direction.SOUTH) {
+
+                    font.drawSplitString(text, (int) (middleX + (button.x1 + button.x2) * 0.5 - font.getStringWidth(text) * 0.5),
+                            (int) (middleY + button.y1 + 26), wrap, 0xffffffff);
+
+                    font.drawSplitString(keybindFormatted, (int) (middleX + (button.x1 + button.x2) * 0.5 - font.getStringWidth(keybindFormatted) * 0.5),
+                            (int) (middleY + button.y1 + 38), wrap, 0xffffffff);
 
                 }
 
             }
         }
 
-        GlStateManager.popMatrix();
+        RenderSystem.popMatrix();
     }
 
     private boolean inTriangle(final double x1, final double y1, final double x2, final double y2,
@@ -387,14 +471,22 @@ public class RadialMenu extends GuiScreen {
     /**
      * Called when the mouse is clicked. Args : mouseX, mouseY, clickedButton
      */
-    protected void mouseClicked(int mouseX, int mouseY, int mouseButton ) {
+    @Override
+    public boolean mouseClicked(double mouseX, double mouseY, int mouseButton) {
+        EffortlessBuilding.log("mouse clicked");
+
+        KeyBinding.updateKeyBindState();
+        KeyBinding.setKeyBindState(ClientProxy.keyBindings[3].getKey(), true);
+
         if (mouseButton == 0) {
-            this.mc.displayGuiScreen(null);
+            this.minecraft.displayGuiScreen(null);
 
-            if (this.mc.currentScreen == null) {
-                this.mc.setIngameFocus();
-            }
+            if (this.minecraft.currentScreen == null) {
+                this.minecraft.setGameFocused(true);
             }
         }
+        return super.mouseClicked(mouseX, mouseY, mouseButton);
+    }
+
 }
 

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

@@ -1,27 +1,30 @@
 package nl.requios.effortlessbuilding.gui.buildmodifier;
 
-import net.minecraft.client.gui.GuiButton;
-import net.minecraft.client.gui.GuiScreen;
+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.util.math.BlockPos;
 import net.minecraft.util.text.TextFormatting;
-import net.minecraftforge.fml.client.config.GuiCheckBox;
+import net.minecraftforge.api.distmarker.Dist;
+import net.minecraftforge.api.distmarker.OnlyIn;
 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 GuiCheckBox buttonArrayEnabled;
+    private GuiCheckBoxFixed buttonArrayEnabled;
     private GuiNumberField textArrayOffsetX, textArrayOffsetY, textArrayOffsetZ, textArrayCount;
 
     public ArraySettingsGui(GuiScrollPane scrollPane) {
@@ -29,31 +32,37 @@ public class ArraySettingsGui extends GuiCollapsibleScrollEntry {
     }
 
     @Override
-    public int initGui(int id, List<GuiButton> buttonList) {
-        id = super.initGui(id, buttonList);
+    public void init(List<Widget> buttons) {
+        super.init(buttons);
 
         int y = top;
-        buttonArrayEnabled = new GuiCheckBox(id++, left - 15 + 8, y, "", false);
-        buttonList.add(buttonArrayEnabled);
+        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);
 
         y = top + 20;
-        textArrayOffsetX = new GuiNumberField(id++, id++, id++, fontRenderer, buttonList, left + 70, y, 50, 18);
+        textArrayOffsetX = new GuiNumberField(font, buttons, left + 70, y, 50, 18);
         textArrayOffsetX.setNumber(0);
         textArrayOffsetX.setTooltip("How much each copy is shifted.");
         arrayNumberFieldList.add(textArrayOffsetX);
 
-        textArrayOffsetY = new GuiNumberField(id++, id++, id++, fontRenderer, buttonList, left + 140, y, 50, 18);
+        textArrayOffsetY = new GuiNumberField(font, buttons, left + 140, y, 50, 18);
         textArrayOffsetY.setNumber(0);
         textArrayOffsetY.setTooltip("How much each copy is shifted.");
         arrayNumberFieldList.add(textArrayOffsetY);
 
-        textArrayOffsetZ = new GuiNumberField(id++, id++, id++, fontRenderer, buttonList, left + 210, y, 50, 18);
+        textArrayOffsetZ = new GuiNumberField(font, buttons, left + 210, y, 50, 18);
         textArrayOffsetZ.setNumber(0);
         textArrayOffsetZ.setTooltip("How much each copy is shifted.");
         arrayNumberFieldList.add(textArrayOffsetZ);
 
         y = top + 50;
-        textArrayCount = new GuiNumberField(id++, id++, id++, fontRenderer, buttonList, left + 55, y, 50, 18);
+        textArrayCount = new GuiNumberField(font, buttons, left + 55, y, 50, 18);
         textArrayCount.setNumber(5);
         textArrayCount.setTooltip("How many copies should be made.");
         arrayNumberFieldList.add(textArrayCount);
@@ -69,57 +78,51 @@ public class ArraySettingsGui extends GuiCollapsibleScrollEntry {
         }
 
         setCollapsed(!buttonArrayEnabled.isChecked());
-
-        return id;
     }
 
-    @Override
     public void updateScreen() {
-        super.updateScreen();
         arrayNumberFieldList.forEach(GuiNumberField::update);
     }
 
     @Override
     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.drawButton(this.mc, mouseX, mouseY, partialTicks);
+        buttonArrayEnabled.render(mouseX, mouseY, partialTicks);
         if (buttonArrayEnabled.isChecked()) {
             buttonArrayEnabled.y = yy;
-            fontRenderer.drawString("Array enabled", left + offset, yy + 2, 0xFFFFFF, true);
+            font.drawString("Array enabled", left + offset, yy + 2, 0xFFFFFF);
 
             yy = y + 20;
-            fontRenderer.drawString("Offset", left + offset, yy + 5, 0xFFFFFF, true);
-            fontRenderer.drawString("X", left + 50 + offset, yy + 5, 0xFFFFFF, true);
+            font.drawString("Offset", left + offset, yy + 5, 0xFFFFFF);
+            font.drawString("X", left + 50 + offset, yy + 5, 0xFFFFFF);
             textArrayOffsetX.y = yy;
-            fontRenderer.drawString("Y", left + 120 + offset, yy + 5, 0xFFFFFF, true);
+            font.drawString("Y", left + 120 + offset, yy + 5, 0xFFFFFF);
             textArrayOffsetY.y = yy;
-            fontRenderer.drawString("Z", left + 190 + offset, yy + 5, 0xFFFFFF, true);
+            font.drawString("Z", left + 190 + offset, yy + 5, 0xFFFFFF);
             textArrayOffsetZ.y = yy;
 
             yy = y + 50;
-            fontRenderer.drawString("Count", left + offset, yy + 5, 0xFFFFFF, true);
+            font.drawString("Count", left + offset, yy + 5, 0xFFFFFF);
             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;
-            fontRenderer.drawString(reachText, left + 176 + offset, yy + 5, 0xFFFFFF, true);
+            font.drawString(reachText, left + 176 + offset, yy + 5, 0xFFFFFF);
 
-            arrayNumberFieldList.forEach(numberField -> numberField.drawNumberField(this.mc, mouseX, mouseY, partialTicks));
+            arrayNumberFieldList.forEach(numberField -> numberField.drawNumberField(mouseX, mouseY, partialTicks));
         } else {
             buttonArrayEnabled.y = yy;
-            fontRenderer.drawString("Array disabled", left + offset, yy + 2, 0x999999, true);
+            font.drawString("Array disabled", left + offset, yy + 2, 0x999999);
         }
 
     }
 
-    public void drawTooltip(GuiScreen guiScreen, int mouseX, int mouseY) {
+    public void drawTooltip(Screen guiScreen, int mouseX, int mouseY) {
         //Draw tooltips last
         if (buttonArrayEnabled.isChecked())
         {
@@ -128,43 +131,28 @@ public class ArraySettingsGui extends GuiCollapsibleScrollEntry {
     }
 
     @Override
-    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);
+    public boolean charTyped(char typedChar, int keyCode) {
+        super.charTyped(typedChar, keyCode);
         for (GuiNumberField numberField : arrayNumberFieldList) {
-            numberField.keyTyped(typedChar, keyCode);
+            numberField.charTyped(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.setIsChecked(!buttonArrayEnabled.isChecked());
-            buttonArrayEnabled.playPressSound(this.mc.getSoundHandler());
-            actionPerformed(buttonArrayEnabled);
+            buttonArrayEnabled.playDownSound(this.mc.getSoundHandler());
+            buttonArrayEnabled.onClick(mouseX, mouseY);
         }
 
         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);

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

@@ -1,35 +1,35 @@
 package nl.requios.effortlessbuilding.gui.buildmodifier;
 
-import net.minecraft.client.gui.GuiButton;
-import net.minecraft.client.gui.GuiScreen;
+import net.minecraft.client.gui.widget.Widget;
+import net.minecraft.client.gui.widget.button.Button;
+import net.minecraft.client.gui.screen.Screen;
 import net.minecraft.util.ResourceLocation;
 import net.minecraft.util.math.Vec3d;
 import net.minecraft.util.text.TextFormatting;
-import net.minecraftforge.fml.client.config.GuiCheckBox;
+import net.minecraftforge.api.distmarker.Dist;
+import net.minecraftforge.api.distmarker.OnlyIn;
 import nl.requios.effortlessbuilding.EffortlessBuilding;
 import nl.requios.effortlessbuilding.buildmodifier.Mirror;
 import nl.requios.effortlessbuilding.buildmodifier.ModifierSettingsManager;
-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.gui.elements.*;
 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<GuiButton> mirrorButtonList = new ArrayList<>();
+    protected List<Button> mirrorButtonList = new ArrayList<>();
     protected List<GuiIconButton> mirrorIconButtonList = new ArrayList<>();
     protected List<GuiNumberField> mirrorNumberFieldList = new ArrayList<>();
 
     private GuiNumberField textMirrorPosX, textMirrorPosY, textMirrorPosZ, textMirrorRadius;
-    private GuiCheckBox buttonMirrorEnabled, buttonMirrorX, buttonMirrorY, buttonMirrorZ;
+    private GuiCheckBoxFixed buttonMirrorEnabled, buttonMirrorX, buttonMirrorY, buttonMirrorZ;
     private GuiIconButton buttonCurrentPosition, buttonToggleOdd, buttonDrawPlanes, buttonDrawLines;
     private boolean drawPlanes, drawLines, toggleOdd;
 
@@ -38,42 +38,48 @@ public class MirrorSettingsGui extends GuiCollapsibleScrollEntry {
     }
 
     @Override
-    public int initGui(int id, List<GuiButton> buttonList) {
-        id = super.initGui(id, buttonList);
+    public void init(List<Widget> buttonList) {
+        super.init(buttonList);
 
         int y = top - 2;
-        buttonMirrorEnabled = new GuiCheckBox(id++, left - 15 + 8, y, "", false);
+        buttonMirrorEnabled = new GuiCheckBoxFixed(left - 15 + 8, y, "", false) {
+            @Override
+            public void onClick(double mouseX, double mouseY) {
+                super.onClick(mouseX, mouseY);
+                setCollapsed(!buttonMirrorEnabled.isChecked());
+            }
+        };
         buttonList.add(buttonMirrorEnabled);
 
         y = top + 18;
-        textMirrorPosX = new GuiNumberField(id++, id++, id++, fontRenderer, buttonList, left + 58, y, 62, 18);
+        textMirrorPosX = new GuiNumberField(font, buttonList, left + 58, y, 62, 18);
         textMirrorPosX.setNumber(0);
         textMirrorPosX.setTooltip(
                 Arrays.asList("The position of the mirror.", TextFormatting.GRAY + "For odd numbered builds add 0.5."));
         mirrorNumberFieldList.add(textMirrorPosX);
 
-        textMirrorPosY = new GuiNumberField(id++, id++, id++, fontRenderer, buttonList, left + 138, y, 62, 18);
+        textMirrorPosY = new GuiNumberField(font, buttonList, left + 138, y, 62, 18);
         textMirrorPosY.setNumber(64);
         textMirrorPosY.setTooltip(Arrays.asList("The position of the mirror.", TextFormatting.GRAY + "For odd numbered builds add 0.5."));
         mirrorNumberFieldList.add(textMirrorPosY);
 
-        textMirrorPosZ = new GuiNumberField(id++, id++, id++, fontRenderer, buttonList, left + 218, y, 62, 18);
+        textMirrorPosZ = new GuiNumberField(font, buttonList, left + 218, y, 62, 18);
         textMirrorPosZ.setNumber(0);
         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 GuiCheckBox(id++, left + 60, y, " X", true);
+        buttonMirrorX = new GuiCheckBoxFixed(left + 60, y, " X", true);
         mirrorButtonList.add(buttonMirrorX);
 
-        buttonMirrorY = new GuiCheckBox(id++, left + 100, y, " Y", false);
+        buttonMirrorY = new GuiCheckBoxFixed(left + 100, y, " Y", false);
         mirrorButtonList.add(buttonMirrorY);
 
-        buttonMirrorZ = new GuiCheckBox(id++, left + 140, y, " Z", false);
+        buttonMirrorZ = new GuiCheckBoxFixed(left + 140, y, " Z", false);
         mirrorButtonList.add(buttonMirrorZ);
 
         y = top + 47;
-        textMirrorRadius = new GuiNumberField(id++, id++, id++, fontRenderer, buttonList, left + 218, y, 62, 18);
+        textMirrorRadius = new GuiNumberField(font, buttonList, left + 218, y, 62, 18);
         textMirrorRadius.setNumber(50);
         //TODO change to diameter (remove /2)
         textMirrorRadius.setTooltip(Arrays.asList("How far the mirror reaches in any direction.",
@@ -82,19 +88,46 @@ public class MirrorSettingsGui extends GuiCollapsibleScrollEntry {
         mirrorNumberFieldList.add(textMirrorRadius);
 
         y = top + 72;
-        buttonCurrentPosition = new GuiIconButton(id++, left + 5, y, 0, 0, BUILDING_ICONS);
+        buttonCurrentPosition = new GuiIconButton(left + 5, y, 0, 0, BUILDING_ICONS, button -> {
+            Vec3d pos = new Vec3d(Math.floor(mc.player.getPosX()) + 0.5, Math.floor(mc.player.getPosY()) + 0.5, Math.floor(mc.player.getPosZ()) + 0.5);
+            textMirrorPosX.setNumber(pos.x);
+            textMirrorPosY.setNumber(pos.y);
+            textMirrorPosZ.setNumber(pos.z);
+        });
         buttonCurrentPosition.setTooltip("Set mirror position to current player position");
         mirrorIconButtonList.add(buttonCurrentPosition);
 
-        buttonToggleOdd = new GuiIconButton(id++, left + 35, y, 0, 20, BUILDING_ICONS);
+        buttonToggleOdd = new GuiIconButton(left + 35, y, 0, 20, BUILDING_ICONS, button -> {
+            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()));
+            }
+        });
         buttonToggleOdd.setTooltip(Arrays.asList("Set mirror position to middle of block", "for odd numbered builds"));
         mirrorIconButtonList.add(buttonToggleOdd);
 
-        buttonDrawLines = new GuiIconButton(id++, left + 65, y, 0, 40, BUILDING_ICONS);
+        buttonDrawLines = new GuiIconButton(left + 65, y, 0, 40, BUILDING_ICONS, button -> {
+            drawLines = !drawLines;
+            buttonDrawLines.setUseAlternateIcon(drawLines);
+            buttonDrawLines.setTooltip(drawLines ? "Hide lines" : "Show lines");
+        });
         buttonDrawLines.setTooltip("Show lines");
         mirrorIconButtonList.add(buttonDrawLines);
 
-        buttonDrawPlanes = new GuiIconButton(id++, left + 95, y, 0, 60, BUILDING_ICONS);
+        buttonDrawPlanes = new GuiIconButton(left + 95, y, 0, 60, BUILDING_ICONS, button -> {
+            drawPlanes = !drawPlanes;
+            buttonDrawPlanes.setUseAlternateIcon(drawPlanes);
+            buttonDrawPlanes.setTooltip(drawPlanes ? "Hide area" : "Show area");
+        });
         buttonDrawPlanes.setTooltip("Show area");
         mirrorIconButtonList.add(buttonDrawPlanes);
 
@@ -129,8 +162,6 @@ public class MirrorSettingsGui extends GuiCollapsibleScrollEntry {
         buttonList.addAll(mirrorIconButtonList);
 
         setCollapsed(!buttonMirrorEnabled.isChecked());
-
-        return id;
     }
 
     @Override
@@ -142,31 +173,30 @@ public class MirrorSettingsGui extends GuiCollapsibleScrollEntry {
     @Override
     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.drawButton(this.mc, mouseX, mouseY, partialTicks);
+        buttonMirrorEnabled.render(mouseX, mouseY, partialTicks);
         if (buttonMirrorEnabled.isChecked()) {
             buttonMirrorEnabled.y = yy;
-            fontRenderer.drawString("Mirror enabled", left + offset, yy + 2, 0xFFFFFF, true);
+            font.drawString("Mirror enabled", left + offset, yy + 2, 0xFFFFFF);
 
             yy = y + 18;
-            fontRenderer.drawString("Position", left + offset, yy + 5, 0xFFFFFF, true);
-            fontRenderer.drawString("X", left + 40 + offset, yy + 5, 0xFFFFFF, true);
+            font.drawString("Position", left + offset, yy + 5, 0xFFFFFF);
+            font.drawString("X", left + 40 + offset, yy + 5, 0xFFFFFF);
             textMirrorPosX.y = yy;
-            fontRenderer.drawString("Y", left + 120 + offset, yy + 5, 0xFFFFFF, true);
+            font.drawString("Y", left + 120 + offset, yy + 5, 0xFFFFFF);
             textMirrorPosY.y = yy;
-            fontRenderer.drawString("Z", left + 200 + offset, yy + 5, 0xFFFFFF, true);
+            font.drawString("Z", left + 200 + offset, yy + 5, 0xFFFFFF);
             textMirrorPosZ.y = yy;
 
             yy = y + 50;
-            fontRenderer.drawString("Direction", left + offset, yy + 2, 0xFFFFFF, true);
+            font.drawString("Direction", left + offset, yy + 2, 0xFFFFFF);
             buttonMirrorX.y = yy;
             buttonMirrorY.y = yy;
             buttonMirrorZ.y = yy;
-            fontRenderer.drawString("Radius", left + 176 + offset, yy + 2, 0xFFFFFF, true);
+            font.drawString("Radius", left + 176 + offset, yy + 2, 0xFFFFFF);
             textMirrorRadius.y = yy - 3;
 
             yy = y + 72;
@@ -175,17 +205,17 @@ public class MirrorSettingsGui extends GuiCollapsibleScrollEntry {
             buttonDrawLines.y = yy;
             buttonDrawPlanes.y = yy;
 
-            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));
+            mirrorButtonList.forEach(button -> button.render(mouseX, mouseY, partialTicks));
+            mirrorIconButtonList.forEach(button -> button.render(mouseX, mouseY, partialTicks));
+            mirrorNumberFieldList.forEach(numberField -> numberField.drawNumberField(mouseX, mouseY, partialTicks));
         } else {
             buttonMirrorEnabled.y = yy;
-            fontRenderer.drawString("Mirror disabled", left + offset, yy + 2, 0x999999, true);
+            font.drawString("Mirror disabled", left + offset, yy + 2, 0x999999);
         }
 
     }
 
-    public void drawTooltip(GuiScreen guiScreen, int mouseX, int mouseY) {
+    public void drawTooltip(Screen guiScreen, int mouseX, int mouseY) {
         //Draw tooltips last
         if (buttonMirrorEnabled.isChecked())
         {
@@ -195,74 +225,28 @@ public class MirrorSettingsGui extends GuiCollapsibleScrollEntry {
     }
 
     @Override
-    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);
+    public boolean charTyped(char typedChar, int keyCode) {
+        super.charTyped(typedChar, keyCode);
         for (GuiNumberField numberField : mirrorNumberFieldList) {
-            numberField.keyTyped(typedChar, keyCode);
+            numberField.charTyped(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.setIsChecked(!buttonMirrorEnabled.isChecked());
-            buttonMirrorEnabled.playPressSound(this.mc.getSoundHandler());
-            actionPerformed(buttonMirrorEnabled);
+            buttonMirrorEnabled.playDownSound(this.mc.getSoundHandler());
+            buttonMirrorEnabled.onClick(mouseX, mouseY);
         }
 
         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();
 

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

@@ -1,7 +1,12 @@
 package nl.requios.effortlessbuilding.gui.buildmodifier;
 
-import net.minecraft.client.gui.GuiButton;
-import net.minecraft.client.gui.GuiScreen;
+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.ITextComponent;
+import net.minecraft.util.text.TranslationTextComponent;
+import net.minecraftforge.api.distmarker.Dist;
+import net.minecraftforge.api.distmarker.OnlyIn;
 import nl.requios.effortlessbuilding.EffortlessBuilding;
 import nl.requios.effortlessbuilding.buildmodifier.Array;
 import nl.requios.effortlessbuilding.buildmodifier.Mirror;
@@ -9,89 +14,97 @@ 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;
 
-import java.io.IOException;
-
-public class ModifierSettingsGui extends GuiScreen {
+@OnlyIn(Dist.CLIENT)
+public class ModifierSettingsGui extends Screen {
 
     private GuiScrollPane scrollPane;
-    private GuiButton buttonClose;
+    private Button 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
-    public void initGui() {
-        int id = 0;
-
-        scrollPane = new GuiScrollPane(this, fontRenderer, 8, height - 30);
+    protected void init() {
+        scrollPane = new GuiScrollPane(this, font, 8, height - 30);
 
         mirrorSettingsGui = new MirrorSettingsGui(scrollPane);
-        scrollPane.listEntries.add(mirrorSettingsGui);
+        scrollPane.AddListEntry(mirrorSettingsGui);
 
         arraySettingsGui = new ArraySettingsGui(scrollPane);
-        scrollPane.listEntries.add(arraySettingsGui);
+        scrollPane.AddListEntry(arraySettingsGui);
 
         radialMirrorSettingsGui = new RadialMirrorSettingsGui(scrollPane);
-        scrollPane.listEntries.add(radialMirrorSettingsGui);
+        scrollPane.AddListEntry(radialMirrorSettingsGui);
 
-        id = scrollPane.initGui(id, buttonList);
+        scrollPane.init(buttons);
 
         //Close button
         int y = height - 26;
-        buttonClose = new GuiButton(id++, width / 2 - 100, y, "Close");
-        buttonList.add(buttonClose);
-
+        buttonClose = new Button(width / 2 - 100, y, 200, 20, "Close", (button) -> {
+            Minecraft.getInstance().player.closeScreen();
+        });
+        buttons.add(buttonClose);
     }
 
     @Override
     //Process general logic, i.e. hide buttons
-    public void updateScreen() {
+    public void tick() {
         scrollPane.updateScreen();
+
+        handleMouseInput();
     }
 
     @Override
-    //Set colors using GL11, use the fontRendererObj field to display text
+    //Set colors using GL11, use the fontObj field to display text
     //Use drawTexturedModalRect() to transfers areas of a texture resource to the screen
-    public void drawScreen(int mouseX, int mouseY, float partialTicks) {
-        this.drawDefaultBackground();
+    public void render(int mouseX, int mouseY, float partialTicks) {
+        this.renderBackground();
 
-        scrollPane.drawScreen(mouseX, mouseY, partialTicks);
+        scrollPane.render(mouseX, mouseY, partialTicks);
 
-        buttonClose.drawButton(this.mc, mouseX, mouseY, partialTicks);
+        buttonClose.render(mouseX, mouseY, partialTicks);
 
         scrollPane.drawTooltip(this, mouseX, mouseY);
     }
 
+
     @Override
-    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();
+    public boolean charTyped(char typedChar, int keyCode) {
+        super.charTyped(typedChar, keyCode);
+        scrollPane.charTyped(typedChar, keyCode);
+        if (keyCode == ClientProxy.keyBindings[0].getKey().getKeyCode()) {
+            minecraft.player.closeScreen();
         }
+        return false;
     }
 
     @Override
-    protected void mouseClicked(int mouseX, int mouseY, int mouseButton) throws IOException {
+    public boolean mouseClicked(double mouseX, double mouseY, int mouseButton) {
         super.mouseClicked(mouseX, mouseY, mouseButton);
-        scrollPane.mouseClicked(mouseX, mouseY, mouseButton);
+        buttons.forEach(button -> button.mouseClicked(mouseX, mouseY, mouseButton));
+        return scrollPane.mouseClicked(mouseX, mouseY, mouseButton);
     }
 
     @Override
-    protected void mouseReleased(int mouseX, int mouseY, int state) {
+    public boolean mouseReleased(double mouseX, double mouseY, int state) {
         if (state != 0 || !scrollPane.mouseReleased(mouseX, mouseY, state))
         {
-            super.mouseReleased(mouseX, mouseY, state);
+            return super.mouseReleased(mouseX, mouseY, state);
         }
+        return false;
     }
 
-    @Override
-    public void handleMouseInput() throws IOException {
-        super.handleMouseInput();
+    public void handleMouseInput() {
+        //super.handleMouseInput();
         scrollPane.handleMouseInput();
 
         //Scrolling numbers
@@ -101,16 +114,7 @@ public class ModifierSettingsGui extends GuiScreen {
     }
 
     @Override
-    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() {
+    public void removed() {
         scrollPane.onGuiClosed();
 
         //save everything
@@ -118,20 +122,22 @@ public class ModifierSettingsGui extends GuiScreen {
         Array.ArraySettings a = arraySettingsGui.getArraySettings();
         RadialMirror.RadialMirrorSettings r = radialMirrorSettingsGui.getRadialMirrorSettings();
 
-        ModifierSettingsManager.ModifierSettings modifierSettings = ModifierSettingsManager.getModifierSettings(mc.player);
+        ModifierSettingsManager.ModifierSettings modifierSettings = ModifierSettingsManager.getModifierSettings(minecraft.player);
         if (modifierSettings == null) modifierSettings = new ModifierSettingsManager.ModifierSettings();
         modifierSettings.setMirrorSettings(m);
         modifierSettings.setArraySettings(a);
         modifierSettings.setRadialMirrorSettings(r);
 
         //Sanitize
-        String error = ModifierSettingsManager.sanitize(modifierSettings, mc.player);
-        if (!error.isEmpty()) EffortlessBuilding.log(mc.player, error);
+        String error = ModifierSettingsManager.sanitize(modifierSettings, minecraft.player);
+        if (!error.isEmpty()) EffortlessBuilding.log(minecraft.player, error);
 
-        ModifierSettingsManager.setModifierSettings(mc.player, modifierSettings);
+        ModifierSettingsManager.setModifierSettings(minecraft.player, modifierSettings);
 
         //Send to server
-        EffortlessBuilding.packetHandler.sendToServer(new ModifierSettingsMessage(modifierSettings));
+        PacketHandler.INSTANCE.sendToServer(new ModifierSettingsMessage(modifierSettings));
+
+        Minecraft.getInstance().mouseHelper.grabMouse();
     }
 
 }

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

@@ -1,35 +1,35 @@
 package nl.requios.effortlessbuilding.gui.buildmodifier;
 
-import net.minecraft.client.gui.GuiButton;
-import net.minecraft.client.gui.GuiScreen;
+import net.minecraft.client.gui.widget.Widget;
+import net.minecraft.client.gui.widget.button.Button;
+import net.minecraft.client.gui.screen.Screen;
 import net.minecraft.util.ResourceLocation;
 import net.minecraft.util.math.Vec3d;
 import net.minecraft.util.text.TextFormatting;
-import net.minecraftforge.fml.client.config.GuiCheckBox;
+import net.minecraftforge.api.distmarker.Dist;
+import net.minecraftforge.api.distmarker.OnlyIn;
 import nl.requios.effortlessbuilding.EffortlessBuilding;
 import nl.requios.effortlessbuilding.buildmodifier.ModifierSettingsManager;
 import nl.requios.effortlessbuilding.buildmodifier.RadialMirror;
-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.gui.elements.*;
 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<GuiButton> radialMirrorButtonList = new ArrayList<>();
+    protected List<Button> radialMirrorButtonList = new ArrayList<>();
     protected List<GuiIconButton> radialMirrorIconButtonList = new ArrayList<>();
     protected List<GuiNumberField> radialMirrorNumberFieldList = new ArrayList<>();
 
     private GuiNumberField textRadialMirrorPosX, textRadialMirrorPosY, textRadialMirrorPosZ, textRadialMirrorSlices, textRadialMirrorRadius;
-    private GuiCheckBox buttonRadialMirrorEnabled, buttonRadialMirrorAlternate;
+    private GuiCheckBoxFixed buttonRadialMirrorEnabled, buttonRadialMirrorAlternate;
     private GuiIconButton buttonCurrentPosition, buttonToggleOdd, buttonDrawPlanes, buttonDrawLines;
     private boolean drawPlanes, drawLines, toggleOdd;
 
@@ -38,37 +38,43 @@ public class RadialMirrorSettingsGui extends GuiCollapsibleScrollEntry {
     }
 
     @Override
-    public int initGui(int id, List<GuiButton> buttonList) {
-        id = super.initGui(id, buttonList);
+    public void init(List<Widget> buttonList) {
+        super.init(buttonList);
 
         int y = top - 2;
-        buttonRadialMirrorEnabled = new GuiCheckBox(id++, left - 15 + 8, y, "", false);
+        buttonRadialMirrorEnabled = new GuiCheckBoxFixed(left - 15 + 8, y, "", false) {
+            @Override
+            public void onClick(double mouseX, double mouseY) {
+                super.onClick(mouseX, mouseY);
+                setCollapsed(!buttonRadialMirrorEnabled.isChecked());
+            }
+        };
         buttonList.add(buttonRadialMirrorEnabled);
 
         y = top + 18;
-        textRadialMirrorPosX = new GuiNumberField(id++, id++, id++, fontRenderer, buttonList, left + 58, y, 62, 18);
+        textRadialMirrorPosX = new GuiNumberField(font, buttonList, left + 58, y, 62, 18);
         textRadialMirrorPosX.setNumber(0);
         textRadialMirrorPosX.setTooltip(
                 Arrays.asList("The position of the radial mirror.", TextFormatting.GRAY + "For odd numbered builds add 0.5."));
         radialMirrorNumberFieldList.add(textRadialMirrorPosX);
 
-        textRadialMirrorPosY = new GuiNumberField(id++, id++, id++, fontRenderer, buttonList, left + 138, y, 62, 18);
+        textRadialMirrorPosY = new GuiNumberField(font, buttonList, left + 138, y, 62, 18);
         textRadialMirrorPosY.setNumber(64);
         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(id++, id++, id++, fontRenderer, buttonList, left + 218, y, 62, 18);
+        textRadialMirrorPosZ = new GuiNumberField(font, buttonList, left + 218, y, 62, 18);
         textRadialMirrorPosZ.setNumber(0);
         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(id++, id++, id++, fontRenderer, buttonList, left + 55, y, 50, 18);
+        textRadialMirrorSlices = new GuiNumberField(font, buttonList, left + 55, y, 50, 18);
         textRadialMirrorSlices.setNumber(4);
         textRadialMirrorSlices.setTooltip(Arrays.asList("The number of repeating slices.", TextFormatting.GRAY + "Minimally 2."));
         radialMirrorNumberFieldList.add(textRadialMirrorSlices);
 
-        textRadialMirrorRadius = new GuiNumberField(id++, id++, id++, fontRenderer, buttonList, left + 218, y, 62, 18);
+        textRadialMirrorRadius = new GuiNumberField(font, buttonList, left + 218, y, 62, 18);
         textRadialMirrorRadius.setNumber(50);
         //TODO change to diameter (remove /2)
         textRadialMirrorRadius.setTooltip(Arrays.asList("How far the radial mirror reaches from its center position.",
@@ -76,26 +82,52 @@ public class RadialMirrorSettingsGui extends GuiCollapsibleScrollEntry {
                 TextFormatting.GRAY + "Upgradeable in survival with reach upgrades."));
         radialMirrorNumberFieldList.add(textRadialMirrorRadius);
 
-
         y = top + 72;
-        buttonCurrentPosition = new GuiIconButton(id++, left + 5, y, 0, 0, BUILDING_ICONS);
+        buttonCurrentPosition = new GuiIconButton(left + 5, y, 0, 0, BUILDING_ICONS, button -> {
+            Vec3d pos = new Vec3d(Math.floor(mc.player.getPosX()) + 0.5, Math.floor(mc.player.getPosY()) + 0.5, Math.floor(mc.player.getPosZ()) + 0.5);
+            textRadialMirrorPosX.setNumber(pos.x);
+            textRadialMirrorPosY.setNumber(pos.y);
+            textRadialMirrorPosZ.setNumber(pos.z);
+        });
         buttonCurrentPosition.setTooltip("Set radial mirror position to current player position");
         radialMirrorIconButtonList.add(buttonCurrentPosition);
 
-        buttonToggleOdd = new GuiIconButton(id++, left + 35, y, 0, 20, BUILDING_ICONS);
+        buttonToggleOdd = new GuiIconButton(left + 35, y, 0, 20, BUILDING_ICONS, button -> {
+            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()));
+            }
+        });
         buttonToggleOdd.setTooltip(Arrays.asList("Set radial mirror position to middle of block", "for odd numbered builds"));
         radialMirrorIconButtonList.add(buttonToggleOdd);
 
-        buttonDrawLines = new GuiIconButton(id++, left + 65, y, 0, 40, BUILDING_ICONS);
+        buttonDrawLines = new GuiIconButton(left + 65, y, 0, 40, BUILDING_ICONS, button -> {
+            drawLines = !drawLines;
+            buttonDrawLines.setUseAlternateIcon(drawLines);
+            buttonDrawLines.setTooltip(drawLines ? "Hide lines" : "Show lines");
+        });
         buttonDrawLines.setTooltip("Show lines");
         radialMirrorIconButtonList.add(buttonDrawLines);
 
-        buttonDrawPlanes = new GuiIconButton(id++, left + 95, y, 0, 60, BUILDING_ICONS);
+        buttonDrawPlanes = new GuiIconButton(left + 95, y, 0, 60, BUILDING_ICONS, button -> {
+            drawPlanes = !drawPlanes;
+            buttonDrawPlanes.setUseAlternateIcon(drawPlanes);
+            buttonDrawPlanes.setTooltip(drawPlanes ? "Hide area" : "Show area");
+        });
         buttonDrawPlanes.setTooltip("Show area");
         radialMirrorIconButtonList.add(buttonDrawPlanes);
 
         y = top + 76;
-        buttonRadialMirrorAlternate = new GuiCheckBox(id++, left + 140, y, " Alternate", false);
+        buttonRadialMirrorAlternate = new GuiCheckBoxFixed(left + 140, y, " Alternate", false);
         radialMirrorButtonList.add(buttonRadialMirrorAlternate);
 
         ModifierSettingsManager.ModifierSettings modifierSettings = ModifierSettingsManager.getModifierSettings(mc.player);
@@ -128,42 +160,38 @@ 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(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.drawButton(this.mc, mouseX, mouseY, partialTicks);
+        buttonRadialMirrorEnabled.render(mouseX, mouseY, partialTicks);
         if (buttonRadialMirrorEnabled.isChecked()) {
             buttonRadialMirrorEnabled.y = yy;
-            fontRenderer.drawString("Radial mirror enabled", left + offset, yy + 2, 0xFFFFFF, true);
+            font.drawString("Radial mirror enabled", left + offset, yy + 2, 0xFFFFFF);
 
             yy = y + 18;
-            fontRenderer.drawString("Position", left + offset, yy + 5, 0xFFFFFF, true);
-            fontRenderer.drawString("X", left + 40 + offset, yy + 5, 0xFFFFFF, true);
+            font.drawString("Position", left + offset, yy + 5, 0xFFFFFF);
+            font.drawString("X", left + 40 + offset, yy + 5, 0xFFFFFF);
             textRadialMirrorPosX.y = yy;
-            fontRenderer.drawString("Y", left + 120 + offset, yy + 5, 0xFFFFFF, true);
+            font.drawString("Y", left + 120 + offset, yy + 5, 0xFFFFFF);
             textRadialMirrorPosY.y = yy;
-            fontRenderer.drawString("Z", left + 200 + offset, yy + 5, 0xFFFFFF, true);
+            font.drawString("Z", left + 200 + offset, yy + 5, 0xFFFFFF);
             textRadialMirrorPosZ.y = yy;
 
             yy = y + 50;
-            fontRenderer.drawString("Slices", left + offset, yy + 2, 0xFFFFFF, true);
+            font.drawString("Slices", left + offset, yy + 2, 0xFFFFFF);
             textRadialMirrorSlices.y = yy - 3;
-            fontRenderer.drawString("Radius", left + 176 + offset, yy + 2, 0xFFFFFF, true);
+            font.drawString("Radius", left + 176 + offset, yy + 2, 0xFFFFFF);
             textRadialMirrorRadius.y = yy - 3;
 
             yy = y + 72;
@@ -175,18 +203,18 @@ public class RadialMirrorSettingsGui extends GuiCollapsibleScrollEntry {
             yy = y + 76;
             buttonRadialMirrorAlternate.y = yy;
 
-            radialMirrorButtonList.forEach(button -> button.drawButton(this.mc, mouseX, mouseY, partialTicks));
-            radialMirrorIconButtonList.forEach(button -> button.drawButton(this.mc, mouseX, mouseY, partialTicks));
+            radialMirrorButtonList.forEach(button -> button.render(mouseX, mouseY, partialTicks));
+            radialMirrorIconButtonList.forEach(button -> button.render(mouseX, mouseY, partialTicks));
             radialMirrorNumberFieldList
-                    .forEach(numberField -> numberField.drawNumberField(this.mc, mouseX, mouseY, partialTicks));
+                    .forEach(numberField -> numberField.drawNumberField(mouseX, mouseY, partialTicks));
         } else {
             buttonRadialMirrorEnabled.y = yy;
-            fontRenderer.drawString("Radial mirror disabled", left + offset, yy + 2, 0x999999, true);
+            font.drawString("Radial mirror disabled", left + offset, yy + 2, 0x999999);
         }
 
     }
 
-    public void drawTooltip(GuiScreen guiScreen, int mouseX, int mouseY) {
+    public void drawTooltip(Screen guiScreen, int mouseX, int mouseY) {
         //Draw tooltips last
         if (buttonRadialMirrorEnabled.isChecked())
         {
@@ -196,74 +224,28 @@ public class RadialMirrorSettingsGui extends GuiCollapsibleScrollEntry {
     }
 
     @Override
-    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);
+    public boolean charTyped(char typedChar, int keyCode) {
+        super.charTyped(typedChar, keyCode);
         for (GuiNumberField numberField : radialMirrorNumberFieldList) {
-            numberField.keyTyped(typedChar, keyCode);
+            numberField.charTyped(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.setIsChecked(!buttonRadialMirrorEnabled.isChecked());
-            buttonRadialMirrorEnabled.playPressSound(this.mc.getSoundHandler());
-            actionPerformed(buttonRadialMirrorEnabled);
+            buttonRadialMirrorEnabled.playDownSound(this.mc.getSoundHandler());
+            buttonRadialMirrorEnabled.onClick(mouseX, mouseY);
         }
 
         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();
 

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

@@ -0,0 +1,66 @@
+package nl.requios.effortlessbuilding.gui.elements;
+
+import net.minecraft.client.Minecraft;
+import net.minecraft.client.gui.widget.button.Button;
+import net.minecraftforge.fml.client.gui.GuiUtils;
+
+/**
+ * This class provides a checkbox style control.
+ */
+public class GuiCheckBoxFixed extends Button
+{
+    private boolean isChecked;
+    private int     boxWidth;
+
+    public GuiCheckBoxFixed(int xPos, int yPos, String displayString, boolean isChecked)
+    {
+        super(xPos, yPos, Minecraft.getInstance().fontRenderer.getStringWidth(displayString) + 2 + 11, 11, displayString, b -> {});
+        this.isChecked = isChecked;
+        this.boxWidth = 11;
+        this.height = 11;
+        this.width = this.boxWidth + 2 + Minecraft.getInstance().fontRenderer.getStringWidth(displayString);
+    }
+
+    @Override
+    public void renderButton(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(mc, mouseX, mouseY);
+            int color = 14737632;
+
+            if (packedFGColor != 0)
+            {
+                color = packedFGColor;
+            }
+            else if (!this.active)
+            {
+                color = 10526880;
+            }
+
+            if (this.isChecked)
+                this.drawCenteredString(mc.fontRenderer, "x", this.x + this.boxWidth / 2 + 1, this.y + 1, 14737632);
+
+            this.drawString(mc.fontRenderer, 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

@@ -2,16 +2,19 @@ package nl.requios.effortlessbuilding.gui.elements;
 
 import net.minecraft.client.Minecraft;
 import net.minecraft.client.gui.FontRenderer;
-import net.minecraft.client.gui.GuiButton;
-import net.minecraft.client.gui.GuiScreen;
+import net.minecraft.client.gui.widget.Widget;
+import net.minecraft.client.gui.widget.button.Button;
+import net.minecraft.client.gui.screen.Screen;
+import net.minecraftforge.api.distmarker.Dist;
+import net.minecraftforge.api.distmarker.OnlyIn;
 
-import java.io.IOException;
 import java.util.List;
 
+@OnlyIn(Dist.CLIENT)
 public abstract class GuiCollapsibleScrollEntry implements GuiScrollPane.IScrollEntry {
 
     public GuiScrollPane scrollPane;
-    protected FontRenderer fontRenderer;
+    protected FontRenderer font;
     protected Minecraft mc;
 
     protected boolean isCollapsed = true;
@@ -19,35 +22,24 @@ public abstract class GuiCollapsibleScrollEntry implements GuiScrollPane.IScroll
 
     public GuiCollapsibleScrollEntry(GuiScrollPane scrollPane) {
         this.scrollPane = scrollPane;
-        this.fontRenderer = scrollPane.fontRenderer;
-        this.mc = scrollPane.parent.mc;
+        this.font = scrollPane.font;
+        this.mc = Minecraft.getInstance();
     }
 
     @Override
-    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;
+    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;
     }
 
     @Override
     public void updateScreen() {
-
     }
 
     @Override
-    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) {
-
+    public void drawTooltip(Screen guiScreen, int mouseX, int mouseY) {
     }
 
     @Override
@@ -56,8 +48,8 @@ public abstract class GuiCollapsibleScrollEntry implements GuiScrollPane.IScroll
     }
 
     @Override
-    public void keyTyped(char eventChar, int eventKey) throws IOException {
-
+    public boolean charTyped(char eventChar, int eventKey) {
+        return false;
     }
 
     @Override
@@ -70,14 +62,8 @@ 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,27 +1,30 @@
 package nl.requios.effortlessbuilding.gui.elements;
 
 import net.minecraft.client.Minecraft;
-import net.minecraft.client.gui.GuiButton;
-import net.minecraft.client.gui.GuiScreen;
+import net.minecraft.client.gui.widget.button.Button;
+import net.minecraft.client.gui.screen.Screen;
 import net.minecraft.util.ResourceLocation;
+import net.minecraftforge.api.distmarker.Dist;
+import net.minecraftforge.api.distmarker.OnlyIn;
 
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
 
-public class GuiIconButton extends GuiButton {
+@OnlyIn(Dist.CLIENT)
+public class GuiIconButton extends Button {
 
     private final ResourceLocation resourceLocation;
     private final int iconX, iconY, iconWidth, iconHeight, iconAltX, iconAltY;
     List<String> tooltip = new ArrayList<>();
     private boolean useAltIcon = false;
 
-    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 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 width, int height, int iconX, int iconY, int iconWidth, int iconHeight, int iconAltX, int iconAltY, ResourceLocation resourceLocation) {
-        super(buttonId, x, y, width, height, "");
+    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, "", onPress);
         this.iconX = iconX;
         this.iconY = iconY;
         this.iconWidth = iconWidth;
@@ -44,12 +47,12 @@ public class GuiIconButton extends GuiButton {
     }
 
     @Override
-    public void drawButton(Minecraft mc, int mouseX, int mouseY, float partialTicks) {
-        super.drawButton(mc, mouseX, mouseY, partialTicks);
+    public void render(int mouseX, int mouseY, float partialTicks) {
+        super.render(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);
+            this.isHovered = mouseX >= this.x && mouseY >= this.y && mouseX < this.x + this.width && mouseY < this.y + this.height;
+            Minecraft.getInstance().getTextureManager().bindTexture(this.resourceLocation);
             int currentIconX = this.iconX;
             int currentIconY = this.iconY;
 
@@ -59,17 +62,18 @@ public class GuiIconButton extends GuiButton {
                 currentIconY += iconAltY;
             }
 
-            this.drawTexturedModalRect(this.x, this.y, currentIconX, currentIconY, this.iconWidth, this.iconHeight);
+            //Draws a textured rectangle at the current z-value. Used to be drawTexturedModalRect in Gui.
+            this.blit(this.x, this.y, currentIconX, currentIconY, this.iconWidth, this.iconHeight);
         }
     }
 
-    public void drawTooltip(GuiScreen guiScreen, int mouseX, int mouseY) {
+    public void drawTooltip(Screen screen, int mouseX, int mouseY) {
         boolean flag = mouseX >= x && mouseX < x + width && mouseY >= y && mouseY < y + height;
 
         if (flag) {
             List<String> textLines = new ArrayList<>();
             textLines.addAll(tooltip);
-            guiScreen.drawHoveringText(textLines, mouseX - 10, mouseY + 25);
+            screen.renderTooltip(textLines, mouseX - 10, mouseY + 25);
         }
     }
 }

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

@@ -1,48 +1,68 @@
 package nl.requios.effortlessbuilding.gui.elements;
 
-import net.minecraft.client.Minecraft;
 import net.minecraft.client.gui.*;
+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.TextFormatting;
+import net.minecraftforge.api.distmarker.Dist;
+import net.minecraftforge.api.distmarker.OnlyIn;
 
-import java.io.IOException;
 import java.text.DecimalFormat;
+import java.text.ParseException;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
 
-public class GuiNumberField extends Gui {
+@OnlyIn(Dist.CLIENT)
+public class GuiNumberField extends AbstractGui {
 
     public int x, y, width, height;
     public int buttonWidth = 10;
 
-    protected GuiTextField textField;
-    protected GuiButton minusButton, plusButton;
+    protected TextFieldWidget textField;
+    protected Button minusButton, plusButton;
 
     List<String> tooltip = new ArrayList<>();
 
-    public GuiNumberField(int id1, int id2, int id3, FontRenderer fontRenderer,
-                          List<GuiButton> buttonList, int x, int y, int width, int height) {
+    public GuiNumberField(FontRenderer font, List<Widget> buttonList, int x, int y, int width, int height) {
         this.x = x;
         this.y = y;
         this.width = width;
         this.height = height;
 
-        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, "+");
+        textField = new TextFieldWidget(font, x + buttonWidth + 1, y + 1, width - 2 * buttonWidth - 2, height - 2, "");
+        minusButton = new Button(x, y - 1, buttonWidth, height + 2, "-", 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, "+", button -> {
+            float valueChanged = 1f;
+            if (Screen.hasControlDown()) valueChanged = 5f;
+            if (Screen.hasShiftDown()) valueChanged = 10f;
+
+            setNumber(getNumber() + valueChanged);
+        });
 
         buttonList.add(minusButton);
         buttonList.add(plusButton);
     }
 
     public void setNumber(double number) {
-        DecimalFormat format = new DecimalFormat("0.#");
-        textField.setText(format.format(number));
+        textField.setText(DecimalFormat.getInstance().format(number));
     }
 
     public double getNumber() {
         if (textField.getText().isEmpty()) return 0;
-        return Double.parseDouble(textField.getText());
+        try {
+            return DecimalFormat.getInstance().parse(textField.getText()).doubleValue();
+        } catch (ParseException e) {
+            return 0;
+        }
     }
 
     public void setTooltip(String tooltip) {
@@ -53,7 +73,7 @@ public class GuiNumberField extends Gui {
         this.tooltip = tooltip;
     }
 
-    public boolean mouseClicked(int mouseX, int mouseY, int mouseButton) {
+    public boolean mouseClicked(double mouseX, double mouseY, int mouseButton) {
         boolean result = textField.mouseClicked(mouseX, mouseY, mouseButton);
 
         //Check if clicked inside textfield
@@ -62,24 +82,24 @@ public class GuiNumberField extends Gui {
         //Rightclicked inside textfield
         if (flag && mouseButton == 1) {
             textField.setText("");
-            textField.setFocused(true);
+            textField.setFocused2(true);
             result = true;
         }
 
         return result;
     }
 
-    public void drawNumberField(Minecraft mc, int mouseX, int mouseY, float partialTicks) {
+    public void drawNumberField(int mouseX, int mouseY, float partialTicks) {
         textField.y = y + 1;
         minusButton.y = y - 1;
         plusButton.y = y - 1;
 
-        textField.drawTextBox();
-        minusButton.drawButton(mc, mouseX, mouseY, partialTicks);
-        plusButton.drawButton(mc, mouseX, mouseY, partialTicks);
+        textField.render(mouseX, mouseY, partialTicks);
+        minusButton.render(mouseX, mouseY, partialTicks);
+        plusButton.render(mouseX, mouseY, partialTicks);
     }
 
-    public void drawTooltip(GuiScreen guiScreen, int mouseX, int mouseY) {
+    public void drawTooltip(Screen screen, 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;
@@ -102,37 +122,25 @@ public class GuiNumberField extends Gui {
             textLines.add("Hold " + TextFormatting.AQUA + "ctrl " + TextFormatting.RESET + "for " + TextFormatting.DARK_GREEN + "5");
         }
 
-        guiScreen.drawHoveringText(textLines, mouseX - 10, mouseY + 25);
+        screen.renderTooltip(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.updateCursorCounter();
+        textField.tick();
     }
 
-    public void keyTyped(char typedChar, int keyCode) throws IOException {
-        if (!textField.isFocused()) return;
+    public boolean charTyped(char typedChar, int keyCode) {
+        if (!textField.isFocused()) return false;
 //        if (Character.isDigit(typedChar) || typedChar == '.' || typedChar == '-' || keyCode == Keyboard.KEY_BACK
 //            || keyCode == Keyboard.KEY_DELETE || keyCode == Keyboard.KEY_LEFT || keyCode == Keyboard.KEY_RIGHT
 //            || keyCode == Keyboard.KEY_UP || keyCode == Keyboard.KEY_DOWN) {
-            textField.textboxKeyTyped(typedChar, keyCode);
+            return textField.charTyped(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,178 +1,186 @@
 package nl.requios.effortlessbuilding.gui.elements;
 
+import com.mojang.blaze3d.platform.GlStateManager;
+import com.mojang.blaze3d.systems.RenderSystem;
 import net.minecraft.client.Minecraft;
-import net.minecraft.client.gui.FontRenderer;
-import net.minecraft.client.gui.GuiButton;
-import net.minecraft.client.gui.GuiListExtended;
-import net.minecraft.client.gui.GuiScreen;
+import net.minecraft.client.gui.*;
+import net.minecraft.client.gui.screen.Screen;
+import net.minecraft.client.gui.widget.Widget;
 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.fml.relauncher.Side;
-import net.minecraftforge.fml.relauncher.SideOnly;
-import org.lwjgl.input.Mouse;
+import net.minecraftforge.api.distmarker.Dist;
+import net.minecraftforge.api.distmarker.OnlyIn;
+import net.minecraftforge.common.MinecraftForge;
 
-import java.io.IOException;
 import java.util.ArrayList;
 import java.util.List;
 
-@SideOnly(Side.CLIENT)
-public class GuiScrollPane extends GuiListExtended {
+@OnlyIn(Dist.CLIENT)
+public class GuiScrollPane extends SlotGui {
 
-    public GuiScreen parent;
-    public FontRenderer fontRenderer;
-    public List<IScrollEntry> listEntries;
+    public Screen parent;
+    public FontRenderer font;
+    private List<IScrollEntry> listEntries;
+    private float scrollMultiplier = 1f;
 
-    public GuiScrollPane(GuiScreen parent, FontRenderer fontRenderer, int top, int bottom) {
-        super(parent.mc, parent.width, parent.height, top, bottom, 100);
+    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);
         this.parent = parent;
-        this.fontRenderer = fontRenderer;
-        this.setShowSelectionBox(false);
+        this.font = font;
+        this.renderSelection = false;
         listEntries = new ArrayList<>();
+        MinecraftForge.EVENT_BUS.register(this);
     }
 
-    @Override
-    public IGuiListEntry getListEntry(int index) {
+    public IScrollEntry getListEntry(int index) {
         return listEntries.get(index);
     }
 
+    public void AddListEntry(IScrollEntry listEntry){
+        listEntries.add(listEntry);
+    }
+
     @Override
-    protected int getSize() {
+    protected int getItemCount() {
         return listEntries.size();
     }
 
     @Override
-    protected int getScrollBarX() {
+    protected boolean isSelectedItem(int slotIndex) {
+        return false;
+    }
+
+    @Override
+    protected int getScrollbarPosition() {
         //return width / 2 + 140 + 10;
         return width - 15;
     }
 
     @Override
-    public int getListWidth() {
+    public int getRowWidth() {
         return 280;
     }
 
     //Removed background
     @Override
-    public void drawScreen(int mouseXIn, int mouseYIn, float partialTicks)
-    {
-        if (this.visible)
+    public void render(int mouseXIn, int mouseYIn, float partialTicks)
     {
+        if (this.visible) {
             this.mouseX = mouseXIn;
             this.mouseY = mouseYIn;
-            int scrollBarLeft = this.getScrollBarX();
-            int scrollBarRight = scrollBarLeft + 6;
-            this.bindAmountScrolled();
-            GlStateManager.disableLighting();
-            GlStateManager.disableFog();
+            this.renderBackground();
+            int scrollbarLeft = this.getScrollbarPosition();
+            int scrollbarRight = scrollbarLeft + 6;
+            this.capYPosition();
 
             Tessellator tessellator = Tessellator.getInstance();
             BufferBuilder bufferbuilder = tessellator.getBuffer();
-            int insideLeft = this.left + this.width / 2 - this.getListWidth() / 2 + 2;
-            int insideTop = this.top + 4 - (int)this.amountScrolled;
 
-            if (this.hasListHeader)
-            {
-                this.drawListHeader(insideLeft, insideTop, tessellator);
+            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);
             }
 
             //All entries
-            this.drawSelectionBox(insideLeft, insideTop, mouseXIn, mouseYIn, partialTicks);
-            GlStateManager.disableDepth();
+            this.renderList(insideLeft, insideTop, mouseXIn, mouseYIn, partialTicks);
+            RenderSystem.disableDepthTest();
+
             //Dirt overlays on top and bottom
-//            this.overlayBackground(0, this.top, 255, 255);
-//            this.overlayBackground(this.bottom, this.height, 255, 255);
-            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 fade
+//            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();
+
+            //top
 //            bufferbuilder.begin(7, DefaultVertexFormats.POSITION_TEX_COLOR);
-//            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();
+//            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();
 //            tessellator.draw();
-//            //top line
+
+            //bottom
 //            bufferbuilder.begin(7, DefaultVertexFormats.POSITION_TEX_COLOR);
-//            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();
+//            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();
 //            tessellator.draw();
 
             //Draw scrollbar
             int maxScroll = this.getMaxScroll();
-            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;
+            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;
                 }
 
                 bufferbuilder.begin(7, DefaultVertexFormats.POSITION_TEX_COLOR);
-                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();
+                bufferbuilder.pos((double) scrollbarLeft, (double) this.y1, 0.0F).tex(0.0F, 1.0F).color(0, 0, 0, 255).endVertex();
+                bufferbuilder.pos((double) scrollbarRight, (double) this.y1, 0.0F).tex(1.0F, 1.0F).color(0, 0, 0, 255).endVertex();
+                bufferbuilder.pos((double) scrollbarRight, (double) this.y0, 0.0F).tex(1.0F, 0.0F).color(0, 0, 0, 255).endVertex();
+                bufferbuilder.pos((double) scrollbarLeft, (double) this.y0, 0.0F).tex(0.0F, 0.0F).color(0, 0, 0, 255).endVertex();
                 tessellator.draw();
                 bufferbuilder.begin(7, DefaultVertexFormats.POSITION_TEX_COLOR);
-                bufferbuilder.pos((double)scrollBarLeft, (double)(l1 + k1), 0.0D).tex(0.0D, 1.0D).color(128, 128, 128, 255).endVertex();
-                bufferbuilder.pos((double)scrollBarRight, (double)(l1 + k1), 0.0D).tex(1.0D, 1.0D).color(128, 128, 128, 255).endVertex();
-                bufferbuilder.pos((double)scrollBarRight, (double)l1, 0.0D).tex(1.0D, 0.0D).color(128, 128, 128, 255).endVertex();
-                bufferbuilder.pos((double)scrollBarLeft, (double)l1, 0.0D).tex(0.0D, 0.0D).color(128, 128, 128, 255).endVertex();
+                bufferbuilder.pos((double) scrollbarLeft, (double) (l1 + k1), 0.0F).tex(0.0F, 1.0F).color(128, 128, 128, 255).endVertex();
+                bufferbuilder.pos((double) scrollbarRight, (double) (l1 + k1), 0.0F).tex(1.0F, 1.0F).color(128, 128, 128, 255).endVertex();
+                bufferbuilder.pos((double) scrollbarRight, (double) l1, 0.0F).tex(1.0F, 0.0F).color(128, 128, 128, 255).endVertex();
+                bufferbuilder.pos((double) scrollbarLeft, (double) l1, 0.0F).tex(0.0F, 0.0F).color(128, 128, 128, 255).endVertex();
                 tessellator.draw();
                 bufferbuilder.begin(7, DefaultVertexFormats.POSITION_TEX_COLOR);
-                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();
+                bufferbuilder.pos((double) scrollbarLeft, (double) (l1 + k1 - 1), 0.0F).tex(0.0F, 1.0F).color(192, 192, 192, 255).endVertex();
+                bufferbuilder.pos((double) (scrollbarRight - 1), (double) (l1 + k1 - 1), 0.0F).tex(1.0F, 1.0F).color(192, 192, 192, 255).endVertex();
+                bufferbuilder.pos((double) (scrollbarRight - 1), (double) l1, 0.0F).tex(1.0F, 0.0F).color(192, 192, 192, 255).endVertex();
+                bufferbuilder.pos((double) scrollbarLeft, (double) l1, 0.0F).tex(0.0F, 0.0F).color(192, 192, 192, 255).endVertex();
                 tessellator.draw();
             }
 
-            GlStateManager.enableTexture2D();
-            GlStateManager.shadeModel(7424);
-            GlStateManager.enableAlpha();
-            GlStateManager.disableBlend();
+            //this.renderDecorations(mouseXIn, mouseYIn);
+            RenderSystem.enableTexture();
+            RenderSystem.shadeModel(7424);
+            RenderSystem.enableAlphaTest();
+            RenderSystem.disableBlend();
         }
     }
 
     //SLOTHEIGHT MODIFICATIONS
     //SlotHeight is still relied on for determining how much to scroll
     @Override
-    protected int getContentHeight() {
+    protected int getMaxPosition() {
         //Add every entry height
-        int height = this.headerPadding;
+        int height = this.headerHeight;
         for (IScrollEntry entry : listEntries) {
             height += entry.getHeight();
         }
         return height;
     }
 
-    public int getContentHeight(int count) {
+    @Override
+    protected void renderBackground() {
+
+    }
+
+    @Override
+    protected void renderItem(int slotIndex, int xPos, int yPos, int heightIn, int mouseXIn, int mouseYIn, float partialTicks) {
+        this.getListEntry(slotIndex).drawEntry(slotIndex, xPos, yPos, this.getRowWidth(), heightIn, mouseXIn, mouseYIn,
+                this.getSlotIndexFromScreenCoords(mouseXIn, mouseYIn) == slotIndex, partialTicks);
+    }
+
+    public int getMaxPosition(int count) {
         //Add all count entry heights
-        int height = this.headerPadding;
+        int height = this.headerHeight;
         for (int i = 0; i < count; i++) {
             IScrollEntry entry = listEntries.get(i);
             height += entry.getHeight();
@@ -180,108 +188,102 @@ public class GuiScrollPane extends GuiListExtended {
         return height;
     }
 
-    @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 = posY - this.top - this.headerPadding + (int)this.amountScrolled - 4; //click height in content dimensions
-        //int slotIndex = relativeMouseY / this.slotHeight;
+    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);
 
         //Iterate over every entry until relativeMouseY falls within its height
         for (int i = 0; i < listEntries.size(); i++) {
             IScrollEntry entry = listEntries.get(i);
             if (relativeMouseY <= entry.getHeight())
-                return posX < this.getScrollBarX() && posX >= left && posX <= right && i >= 0 &&
-                       relativeMouseY >= 0 && i < this.getSize() ? i : -1;
+                return posX < this.getScrollbarPosition() && posX >= left && posX <= right && i >= 0 &&
+                       relativeMouseY >= 0 && i < this.getItemCount() ? i : -1;
             relativeMouseY -= entry.getHeight();
         }
         return -1;
     }
 
     @Override
-    public boolean mouseClicked(int mouseX, int mouseY, int mouseEvent)
-    {
-        if (this.isMouseYWithinSlotBounds(mouseY))
-        {
-            int i = this.getSlotIndexFromScreenCoords(mouseX, mouseY);
+    public boolean mouseClicked(double mouseX, double mouseY, int button) {
+        int selectedSlot = this.getSlotIndexFromScreenCoords(mouseX, mouseY);
+        double relativeX = getRelativeMouseX(mouseX);
 
-            if (i >= 0)
-            {
-                int j = this.left + this.width / 2 - this.getListWidth() / 2 + 2;
-                int k = this.top + 4 - this.getAmountScrolled() + getContentHeight(i) + this.headerPadding;
-                int relativeX = mouseX - j;
-                int relativeY = mouseY - k;
+        //Always pass through mouseclicked, to be able to unfocus textfields
+        for (int i = 0; i < this.listEntries.size(); i++) {
+            double relativeY = getRelativeMouseY(mouseY, i);
+            this.getListEntry(i).mousePressed(selectedSlot, (int) mouseX, (int) mouseY, button, (int) relativeX, (int) relativeY);
+        }
 
-                if (this.getListEntry(i).mousePressed(i, mouseX, mouseY, mouseEvent, relativeX, relativeY))
-                {
-                    this.setEnabled(false);
-                    return true;
-                }
-            }
-        }
+
+//        if (this.isMouseYWithinSlotBounds(mouseY))
+//        {
+//            int i = this.getSlotIndexFromScreenCoords(mouseX, mouseY);
+//
+//            if (i >= 0)
+//            {
+//                int relativeX = getRelativeMouseX(mouseX);
+//                int relativeY = getRelativeMouseY(mouseY, i);
+//
+//                if (this.getListEntry(i).mousePressed(i, mouseX, mouseY, mouseEvent, relativeX, relativeY))
+//                {
+//                    this.setEnabled(false);
+//                    return true;
+//                }
+//            }
+//        }
 
         return false;
     }
 
     @Override
-    public boolean mouseReleased(int x, int y, int mouseEvent)
+    public boolean mouseReleased(double mouseX, double mouseY, int button) {
+        for (int i = 0; i < this.getItemCount(); ++i)
         {
-        for (int i = 0; i < this.getSize(); ++i)
-        {
-            int j = this.left + this.width / 2 - this.getListWidth() / 2 + 2;
-            int k = this.top + 4 - this.getAmountScrolled() + getContentHeight(i) + this.headerPadding;
-            int relativeX = x - j;
-            int relativeY = y - k;
-            this.getListEntry(i).mouseReleased(i, x, y, mouseEvent, relativeX, relativeY);
+            double relativeX = getRelativeMouseX(mouseX);
+            double relativeY = getRelativeMouseY(mouseY, i);
+            this.getListEntry(i).mouseReleased(i, (int) mouseX, (int) mouseY, button, (int) relativeX, (int) relativeY);
         }
 
-        this.setEnabled(true);
+        this.visible = true;
         return false;
     }
 
-    @Override
     public void handleMouseInput() {
-        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 relativeMouseY = this.mouseY - this.top - this.headerPadding + (int) this.amountScrolled -
-                                     4; //click height in content dimensions
+        if (this.isMouseInList(this.mouseX, this.mouseY)) {
+            if (minecraft.mouseHelper.isLeftDown() && 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;
                 int slotIndex = getSlotIndexFromScreenCoords(this.mouseX, this.mouseY);
+                double relativeMouseY = getRelativeMouseY(mouseY, slotIndex);
 
                 if (slotIndex > -1) {
-                    this.elementClicked(slotIndex, false, this.mouseX, this.mouseY);
-                    this.selectedElement = slotIndex;
+                    this.mouseClicked(this.mouseX, this.mouseY, 0);
                 } else if (this.mouseX >= i && this.mouseX <= j && relativeMouseY < 0) {
-                    this.clickedHeader(this.mouseX - i, this.mouseY - this.top + (int) this.amountScrolled - 4);
+                    this.clickedHeader(this.mouseX - i, this.mouseY - this.y0 + (int) this.yo - 4);
                 }
             }
 
-            if (Mouse.isButtonDown(0) && this.getEnabled()) {
-                if (this.initialClickY == -1) {
+            if (minecraft.mouseHelper.isLeftDown() && this.isVisible()) {
+                if (this.yDrag == -1) {
                     boolean flag1 = true;
 
-                    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 relativeMouseY = this.mouseY - this.top - this.headerPadding + (int) this.amountScrolled -
-                                             4; //click height in content dimensions
+                    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;
                         int slotIndex = getSlotIndexFromScreenCoords(this.mouseX, this.mouseY);
+                        double relativeMouseY = getRelativeMouseY(mouseY, slotIndex);
 
                         if (slotIndex > -1) {
-                            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();
+                            this.mouseClicked(slotIndex, this.mouseX, this.mouseY);
                         } else if (this.mouseX >= i2 && this.mouseX <= j2 && relativeMouseY < 0) {
                             this.clickedHeader(this.mouseX - i2,
-                                    this.mouseY - this.top + (int) this.amountScrolled - 4);
+                                    this.mouseY - this.y0 + (int) this.yo - 4);
                             flag1 = false;
                         }
 
-                        int i3 = this.getScrollBarX();
+                        int i3 = this.getScrollbarPosition();
                         int j1 = i3 + 6;
 
                         if (this.mouseX >= i3 && this.mouseX <= j1) {
@@ -292,56 +294,45 @@ public class GuiScrollPane extends GuiListExtended {
                                 maxScroll = 1;
                             }
 
-                            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;
+                            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;
                         } else {
                             this.scrollMultiplier = 1.0F;
                         }
 
                         if (flag1) {
-                            this.initialClickY = this.mouseY;
+                            this.yDrag = this.mouseY;
                         } else {
-                            this.initialClickY = -2;
+                            this.yDrag = -2;
                         }
                     } else {
-                        this.initialClickY = -2;
+                        this.yDrag = -2;
                     }
-                } else if (this.initialClickY >= 0) {
-                    this.amountScrolled -= (float) (this.mouseY - this.initialClickY) * this.scrollMultiplier;
-                    this.initialClickY = this.mouseY;
+                } else if (this.yDrag >= 0) {
+                    this.yo -= (float) (this.mouseY - this.yDrag) * this.scrollMultiplier;
+                    this.yDrag = this.mouseY;
                 }
             } else {
-                this.initialClickY = -1;
+                this.yDrag = -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 drawSelectionBox(int insideLeft, int insideTop, int mouseXIn, int mouseYIn, float partialTicks)
+    protected void renderList(int insideLeft, int insideTop, int mouseXIn, int mouseYIn, float partialTicks)
     {
-        int size = this.getSize();
+        int itemCount = this.getItemCount();
         Tessellator tessellator = Tessellator.getInstance();
         BufferBuilder bufferbuilder = tessellator.getBuffer();
 
         //Find y to start with
-        int y = this.headerPadding + insideTop;
-        int contentHeight = getContentHeight();
-        int insideHeight = this.bottom - this.top - 4;
+        int y = this.headerHeight + insideTop;
+        int contentHeight = getMaxPosition();
+        int insideHeight = this.y1 - this.y0 - 4;
 
         if (contentHeight < insideHeight) {
             //it fits, so we can center it vertically
@@ -349,47 +340,68 @@ public class GuiScrollPane extends GuiListExtended {
         }
 
         //Draw all entries
-        for (int i = 0; i < size; ++i)
+        for (int i = 0; i < itemCount; ++i)
         {
             int entryHeight = listEntries.get(i).getHeight();
             int entryHeight2 = entryHeight - 4;
 
-            if (y > this.bottom || y + entryHeight2 < this.top)
+            if (y > this.y1 || y + entryHeight2 < this.y0)
             {
-                this.updateItemPos(i, insideLeft, y, partialTicks);
+                this.updateItemPosition(i, insideLeft, y, partialTicks);
             }
 
-            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();
+            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.pos((double)i1, (double)(y + entryHeight2 + 2), 0.0D).endVertex();
+                bufferbuilder.pos((double)j1, (double)(y + entryHeight2 + 2), 0.0D).endVertex();
+                bufferbuilder.pos((double)j1, (double)(y - 2), 0.0D).endVertex();
+                bufferbuilder.pos((double)i1, (double)(y - 2), 0.0D).endVertex();
                 tessellator.draw();
-                GlStateManager.enableTexture2D();
+                RenderSystem.color4f(0.0F, 0.0F, 0.0F, 1.0F);
+                bufferbuilder.begin(7, DefaultVertexFormats.POSITION);
+                bufferbuilder.pos((double)(i1 + 1), (double)(y + entryHeight2 + 1), 0.0D).endVertex();
+                bufferbuilder.pos((double)(j1 - 1), (double)(y + entryHeight2 + 1), 0.0D).endVertex();
+                bufferbuilder.pos((double)(j1 - 1), (double)(y - 1), 0.0D).endVertex();
+                bufferbuilder.pos((double)(i1 + 1), (double)(y - 1), 0.0D).endVertex();
+                tessellator.draw();
+                RenderSystem.enableTexture();
             }
 
-            this.drawSlot(i, insideLeft, y, entryHeight2, mouseXIn, mouseYIn, partialTicks);
+            this.renderItem(i, insideLeft, y, entryHeight2, mouseXIn, mouseYIn, partialTicks);
             y += entryHeight;
         }
     }
 
-    //PASSTHROUGHS
-    public int initGui(int id, List<GuiButton> buttonList) {
-        for (IScrollEntry entry : this.listEntries) {
-            id = entry.initGui(id, buttonList);
+    private double getRelativeMouseX(double mouseX) {
+        int j = this.x0 + this.width / 2 - this.getRowWidth() / 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;
+
+        //Content might be centered, adjust relative mouse y accordingly
+        int contentHeight = getMaxPosition();
+        int insideHeight = this.y1 - this.y0 - 4;
+
+        if (contentHeight < insideHeight) {
+            //it fits, so we can center it vertically
+            relativeMouseY -= (insideHeight - contentHeight) / 2f;
+        }
+        return relativeMouseY;
+    }
+
+    //PASSTHROUGHS
+    public void init(List<Widget> buttonList) {
+        for (IScrollEntry entry : this.listEntries) {
+            entry.init(buttonList);
         }
-        registerScrollButtons(id++, id++);
-        return id;
     }
 
     public void updateScreen() {
@@ -397,19 +409,16 @@ public class GuiScrollPane extends GuiListExtended {
             entry.updateScreen();
     }
 
-    public void drawTooltip(GuiScreen guiScreen, int mouseX, int mouseY) {
+    public void drawTooltip(Screen guiScreen, int mouseX, int mouseY) {
         for (IScrollEntry entry : this.listEntries)
             entry.drawTooltip(guiScreen, mouseX, mouseY);
     }
 
-    public void keyTyped(char eventChar, int eventKey) throws IOException {
+    @Override
+    public boolean charTyped(char eventChar, int eventKey) {
         for (IScrollEntry entry : this.listEntries)
-            entry.keyTyped(eventChar, eventKey);
-    }
-
-    public void actionPerformed(GuiButton button) {
-        for (IScrollEntry entry : this.listEntries)
-            entry.actionPerformed(button);
+            entry.charTyped(eventChar, eventKey);
+        return false;
     }
 
     public void onGuiClosed() {
@@ -417,19 +426,41 @@ public class GuiScrollPane extends GuiListExtended {
             entry.onGuiClosed();
     }
 
-    public interface IScrollEntry extends GuiListExtended.IGuiListEntry {
-        int initGui(int id, List<GuiButton> buttonList);
+    //Make protected values available
+    public int getWidth() {
+        return width;
+    }
+
+    public int getHeight() {
+        return height;
+    }
+
+    public interface IScrollEntry {
+        void init(List<Widget> buttonList);
 
         void updateScreen();
 
-        void drawTooltip(GuiScreen guiScreen, int mouseX, int mouseY);
+        void drawTooltip(Screen guiScreen, int mouseX, int mouseY);
 
-        void keyTyped(char eventChar, int eventKey) throws IOException;
-
-        void actionPerformed(GuiButton button);
+        boolean charTyped(char eventChar, int eventKey);
 
         void onGuiClosed();
 
         int getHeight();
+
+        void updatePosition(int slotIndex, int x, int y, float partialTicks);
+
+        void drawEntry(int slotIndex, int x, int y, int listWidth, int slotHeight, int mouseX, int mouseY, boolean isSelected, float partialTicks);
+
+        /**
+         * Called when the mouse is clicked within this entry. Returning true means that something within this entry was
+         * 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/helper/FixedStack.java

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

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

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

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

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

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

@@ -1,63 +1,75 @@
 package nl.requios.effortlessbuilding.helper;
 
-import net.minecraft.block.Block;
-import net.minecraft.block.BlockLiquid;
-import net.minecraft.block.SoundType;
+import net.minecraft.advancements.CriteriaTriggers;
+import net.minecraft.block.*;
+import net.minecraft.block.SlabBlock;
 import net.minecraft.block.material.Material;
-import net.minecraft.block.state.IBlockState;
-import net.minecraft.enchantment.EnchantmentHelper;
+import net.minecraft.entity.player.PlayerEntity;
+import net.minecraft.entity.player.ServerPlayerEntity;
+import net.minecraft.item.BlockItem;
+import net.minecraft.util.*;
+import net.minecraft.block.BlockState;
 import net.minecraft.entity.Entity;
-import net.minecraft.entity.player.EntityPlayer;
-import net.minecraft.init.Blocks;
-import net.minecraft.init.Enchantments;
-import net.minecraft.item.Item;
-import net.minecraft.item.ItemBlock;
+import net.minecraft.block.Blocks;
 import net.minecraft.item.ItemStack;
-import net.minecraft.stats.StatList;
-import net.minecraft.util.EnumFacing;
-import net.minecraft.util.SoundCategory;
-import net.minecraft.util.math.AxisAlignedBB;
+import net.minecraft.util.CachedBlockInfo;
+import net.minecraft.util.Direction;
+import net.minecraft.util.Hand;
 import net.minecraft.util.math.BlockPos;
 import net.minecraft.util.math.Vec3d;
-import net.minecraft.world.IBlockAccess;
+import net.minecraft.util.math.shapes.VoxelShape;
 import net.minecraft.world.World;
-import net.minecraftforge.items.ItemHandlerHelper;
-import nl.requios.effortlessbuilding.EffortlessBuilding;
+import net.minecraftforge.common.ToolType;
+import nl.requios.effortlessbuilding.BuildConfig;
 import nl.requios.effortlessbuilding.buildmodifier.ModifierSettingsManager;
 import nl.requios.effortlessbuilding.compatibility.CompatHelper;
 
 import javax.annotation.Nonnull;
 import javax.annotation.Nullable;
-import java.util.ArrayList;
-import java.util.List;
 
 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, EntityPlayer player, BlockPos pos, IBlockState blockState,
-                                     ItemStack origstack, EnumFacing facing, Vec3d hitVec, boolean skipCollisionCheck, boolean playSound) {
-        if (!world.isBlockLoaded(pos, true)) return false;
+    public static boolean placeBlock(World world, PlayerEntity player, BlockPos pos, BlockState blockState,
+                                     ItemStack origstack, Direction facing, Vec3d hitVec, boolean skipPlaceCheck,
+                                     boolean skipCollisionCheck, boolean playSound) {
+        if (!world.isBlockPresent(pos)) return false;
         ItemStack itemstack = origstack;
 
+        if (blockState.getBlock().isAir(blockState, world, pos) || itemstack.isEmpty()) {
+            dropBlock(world, player, pos);
+            world.removeBlock(pos, false);
+            return true;
+        }
+
         //Randomizer bag, other proxy item synergy
         //Preliminary compatibility code for other items that hold blocks
         if (CompatHelper.isItemBlockProxy(itemstack))
             itemstack = CompatHelper.getItemBlockByState(itemstack, blockState);
 
-        if(!(itemstack.getItem() instanceof ItemBlock))
+        if (!(itemstack.getItem() instanceof BlockItem))
             return false;
-        Block block = ((ItemBlock) itemstack.getItem()).getBlock();
+        Block block = ((BlockItem) itemstack.getItem()).getBlock();
 
-        if (canPlace(world, player, pos, blockState, itemstack, skipCollisionCheck, facing.getOpposite())) {
+
+        //More manual with ItemBlock#placeBlockAt
+        if (skipPlaceCheck || canPlace(world, player, pos, blockState, itemstack, skipCollisionCheck, facing.getOpposite())) {
             //Drop existing block
             dropBlock(world, player, pos);
 
-            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;
+            //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.setBlockState(pos, blockState, 3)) return false;
+            BlockItem.setTileEntityNBT(world, player, pos, itemstack); //Actually BlockItem::onBlockPlaced but that is protected
+            block.onBlockPlacedBy(world, pos, blockState, player, itemstack);
+            if (player instanceof ServerPlayerEntity) {
+                CriteriaTriggers.PLACED_BLOCK.trigger((ServerPlayerEntity)player, pos, itemstack);
+            }
 
-            IBlockState afterState = world.getBlockState(pos);
+            BlockState afterState = world.getBlockState(pos);
 
             if (playSound) {
                 SoundType soundtype = afterState.getBlock().getSoundType(afterState, world, pos, player);
@@ -65,23 +77,46 @@ public class SurvivalHelper {
             }
 
             if (!player.isCreative() && Block.getBlockFromItem(itemstack.getItem()) == block) {
-                CompatHelper.shrinkStack(origstack, itemstack);
+                CompatHelper.shrinkStack(origstack, itemstack, player);
             }
 
             return true;
         }
         return false;
+
+        //Using ItemBlock#onItemUse
+//        EnumActionResult result;
+//        PlayerInteractEvent.RightClickBlock event = ForgeHooks.onRightClickBlock(player, EnumHand.MAIN_HAND, pos, facing, net.minecraftforge.common.ForgeHooks.rayTraceEyeHitVec(player, ReachHelper.getPlacementReach(player)));
+//        if (player.isCreative())
+//        {
+//            int i = itemstack.getMetadata();
+//            int j = itemstack.getCount();
+//            if (event.getUseItem() != net.minecraftforge.fml.common.eventhandler.Event.Result.DENY) {
+//                EnumActionResult enumactionresult = itemstack.getItem().onItemUse(player, world, pos, EnumHand.MAIN_HAND, facing, (float) hitVec.x, (float) hitVec.y, (float) hitVec.z);
+//                itemstack.setItemDamage(i);
+//                itemstack.setCount(j);
+//                return enumactionresult == EnumActionResult.SUCCESS;
+//            } else return false;
+//        }
+//        else
+//        {
+//            ItemStack copyForUse = itemstack.copy();
+//            if (event.getUseItem() != net.minecraftforge.fml.common.eventhandler.Event.Result.DENY)
+//                result = itemstack.getItem().onItemUse(player, world, pos, EnumHand.MAIN_HAND, facing, (float) hitVec.x, (float) hitVec.y, (float) hitVec.z);
+//            if (itemstack.isEmpty()) net.minecraftforge.event.ForgeEventFactory.onPlayerDestroyItem(player, copyForUse, EnumHand.MAIN_HAND);
+//            return false;
+//        }
+
     }
 
     //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, EntityPlayer player, BlockPos pos) {
-        if (!world.isBlockLoaded(pos, false)) return false;
+    public static boolean breakBlock(World world, PlayerEntity player, BlockPos pos, boolean skipChecks) {
+        if (!world.isBlockPresent(pos) && !world.isAirBlock(pos)) return false;
 
         //Check if can break
-        if (canBreak(world, player, pos))
-        {
-//            player.addStat(StatList.getBlockStats(world.getBlockState(pos).getBlock()));
+        if (skipChecks || canBreak(world, player, pos)) {
+//            player.addStat(StatList.getBlockStats(world.getNewBlockState(pos).getBlock()));
 //            player.addExhaustion(0.005F);
 
             //Drop existing block
@@ -90,17 +125,17 @@ public class SurvivalHelper {
             //Damage tool
             player.getHeldItemMainhand().onBlockDestroyed(world, world.getBlockState(pos), pos, player);
 
-            world.setBlockToAir(pos);
+            world.removeBlock(pos, false);
             return true;
         }
         return false;
     }
 
     //Gives items directly to player
-    public static void dropBlock(World world, EntityPlayer player, BlockPos pos){
+    public static void dropBlock(World world, PlayerEntity player, BlockPos pos){
         if (player.isCreative()) return;
 
-        IBlockState blockState = world.getBlockState(pos);
+        BlockState blockState = world.getBlockState(pos);
         Block block = blockState.getBlock();
 
         block.harvestBlock(world, player, pos, blockState, world.getTileEntity(pos), player.getHeldItemMainhand());
@@ -147,17 +182,17 @@ public class SurvivalHelper {
      * @param sidePlacedOn
      * @return Whether the player may place the block at pos with itemstack
      */
-    public static boolean canPlace(World world, EntityPlayer player, BlockPos pos, IBlockState newBlockState, ItemStack itemStack, boolean skipCollisionCheck, EnumFacing sidePlacedOn) {
+    public static boolean canPlace(World world, PlayerEntity player, BlockPos pos, BlockState newBlockState, ItemStack itemStack, boolean skipCollisionCheck, Direction sidePlacedOn) {
 
         //Check if itemstack is correct
-        if (!(itemStack.getItem() instanceof ItemBlock) || Block.getBlockFromItem(itemStack.getItem()) != newBlockState.getBlock()) {
+        if (!(itemStack.getItem() instanceof BlockItem) || 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 = ((ItemBlock) itemStack.getItem()).getBlock();
+        Block block = ((BlockItem) itemStack.getItem()).getBlock();
 
         return !itemStack.isEmpty() && canPlayerEdit(player, world, pos, itemStack) &&
                mayPlace(world, block, newBlockState, pos, skipCollisionCheck, sidePlacedOn, player) &&
@@ -165,20 +200,28 @@ public class SurvivalHelper {
     }
 
     //Can be harvested with hand? (or in creative)
-    private static boolean canReplace(World world, EntityPlayer player, BlockPos pos){
+    private static boolean canReplace(World world, PlayerEntity player, BlockPos pos){
         if (player.isCreative()) return true;
 
-        IBlockState state = world.getBlockState(pos);
-        state = state.getBlock().getActualState(state, world, pos);
-        if (state.getMaterial().isToolNotRequired()) return true;
+        BlockState state = world.getBlockState(pos);
+
+        switch (BuildConfig.survivalBalancers.quickReplaceMiningLevel.get()) {
+            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(EntityPlayer player, World world, BlockPos pos, ItemStack stack)
+    private static boolean canPlayerEdit(PlayerEntity player, World world, BlockPos pos, ItemStack stack)
     {
-        if (player.capabilities.allowEdit)
+        if (!world.isBlockModifiable(player, pos)) return false;
+
+        if (player.abilities.allowEdit)
         {
             //True in creative and survival mode
             return true;
@@ -186,47 +229,55 @@ public class SurvivalHelper {
         else
         {
             //Adventure mode
-            Block block = world.getBlockState(pos).getBlock();
-            return stack.canPlaceOn(block) || stack.canEditBlocks();
+            CachedBlockInfo blockworldstate = new CachedBlockInfo(world, pos, false);
+            return stack.canPlaceOn(world.getTags(), blockworldstate);
+
         }
     }
 
     //From World#mayPlace
-    private static boolean mayPlace(World world, Block blockIn, IBlockState newBlockState, BlockPos pos, boolean skipCollisionCheck, EnumFacing sidePlacedOn, @Nullable Entity placer)
+    private static boolean mayPlace(World world, Block blockIn, BlockState newBlockState, BlockPos pos, boolean skipCollisionCheck, Direction sidePlacedOn, @Nullable Entity placer)
     {
-        IBlockState iblockstate1 = world.getBlockState(pos);
-        AxisAlignedBB axisalignedbb = skipCollisionCheck ? Block.NULL_AABB : blockIn.getDefaultState().getCollisionBoundingBox(world, pos);
+        BlockState iblockstate1 = world.getBlockState(pos);
+        VoxelShape voxelShape = skipCollisionCheck ? null : blockIn.getDefaultState().getCollisionShape(world, pos);
 
-        if (axisalignedbb != Block.NULL_AABB && !world.checkNoEntityCollision(axisalignedbb.offset(pos)))
+        if (voxelShape != null && !world.checkNoEntityCollision(placer, voxelShape))
         {
             return false;
         }
 
+        //Check if double slab
+        if (placer != null && doesBecomeDoubleSlab(((PlayerEntity) placer), pos, sidePlacedOn)) {
+            return true;
+        }
+
         //Check if same block
         //Necessary otherwise extra items will be dropped
         if (iblockstate1 == newBlockState) {
             return false;
         }
 
-        if (iblockstate1.getMaterial() == Material.CIRCUITS && blockIn == Blocks.ANVIL)
+        //TODO 1.14 check what Material.CIRCUITS has become
+        if (iblockstate1.getMaterial() == Material.REDSTONE_LIGHT && blockIn == Blocks.ANVIL)
         {
             return true;
         }
 
         //Check quickreplace
-        if (placer instanceof EntityPlayer && ModifierSettingsManager.getModifierSettings(((EntityPlayer) placer)).doQuickReplace()) {
+        if (placer instanceof PlayerEntity && ModifierSettingsManager.getModifierSettings(((PlayerEntity) placer)).doQuickReplace()) {
             return true;
         }
 
-        return iblockstate1.getBlock().isReplaceable(world, pos) && blockIn.canPlaceBlockOnSide(world, pos, sidePlacedOn);
+        //TODO 1.13 replaceable
+        return iblockstate1.getMaterial().isReplaceable() /*&& canPlaceBlockOnSide(world, pos, sidePlacedOn)*/;
     }
 
 
 
     //Can break using held tool? (or in creative)
-    public static boolean canBreak(World world, EntityPlayer player, BlockPos pos) {
-        IBlockState blockState = world.getBlockState(pos);
-        if (blockState.getBlock() instanceof BlockLiquid) return false;
+    public static boolean canBreak(World world, PlayerEntity player, BlockPos pos) {
+        BlockState blockState = world.getBlockState(pos);
+        if (!world.getFluidState(pos).isEmpty()) return false;
 
         if (player.isCreative()) return true;
 
@@ -234,13 +285,12 @@ public class SurvivalHelper {
     }
 
     //From ForgeHooks#canHarvestBlock
-    public static boolean canHarvestBlock(@Nonnull Block block, @Nonnull EntityPlayer player, @Nonnull IBlockAccess world, @Nonnull BlockPos pos)
+    public static boolean canHarvestBlock(@Nonnull Block block, @Nonnull PlayerEntity player, @Nonnull World world, @Nonnull BlockPos pos)
     {
-        IBlockState state = world.getBlockState(pos);
-        state = state.getBlock().getActualState(state, world, pos);
+        BlockState state = world.getBlockState(pos);
 
         //Dont break bedrock
-        if (state.getBlockHardness((World) world, pos) < 0) {
+        if (state.getBlockHardness(world, pos) < 0) {
             return false;
         }
 
@@ -250,13 +300,13 @@ public class SurvivalHelper {
         }
 
         ItemStack stack = player.getHeldItemMainhand();
-        String tool = block.getHarvestTool(state);
+        ToolType tool = block.getHarvestTool(state);
         if (stack.isEmpty() || tool == null)
         {
             return player.canHarvestBlock(state);
         }
 
-        if (stack.getItemDamage() >= stack.getMaxDamage()) return false;
+        if (stack.getDamage() >= stack.getMaxDamage()) return false;
 
         int toolLevel = stack.getItem().getHarvestLevel(stack, tool, player, state);
         if (toolLevel < 0)
@@ -266,4 +316,30 @@ public class SurvivalHelper {
 
         return toolLevel >= block.getHarvestLevel(state);
     }
+
+    public static boolean doesBecomeDoubleSlab(PlayerEntity player, BlockPos pos, Direction facing) {
+        BlockState placedBlockState = player.world.getBlockState(pos);
+
+        ItemStack itemstack = player.getHeldItem(Hand.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 (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;
+//            }
+        }
+        return false;
+    }
 }

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

@@ -1,26 +1,36 @@
 package nl.requios.effortlessbuilding.item;
 
 import net.minecraft.block.Block;
-import net.minecraft.block.state.IBlockState;
+import net.minecraft.block.BlockState;
 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.entity.player.PlayerEntity;
+import net.minecraft.entity.player.PlayerInventory;
+import net.minecraft.entity.player.ServerPlayerEntity;
+import net.minecraft.inventory.container.Container;
+import net.minecraft.inventory.container.INamedContainerProvider;
+import net.minecraft.item.*;
+import net.minecraft.nbt.CompoundNBT;
+import net.minecraft.util.*;
+import net.minecraft.util.ActionResultType;
+import net.minecraft.util.Hand;
 import net.minecraft.util.math.BlockPos;
+import net.minecraft.util.math.BlockRayTraceResult;
 import net.minecraft.util.math.Vec3d;
+import net.minecraft.util.text.ITextComponent;
+import net.minecraft.util.text.StringTextComponent;
 import net.minecraft.util.text.TextFormatting;
+import net.minecraft.util.text.TranslationTextComponent;
 import net.minecraft.world.World;
 import net.minecraftforge.common.capabilities.ICapabilityProvider;
+import net.minecraftforge.fml.network.NetworkHooks;
 import net.minecraftforge.items.CapabilityItemHandler;
 import net.minecraftforge.items.IItemHandler;
 import nl.requios.effortlessbuilding.EffortlessBuilding;
+import nl.requios.effortlessbuilding.buildmode.BuildModes;
+import nl.requios.effortlessbuilding.buildmode.ModeSettingsManager;
+import nl.requios.effortlessbuilding.buildmodifier.ModifierSettingsManager;
 import nl.requios.effortlessbuilding.capability.ItemHandlerCapabilityProvider;
+import nl.requios.effortlessbuilding.gui.RandomizerBagContainer;
 import nl.requios.effortlessbuilding.helper.SurvivalHelper;
 
 import javax.annotation.Nullable;
@@ -36,44 +46,60 @@ public class ItemRandomizerBag extends Item {
     private static Random rand = new Random(currentSeed);
 
     public ItemRandomizerBag() {
-        this.setRegistryName(EffortlessBuilding.MODID, "randomizer_bag");
-        this.setTranslationKey(this.getRegistryName().toString());
+        super(new Item.Properties().group(ItemGroup.TOOLS).maxStackSize(1));
 
-        this.maxStackSize = 1;
-        this.setCreativeTab(CreativeTabs.TOOLS);
+        this.setRegistryName(EffortlessBuilding.MODID, "randomizer_bag");
     }
 
     @Override
-    public EnumActionResult onItemUse(EntityPlayer player, World world, BlockPos pos, EnumHand hand, EnumFacing facing, float hitX, float hitY, float hitZ) {
+    public ActionResultType onItemUse(ItemUseContext ctx) {
+        PlayerEntity player = ctx.getPlayer();
+        World world = ctx.getWorld();
+        BlockPos pos = ctx.getPos();
+        Direction facing = ctx.getFace();
+        ItemStack item = ctx.getItem();
+        Vec3d hitVec = ctx.getHitVec();
 
-        if (player.isSneaking()) {
-            if (world.isRemote) return EnumActionResult.SUCCESS;
+        if (player == null) return ActionResultType.FAIL;
+
+        if (ctx.func_225518_g_()) { //ctx.isPlacerSneaking()
+            if (world.isRemote) return ActionResultType.SUCCESS;
             //Open inventory
-            player.openGui(EffortlessBuilding.instance, EffortlessBuilding.RANDOMIZER_BAG_GUI, world, 0, 0, 0);
+            NetworkHooks.openGui((ServerPlayerEntity) player, new ContainerProvider(item));
         } else {
-            if (world.isRemote) return EnumActionResult.SUCCESS;
+            if (world.isRemote) 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
-            ItemStack bag = player.getHeldItem(hand);
+            //TODO offhand support
+            ItemStack bag = player.getHeldItem(Hand.MAIN_HAND);
             IItemHandler bagInventory = getBagInventory(bag);
             if (bagInventory == null)
-                return EnumActionResult.FAIL;
+                return ActionResultType.FAIL;
 
             ItemStack toPlace = pickRandomStack(bagInventory);
-            if (toPlace.isEmpty()) return EnumActionResult.FAIL;
+            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);
 
-            if (!world.getBlockState(pos).getBlock().isReplaceable(world, pos)) {
+            //TODO replaceable
+            if (!world.getBlockState(pos).getBlock().getMaterial(world.getBlockState(pos)).isReplaceable()) {
                 pos = pos.offset(facing);
             }
 
-            IBlockState blockState = Block.getBlockFromItem(toPlace.getItem()).getStateForPlacement(world, pos, facing,
-                    hitX, hitY, hitZ, toPlace.getMetadata(), player, hand);
+            BlockItemUseContext blockItemUseContext = new BlockItemUseContext(new ItemUseContext(player, Hand.MAIN_HAND, new BlockRayTraceResult(hitVec, facing, pos, false)));
+            BlockState blockState = Block.getBlockFromItem(toPlace.getItem()).getStateForPlacement(blockItemUseContext);
 
-            SurvivalHelper.placeBlock(world, player, pos, blockState, toPlace, facing, new Vec3d(hitX, hitY, hitZ), false, true);
+            SurvivalHelper.placeBlock(world, player, pos, blockState, toPlace, facing, hitVec, false, false, true);
 
             //Synergy
             //Works without calling
@@ -82,30 +108,30 @@ public class ItemRandomizerBag extends Item {
 //            Mirror.onBlockPlaced(placeEvent);
 //            Array.onBlockPlaced(placeEvent);
         }
-        return EnumActionResult.SUCCESS;
+        return ActionResultType.SUCCESS;
     }
 
     @Override
-    public ActionResult<ItemStack> onItemRightClick(World world, EntityPlayer player, EnumHand hand) {
+    public ActionResult<ItemStack> onItemRightClick(World world, PlayerEntity player, Hand hand) {
         ItemStack bag = player.getHeldItem(hand);
 
         if (player.isSneaking()) {
-            if (world.isRemote) return new ActionResult<>(EnumActionResult.SUCCESS, bag);
+            if (world.isRemote) return new ActionResult<>(ActionResultType.SUCCESS, bag);
             //Open inventory
-            player.openGui(EffortlessBuilding.instance, EffortlessBuilding.RANDOMIZER_BAG_GUI, world, 0, 0, 0);
+            NetworkHooks.openGui((ServerPlayerEntity) player, new ContainerProvider(bag));
         } else {
             //Use item
             //Get bag inventory
             IItemHandler bagInventory = getBagInventory(bag);
             if (bagInventory == null)
-                return new ActionResult<>(EnumActionResult.FAIL, bag);
+                return new ActionResult<>(ActionResultType.FAIL, bag);
 
             ItemStack toUse = pickRandomStack(bagInventory);
-            if (toUse.isEmpty()) return new ActionResult<>(EnumActionResult.FAIL, bag);
+            if (toUse.isEmpty()) return new ActionResult<>(ActionResultType.FAIL, bag);
 
             return toUse.useItemRightClick(world, player, hand);
         }
-        return new ActionResult<>(EnumActionResult.PASS, bag);
+        return new ActionResult<>(ActionResultType.PASS, bag);
     }
 
     /**
@@ -115,8 +141,7 @@ public class ItemRandomizerBag extends Item {
      * @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);
+        return bag.getCapability(CapabilityItemHandler.ITEM_HANDLER_CAPABILITY, null).orElse(null);
     }
 
     /**
@@ -165,25 +190,28 @@ public class ItemRandomizerBag extends Item {
     }
 
     @Override
-    public int getMaxItemUseDuration(ItemStack stack) {
+    public int getUseDuration(ItemStack p_77626_1_) {
         return 1;
     }
 
     @Nullable
     @Override
-    public ICapabilityProvider initCapabilities(ItemStack stack, @Nullable NBTTagCompound nbt) {
+    public ICapabilityProvider initCapabilities(ItemStack stack, @Nullable CompoundNBT 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");
+    public void addInformation(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.getPlayers().size() > 1) {
+            tooltip.add(new StringTextComponent(TextFormatting.YELLOW + "Experimental on servers: may lose inventory"));
+        }
     }
 
     @Override
     public String getTranslationKey() {
-        return super.getTranslationKey();
+        return this.getRegistryName().toString();
     }
 
     public static void resetRandomness() {
@@ -194,4 +222,24 @@ public class ItemRandomizerBag extends Item {
         currentSeed = Calendar.getInstance().getTimeInMillis();
         rand.setSeed(currentSeed);
     }
+
+    public static class ContainerProvider implements INamedContainerProvider{
+
+        private ItemStack bag;
+
+        public ContainerProvider(ItemStack bag) {
+            this.bag = bag;
+        }
+
+        @Override
+        public ITextComponent getDisplayName() {
+            return new TranslationTextComponent("effortlessbuilding.screen.randomizer_bag");
+        }
+
+        @Nullable
+        @Override
+        public Container createMenu(int containerId, PlayerInventory playerInventory, PlayerEntity player) {
+            return new RandomizerBagContainer(containerId, playerInventory, ItemRandomizerBag.getBagInventory(bag));
+        }
+    }
 }

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

@@ -1,12 +1,13 @@
 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.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;
@@ -20,19 +21,16 @@ import java.util.List;
 public class ItemReachUpgrade1 extends Item {
 
     public ItemReachUpgrade1() {
+        super(new Item.Properties().group(ItemGroup.TOOLS).maxStackSize(1));
         this.setRegistryName(EffortlessBuilding.MODID, "reach_upgrade1");
-        this.setTranslationKey(this.getRegistryName().toString());
-
-        this.maxStackSize = 1;
-        this.setCreativeTab(CreativeTabs.TOOLS);
     }
 
     @Override
-    public ActionResult<ItemStack> onItemRightClick(World world, EntityPlayer player, EnumHand hand) {
+    public ActionResult<ItemStack> onItemRightClick(World world, PlayerEntity player, Hand 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));
+            return new ActionResult<>(ActionResultType.PASS, player.getHeldItem(hand));
         }
 
         ModifierSettingsManager.ModifierSettings modifierSettings = ModifierSettingsManager.getModifierSettings(player);
@@ -52,22 +50,16 @@ public class ItemReachUpgrade1 extends Item {
             SoundEvent soundEvent = new SoundEvent(new ResourceLocation("item.armor.equip_leather"));
             player.playSound(soundEvent, 1f, 1f);
         }
-        return new ActionResult<>(EnumActionResult.PASS, player.getHeldItem(hand));
+        return new ActionResult<>(ActionResultType.PASS, player.getHeldItem(hand));
     }
 
     @Override
-    public ItemStack onItemUseFinish(ItemStack stack, World worldIn, EntityLivingBase entityLiving) {
-        EffortlessBuilding.log("used");
-        return ItemStack.EMPTY;
-    }
-
-    @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);
+    public void addInformation(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 getTranslationKey() {
-        return super.getTranslationKey();
+        return this.getRegistryName().toString();
     }
 }

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

@@ -1,11 +1,13 @@
 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.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;
@@ -19,19 +21,16 @@ import java.util.List;
 public class ItemReachUpgrade2 extends Item {
 
     public ItemReachUpgrade2() {
+        super(new Item.Properties().group(ItemGroup.TOOLS).maxStackSize(1));
         this.setRegistryName(EffortlessBuilding.MODID, "reach_upgrade2");
-        this.setTranslationKey(this.getRegistryName().toString());
-
-        this.maxStackSize = 1;
-        this.setCreativeTab(CreativeTabs.TOOLS);
     }
 
     @Override
-    public ActionResult<ItemStack> onItemRightClick(World world, EntityPlayer player, EnumHand hand) {
+    public ActionResult<ItemStack> onItemRightClick(World world, PlayerEntity player, Hand 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));
+            return new ActionResult<>(ActionResultType.PASS, player.getHeldItem(hand));
         }
 
         ModifierSettingsManager.ModifierSettings modifierSettings = ModifierSettingsManager.getModifierSettings(player);
@@ -55,17 +54,17 @@ public class ItemReachUpgrade2 extends Item {
             SoundEvent soundEvent = new SoundEvent(new ResourceLocation("item.armor.equip_leather"));
             player.playSound(soundEvent, 1f, 1f);
         }
-        return new ActionResult<>(EnumActionResult.PASS, player.getHeldItem(hand));
+        return new ActionResult<>(ActionResultType.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");
+    public void addInformation(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 getTranslationKey() {
-        return super.getTranslationKey();
+        return this.getRegistryName().toString();
     }
 }

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

@@ -1,11 +1,13 @@
 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.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;
@@ -19,19 +21,16 @@ import java.util.List;
 public class ItemReachUpgrade3 extends Item {
 
     public ItemReachUpgrade3() {
+        super(new Item.Properties().group(ItemGroup.TOOLS).maxStackSize(1));
         this.setRegistryName(EffortlessBuilding.MODID, "reach_upgrade3");
-        this.setTranslationKey(this.getRegistryName().toString());
-
-        this.maxStackSize = 1;
-        this.setCreativeTab(CreativeTabs.TOOLS);
     }
 
     @Override
-    public ActionResult<ItemStack> onItemRightClick(World world, EntityPlayer player, EnumHand hand) {
+    public ActionResult<ItemStack> onItemRightClick(World world, PlayerEntity player, Hand 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));
+            return new ActionResult<>(ActionResultType.PASS, player.getHeldItem(hand));
         }
 
         ModifierSettingsManager.ModifierSettings modifierSettings = ModifierSettingsManager.getModifierSettings(player);
@@ -58,17 +57,17 @@ public class ItemReachUpgrade3 extends Item {
             SoundEvent soundEvent = new SoundEvent(new ResourceLocation("item.armor.equip_leather"));
             player.playSound(soundEvent, 1f, 1f);
         }
-        return new ActionResult<>(EnumActionResult.PASS, player.getHeldItem(hand));
+        return new ActionResult<>(ActionResultType.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");
+    public void addInformation(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 getTranslationKey() {
-        return super.getTranslationKey();
+        return this.getRegistryName().toString();
     }
 }

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

@@ -0,0 +1,87 @@
+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.Vec3d;
+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 BlockPos coordinate;
+    private BlockState previousBlockState;
+    private 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 BlockPos getCoordinate() {
+        return coordinate;
+    }
+
+    public BlockState getPreviousBlockState() {
+        return previousBlockState;
+    }
+
+    public BlockState getNewBlockState() {
+        return 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.getStateId(message.previousBlockState));
+        buf.writeInt(Block.getStateId(message.newBlockState));
+    }
+
+    public static AddUndoMessage decode(PacketBuffer buf) {
+        BlockPos coordinate = new BlockPos(buf.readInt(), buf.readInt(), buf.readInt());
+        BlockState previousBlockState = Block.getStateById(buf.readInt());
+        BlockState newBlockState = Block.getStateById(buf.readInt());
+        return new AddUndoMessage(coordinate, previousBlockState, 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 Vec3d(0,0,0),
+                            message.getCoordinate(), message.getCoordinate()));
+                }
+            });
+            ctx.get().setPacketHandled(true);
+        }
+    }
+}

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

@@ -1,40 +1,47 @@
 package nl.requios.effortlessbuilding.network;
 
-import io.netty.buffer.ByteBuf;
-import net.minecraft.util.EnumFacing;
+import net.minecraft.network.PacketBuffer;
+import net.minecraft.util.Direction;
 import net.minecraft.util.math.BlockPos;
+import net.minecraft.util.math.BlockRayTraceResult;
 import net.minecraft.util.math.RayTraceResult;
 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 net.minecraftforge.fml.LogicalSide;
+import net.minecraftforge.fml.network.NetworkEvent;
 import nl.requios.effortlessbuilding.EffortlessBuilding;
 import nl.requios.effortlessbuilding.buildmode.BuildModes;
-import nl.requios.effortlessbuilding.buildmodifier.BuildModifiers;
+
+import java.util.function.Supplier;
 
 /***
  * Sends a message to the server indicating that a player wants to break a block
  */
-public class BlockBrokenMessage implements IMessage {
+public class BlockBrokenMessage {
 
     private boolean blockHit;
     private BlockPos blockPos;
-    private EnumFacing sideHit;
+    private Direction sideHit;
     private Vec3d hitVec;
 
     public BlockBrokenMessage() {
         this.blockHit = false;
-        this.blockPos = BlockPos.ORIGIN;
-        this.sideHit = EnumFacing.UP;
+        this.blockPos = BlockPos.ZERO;
+        this.sideHit = Direction.UP;
         this.hitVec = new Vec3d(0, 0, 0);
     }
 
-    public BlockBrokenMessage(RayTraceResult result) {
-        this.blockHit = result.typeOfHit == RayTraceResult.Type.BLOCK;
-        this.blockPos = result.getBlockPos();
-        this.sideHit = result.sideHit;
-        this.hitVec = result.hitVec;
+    public BlockBrokenMessage(BlockRayTraceResult result) {
+        this.blockHit = result.getType() == RayTraceResult.Type.BLOCK;
+        this.blockPos = result.getPos();
+        this.sideHit = result.getFace();
+        this.hitVec = result.getHitVec();
+    }
+
+    public BlockBrokenMessage(boolean blockHit, BlockPos blockPos, Direction sideHit, Vec3d hitVec) {
+        this.blockHit = blockHit;
+        this.blockPos = blockPos;
+        this.sideHit = sideHit;
+        this.hitVec = hitVec;
     }
 
     public boolean isBlockHit() {
@@ -45,7 +52,7 @@ public class BlockBrokenMessage implements IMessage {
         return blockPos;
     }
 
-    public EnumFacing getSideHit() {
+    public Direction getSideHit() {
         return sideHit;
     }
 
@@ -53,43 +60,36 @@ public class BlockBrokenMessage implements IMessage {
         return hitVec;
     }
 
-    @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);
+    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.getIndex());
+        buf.writeDouble(message.hitVec.x);
+        buf.writeDouble(message.hitVec.y);
+        buf.writeDouble(message.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());
+    public static BlockBrokenMessage decode(PacketBuffer buf) {
+        boolean blockHit = buf.readBoolean();
+        BlockPos blockPos = new BlockPos(buf.readInt(), buf.readInt(), buf.readInt());
+        Direction sideHit = Direction.byIndex(buf.readInt());
+        Vec3d hitVec = new Vec3d(buf.readDouble(), buf.readDouble(), buf.readDouble());
+        return new BlockBrokenMessage(blockHit, blockPos, sideHit, hitVec);
     }
 
-    // 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) {
+    public static class Handler
+    {
+        public static void handle(BlockBrokenMessage message, Supplier<NetworkEvent.Context> ctx)
+        {
+            ctx.get().enqueueWork(() -> {
+                if (ctx.get().getDirection().getReceptionSide() == LogicalSide.SERVER) {
                     //Received serverside
-                EffortlessBuilding.proxy.getThreadListenerFromContext(ctx).addScheduledTask(() -> {
-                    BuildModes.onBlockBrokenMessage(ctx.getServerHandler().player, message);
+                    BuildModes.onBlockBrokenMessage(ctx.get().getSender(), message);
+                }
             });
-            }
-            // No response packet
-            return null;
+            ctx.get().setPacketHandled(true);
         }
     }
-
 }

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

@@ -1,43 +1,53 @@
 package nl.requios.effortlessbuilding.network;
 
-import io.netty.buffer.ByteBuf;
-import net.minecraft.util.EnumFacing;
+import net.minecraft.util.Direction;
 import net.minecraft.util.math.BlockPos;
+import net.minecraft.util.math.BlockRayTraceResult;
 import net.minecraft.util.math.RayTraceResult;
 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 net.minecraft.network.PacketBuffer;
+import net.minecraftforge.fml.LogicalSide;
+import net.minecraftforge.fml.network.NetworkEvent;
 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 implements IMessage {
+public class BlockPlacedMessage {
 
     private boolean blockHit;
     private BlockPos blockPos;
-    private EnumFacing sideHit;
+    private Direction sideHit;
     private Vec3d hitVec;
+    private boolean placeStartPos; //prevent double placing in normal mode
 
     public BlockPlacedMessage() {
         this.blockHit = false;
-        this.blockPos = BlockPos.ORIGIN;
-        this.sideHit = EnumFacing.UP;
+        this.blockPos = BlockPos.ZERO;
+        this.sideHit = Direction.UP;
         this.hitVec = new Vec3d(0, 0, 0);
+        this.placeStartPos = true;
     }
 
-    public BlockPlacedMessage(RayTraceResult result) {
-        this.blockHit = result.typeOfHit == RayTraceResult.Type.BLOCK;
-        this.blockPos = result.getBlockPos();
-        this.sideHit = result.sideHit;
-        this.hitVec = result.hitVec;
+    public BlockPlacedMessage(BlockRayTraceResult result, boolean placeStartPos) {
+        this.blockHit = result.getType() == RayTraceResult.Type.BLOCK;
+        this.blockPos = result.getPos();
+        this.sideHit = result.getFace();
+        this.hitVec = result.getHitVec();
+        this.placeStartPos = placeStartPos;
+    }
+
+    public BlockPlacedMessage(boolean blockHit, BlockPos blockPos, Direction sideHit, Vec3d hitVec, boolean placeStartPos) {
+        this.blockHit = blockHit;
+        this.blockPos = blockPos;
+        this.sideHit = sideHit;
+        this.hitVec = hitVec;
+        this.placeStartPos = placeStartPos;
     }
 
     public boolean isBlockHit() {
@@ -48,7 +58,7 @@ public class BlockPlacedMessage implements IMessage {
         return blockPos;
     }
 
-    public EnumFacing getSideHit() {
+    public Direction getSideHit() {
         return sideHit;
     }
 
@@ -56,49 +66,46 @@ public class BlockPlacedMessage implements IMessage {
         return hitVec;
     }
 
-    @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);
+    public boolean getPlaceStartPos() {
+        return 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());
+    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.getIndex());
+        buf.writeDouble(message.hitVec.x);
+        buf.writeDouble(message.hitVec.y);
+        buf.writeDouble(message.hitVec.z);
+        buf.writeBoolean(message.placeStartPos);
     }
 
-    // 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
+    public static BlockPlacedMessage decode(PacketBuffer buf) {
+        boolean blockHit = buf.readBoolean();
+        BlockPos blockPos = new BlockPos(buf.readInt(), buf.readInt(), buf.readInt());
+        Direction sideHit = Direction.byIndex(buf.readInt());
+        Vec3d hitVec = new Vec3d(buf.readDouble(), buf.readDouble(), buf.readDouble());
+        boolean placeStartPos = buf.readBoolean();
+        return new BlockPlacedMessage(blockHit, blockPos, sideHit, hitVec, placeStartPos);
+    }
 
-        @Override
-        public IMessage onMessage(BlockPlacedMessage message, MessageContext ctx) {
-            //EffortlessBuilding.log("message received on " + ctx.side + " side");
-
-            if (ctx.side == Side.CLIENT){
+    public static class Handler
+    {
+        public static void handle(BlockPlacedMessage message, Supplier<NetworkEvent.Context> ctx)
+        {
+            ctx.get().enqueueWork(() -> {
+                if (ctx.get().getDirection().getReceptionSide() == LogicalSide.CLIENT) {
                     //Received clientside
-                EffortlessBuilding.proxy.getThreadListenerFromContext(ctx).addScheduledTask(() -> {
                     //Nod RenderHandler to do the dissolve shader effect
                     BlockPreviewRenderer.onBlocksPlaced();
-                });
-                return null;
                 } else {
                     //Received serverside
-                EffortlessBuilding.proxy.getThreadListenerFromContext(ctx).addScheduledTask(() -> {
-                    BuildModes.onBlockPlacedMessage(ctx.getServerHandler().player, message);
+                    BuildModes.onBlockPlacedMessage(ctx.get().getSender(), message);
+                }
             });
-                // No response packet
-                return null;
-            }
+            ctx.get().setPacketHandled(true);
         }
     }
 }

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

@@ -1,45 +1,35 @@
 package nl.requios.effortlessbuilding.network;
 
-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 net.minecraft.entity.player.PlayerEntity;
+import net.minecraft.network.PacketBuffer;
+import net.minecraftforge.fml.network.NetworkEvent;
 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 implements IMessage {
-
-    @Override
-    public void toBytes(ByteBuf buf) {
+public class CancelModeMessage {
 
+    public static void encode(CancelModeMessage message, PacketBuffer buf) {
     }
 
-    @Override
-    public void fromBytes(ByteBuf buf) {
-
+    public static CancelModeMessage decode(PacketBuffer buf) {
+        return new CancelModeMessage();
     }
 
-    // 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);
+    public static class Handler
+    {
+        public static void handle(CancelModeMessage message, Supplier<NetworkEvent.Context> ctx)
+        {
+            ctx.get().enqueueWork(() -> {
+                PlayerEntity player = EffortlessBuilding.proxy.getPlayerEntityFromContext(ctx);
 
                 BuildModes.initializeMode(player);
             });
-            // No response packet
-            return null;
+            ctx.get().setPacketHandled(true);
         }
     }
 }

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

@@ -0,0 +1,44 @@
+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

@@ -0,0 +1,46 @@
+package nl.requios.effortlessbuilding.network;
+
+import net.minecraft.entity.player.PlayerEntity;
+import net.minecraft.network.PacketBuffer;
+import net.minecraftforge.fml.network.NetworkEvent;
+import nl.requios.effortlessbuilding.EffortlessBuilding;
+import nl.requios.effortlessbuilding.buildmode.ModeOptions;
+
+import java.util.function.Supplier;
+
+/**
+ * Shares mode settings (see ModeSettingsManager) between server and client
+ */
+public class ModeActionMessage {
+
+    private ModeOptions.ActionEnum action;
+
+    public ModeActionMessage() {
+    }
+
+    public ModeActionMessage(ModeOptions.ActionEnum action) {
+        this.action = action;
+    }
+
+    public static void encode(ModeActionMessage message, PacketBuffer buf) {
+        buf.writeInt(message.action.ordinal());
+    }
+
+    public static ModeActionMessage decode(PacketBuffer buf) {
+        ModeOptions.ActionEnum action = ModeOptions.ActionEnum.values()[buf.readInt()];
+        return new ModeActionMessage(action);
+    }
+
+    public static class Handler
+    {
+        public static void handle(ModeActionMessage message, Supplier<NetworkEvent.Context> ctx)
+        {
+            ctx.get().enqueueWork(() -> {
+                PlayerEntity player = EffortlessBuilding.proxy.getPlayerEntityFromContext(ctx);
+
+                ModeOptions.performAction(player, message.action);
+            });
+            ctx.get().setPacketHandled(true);
+        }
+    }
+}

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

@@ -1,21 +1,19 @@
 package nl.requios.effortlessbuilding.network;
 
-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 net.minecraft.entity.player.PlayerEntity;
+import net.minecraft.network.PacketBuffer;
+import net.minecraftforge.fml.network.NetworkEvent;
 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 static nl.requios.effortlessbuilding.buildmode.ModeSettingsManager.*;
+import java.util.function.Supplier;
 
 /**
  * Shares mode settings (see ModeSettingsManager) between server and client
  */
-public class ModeSettingsMessage implements IMessage {
+public class ModeSettingsMessage {
 
     private ModeSettings modeSettings;
 
@@ -26,45 +24,29 @@ public class ModeSettingsMessage implements IMessage {
         this.modeSettings = modeSettings;
     }
 
-    @Override
-    public void toBytes(ByteBuf buf) {
-        buf.writeInt(modeSettings.getBuildMode().ordinal());
-
-        //TODO add mode settings
+    public static void encode(ModeSettingsMessage message, PacketBuffer buf) {
+        buf.writeInt(message.modeSettings.getBuildMode().ordinal());
     }
 
-    @Override
-    public void fromBytes(ByteBuf buf) {
+    public static ModeSettingsMessage decode(PacketBuffer buf) {
         BuildModes.BuildModeEnum buildMode = BuildModes.BuildModeEnum.values()[buf.readInt()];
 
-        //TODO add mode settings
-
-        modeSettings = new ModeSettings(buildMode);
+        return new ModeSettingsMessage(new ModeSettings(buildMode));
     }
 
-    // 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);
+    public static class Handler
+    {
+        public static void handle(ModeSettingsMessage message, Supplier<NetworkEvent.Context> ctx)
+        {
+            ctx.get().enqueueWork(() -> {
+                PlayerEntity player = EffortlessBuilding.proxy.getPlayerEntityFromContext(ctx);
 
                 // Sanitize
-                ModeSettingsManager.sanitize(modeSettings, player);
+                ModeSettingsManager.sanitize(message.modeSettings, player);
 
-                ModeSettingsManager.setModeSettings(player, modeSettings);
+                ModeSettingsManager.setModeSettings(player, message.modeSettings);
             });
-            // No response packet
-            return null;
+            ctx.get().setPacketHandled(true);
         }
     }
 }

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

@@ -1,25 +1,24 @@
 package nl.requios.effortlessbuilding.network;
 
-import io.netty.buffer.ByteBuf;
-import net.minecraft.entity.player.EntityPlayer;
-import net.minecraft.util.IThreadListener;
+import net.minecraft.entity.player.PlayerEntity;
+import net.minecraft.network.PacketBuffer;
 import net.minecraft.util.math.BlockPos;
 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.network.NetworkEvent;
 import nl.requios.effortlessbuilding.EffortlessBuilding;
 import nl.requios.effortlessbuilding.buildmodifier.Array;
 import nl.requios.effortlessbuilding.buildmodifier.Mirror;
 import nl.requios.effortlessbuilding.buildmodifier.ModifierSettingsManager;
 import nl.requios.effortlessbuilding.buildmodifier.RadialMirror;
 
-import static nl.requios.effortlessbuilding.buildmodifier.ModifierSettingsManager.*;
+import java.util.function.Supplier;
+
+import static nl.requios.effortlessbuilding.buildmodifier.ModifierSettingsManager.ModifierSettings;
 
 /**
  * Shares modifier settings (see ModifierSettingsManager) between server and client
  */
-public class ModifierSettingsMessage implements IMessage {
+public class ModifierSettingsMessage {
 
     private ModifierSettings modifierSettings;
 
@@ -30,10 +29,9 @@ public class ModifierSettingsMessage implements IMessage {
         this.modifierSettings = modifierSettings;
     }
 
-    @Override
-    public void toBytes(ByteBuf buf) {
+    public static void encode(ModifierSettingsMessage message, PacketBuffer buf) {
         //MIRROR
-        Mirror.MirrorSettings m = modifierSettings.getMirrorSettings();
+        Mirror.MirrorSettings m = message.modifierSettings.getMirrorSettings();
         buf.writeBoolean(m != null);
         if (m != null) {
             buf.writeBoolean(m.enabled);
@@ -49,7 +47,7 @@ public class ModifierSettingsMessage implements IMessage {
         }
 
         //ARRAY
-        Array.ArraySettings a = modifierSettings.getArraySettings();
+        Array.ArraySettings a = message.modifierSettings.getArraySettings();
         buf.writeBoolean(a != null);
         if (a != null) {
             buf.writeBoolean(a.enabled);
@@ -59,12 +57,12 @@ public class ModifierSettingsMessage implements IMessage {
             buf.writeInt(a.count);
         }
 
-        buf.writeBoolean(modifierSettings.doQuickReplace());
+        buf.writeBoolean(message.modifierSettings.doQuickReplace());
 
-        buf.writeInt(modifierSettings.getReachUpgrade());
+        buf.writeInt(message.modifierSettings.getReachUpgrade());
 
         //RADIAL MIRROR
-        RadialMirror.RadialMirrorSettings r = modifierSettings.getRadialMirrorSettings();
+        RadialMirror.RadialMirrorSettings r = message.modifierSettings.getRadialMirrorSettings();
         buf.writeBoolean(r != null);
         if (r != null) {
             buf.writeBoolean(r.enabled);
@@ -79,8 +77,7 @@ public class ModifierSettingsMessage implements IMessage {
         }
     }
 
-    @Override
-    public void fromBytes(ByteBuf buf) {
+    public static ModifierSettingsMessage decode(PacketBuffer buf) {
         //MIRROR
         Mirror.MirrorSettings m = new Mirror.MirrorSettings();
         if (buf.readBoolean()) {
@@ -123,32 +120,23 @@ public class ModifierSettingsMessage implements IMessage {
                     radialMirrorAlternate, radialMirrorRadius, radialMirrorDrawLines, radialMirrorDrawPlanes);
         }
 
-        modifierSettings = new ModifierSettings(m, a, r, quickReplace, reachUpgrade);
+        ModifierSettings modifierSettings = new ModifierSettings(m, a, r, quickReplace, reachUpgrade);
+        return new ModifierSettingsMessage(modifierSettings);
     }
 
-    // The params of the IMessageHandler are <REQ, REPLY>
-    public static class MessageHandler implements IMessageHandler<ModifierSettingsMessage, IMessage> {
-        // Do note that the default constructor is required, but implicitly defined in this case
-
-        @Override
-        public IMessage onMessage(ModifierSettingsMessage message, MessageContext ctx) {
-            //EffortlessBuilding.log("message received on " + ctx.side + " side");
-
-            // The value that was sent
-            ModifierSettings modifierSettings = message.modifierSettings;
-
-            // 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);
+    public static class Handler
+    {
+        public static void handle(ModifierSettingsMessage message, Supplier<NetworkEvent.Context> ctx)
+        {
+            ctx.get().enqueueWork(() -> {
+                PlayerEntity player = EffortlessBuilding.proxy.getPlayerEntityFromContext(ctx);
 
                 // Sanitize
-                ModifierSettingsManager.sanitize(modifierSettings, player);
+                ModifierSettingsManager.sanitize(message.modifierSettings, player);
 
-                ModifierSettingsManager.setModifierSettings(player, modifierSettings);
+                ModifierSettingsManager.setModifierSettings(player, message.modifierSettings);
             });
-            // No response packet
-            return null;
+            ctx.get().setPacketHandled(true);
         }
     }
 }

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

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

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

@@ -1,50 +1,64 @@
 package nl.requios.effortlessbuilding.network;
 
-import io.netty.buffer.ByteBuf;
-import net.minecraft.util.EnumFacing;
-import net.minecraft.util.math.BlockPos;
+import net.minecraft.entity.player.PlayerEntity;
+import net.minecraft.network.PacketBuffer;
+import net.minecraft.util.math.BlockRayTraceResult;
 import net.minecraft.util.math.RayTraceResult;
-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 net.minecraftforge.fml.LogicalSide;
+import net.minecraftforge.fml.network.NetworkEvent;
 import nl.requios.effortlessbuilding.EffortlessBuilding;
-import nl.requios.effortlessbuilding.buildmode.BuildModes;
-import nl.requios.effortlessbuilding.buildmodifier.BuildModifiers;
 import nl.requios.effortlessbuilding.proxy.ClientProxy;
 
+import java.util.function.Supplier;
+
 /***
  * Sends a message to the client asking for its lookat (objectmouseover) data.
  * This is then sent back with a BlockPlacedMessage.
  */
-public class RequestLookAtMessage implements IMessage {
+public class RequestLookAtMessage {
+    private boolean placeStartPos;
 
     public RequestLookAtMessage() {
+        placeStartPos = false;
     }
 
-    @Override
-    public void toBytes(ByteBuf buf) {
+    public RequestLookAtMessage(boolean placeStartPos) {
+        this.placeStartPos = placeStartPos;
     }
 
-    @Override
-    public void fromBytes(ByteBuf buf) {
+    public boolean getPlaceStartPos() {
+        return placeStartPos;
     }
 
-    // The params of the IMessageHandler are <REQ, REPLY>
-    public static class MessageHandler implements IMessageHandler<RequestLookAtMessage, IMessage> {
-        // Do note that the default constructor is required, but implicitly defined in this case
+    public static void encode(RequestLookAtMessage message, PacketBuffer buf) {
+        buf.writeBoolean(message.placeStartPos);
+    }
 
-        @Override
-        public IMessage onMessage(RequestLookAtMessage message, MessageContext ctx) {
-            //EffortlessBuilding.log("message received on " + ctx.side + " side");
+    public static RequestLookAtMessage decode(PacketBuffer buf) {
+        boolean placeStartPos = buf.readBoolean();
+        return new RequestLookAtMessage(placeStartPos);
+    }
 
-            if (ctx.side == Side.CLIENT){
+    public static class Handler
+    {
+        public static void handle(RequestLookAtMessage message, Supplier<NetworkEvent.Context> ctx)
+        {
+            ctx.get().enqueueWork(() -> {
+                if (ctx.get().getDirection().getReceptionSide() == LogicalSide.CLIENT) {
                     //Received clientside
                     //Send back your info
-                return new BlockPlacedMessage(ClientProxy.previousLookAt);
+                    PlayerEntity player = EffortlessBuilding.proxy.getPlayerEntityFromContext(ctx);
+
+                    //Prevent double placing in normal mode with placeStartPos false
+                    //Unless QuickReplace is on, then we do need to place start pos.
+                    if (ClientProxy.previousLookAt.getType() == RayTraceResult.Type.BLOCK) {
+                        PacketHandler.INSTANCE.sendToServer(new BlockPlacedMessage((BlockRayTraceResult) ClientProxy.previousLookAt, message.getPlaceStartPos()));
+                    } else {
+                        PacketHandler.INSTANCE.sendToServer(new BlockPlacedMessage());
                     }
-            return null;
+                }
+            });
+            ctx.get().setPacketHandled(true);
         }
     }
 }

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

@@ -0,0 +1,79 @@
+package nl.requios.effortlessbuilding.network;
+
+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.Vec3d;
+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;
+
+public class TranslatedLogMessage {
+    private String prefix;
+    private String translationKey;
+    private String suffix;
+    private boolean actionBar;
+
+    public TranslatedLogMessage(){
+        prefix = "";
+        translationKey = "";
+        suffix = "";
+        actionBar = false;
+    }
+
+    public TranslatedLogMessage(String prefix, String translationKey, String suffix, boolean actionBar) {
+        this.prefix = prefix;
+        this.translationKey = translationKey;
+        this.suffix = suffix;
+        this.actionBar = actionBar;
+    }
+
+    public String getPrefix() {
+        return prefix;
+    }
+
+    public String getTranslationKey() {
+        return translationKey;
+    }
+
+    public String getSuffix() {
+        return suffix;
+    }
+
+    public boolean isActionBar() {
+        return actionBar;
+    }
+
+    public static void encode(TranslatedLogMessage message, PacketBuffer buf) {
+        buf.writeString(message.prefix);
+        buf.writeString(message.translationKey);
+        buf.writeString(message.suffix);
+        buf.writeBoolean(message.actionBar);
+    }
+
+    public static TranslatedLogMessage decode(PacketBuffer buf) {
+        return new TranslatedLogMessage(buf.readString(), buf.readString(), buf.readString(), buf.readBoolean());
+    }
+
+    public static class Handler
+    {
+        public static void handle(TranslatedLogMessage message, Supplier<NetworkEvent.Context> ctx)
+        {
+            ctx.get().enqueueWork(() -> {
+                if (ctx.get().getDirection().getReceptionSide() == LogicalSide.CLIENT) {
+                    //Received clientside
+
+                    PlayerEntity player = EffortlessBuilding.proxy.getPlayerEntityFromContext(ctx);
+                    EffortlessBuilding.logTranslate(player, message.prefix, message.translationKey, message.suffix, message.actionBar);
+                }
+            });
+            ctx.get().setPacketHandled(true);
+        }
+    }
+}

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

@@ -1,266 +1,114 @@
 package nl.requios.effortlessbuilding.proxy;
 
-import net.minecraft.block.Block;
+import net.minecraft.block.BlockState;
 import net.minecraft.block.SoundType;
-import net.minecraft.block.state.IBlockState;
 import net.minecraft.client.Minecraft;
-import net.minecraft.client.entity.EntityPlayerSP;
-import net.minecraft.client.gui.GuiScreen;
-import net.minecraft.client.renderer.block.model.ModelResourceLocation;
+import net.minecraft.client.entity.player.ClientPlayerEntity;
+import net.minecraft.client.gui.ScreenManager;
+import net.minecraft.client.gui.screen.Screen;
 import net.minecraft.client.renderer.texture.TextureAtlasSprite;
-import net.minecraft.client.renderer.texture.TextureMap;
+import net.minecraft.client.resources.I18n;
 import net.minecraft.client.settings.KeyBinding;
-import net.minecraft.entity.player.EntityPlayer;
-import net.minecraft.entity.player.EntityPlayerMP;
-import net.minecraft.item.Item;
+import net.minecraft.client.util.InputMappings;
+import net.minecraft.entity.player.PlayerEntity;
+import net.minecraft.item.BlockItem;
 import net.minecraft.item.ItemStack;
-import net.minecraft.util.EnumHand;
-import net.minecraft.util.IThreadListener;
+import net.minecraft.util.Hand;
 import net.minecraft.util.ResourceLocation;
 import net.minecraft.util.SoundCategory;
-import net.minecraft.util.math.BlockPos;
-import net.minecraft.util.math.RayTraceResult;
+import net.minecraft.util.math.*;
 import net.minecraft.util.text.TextFormatting;
+import net.minecraft.world.World;
+import net.minecraftforge.api.distmarker.Dist;
 import net.minecraftforge.client.event.GuiOpenEvent;
-import net.minecraftforge.client.event.ModelRegistryEvent;
+import net.minecraftforge.client.event.InputEvent;
 import net.minecraftforge.client.event.TextureStitchEvent;
-import net.minecraftforge.client.model.ModelLoader;
-import net.minecraftforge.event.entity.EntityJoinWorldEvent;
+import net.minecraftforge.client.settings.KeyConflictContext;
+import net.minecraftforge.client.settings.KeyModifier;
+import net.minecraftforge.event.TickEvent;
+import net.minecraftforge.eventbus.api.SubscribeEvent;
+import net.minecraftforge.fml.DeferredWorkQueue;
+import net.minecraftforge.fml.LogicalSide;
 import net.minecraftforge.fml.client.registry.ClientRegistry;
 import net.minecraftforge.fml.common.Mod;
-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.eventhandler.Event;
-import net.minecraftforge.fml.common.eventhandler.EventPriority;
-import net.minecraftforge.fml.common.eventhandler.SubscribeEvent;
-import net.minecraftforge.fml.common.gameevent.InputEvent;
-import net.minecraftforge.fml.common.gameevent.TickEvent;
-import net.minecraftforge.fml.common.network.simpleimpl.MessageContext;
-import net.minecraftforge.fml.relauncher.Side;
+import net.minecraftforge.fml.event.lifecycle.FMLClientSetupEvent;
+import net.minecraftforge.fml.event.lifecycle.FMLCommonSetupEvent;
+import net.minecraftforge.fml.network.NetworkEvent;
 import nl.requios.effortlessbuilding.EffortlessBuilding;
 import nl.requios.effortlessbuilding.buildmode.BuildModes;
+import nl.requios.effortlessbuilding.buildmode.ModeOptions;
 import nl.requios.effortlessbuilding.buildmode.ModeSettingsManager;
 import nl.requios.effortlessbuilding.buildmodifier.ModifierSettingsManager;
+import nl.requios.effortlessbuilding.compatibility.CompatHelper;
+import nl.requios.effortlessbuilding.gui.RandomizerBagScreen;
+import nl.requios.effortlessbuilding.gui.buildmode.PlayerSettingsGui;
 import nl.requios.effortlessbuilding.gui.buildmode.RadialMenu;
 import nl.requios.effortlessbuilding.gui.buildmodifier.ModifierSettingsGui;
-import nl.requios.effortlessbuilding.compatibility.CompatHelper;
 import nl.requios.effortlessbuilding.helper.ReachHelper;
-import nl.requios.effortlessbuilding.render.RenderHandler;
-import nl.requios.effortlessbuilding.render.ShaderHandler;
 import nl.requios.effortlessbuilding.network.*;
-import org.lwjgl.input.Keyboard;
+import nl.requios.effortlessbuilding.render.ShaderHandler;
+import org.lwjgl.glfw.GLFW;
 
+import javax.annotation.Nullable;
 import java.util.HashMap;
+import java.util.function.Supplier;
 
-@Mod.EventBusSubscriber(Side.CLIENT)
+@Mod.EventBusSubscriber(value = {Dist.CLIENT})
 public class ClientProxy implements IProxy {
     public static KeyBinding[] keyBindings;
     public static RayTraceResult previousLookAt;
     public static RayTraceResult currentLookAt;
+    private static int placeCooldown = 0;
     private static int breakCooldown = 0;
+    private static boolean shadersInitialized = false;
 
     public static int ticksInGame = 0;
 
-    private static final HashMap<BuildModes.BuildModeEnum, TextureAtlasSprite> buildModeIcons = new HashMap<>();
+    @Override
+    public void setup(FMLCommonSetupEvent event) {}
 
     @Override
-    public void preInit(FMLPreInitializationEvent event) {
-        ShaderHandler.init();
-    }
-
-    @Override
-    public void init(FMLInitializationEvent event) {
+    public void clientSetup(FMLClientSetupEvent event) {
         // register key bindings
-        keyBindings = new KeyBinding[4];
+        keyBindings = new KeyBinding[7];
 
         // instantiate the key bindings
-        keyBindings[0] = new KeyBinding("key.effortlessbuilding.hud.desc", Keyboard.KEY_ADD, "key.effortlessbuilding.category");
-        keyBindings[1] = new KeyBinding("key.effortlessbuilding.replace.desc", Keyboard.KEY_SUBTRACT, "key.effortlessbuilding.category");
-        keyBindings[2] = new KeyBinding("key.effortlessbuilding.creative.desc", Keyboard.KEY_NONE, "key.effortlessbuilding.category");
-        keyBindings[3] = new KeyBinding("key.effortlessbuilding.mode.desc", Keyboard.KEY_LMENU, "key.effortlessbuilding.category");
-//        keyBindings[4] = new KeyBinding("Reload shaders", Keyboard.KEY_TAB, "key.effortlessbuilding.category");
+        keyBindings[0] = new KeyBinding("key.effortlessbuilding.hud.desc", KeyConflictContext.UNIVERSAL, InputMappings.getInputByCode(GLFW.GLFW_KEY_KP_ADD, 0), "key.effortlessbuilding.category");
+        keyBindings[1] = new KeyBinding("key.effortlessbuilding.replace.desc", KeyConflictContext.IN_GAME, InputMappings.getInputByCode(GLFW.GLFW_KEY_KP_SUBTRACT, 0), "key.effortlessbuilding.category");
+        keyBindings[2] = new KeyBinding("key.effortlessbuilding.creative.desc", KeyConflictContext.IN_GAME, InputMappings.getInputByCode(GLFW.GLFW_KEY_F4, 0), "key.effortlessbuilding.category");
+        keyBindings[3] = new KeyBinding("key.effortlessbuilding.mode.desc", KeyConflictContext.IN_GAME, InputMappings.getInputByCode(GLFW.GLFW_KEY_LEFT_ALT, 0), "key.effortlessbuilding.category") {
+            @Override
+            public boolean conflicts(KeyBinding other) {
+                //Does not conflict with Chisels and Bits radial menu
+                if (other.getKey().getKeyCode() == getKey().getKeyCode() && other.getKeyDescription().equals("mod.chiselsandbits.other.mode")) return false;
+                return super.conflicts(other);
+            }
+        };
+        keyBindings[4] = new KeyBinding("key.effortlessbuilding.undo.desc", KeyConflictContext.IN_GAME, KeyModifier.CONTROL, InputMappings.getInputByCode(GLFW.GLFW_KEY_Z, 0), "key.effortlessbuilding.category");
+        keyBindings[5] = new KeyBinding("key.effortlessbuilding.redo.desc", KeyConflictContext.IN_GAME, KeyModifier.CONTROL, InputMappings.getInputByCode(GLFW.GLFW_KEY_Y, 0), "key.effortlessbuilding.category");
+        keyBindings[6] = new KeyBinding("key.effortlessbuilding.altplacement.desc", KeyConflictContext.IN_GAME, InputMappings.getInputByCode(GLFW.GLFW_KEY_LEFT_CONTROL, 0), "key.effortlessbuilding.category");
+        //keyBindings[7] = new KeyBinding("Reload shaders", KeyConflictContext.UNIVERSAL, InputMappings.getInputByCode(GLFW.GLFW_KEY_TAB, 0), "key.effortlessbuilding.category");
 
         // register all the key bindings
         for (int i = 0; i < keyBindings.length; ++i) {
             ClientRegistry.registerKeyBinding(keyBindings[i]);
         }
+
+        DeferredWorkQueue.runLater( () -> ScreenManager.registerFactory(EffortlessBuilding.RANDOMIZER_BAG_CONTAINER, RandomizerBagScreen::new));
     }
 
-    @Override
-    public void postInit(FMLPostInitializationEvent event) {
-
-    }
-
-    @Override
-    public EntityPlayer getPlayerEntityFromContext(MessageContext ctx) {
-        return (ctx.side.isClient() ? Minecraft.getMinecraft().player : ctx.getServerHandler().player);
-    }
-
-    @Override
-    public IThreadListener getThreadListenerFromContext(MessageContext ctx) {
-        return (ctx.side.isClient() ? Minecraft.getMinecraft() : ((EntityPlayerMP) getPlayerEntityFromContext(ctx)).getServerWorld());
-    }
-
-    @Override
-    public void serverStarting(FMLServerStartingEvent event) {
-        //This will get called clientside
-    }
-
-    @SubscribeEvent
-    public static void registerModels(ModelRegistryEvent event) {
-        for (Block block : EffortlessBuilding.BLOCKS) {
-            ModelLoader.setCustomModelResourceLocation(Item.getItemFromBlock(block), 0, new ModelResourceLocation(block.getRegistryName(), "inventory"));
-        }
-
-        for (Item item : EffortlessBuilding.ITEMS) {
-            ModelLoader.setCustomModelResourceLocation(item, 0, new ModelResourceLocation(item.getRegistryName(), "inventory"));
-        }
-    }
-
-    @SubscribeEvent
-    public static void onEntityJoinWorld(EntityJoinWorldEvent event) {
-        if (event.getEntity() == Minecraft.getMinecraft().player) {
-            event.getWorld().addEventListener(new RenderHandler());
-        }
-    }
-
-    @SubscribeEvent
-    public static void onTextureStitch(final TextureStitchEvent.Pre event) {
-        //register icon textures
-        final TextureMap map = event.getMap();
-
-        for ( final BuildModes.BuildModeEnum mode : BuildModes.BuildModeEnum.values() )
-        {
-            final ResourceLocation sprite = new ResourceLocation("effortlessbuilding", "icons/" + mode.name().toLowerCase());
-            buildModeIcons.put( mode, map.registerSprite(sprite));
-        }
-    }
-
-    public static TextureAtlasSprite getBuildModeIcon(BuildModes.BuildModeEnum mode) {
-        return buildModeIcons.get(mode);
-    }
-
-    @SubscribeEvent
-    public static void onMouseInput(InputEvent.MouseInputEvent event) {
-        Minecraft mc = Minecraft.getMinecraft();
-        EntityPlayerSP player = mc.player;
-
-        if (Minecraft.getMinecraft().currentScreen != null ||
-            ModeSettingsManager.getModeSettings(player).getBuildMode() == BuildModes.BuildModeEnum.Normal ||
-            RadialMenu.instance.isVisible()) {
-            return;
-        }
-
-        if (mc.gameSettings.keyBindUseItem.isPressed()) {
-            //KeyBinding.setKeyBindState(mc.gameSettings.keyBindUseItem.getKeyCode(), false);
-
-            ItemStack currentItemStack = player.getHeldItem(EnumHand.MAIN_HAND);
-            if (CompatHelper.isItemBlockProxy(currentItemStack) && !player.isSneaking()) {
-
-                //find position in distance
-                RayTraceResult lookingAt = getLookingAt(player);
-                BuildModes.onBlockPlacedMessage(player, new BlockPlacedMessage(lookingAt));
-                EffortlessBuilding.packetHandler.sendToServer(new BlockPlacedMessage(lookingAt));
-
-                //play sound if further than normal
-                if (lookingAt != null && lookingAt.typeOfHit == RayTraceResult.Type.BLOCK &&
-                    (lookingAt.hitVec.subtract(player.getPositionEyes(1f))).lengthSquared() > 25f) {
-
-                    BlockPos blockPos = lookingAt.getBlockPos();
-                    IBlockState state = player.world.getBlockState(blockPos);
-                    SoundType soundtype = state.getBlock().getSoundType(state, player.world, blockPos, player);
-                    player.world.playSound(player, blockPos, soundtype.getPlaceSound(), SoundCategory.BLOCKS,
-                            (soundtype.getVolume() + 1.0F) / 2.0F, soundtype.getPitch() * 0.8F);
-                    player.swingArm(EnumHand.MAIN_HAND);
-                }
-            }
-        }
-
-        if (mc.gameSettings.keyBindAttack.isKeyDown()) {
-            //KeyBinding.setKeyBindState(mc.gameSettings.keyBindAttack.getKeyCode(), false);
-
-            //Break block in distance in creative (or survival if enabled in config)
-            if (ReachHelper.canBreakFar(player)) {
-                if (breakCooldown <= 0) {
-                    breakCooldown = 6;
-                    RayTraceResult lookingAt = getLookingAt(player);
-
-                    BuildModes.onBlockBrokenMessage(player, new BlockBrokenMessage(lookingAt));
-                    EffortlessBuilding.packetHandler.sendToServer(new BlockBrokenMessage(lookingAt));
-
-                    //play sound
-                    if (lookingAt != null && lookingAt.typeOfHit == RayTraceResult.Type.BLOCK) {
-                        BlockPos blockPos = lookingAt.getBlockPos();
-                        IBlockState state = player.world.getBlockState(blockPos);
-                        SoundType soundtype = state.getBlock().getSoundType(state, player.world, blockPos, player);
-                        player.world.playSound(player, blockPos, soundtype.getBreakSound(), SoundCategory.BLOCKS,
-                                (soundtype.getVolume() + 1.0F) / 2.0F, soundtype.getPitch() * 0.8F);
-                        player.swingArm(EnumHand.MAIN_HAND);
-                    }
-                } else {
-                    breakCooldown--;
-                }
-            }
-
-            //EffortlessBuilding.packetHandler.sendToServer(new CancelModeMessage());
-
-        } else {
-            breakCooldown = 0;
-        }
-        event.setResult(Event.Result.ALLOW);
-    }
-
-    @SubscribeEvent(priority = EventPriority.NORMAL, receiveCanceled = true)
-    public static void onKeyPress(InputEvent.KeyInputEvent event) {
-        EntityPlayerSP player = Minecraft.getMinecraft().player;
-
-        //Remember to send packet to server if necessary
-        //Show HUD
-        if (keyBindings[0].isPressed()) {
-            //Disabled if max reach is 0, might be set in the config that way.
-            if (ReachHelper.getMaxReach(player) == 0) {
-                EffortlessBuilding.log(player, "Build modifiers are disabled until your reach has increased. Increase your reach with craftable reach upgrades.");
-            } else {
-                if (Minecraft.getMinecraft().currentScreen == null) {
-                    Minecraft.getMinecraft().displayGuiScreen(new ModifierSettingsGui());
-                } else {
-                    player.closeScreen();
-                }
-            }
-        }
-
-        //QuickReplace toggle
-        if (keyBindings[1].isPressed()) {
-            ModifierSettingsManager.ModifierSettings modifierSettings = ModifierSettingsManager.getModifierSettings(player);
-            modifierSettings.setQuickReplace(!modifierSettings.doQuickReplace());
-            EffortlessBuilding.log(player, "Set "+ TextFormatting.GOLD + "Quick Replace " + TextFormatting.RESET + (
-                    modifierSettings.doQuickReplace() ? "on" : "off"));
-            EffortlessBuilding.packetHandler.sendToServer(new ModifierSettingsMessage(modifierSettings));
-        }
-
-        //Creative/survival mode toggle
-        if (keyBindings[2].isPressed()) {
-            if (player.isCreative()) {
-                player.sendChatMessage("/gamemode 0");
-            } else {
-                player.sendChatMessage("/gamemode 1");
-            }
-        }
-
-//        if (keyBindings[4].isPressed()) {
-//            //TODO remove
-//            ShaderHandler.init();
-//            EffortlessBuilding.log(player, "Reloaded shaders");
-//        }
-
+    public PlayerEntity getPlayerEntityFromContext(Supplier<NetworkEvent.Context> ctx){
+        return (ctx.get().getDirection().getReceptionSide() == LogicalSide.CLIENT ? Minecraft.getInstance().player : ctx.get().getSender());
     }
 
     @SubscribeEvent
     public static void onClientTick(TickEvent.ClientTickEvent event) {
+
         if (event.phase == TickEvent.Phase.START) {
-            RayTraceResult objectMouseOver = Minecraft.getMinecraft().objectMouseOver;
+            onMouseInput();
+
+            //Update previousLookAt
+            RayTraceResult objectMouseOver = Minecraft.getInstance().objectMouseOver;
             //Checking for null is necessary! Even in vanilla when looking down ladders it is occasionally null (instead of Type MISS)
             if (objectMouseOver == null) return;
 
@@ -270,44 +118,262 @@ public class ClientProxy implements IProxy {
                 return;
             }
 
-            if (objectMouseOver.typeOfHit == RayTraceResult.Type.BLOCK) {
-                if (currentLookAt.typeOfHit != RayTraceResult.Type.BLOCK) {
+            if (objectMouseOver.getType() == RayTraceResult.Type.BLOCK) {
+                if (currentLookAt.getType() != RayTraceResult.Type.BLOCK) {
                     currentLookAt = objectMouseOver;
                     previousLookAt = objectMouseOver;
                 } else {
-                    if (currentLookAt.getBlockPos() != objectMouseOver.getBlockPos()) {
+                    if (((BlockRayTraceResult) currentLookAt).getPos() != ((BlockRayTraceResult) objectMouseOver).getPos()) {
                         previousLookAt = currentLookAt;
                         currentLookAt = objectMouseOver;
                     }
                 }
             }
+
         } else if (event.phase == TickEvent.Phase.END){
-            GuiScreen gui = Minecraft.getMinecraft().currentScreen;
-            if(gui == null || !gui.doesGuiPauseGame()) {
+            Screen gui = Minecraft.getInstance().currentScreen;
+            if(gui == null || !gui.isPauseScreen()) {
                 ticksInGame++;
             }
+
+            //Init shaders in the first tick. Doing it anywhere before this seems to crash the game.
+            if (!shadersInitialized) {
+                ShaderHandler.init();
+                shadersInitialized = true;
+            }
         }
 
     }
 
+    private static void onMouseInput() {
+        Minecraft mc = Minecraft.getInstance();
+        ClientPlayerEntity player = mc.player;
+        if (player == null) return;
+        BuildModes.BuildModeEnum buildMode = ModeSettingsManager.getModeSettings(player).getBuildMode();
+
+        if (Minecraft.getInstance().currentScreen != null ||
+            buildMode == BuildModes.BuildModeEnum.NORMAL ||
+            RadialMenu.instance.isVisible()) {
+            return;
+        }
+
+        if (mc.gameSettings.keyBindUseItem.isKeyDown()) {
+
+            //KeyBinding.setKeyBindState(mc.gameSettings.keyBindUseItem.getKeyCode(), false);
+
+            if (placeCooldown <= 0) {
+                placeCooldown = 4;
+
+                ItemStack currentItemStack = player.getHeldItem(Hand.MAIN_HAND);
+                if (currentItemStack.getItem() instanceof BlockItem ||
+                    (CompatHelper.isItemBlockProxy(currentItemStack) && !player.isSneaking())) {
+
+                    ItemStack itemStack = CompatHelper.getItemBlockFromStack(currentItemStack);
+
+                    //find position in distance
+                    RayTraceResult lookingAt = getLookingAt(player);
+                    if (lookingAt != null && lookingAt.getType() == RayTraceResult.Type.BLOCK) {
+                        BlockRayTraceResult blockLookingAt = (BlockRayTraceResult) lookingAt;
+
+                        BuildModes.onBlockPlacedMessage(player, new BlockPlacedMessage(blockLookingAt, true));
+                        PacketHandler.INSTANCE.sendToServer(new BlockPlacedMessage(blockLookingAt, true));
+
+                        //play sound if further than normal
+                        if ((blockLookingAt.getHitVec().subtract(player.getEyePosition(1f))).lengthSquared() > 25f &&
+                            itemStack.getItem() instanceof BlockItem) {
+
+                            BlockState state = ((BlockItem) itemStack.getItem()).getBlock().getDefaultState();
+                            BlockPos blockPos = blockLookingAt.getPos();
+                            SoundType soundType = state.getBlock().getSoundType(state, player.world, blockPos, player);
+                            player.world.playSound(player, player.getPosition(), soundType.getPlaceSound(), SoundCategory.BLOCKS,
+                                    0.4f, soundType.getPitch() * 1f);
+                            player.swingArm(Hand.MAIN_HAND);
+                        }
+                    } else {
+                        BuildModes.onBlockPlacedMessage(player, new BlockPlacedMessage());
+                        PacketHandler.INSTANCE.sendToServer(new BlockPlacedMessage());
+                    }
+                }
+            }
+            else if (buildMode == BuildModes.BuildModeEnum.NORMAL_PLUS) {
+                placeCooldown--;
+                if (ModeOptions.getBuildSpeed() == ModeOptions.ActionEnum.FAST_SPEED) placeCooldown = 0;
+            }
+        } else {
+            placeCooldown = 0;
+        }
+
+        if (mc.gameSettings.keyBindAttack.isKeyDown()) {
+
+            //Break block in distance in creative (or survival if enabled in config)
+            if (breakCooldown <= 0) {
+                breakCooldown = 4;
+
+                //Early out if cant break far, coming from own mouse event (not block broken event)
+                //To make breaking blocks in survival possible like array
+                //TODO this causes not being able to cancel placement in survival
+                //  moving it to after buildmodes fixes that, but introduces this bug
+                if (!ReachHelper.canBreakFar(player)) return;
+
+                RayTraceResult lookingAt = getLookingAt(player);
+                if (lookingAt != null && lookingAt.getType() == RayTraceResult.Type.BLOCK) {
+                    BlockRayTraceResult blockLookingAt = (BlockRayTraceResult) lookingAt;
+
+                    BuildModes.onBlockBrokenMessage(player, new BlockBrokenMessage(blockLookingAt));
+                    PacketHandler.INSTANCE.sendToServer(new BlockBrokenMessage(blockLookingAt));
+
+                    //play sound if further than normal
+                    if ((blockLookingAt.getHitVec().subtract(player.getEyePosition(1f))).lengthSquared() > 25f) {
+
+                        BlockPos blockPos = blockLookingAt.getPos();
+                        BlockState state = player.world.getBlockState(blockPos);
+                        SoundType soundtype = state.getBlock().getSoundType(state, player.world, blockPos, player);
+                        player.world.playSound(player, player.getPosition(), soundtype.getBreakSound(), SoundCategory.BLOCKS,
+                                0.4f, soundtype.getPitch() * 1f);
+                        player.swingArm(Hand.MAIN_HAND);
+                    }
+                } else {
+                    BuildModes.onBlockBrokenMessage(player, new BlockBrokenMessage());
+                    PacketHandler.INSTANCE.sendToServer(new BlockBrokenMessage());
+                }
+            }
+            else if (buildMode == BuildModes.BuildModeEnum.NORMAL_PLUS) {
+                breakCooldown--;
+                if (ModeOptions.getBuildSpeed() == ModeOptions.ActionEnum.FAST_SPEED) breakCooldown = 0;
+            }
+
+            //EffortlessBuilding.packetHandler.sendToServer(new CancelModeMessage());
+
+        } else {
+            breakCooldown = 0;
+        }
+    }
+
+    @SubscribeEvent(receiveCanceled = true)
+    public static void onKeyPress(InputEvent.KeyInputEvent event) {
+        ClientPlayerEntity player = Minecraft.getInstance().player;
+
+        //Remember to send packet to server if necessary
+        //Show Modifier Settings GUI
+        if (keyBindings[0].isPressed()) {
+            openModifierSettings();
+        }
+
+        //QuickReplace toggle
+        if (keyBindings[1].isPressed()) {
+            ModifierSettingsManager.ModifierSettings modifierSettings = ModifierSettingsManager.getModifierSettings(player);
+            modifierSettings.setQuickReplace(!modifierSettings.doQuickReplace());
+            EffortlessBuilding.log(player, "Set " + TextFormatting.GOLD + "Quick Replace " + TextFormatting.RESET + (
+                    modifierSettings.doQuickReplace() ? "on" : "off"));
+            PacketHandler.INSTANCE.sendToServer(new ModifierSettingsMessage(modifierSettings));
+        }
+
+        //Creative/survival mode toggle
+        if (keyBindings[2].isPressed()) {
+            if (player.isCreative()) {
+                player.sendChatMessage("/gamemode survival");
+            } else {
+                player.sendChatMessage("/gamemode creative");
+            }
+        }
+
+        //Undo (Ctrl+Z)
+        if (keyBindings[4].isPressed()) {
+            ModeOptions.ActionEnum action = ModeOptions.ActionEnum.UNDO;
+            ModeOptions.performAction(player, action);
+            PacketHandler.INSTANCE.sendToServer(new ModeActionMessage(action));
+        }
+
+        //Redo (Ctrl+Y)
+        if (keyBindings[5].isPressed()) {
+            ModeOptions.ActionEnum action = ModeOptions.ActionEnum.REDO;
+            ModeOptions.performAction(player, action);
+            PacketHandler.INSTANCE.sendToServer(new ModeActionMessage(action));
+        }
+
+        //Change placement mode
+        if (keyBindings[6].isPressed()) {
+            //Toggle between first two actions of the first option of the current build mode
+            BuildModes.BuildModeEnum currentBuildMode = ModeSettingsManager.getModeSettings(player).getBuildMode();
+            if (currentBuildMode.options.length > 0) {
+                ModeOptions.OptionEnum option = currentBuildMode.options[0];
+                if (option.actions.length >= 2) {
+                    if (ModeOptions.getOptionSetting(option) == option.actions[0]) {
+                        ModeOptions.performAction(player, option.actions[1]);
+                        PacketHandler.INSTANCE.sendToServer(new ModeActionMessage(option.actions[1]));
+                    } else {
+                        ModeOptions.performAction(player, option.actions[0]);
+                        PacketHandler.INSTANCE.sendToServer(new ModeActionMessage(option.actions[0]));
+                    }
+                }
+            }
+        }
+
+        //For shader development
+        if (keyBindings.length >= 8 && keyBindings[7].isPressed()) {
+            ShaderHandler.init();
+            EffortlessBuilding.log(player, "Reloaded shaders");
+        }
+
+    }
+
+    public static void openModifierSettings() {
+        Minecraft mc = Minecraft.getInstance();
+        ClientPlayerEntity player = mc.player;
+
+        RadialMenu.instance.setVisibility(0f);
+
+        //Disabled if max reach is 0, might be set in the config that way.
+        if (ReachHelper.getMaxReach(player) == 0) {
+            EffortlessBuilding.log(player, "Build modifiers are disabled until your reach has increased. Increase your reach with craftable reach upgrades.");
+        } else {
+            if (mc.currentScreen == null) {
+                mc.displayGuiScreen(new ModifierSettingsGui());
+            } else {
+                player.closeScreen();
+            }
+        }
+    }
+
+    public static void openPlayerSettings() {
+        Minecraft mc = Minecraft.getInstance();
+        ClientPlayerEntity player = mc.player;
+
+        RadialMenu.instance.setVisibility(0f);
+
+        //Disabled if max reach is 0, might be set in the config that way.
+        if (mc.currentScreen == null) {
+            mc.displayGuiScreen(new PlayerSettingsGui());
+        } else {
+            player.closeScreen();
+        }
+    }
+
     @SubscribeEvent
     public static void onGuiOpen(GuiOpenEvent event) {
-        EntityPlayer player = Minecraft.getMinecraft().player;
+        PlayerEntity player = Minecraft.getInstance().player;
         if (player != null) {
             BuildModes.initializeMode(player);
         }
     }
 
-    public static RayTraceResult getLookingAt(EntityPlayer player) {
-//        World world = player.world;
+    @Nullable
+    public static RayTraceResult getLookingAt(PlayerEntity player) {
+        World world = player.world;
 
         //base distance off of player ability (config)
         float raytraceRange = ReachHelper.getPlacementReach(player);
 
-//        Vec3d look = player.getLookVec();
-//        Vec3d start = new Vec3d(player.posX, player.posY + player.getEyeHeight(), player.posZ);
-//        Vec3d end = new Vec3d(player.posX + look.x * raytraceRange, player.posY + player.getEyeHeight() + look.y * raytraceRange, player.posZ + look.z * raytraceRange);
-        return player.rayTrace(raytraceRange, 1f);
-//        return world.rayTraceBlocks(start, end, false, false, false);
+        Vec3d look = player.getLookVec();
+        Vec3d start = new Vec3d(player.getPosX(), player.getPosY() + player.getEyeHeight(), player.getPosZ());
+        Vec3d end = new Vec3d(player.getPosX() + look.x * raytraceRange, player.getPosY() + player.getEyeHeight() + look.y * raytraceRange, player.getPosZ() + look.z * raytraceRange);
+//        return player.rayTrace(raytraceRange, 1f, RayTraceFluidMode.NEVER);
+        //TODO 1.14 check if correct
+        return world.rayTraceBlocks(new RayTraceContext(start, end, RayTraceContext.BlockMode.COLLIDER, RayTraceContext.FluidMode.NONE, player));
+    }
+
+    @Override
+    public void logTranslate(PlayerEntity player, String prefix, String translationKey, String suffix, boolean actionBar) {
+        EffortlessBuilding.log(Minecraft.getInstance().player, prefix + I18n.format(translationKey) + suffix, actionBar);
     }
 }

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

@@ -1,43 +1,18 @@
 package nl.requios.effortlessbuilding.proxy;
 
-import net.minecraft.entity.player.EntityPlayer;
-import net.minecraft.util.IThreadListener;
-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.simpleimpl.MessageContext;
+import net.minecraft.entity.player.PlayerEntity;
+import net.minecraftforge.fml.event.lifecycle.FMLClientSetupEvent;
+import net.minecraftforge.fml.event.lifecycle.FMLCommonSetupEvent;
+import net.minecraftforge.fml.network.NetworkEvent;
 
-public interface IProxy
-{
-    /**
-     * Register entities and networking.
-     */
-    void preInit(FMLPreInitializationEvent event);
+import java.util.function.Supplier;
 
-    /**
-     * Register event listeners, recipes and advancements.
-     */
-    void init(FMLInitializationEvent event);
+public interface IProxy {
+    void setup(final FMLCommonSetupEvent event);
 
-    /**
-     * For doing inter-mod stuff like checking which mods are loaded or if you want a complete view of things across
-     * mods like having a list of all registered items to aid random item generation.
-     */
-    void postInit(FMLPostInitializationEvent event);
+    void clientSetup(final FMLClientSetupEvent event);
 
-    /**
-     * Server commands should be registered here.
-     */
-    void serverStarting(FMLServerStartingEvent event);
+    PlayerEntity getPlayerEntityFromContext(Supplier<NetworkEvent.Context> ctx);
 
-    /**
-     * Returns a side-appropriate EntityPlayer for use during message handling.
-     *
-     * @param ctx the context
-     * @return the player entity from context
-     */
-    EntityPlayer getPlayerEntityFromContext(MessageContext ctx);
-
-    IThreadListener getThreadListenerFromContext(MessageContext ctx);
+    void logTranslate(PlayerEntity player, String prefix, String translationKey, String suffix, boolean actionBar);
 }

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

@@ -1,45 +1,32 @@
 package nl.requios.effortlessbuilding.proxy;
 
-import net.minecraft.entity.player.EntityPlayer;
-import net.minecraft.entity.player.EntityPlayerMP;
-import net.minecraft.util.IThreadListener;
-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.simpleimpl.MessageContext;
+import net.minecraft.entity.player.PlayerEntity;
+import net.minecraft.entity.player.ServerPlayerEntity;
+import net.minecraftforge.fml.event.lifecycle.FMLClientSetupEvent;
+import net.minecraftforge.fml.event.lifecycle.FMLCommonSetupEvent;
+import net.minecraftforge.fml.network.NetworkEvent;
+import net.minecraftforge.fml.network.PacketDistributor;
+import nl.requios.effortlessbuilding.network.PacketHandler;
+import nl.requios.effortlessbuilding.network.TranslatedLogMessage;
 
-public class ServerProxy implements IProxy
-{
+import java.util.function.Supplier;
+
+public class ServerProxy implements IProxy {
     //Only physical server! Singleplayer server is seen as clientproxy
     @Override
-    public void preInit(FMLPreInitializationEvent event)
-    {
+    public void setup(FMLCommonSetupEvent event) {
+
     }
 
     @Override
-    public void init(FMLInitializationEvent event)
-    {
+    public void clientSetup(FMLClientSetupEvent event) {}
+
+    public PlayerEntity getPlayerEntityFromContext(Supplier<NetworkEvent.Context> ctx){
+        return ctx.get().getSender();
     }
 
     @Override
-    public void postInit(FMLPostInitializationEvent event)
-    {
-    }
-
-    @Override
-    public void serverStarting(FMLServerStartingEvent event)
-    {
-    }
-
-    @Override
-    public EntityPlayer getPlayerEntityFromContext(MessageContext ctx)
-    {
-        return ctx.getServerHandler().player;
-    }
-
-    @Override
-    public IThreadListener getThreadListenerFromContext(MessageContext ctx) {
-        return ((EntityPlayerMP) getPlayerEntityFromContext(ctx)).getServerWorld();
+    public void logTranslate(PlayerEntity player, String prefix, String translationKey, String suffix, boolean actionBar) {
+        PacketHandler.INSTANCE.send(PacketDistributor.PLAYER.with(() -> (ServerPlayerEntity) player), new TranslatedLogMessage(prefix, translationKey, suffix, actionBar));
     }
 }

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

@@ -1,22 +1,23 @@
 package nl.requios.effortlessbuilding.render;
 
-import net.minecraft.block.state.IBlockState;
+import com.mojang.blaze3d.matrix.MatrixStack;
+import com.mojang.blaze3d.systems.RenderSystem;
+import com.mojang.blaze3d.vertex.IVertexBuilder;
+import net.minecraft.block.BlockState;
+import net.minecraft.block.SoundType;
 import net.minecraft.client.Minecraft;
-import net.minecraft.client.entity.EntityPlayerSP;
+import net.minecraft.client.entity.player.ClientPlayerEntity;
 import net.minecraft.client.renderer.BlockRendererDispatcher;
-import net.minecraft.client.renderer.GlStateManager;
-import net.minecraft.client.renderer.OpenGlHelper;
-import net.minecraft.client.renderer.texture.TextureMap;
-import net.minecraft.entity.player.EntityPlayer;
+import net.minecraft.client.renderer.IRenderTypeBuffer;
+import net.minecraft.client.renderer.texture.AtlasTexture;
+import net.minecraft.entity.player.PlayerEntity;
 import net.minecraft.item.ItemStack;
-import net.minecraft.util.EnumFacing;
-import net.minecraft.util.ResourceLocation;
-import net.minecraft.util.math.BlockPos;
-import net.minecraft.util.math.MathHelper;
-import net.minecraft.util.math.RayTraceResult;
-import net.minecraft.util.math.Vec3d;
-import net.minecraftforge.fml.relauncher.Side;
-import net.minecraftforge.fml.relauncher.SideOnly;
+import net.minecraft.util.Direction;
+import net.minecraft.util.SoundCategory;
+import net.minecraft.util.math.*;
+import net.minecraft.util.math.shapes.VoxelShape;
+import net.minecraftforge.api.distmarker.Dist;
+import net.minecraftforge.api.distmarker.OnlyIn;
 import nl.requios.effortlessbuilding.BuildConfig;
 import nl.requios.effortlessbuilding.EffortlessBuilding;
 import nl.requios.effortlessbuilding.buildmode.BuildModes;
@@ -31,19 +32,17 @@ import nl.requios.effortlessbuilding.helper.ReachHelper;
 import nl.requios.effortlessbuilding.helper.SurvivalHelper;
 import nl.requios.effortlessbuilding.item.ItemRandomizerBag;
 import nl.requios.effortlessbuilding.proxy.ClientProxy;
-import org.lwjgl.opengl.ARBMultitexture;
-import org.lwjgl.opengl.ARBShaderObjects;
-import org.lwjgl.opengl.GL11;
+import org.lwjgl.opengl.*;
 
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.List;
 import java.util.function.Consumer;
 
-@SideOnly(Side.CLIENT)
+@OnlyIn(Dist.CLIENT)
 public class BlockPreviewRenderer {
     private static List<BlockPos> previousCoordinates;
-    private static List<IBlockState> previousBlockStates;
+    private static List<BlockState> previousBlockStates;
     private static List<ItemStack> previousItemStacks;
     private static BlockPos previousFirstPos;
     private static BlockPos previousSecondPos;
@@ -52,13 +51,13 @@ public class BlockPreviewRenderer {
     static class PlacedData {
         float time;
         List<BlockPos> coordinates;
-        List<IBlockState> blockStates;
+        List<BlockState> blockStates;
         List<ItemStack> itemStacks;
         BlockPos firstPos;
         BlockPos secondPos;
         boolean breaking;
 
-        public PlacedData(float time, List<BlockPos> coordinates, List<IBlockState> blockStates,
+        public PlacedData(float time, List<BlockPos> coordinates, List<BlockState> blockStates,
                           List<ItemStack> itemStacks, BlockPos firstPos, BlockPos secondPos, boolean breaking) {
             this.time = time;
             this.coordinates = coordinates;
@@ -72,50 +71,49 @@ public class BlockPreviewRenderer {
 
     private static List<PlacedData> placedDataList = new ArrayList<>();
 
-    private static final int secondaryTextureUnit = 7;
-
-    public static void render(EntityPlayer player, ModifierSettings modifierSettings, ModeSettings modeSettings) {
+    public static void render(MatrixStack matrixStack, IRenderTypeBuffer.Impl renderTypeBuffer, PlayerEntity player, ModifierSettings modifierSettings, ModeSettings modeSettings) {
 
         //Render placed blocks with dissolve effect
         //Use fancy shader if config allows, otherwise no dissolve
-        if (BuildConfig.visuals.useShaders) {
-            RenderHandler.beginBlockPreviews();
+        if (BuildConfig.visuals.useShaders.get()) {
             for (int i = 0; i < placedDataList.size(); i++) {
                 PlacedData placed = placedDataList.get(i);
                 if (placed.coordinates != null && !placed.coordinates.isEmpty()) {
 
-                    double totalTime = MathHelper.clampedLerp(30, 60, placed.firstPos.distanceSq(placed.secondPos) / 100.0) * BuildConfig.visuals.dissolveTimeMultiplier;
+                    double totalTime = MathHelper.clampedLerp(30, 60, placed.firstPos.distanceSq(placed.secondPos) / 100.0) * BuildConfig.visuals.dissolveTimeMultiplier.get();
                     float dissolve = (ClientProxy.ticksInGame - placed.time) / (float) totalTime;
-                    renderBlockPreviews(placed.coordinates, placed.blockStates, placed.itemStacks, dissolve, placed.firstPos, placed.secondPos, false, placed.breaking);
+                    renderBlockPreviews(matrixStack, renderTypeBuffer, placed.coordinates, placed.blockStates, placed.itemStacks, dissolve, placed.firstPos, placed.secondPos, false, placed.breaking);
                 }
             }
-            RenderHandler.endBlockPreviews();
         }
         //Expire
         placedDataList.removeIf(placed -> {
-            double totalTime = MathHelper.clampedLerp(30, 60, placed.firstPos.distanceSq(placed.secondPos) / 100.0) * BuildConfig.visuals.dissolveTimeMultiplier;
+            double totalTime = MathHelper.clampedLerp(30, 60, placed.firstPos.distanceSq(placed.secondPos) / 100.0) * BuildConfig.visuals.dissolveTimeMultiplier.get();
             return placed.time + totalTime < ClientProxy.ticksInGame;
         });
 
         //Render block previews
         RayTraceResult lookingAt = ClientProxy.getLookingAt(player);
-        if (modeSettings.getBuildMode() == BuildModes.BuildModeEnum.Normal) lookingAt = Minecraft.getMinecraft().objectMouseOver;
+        if (modeSettings.getBuildMode() == BuildModes.BuildModeEnum.NORMAL) lookingAt = Minecraft.getInstance().objectMouseOver;
 
         ItemStack mainhand = player.getHeldItemMainhand();
         boolean toolInHand = !(!mainhand.isEmpty() && CompatHelper.isItemBlockProxy(mainhand));
 
         BlockPos startPos = null;
-        EnumFacing sideHit = null;
+        Direction sideHit = null;
         Vec3d hitVec = null;
 
         //Checking for null is necessary! Even in vanilla when looking down ladders it is occasionally null (instead of Type MISS)
-        if (lookingAt != null && lookingAt.typeOfHit == RayTraceResult.Type.BLOCK) {
-            startPos = lookingAt.getBlockPos();
+        if (lookingAt != null && lookingAt.getType() == RayTraceResult.Type.BLOCK) {
+            BlockRayTraceResult blockLookingAt = (BlockRayTraceResult) lookingAt;
+            startPos = blockLookingAt.getPos();
 
             //Check if tool (or none) in hand
-            boolean replaceable = player.world.getBlockState(startPos).getBlock().isReplaceable(player.world, startPos);
-            if (!modifierSettings.doQuickReplace() && !toolInHand && !replaceable) {
-                startPos = startPos.offset(lookingAt.sideHit);
+            //TODO 1.13 replaceable
+            boolean replaceable = player.world.getBlockState(startPos).getBlock().getMaterial(player.world.getBlockState(startPos)).isReplaceable();
+            boolean becomesDoubleSlab = SurvivalHelper.doesBecomeDoubleSlab(player, startPos, blockLookingAt.getFace());
+            if (!modifierSettings.doQuickReplace() && !toolInHand && !replaceable && !becomesDoubleSlab) {
+                startPos = startPos.offset(blockLookingAt.getFace());
             }
 
             //Get under tall grass and other replaceable blocks
@@ -123,17 +121,21 @@ public class BlockPreviewRenderer {
                 startPos = startPos.down();
             }
 
-            sideHit = lookingAt.sideHit;
-            hitVec = lookingAt.hitVec;
+            sideHit = blockLookingAt.getFace();
+            hitVec = blockLookingAt.getHitVec();
         }
 
         //Dont render if in normal mode and modifiers are disabled
         //Unless alwaysShowBlockPreview is true in config
         if (doRenderBlockPreviews(modifierSettings, modeSettings, startPos)) {
 
+            //Keep blockstate the same for every block in the buildmode
+            //So dont rotate blocks when in the middle of placing wall etc.
+            if (BuildModes.isActive(player)) {
                 IBuildMode buildModeInstance = modeSettings.getBuildMode().instance;
                 if (buildModeInstance.getSideHit(player) != null) sideHit = buildModeInstance.getSideHit(player);
                 if (buildModeInstance.getHitVec(player) != null) hitVec = buildModeInstance.getHitVec(player);
+            }
 
             if (sideHit != null) {
 
@@ -143,8 +145,8 @@ public class BlockPreviewRenderer {
                 //get coordinates
                 List<BlockPos> startCoordinates = BuildModes.findCoordinates(player, startPos, breaking || modifierSettings.doQuickReplace());
 
-                BlockPos firstPos = BlockPos.ORIGIN, secondPos = BlockPos.ORIGIN;
-                //Remember first and last pos for the shader
+                //Remember first and last point for the shader
+                BlockPos firstPos = BlockPos.ZERO, secondPos = BlockPos.ZERO;
                 if (!startCoordinates.isEmpty()) {
                     firstPos = startCoordinates.get(0);
                     secondPos = startCoordinates.get(startCoordinates.size() - 1);
@@ -158,19 +160,14 @@ public class BlockPreviewRenderer {
 
                 List<BlockPos> newCoordinates = BuildModifiers.findCoordinates(player, startCoordinates);
 
-                Collections.sort(newCoordinates, (lhs, rhs) -> {
-                    // -1 - less than, 1 - greater than, 0 - equal
-                    double lhsDistanceToPlayer = new Vec3d(lhs).subtract(player.getPositionEyes(1f)).lengthSquared();
-                    double rhsDistanceToPlayer = new Vec3d(rhs).subtract(player.getPositionEyes(1f)).lengthSquared();
-                    return (int) Math.signum(lhsDistanceToPlayer - rhsDistanceToPlayer);
-                });
+                sortOnDistanceToPlayer(newCoordinates, player);
 
                 hitVec = new Vec3d(Math.abs(hitVec.x - ((int) hitVec.x)), Math.abs(hitVec.y - ((int) hitVec.y)),
                         Math.abs(hitVec.z - ((int) hitVec.z)));
 
                 //Get blockstates
                 List<ItemStack> itemStacks = new ArrayList<>();
-                List<IBlockState> blockStates = new ArrayList<>();
+                List<BlockState> blockStates = new ArrayList<>();
                 if (breaking) {
                     //Find blockstate of world
                     for (BlockPos coordinate : newCoordinates) {
@@ -194,179 +191,194 @@ public class BlockPreviewRenderer {
                     //if so, renew randomness of randomizer bag
                     ItemRandomizerBag.renewRandomness();
                     //and play sound (max once every tick)
-                    if (startCoordinates.size() > 1 && blockStates.size() > 1 && soundTime < ClientProxy.ticksInGame - 0) {
+                    if (newCoordinates.size() > 1 && blockStates.size() > 1 && soundTime < ClientProxy.ticksInGame - 0) {
                         soundTime = ClientProxy.ticksInGame;
-                        //player.playSound(EffortlessBuilding.SOUND_BUILD_CLICK, 0.2f, 1f);
-                        player.playSound(blockStates.get(0).getBlock().getSoundType(blockStates.get(0), player.world,
-                                newCoordinates.get(0), player).getPlaceSound(), 0.3f, 1f);
+
+                        if (blockStates.get(0) != null) {
+                            SoundType soundType = blockStates.get(0).getBlock().getSoundType(blockStates.get(0), player.world,
+                                    newCoordinates.get(0), player);
+                            player.world.playSound(player, player.getPosition(), breaking ? soundType.getBreakSound() : soundType.getPlaceSound(),
+                                    SoundCategory.BLOCKS, 0.3f, 0.8f);
+                        }
                     }
                 }
 
                 //Render block previews
                 if (blockStates.size() != 0 && newCoordinates.size() == blockStates.size()) {
+                    int blockCount;
+
                     //Use fancy shader if config allows, otherwise outlines
-                    if (BuildConfig.visuals.useShaders && newCoordinates.size() < BuildConfig.visuals.shaderTreshold) {
-
-                        RenderHandler.beginBlockPreviews();
-
-                        renderBlockPreviews(newCoordinates, blockStates, itemStacks, 0f, firstPos, secondPos, !breaking, breaking);
-
-                        RenderHandler.endBlockPreviews();
+                    if (BuildConfig.visuals.useShaders.get() && newCoordinates.size() < BuildConfig.visuals.shaderTreshold.get()) {
+                        blockCount = renderBlockPreviews(matrixStack, renderTypeBuffer, newCoordinates, blockStates, itemStacks, 0f, firstPos, secondPos, !breaking, breaking);
                     } else {
-
-                        RenderHandler.beginLines();
+                        IVertexBuilder buffer = RenderHandler.beginLines(renderTypeBuffer);
 
                         Vec3d color = new Vec3d(1f, 1f, 1f);
                         if (breaking) color = new Vec3d(1f, 0f, 0f);
 
                         for (int i = newCoordinates.size() - 1; i >= 0; i--) {
-                            RenderHandler.renderBlockOutline(newCoordinates.get(i), color);
+                            VoxelShape collisionShape = blockStates.get(i).getCollisionShape(player.world, newCoordinates.get(i));
+                            RenderHandler.renderBlockOutline(matrixStack, buffer, newCoordinates.get(i), collisionShape, color);
                         }
 
-                        RenderHandler.endLines();
+                        RenderHandler.endLines(renderTypeBuffer);
+
+                        blockCount = newCoordinates.size();
                     }
+
+                    //Display block count and dimensions in actionbar
+                    if (BuildModes.isActive(player)) {
+
+                        //Find min and max values (not simply firstPos and secondPos because that doesn't work with circles)
+                        int minX = Integer.MAX_VALUE, maxX = Integer.MIN_VALUE;
+                        int minY = Integer.MAX_VALUE, maxY = Integer.MIN_VALUE;
+                        int minZ = Integer.MAX_VALUE, maxZ = Integer.MIN_VALUE;
+                        for (BlockPos pos : startCoordinates) {
+                            if (pos.getX() < minX) minX = pos.getX();
+                            if (pos.getX() > maxX) maxX = pos.getX();
+                            if (pos.getY() < minY) minY = pos.getY();
+                            if (pos.getY() > maxY) maxY = pos.getY();
+                            if (pos.getZ() < minZ) minZ = pos.getZ();
+                            if (pos.getZ() > maxZ) maxZ = pos.getZ();
+                        }
+                        BlockPos dim = new BlockPos(maxX - minX + 1, maxY - minY + 1, maxZ - minZ + 1);
+
+                        String dimensions = "(";
+                        if (dim.getX() > 1) dimensions += dim.getX() + "x";
+                        if (dim.getZ() > 1) dimensions += dim.getZ() + "x";
+                        if (dim.getY() > 1) dimensions += dim.getY() + "x";
+                        dimensions = dimensions.substring(0, dimensions.length() - 1);
+                        if (dimensions.length() > 1) dimensions += ")";
+
+                        EffortlessBuilding.log(player, blockCount + " blocks " + dimensions, true);
                     }
                 }
 
-            RenderHandler.beginLines();
+
+            }
+
+            IVertexBuilder buffer = RenderHandler.beginLines(renderTypeBuffer);
             //Draw outlines if tool in hand
             //Find proper raytrace: either normal range or increased range depending on canBreakFar
-            RayTraceResult objectMouseOver = Minecraft.getMinecraft().objectMouseOver;
+            RayTraceResult objectMouseOver = Minecraft.getInstance().objectMouseOver;
             RayTraceResult breakingRaytrace = ReachHelper.canBreakFar(player) ? lookingAt : objectMouseOver;
-            if (toolInHand && breakingRaytrace != null && breakingRaytrace.typeOfHit == RayTraceResult.Type.BLOCK) {
-                List<BlockPos> breakCoordinates = BuildModifiers.findCoordinates(player, breakingRaytrace.getBlockPos());
+            if (toolInHand && breakingRaytrace != null && breakingRaytrace.getType() == RayTraceResult.Type.BLOCK) {
+                BlockRayTraceResult blockBreakingRaytrace = (BlockRayTraceResult) breakingRaytrace;
+                List<BlockPos> breakCoordinates = BuildModifiers.findCoordinates(player, blockBreakingRaytrace.getPos());
 
                 //Only render first outline if further than normal reach
-                boolean excludeFirst = objectMouseOver != null && objectMouseOver.typeOfHit == RayTraceResult.Type.BLOCK;
+                boolean excludeFirst = objectMouseOver != null && objectMouseOver.getType() == RayTraceResult.Type.BLOCK;
                 for (int i = excludeFirst ? 1 : 0; i < breakCoordinates.size(); i++) {
                     BlockPos coordinate = breakCoordinates.get(i);
 
-                    IBlockState blockState = player.world.getBlockState(coordinate);
+                    BlockState blockState = player.world.getBlockState(coordinate);
                     if (!blockState.getBlock().isAir(blockState, player.world, coordinate)) {
                         if (SurvivalHelper.canBreak(player.world, player, coordinate) || i == 0) {
-                            RenderHandler.renderBlockOutline(coordinate, new Vec3d(0f, 0f, 0f));
+                            VoxelShape collisionShape = blockState.getCollisionShape(player.world, coordinate);
+                            RenderHandler.renderBlockOutline(matrixStack, buffer, coordinate, collisionShape, new Vec3d(0f, 0f, 0f));
                         }
                     }
                 }
             }
-            RenderHandler.endLines();
+            RenderHandler.endLines(renderTypeBuffer);
         }
     }
 
     //Whether to draw any block previews or outlines
     public static boolean doRenderBlockPreviews(ModifierSettings modifierSettings, ModeSettings modeSettings, BlockPos startPos) {
-        return modeSettings.getBuildMode() != BuildModes.BuildModeEnum.Normal ||
+        return modeSettings.getBuildMode() != BuildModes.BuildModeEnum.NORMAL ||
                (startPos != null && BuildModifiers.isEnabled(modifierSettings, startPos)) ||
-                BuildConfig.visuals.alwaysShowBlockPreview;
+               BuildConfig.visuals.alwaysShowBlockPreview.get();
     }
 
-    protected static void renderBlockPreviews(List<BlockPos> coordinates, List<IBlockState> blockStates,
+    protected static int renderBlockPreviews(MatrixStack matrixStack, IRenderTypeBuffer.Impl renderTypeBuffer, List<BlockPos> coordinates, List<BlockState> blockStates,
                                              List<ItemStack> itemStacks, float dissolve, BlockPos firstPos,
                                              BlockPos secondPos, boolean checkCanPlace, boolean red) {
-        EntityPlayer player = Minecraft.getMinecraft().player;
+        PlayerEntity player = Minecraft.getInstance().player;
         ModifierSettings modifierSettings = ModifierSettingsManager.getModifierSettings(player);
-        BlockRendererDispatcher dispatcher = Minecraft.getMinecraft().getBlockRendererDispatcher();
+        BlockRendererDispatcher dispatcher = Minecraft.getInstance().getBlockRendererDispatcher();
+        int blocksValid = 0;
 
-        if (coordinates.isEmpty()) return;
+        if (coordinates.isEmpty()) return blocksValid;
 
         for (int i = coordinates.size() - 1; i >= 0; i--) {
             BlockPos blockPos = coordinates.get(i);
-            IBlockState blockState = blockStates.get(i);
+            BlockState blockState = blockStates.get(i);
             ItemStack itemstack = itemStacks.isEmpty() ? ItemStack.EMPTY : itemStacks.get(i);
             if (CompatHelper.isItemBlockProxy(itemstack))
                 itemstack = CompatHelper.getItemBlockByState(itemstack, blockState);
 
             //Check if can place
             //If check is turned off, check if blockstate is the same (for dissolve effect)
-            if ((!checkCanPlace /*&& player.world.getBlockState(blockPos) == blockState*/) ||
-                SurvivalHelper.canPlace(player.world, player, blockPos, blockState, itemstack, modifierSettings.doQuickReplace(), EnumFacing.UP)) {
+            if ((!checkCanPlace /*&& player.world.getNewBlockState(blockPos) == blockState*/) || //TODO enable (breaks the breaking shader)
+                SurvivalHelper.canPlace(player.world, player, blockPos, blockState, itemstack, modifierSettings.doQuickReplace(), Direction.UP)) {
 
-                ShaderHandler.useShader(ShaderHandler.dissolve, generateShaderCallback(dissolve,
-                        new Vec3d(blockPos), new Vec3d(firstPos), new Vec3d(secondPos),
-                        blockPos == secondPos, red));
-                RenderHandler.renderBlockPreview(dispatcher, blockPos, blockState);
+                RenderHandler.renderBlockPreview(matrixStack, renderTypeBuffer, dispatcher, blockPos, blockState, dissolve, firstPos, secondPos, red);
+                blocksValid++;
             }
         }
+        return blocksValid;
     }
 
     public static void onBlocksPlaced() {
-        EntityPlayerSP player = Minecraft.getMinecraft().player;
+        onBlocksPlaced(previousCoordinates, previousItemStacks, previousBlockStates, previousFirstPos, previousSecondPos);
+    }
+
+    public static void onBlocksPlaced(List<BlockPos> coordinates, List<ItemStack> itemStacks, List<BlockState> blockStates,
+                                      BlockPos firstPos, BlockPos secondPos) {
+        ClientPlayerEntity player = Minecraft.getInstance().player;
         ModifierSettings modifierSettings = ModifierSettingsManager.getModifierSettings(player);
         ModeSettings modeSettings = ModeSettingsManager.getModeSettings(player);
 
         //Check if block previews are enabled
-        if (doRenderBlockPreviews(modifierSettings, modeSettings, previousFirstPos)) {
+        if (doRenderBlockPreviews(modifierSettings, modeSettings, firstPos)) {
 
             //Save current coordinates, blockstates and itemstacks
-            if (!previousCoordinates.isEmpty() && previousBlockStates.size() == previousCoordinates.size() &&
-                previousCoordinates.size() > 1 && previousCoordinates.size() < BuildConfig.visuals.shaderTreshold) {
+            if (!coordinates.isEmpty() && blockStates.size() == coordinates.size() &&
+                coordinates.size() > 1 && coordinates.size() < BuildConfig.visuals.shaderTreshold.get()) {
 
-                placedDataList.add(new PlacedData(ClientProxy.ticksInGame, previousCoordinates, previousBlockStates,
-                        previousItemStacks, previousFirstPos, previousSecondPos, false));
+                placedDataList.add(new PlacedData(ClientProxy.ticksInGame, coordinates, blockStates,
+                        itemStacks, firstPos, secondPos, false));
             }
         }
 
     }
 
     public static void onBlocksBroken() {
-        EntityPlayerSP player = Minecraft.getMinecraft().player;
+        onBlocksBroken(previousCoordinates, previousItemStacks, previousBlockStates, previousFirstPos, previousSecondPos);
+    }
+
+    public static void onBlocksBroken(List<BlockPos> coordinates, List<ItemStack> itemStacks, List<BlockState> blockStates,
+                                      BlockPos firstPos, BlockPos secondPos) {
+        ClientPlayerEntity player = Minecraft.getInstance().player;
         ModifierSettings modifierSettings = ModifierSettingsManager.getModifierSettings(player);
         ModeSettings modeSettings = ModeSettingsManager.getModeSettings(player);
 
         //Check if block previews are enabled
-        if (doRenderBlockPreviews(modifierSettings, modeSettings, previousFirstPos)) {
+        if (doRenderBlockPreviews(modifierSettings, modeSettings, firstPos)) {
 
             //Save current coordinates, blockstates and itemstacks
-            if (!previousCoordinates.isEmpty() && previousBlockStates.size() == previousCoordinates.size() &&
-                previousCoordinates.size() > 1 && previousCoordinates.size() < BuildConfig.visuals.shaderTreshold) {
+            if (!coordinates.isEmpty() && blockStates.size() == coordinates.size() &&
+                coordinates.size() > 1 && coordinates.size() < BuildConfig.visuals.shaderTreshold.get()) {
 
-                placedDataList.add(new PlacedData(ClientProxy.ticksInGame, previousCoordinates, previousBlockStates,
-                        previousItemStacks, previousFirstPos, previousSecondPos, true));
+                sortOnDistanceToPlayer(coordinates, player);
+
+                placedDataList.add(new PlacedData(ClientProxy.ticksInGame, coordinates, blockStates,
+                        itemStacks, firstPos, secondPos, true));
             }
         }
 
     }
 
-    private static Consumer<Integer> generateShaderCallback(final float dissolve, final Vec3d blockpos,
-                                                            final Vec3d firstpos, final Vec3d secondpos,
-                                                            final boolean highlight, final boolean red) {
-        Minecraft mc = Minecraft.getMinecraft();
-        return (Integer shader) -> {
-            int percentileUniform = ARBShaderObjects.glGetUniformLocationARB(shader, "dissolve");
-            int highlightUniform = ARBShaderObjects.glGetUniformLocationARB(shader, "highlight");
-            int redUniform = ARBShaderObjects.glGetUniformLocationARB(shader, "red");
-            int blockposUniform = ARBShaderObjects.glGetUniformLocationARB(shader, "blockpos");
-            int firstposUniform = ARBShaderObjects.glGetUniformLocationARB(shader, "firstpos");
-            int secondposUniform = ARBShaderObjects.glGetUniformLocationARB(shader, "secondpos");
-            int imageUniform = ARBShaderObjects.glGetUniformLocationARB(shader, "image");
-            int maskUniform = ARBShaderObjects.glGetUniformLocationARB(shader, "mask");
 
-            //image
-            OpenGlHelper.setActiveTexture(ARBMultitexture.GL_TEXTURE0_ARB);
-            GL11.glBindTexture(GL11.GL_TEXTURE_2D, mc.renderEngine.getTexture(TextureMap.LOCATION_BLOCKS_TEXTURE).getGlTextureId());
-            ARBShaderObjects.glUniform1iARB(imageUniform, 0);
+    private static void sortOnDistanceToPlayer(List<BlockPos> coordinates, PlayerEntity player) {
 
-            OpenGlHelper.setActiveTexture(ARBMultitexture.GL_TEXTURE0_ARB + secondaryTextureUnit);
+        Collections.sort(coordinates, (lhs, rhs) -> {
+            // -1 - less than, 1 - greater than, 0 - equal
+            double lhsDistanceToPlayer = new Vec3d(lhs).subtract(player.getEyePosition(1f)).lengthSquared();
+            double rhsDistanceToPlayer = new Vec3d(rhs).subtract(player.getEyePosition(1f)).lengthSquared();
+            return (int) Math.signum(lhsDistanceToPlayer - rhsDistanceToPlayer);
+        });
 
-            GlStateManager.enableTexture2D();
-            GL11.glGetInteger(GL11.GL_TEXTURE_BINDING_2D);
-
-            //mask
-            GL11.glBindTexture(GL11.GL_TEXTURE_2D,
-                    mc.renderEngine.getTexture(new ResourceLocation(EffortlessBuilding.MODID, "textures/shader_mask.png")).getGlTextureId());
-            ARBShaderObjects.glUniform1iARB(maskUniform, secondaryTextureUnit);
-
-            //blockpos
-            ARBShaderObjects.glUniform3fARB(blockposUniform, (float) blockpos.x, (float) blockpos.y, (float) blockpos.z);
-            ARBShaderObjects.glUniform3fARB(firstposUniform, (float) firstpos.x, (float) firstpos.y, (float) firstpos.z);
-            ARBShaderObjects.glUniform3fARB(secondposUniform, (float) secondpos.x, (float) secondpos.y, (float) secondpos.z);
-
-            //dissolve
-            ARBShaderObjects.glUniform1fARB(percentileUniform, dissolve);
-            //highlight
-            ARBShaderObjects.glUniform1iARB(highlightUniform, highlight ? 1 : 0);
-            //red
-            ARBShaderObjects.glUniform1iARB(redUniform, red ? 1 : 0);
-        };
     }
 }

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

@@ -0,0 +1,245 @@
+package nl.requios.effortlessbuilding.render;
+
+import com.mojang.blaze3d.platform.GlStateManager;
+import com.mojang.blaze3d.systems.RenderSystem;
+import net.minecraft.client.Minecraft;
+import net.minecraft.client.renderer.RenderState;
+import net.minecraft.client.renderer.RenderType;
+import net.minecraft.client.renderer.texture.AtlasTexture;
+import net.minecraft.client.renderer.vertex.DefaultVertexFormats;
+import net.minecraft.util.math.BlockPos;
+import net.minecraft.util.math.Vec3d;
+import net.minecraftforge.fml.common.ObfuscationReflectionHelper;
+import nl.requios.effortlessbuilding.EffortlessBuilding;
+import org.lwjgl.opengl.*;
+
+import java.util.OptionalDouble;
+import java.util.function.Consumer;
+
+public class BuildRenderTypes {
+    public static final RenderState.TransparencyState TRANSLUCENT_TRANSPARENCY;
+    public static final RenderState.TransparencyState NO_TRANSPARENCY;
+
+    public static final RenderState.DiffuseLightingState DIFFUSE_LIGHTING_ENABLED;
+    public static final RenderState.DiffuseLightingState DIFFUSE_LIGHTING_DISABLED;
+
+    public static final RenderState.LayerState PROJECTION_LAYERING;
+
+    public static final RenderState.CullState CULL_DISABLED;
+
+    public static final RenderState.AlphaState DEFAULT_ALPHA;
+
+    public static final RenderState.WriteMaskState WRITE_TO_DEPTH_AND_COLOR;
+    public static final RenderState.WriteMaskState COLOR_WRITE;
+
+    public static final RenderType LINES;
+    public static final RenderType PLANES;
+
+    private static final int primaryTextureUnit = 0;
+    private static final int secondaryTextureUnit = 2;
+
+    static {
+        TRANSLUCENT_TRANSPARENCY = ObfuscationReflectionHelper.getPrivateValue(RenderState.class, null, "field_228515_g_");
+        NO_TRANSPARENCY = ObfuscationReflectionHelper.getPrivateValue(RenderState.class, null, "field_228510_b_");
+
+        DIFFUSE_LIGHTING_ENABLED = new RenderState.DiffuseLightingState(true);
+        DIFFUSE_LIGHTING_DISABLED = new RenderState.DiffuseLightingState(false);
+
+        PROJECTION_LAYERING = ObfuscationReflectionHelper.getPrivateValue(RenderState.class, null, "field_228500_J_");
+
+        CULL_DISABLED = new RenderState.CullState(false);
+
+        DEFAULT_ALPHA = new RenderState.AlphaState(0.003921569F);
+
+        final boolean ENABLE_DEPTH_WRITING = true;
+        final boolean ENABLE_COLOUR_COMPONENTS_WRITING = true;
+        WRITE_TO_DEPTH_AND_COLOR = new RenderState.WriteMaskState(ENABLE_COLOUR_COMPONENTS_WRITING, ENABLE_DEPTH_WRITING);
+        COLOR_WRITE = new RenderState.WriteMaskState(true, false);
+
+        final int INITIAL_BUFFER_SIZE = 128;
+        RenderType.State renderState;
+
+        //LINES
+//        RenderSystem.pushLightingAttributes();
+//        RenderSystem.pushTextureAttributes();
+//        RenderSystem.disableCull();
+//        RenderSystem.disableLighting();
+//        RenderSystem.disableTexture();
+//
+//        RenderSystem.enableBlend();
+//        RenderSystem.blendFunc(GL11.GL_SRC_ALPHA, GL11.GL_ONE_MINUS_SRC_ALPHA);
+//
+//        RenderSystem.lineWidth(2);
+        renderState = RenderType.State.getBuilder()
+                .line(new RenderState.LineState(OptionalDouble.of(2)))
+                .layer(PROJECTION_LAYERING)
+                .transparency(TRANSLUCENT_TRANSPARENCY)
+                .writeMask(WRITE_TO_DEPTH_AND_COLOR)
+                .cull(CULL_DISABLED)
+                .build(false);
+        LINES = RenderType.makeType("eb_lines",
+                DefaultVertexFormats.POSITION_COLOR, GL11.GL_LINES, INITIAL_BUFFER_SIZE, renderState);
+
+        renderState = RenderType.State.getBuilder()
+                .line(new RenderState.LineState(OptionalDouble.of(2)))
+                .layer(PROJECTION_LAYERING)
+                .transparency(TRANSLUCENT_TRANSPARENCY)
+                .writeMask(COLOR_WRITE)
+                .cull(CULL_DISABLED)
+                .build(false);
+        PLANES = RenderType.makeType("eb_planes",
+                DefaultVertexFormats.POSITION_COLOR, GL11.GL_TRIANGLE_STRIP, INITIAL_BUFFER_SIZE, renderState);
+
+    }
+
+    private class ShaderInfo {
+        float dissolve;
+        Vec3d blockPos;
+        Vec3d firstPos;
+        Vec3d secondPos;
+        boolean red;
+
+        public ShaderInfo(float dissolve, Vec3d blockPos, Vec3d firstPos, Vec3d secondPos, boolean red) {
+            this.dissolve = dissolve;
+            this.blockPos = blockPos;
+            this.firstPos = firstPos;
+            this.secondPos = secondPos;
+            this.red = red;
+        }
+    }
+
+    public static RenderType getBlockPreviewRenderType(float dissolve, BlockPos blockPos, BlockPos firstPos,
+                                                       BlockPos secondPos, boolean red) {
+//        RenderSystem.pushLightingAttributes();
+//        RenderSystem.pushTextureAttributes();
+//        RenderSystem.enableCull();
+//        RenderSystem.enableTexture();
+//        Minecraft.getInstance().textureManager.bindTexture(ShaderHandler.shaderMaskTextureLocation);
+//
+//        RenderSystem.enableBlend();
+//        RenderSystem.blendFunc(GL11.GL_SRC_ALPHA, GL11.GL_ONE_MINUS_SRC_ALPHA);
+//        RenderSystem.blendColor(1f, 1f, 1f, 0.8f);
+        //end
+//        ShaderHandler.releaseShader();
+
+        //highjacking texturing state (which does nothing by default) to do my own things
+
+        String stateName = "eb_texturing_" + dissolve + "_" + blockPos + "_" + firstPos + "_" + secondPos + "_" + red;
+        RenderState.TexturingState MY_TEXTURING = new RenderState.TexturingState(stateName, () -> {
+//            RenderSystem.pushLightingAttributes();
+//            RenderSystem.pushTextureAttributes();
+
+            ShaderHandler.useShader(ShaderHandler.dissolve, generateShaderCallback(dissolve, new Vec3d(blockPos), new Vec3d(firstPos), new Vec3d(secondPos), blockPos == secondPos, red));
+            RenderSystem.blendColor(1f, 1f, 1f, 0.8f);
+        }, () -> {
+            ShaderHandler.releaseShader();
+        });
+
+        RenderType.State renderState = RenderType.State.getBuilder()
+                .texture(new RenderState.TextureState(ShaderHandler.shaderMaskTextureLocation, false, false))
+                .texturing(MY_TEXTURING)
+                .transparency(TRANSLUCENT_TRANSPARENCY)
+                .diffuseLighting(DIFFUSE_LIGHTING_DISABLED)
+                .alpha(DEFAULT_ALPHA)
+                .cull(new RenderState.CullState(true))
+                .lightmap(new RenderState.LightmapState(false))
+                .overlay(new RenderState.OverlayState(false))
+                .build(true);
+        //Unique name for every combination, otherwise it will reuse the previous one
+        String name = "eb_block_previews_" + dissolve + "_" + blockPos + "_" + firstPos + "_" + secondPos + "_" + red;
+        return RenderType.makeType(name,
+                DefaultVertexFormats.BLOCK, GL11.GL_QUADS, 256, true, true, renderState);
+    }
+
+
+    private static Consumer<Integer> generateShaderCallback(final float dissolve, final Vec3d blockpos,
+                                                            final Vec3d firstpos, final Vec3d secondpos,
+                                                            final boolean highlight, final boolean red) {
+        Minecraft mc = Minecraft.getInstance();
+        return (Integer shader) -> {
+            int percentileUniform = ARBShaderObjects.glGetUniformLocationARB(shader, "dissolve");
+            int highlightUniform = ARBShaderObjects.glGetUniformLocationARB(shader, "highlight");
+            int redUniform = ARBShaderObjects.glGetUniformLocationARB(shader, "red");
+            int blockposUniform = ARBShaderObjects.glGetUniformLocationARB(shader, "blockpos");
+            int firstposUniform = ARBShaderObjects.glGetUniformLocationARB(shader, "firstpos");
+            int secondposUniform = ARBShaderObjects.glGetUniformLocationARB(shader, "secondpos");
+            int imageUniform = ARBShaderObjects.glGetUniformLocationARB(shader, "image");
+            int maskUniform = ARBShaderObjects.glGetUniformLocationARB(shader, "mask");
+
+            RenderSystem.enableTexture();
+            GL11.glGetInteger(GL11.GL_TEXTURE_BINDING_2D);
+
+            //mask
+            ARBShaderObjects.glUniform1iARB(maskUniform, secondaryTextureUnit);
+            glActiveTexture(ARBMultitexture.GL_TEXTURE0_ARB + secondaryTextureUnit);
+            mc.getTextureManager().bindTexture(ShaderHandler.shaderMaskTextureLocation);//getTexture(ShaderHandler.shaderMaskTextureLocation).bindTexture();
+            //GL11.glBindTexture(GL11.GL_TEXTURE_2D, mc.getTextureManager().getTexture(ShaderHandler.shaderMaskTextureLocation).getGlTextureId());
+
+            //image
+            ARBShaderObjects.glUniform1iARB(imageUniform, primaryTextureUnit);
+            glActiveTexture(ARBMultitexture.GL_TEXTURE0_ARB + primaryTextureUnit);
+            mc.getTextureManager().bindTexture(AtlasTexture.LOCATION_BLOCKS_TEXTURE);//.getTexture(AtlasTexture.LOCATION_BLOCKS_TEXTURE).bindTexture();
+            //GL11.glBindTexture(GL11.GL_TEXTURE_2D, mc.getTextureManager().getTexture(AtlasTexture.LOCATION_BLOCKS_TEXTURE).getGlTextureId());
+
+            //blockpos
+            ARBShaderObjects.glUniform3fARB(blockposUniform, (float) blockpos.x, (float) blockpos.y, (float) blockpos.z);
+            ARBShaderObjects.glUniform3fARB(firstposUniform, (float) firstpos.x, (float) firstpos.y, (float) firstpos.z);
+            ARBShaderObjects.glUniform3fARB(secondposUniform, (float) secondpos.x, (float) secondpos.y, (float) secondpos.z);
+
+            //dissolve
+            ARBShaderObjects.glUniform1fARB(percentileUniform, dissolve);
+            //highlight
+            ARBShaderObjects.glUniform1iARB(highlightUniform, highlight ? 1 : 0);
+            //red
+            ARBShaderObjects.glUniform1iARB(redUniform, red ? 1 : 0);
+        };
+    }
+
+    public static void glActiveTexture(int texture) {
+        if (GL.getCapabilities().GL_ARB_multitexture && !GL.getCapabilities().OpenGL13) {
+            ARBMultitexture.glActiveTextureARB(texture);
+        } else {
+            GL13.glActiveTexture(texture);
+        }
+
+    }
+
+//    public static class MyTexturingState extends RenderState.TexturingState {
+//
+//        public float dissolve;
+//        public Vec3d blockPos;
+//        public Vec3d firstPos;
+//        public Vec3d secondPos;
+//        public boolean highlight;
+//        public boolean red;
+//
+//        public MyTexturingState(String p_i225989_1_, float dissolve, Vec3d blockPos, Vec3d firstPos,
+//                                Vec3d secondPos, boolean highlight, boolean red, Runnable p_i225989_2_, Runnable p_i225989_3_) {
+//            super(p_i225989_1_, p_i225989_2_, p_i225989_3_);
+//            this.dissolve = dissolve;
+//            this.blockPos = blockPos;
+//            this.firstPos = firstPos;
+//            this.secondPos = secondPos;
+//            this.highlight = highlight;
+//            this.red = red;
+//        }
+//
+//        @Override
+//        public boolean equals(Object p_equals_1_) {
+//            if (this == p_equals_1_) {
+//                return true;
+//            } else if (p_equals_1_ != null && this.getClass() == p_equals_1_.getClass()) {
+//                MyTexturingState other = (MyTexturingState)p_equals_1_;
+//                return this.dissolve == other.dissolve && this.blockPos == other.blockPos && this.firstPos == other.firstPos
+//                       && this.secondPos == other.secondPos && this.highlight == other.highlight && this.red == other.red;
+//            } else {
+//                return false;
+//            }
+//        }
+//
+//        @Override
+//        public int hashCode() {
+//
+//        }
+//    }
+}

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

@@ -1,18 +1,23 @@
 package nl.requios.effortlessbuilding.render;
 
+import com.mojang.blaze3d.matrix.MatrixStack;
+import com.mojang.blaze3d.vertex.IVertexBuilder;
 import net.minecraft.client.renderer.BufferBuilder;
+import net.minecraft.client.renderer.IRenderTypeBuffer;
+import net.minecraft.client.renderer.Matrix4f;
 import net.minecraft.client.renderer.Tessellator;
 import net.minecraft.client.renderer.vertex.DefaultVertexFormats;
 import net.minecraft.util.math.Vec3d;
-import net.minecraftforge.fml.relauncher.Side;
-import net.minecraftforge.fml.relauncher.SideOnly;
+import net.minecraftforge.api.distmarker.Dist;
+import net.minecraftforge.api.distmarker.OnlyIn;
 import nl.requios.effortlessbuilding.buildmodifier.Mirror;
 import nl.requios.effortlessbuilding.buildmodifier.ModifierSettingsManager;
 import nl.requios.effortlessbuilding.buildmodifier.RadialMirror;
 import org.lwjgl.opengl.GL11;
-import org.lwjgl.util.Color;
 
-@SideOnly(Side.CLIENT)
+import java.awt.*;
+
+@OnlyIn(Dist.CLIENT)
 public class ModifierRenderer {
 
     protected static final Color colorX = new Color(255, 72, 52);
@@ -23,9 +28,7 @@ public class ModifierRenderer {
     protected static final int planeAlpha = 75;
     protected static final Vec3d epsilon = new Vec3d(0.001, 0.001, 0.001); //prevents z-fighting
 
-    public static void render(ModifierSettingsManager.ModifierSettings modifierSettings) {
-        RenderHandler.beginLines();
-
+    public static void render(MatrixStack matrixStack, IRenderTypeBuffer.Impl renderTypeBuffer, ModifierSettingsManager.ModifierSettings modifierSettings) {
         //Mirror lines and areas
         Mirror.MirrorSettings m = modifierSettings.getMirrorSettings();
         if (m != null && m.enabled && (m.mirrorX || m.mirrorY || m.mirrorZ))
@@ -38,28 +41,28 @@ public class ModifierRenderer {
                 Vec3d posA = new Vec3d(pos.x, pos.y - radius, pos.z - radius);
                 Vec3d posB = new Vec3d(pos.x, pos.y + radius, pos.z + radius);
 
-                drawMirrorPlane(posA, posB, colorX, m.drawLines, m.drawPlanes, true);
+                drawMirrorPlane(matrixStack, renderTypeBuffer, posA, posB, colorX, m.drawLines, m.drawPlanes, true);
             }
             if (m.mirrorY)
             {
                 Vec3d posA = new Vec3d(pos.x - radius, pos.y, pos.z - radius);
                 Vec3d posB = new Vec3d(pos.x + radius, pos.y, pos.z + radius);
 
-                drawMirrorPlaneY(posA, posB, colorY, m.drawLines, m.drawPlanes);
+                drawMirrorPlaneY(matrixStack, renderTypeBuffer, posA, posB, colorY, m.drawLines, m.drawPlanes);
             }
             if (m.mirrorZ)
             {
                 Vec3d posA = new Vec3d(pos.x - radius, pos.y - radius, pos.z);
                 Vec3d posB = new Vec3d(pos.x + radius, pos.y + radius, pos.z);
 
-                drawMirrorPlane(posA, posB, colorZ, m.drawLines, m.drawPlanes, true);
+                drawMirrorPlane(matrixStack, renderTypeBuffer, posA, posB, colorZ, m.drawLines, m.drawPlanes, true);
             }
 
             //Draw axis coordinated colors if two or more axes are enabled
             //(If only one is enabled the lines are that planes color)
             if (m.drawLines && ((m.mirrorX && m.mirrorY) || (m.mirrorX && m.mirrorZ) || (m.mirrorY && m.mirrorZ)))
             {
-                drawMirrorLines(m);
+                drawMirrorLines(matrixStack, renderTypeBuffer, m);
             }
         }
 
@@ -80,96 +83,95 @@ public class ModifierRenderer {
 
                 Vec3d posA = new Vec3d(pos.x, pos.y - radius, pos.z);
                 Vec3d posB = new Vec3d(newVec.x, pos.y + radius, newVec.z);
-                drawMirrorPlane(posA, posB, colorRadial, r.drawLines, r.drawPlanes, false);
+                drawMirrorPlane(matrixStack, renderTypeBuffer, posA, posB, colorRadial, r.drawLines, r.drawPlanes, false);
             }
         }
-
-        RenderHandler.endLines();
     }
 
 
     //----Mirror----
 
-    protected static void drawMirrorPlane(Vec3d posA, Vec3d posB, Color c, boolean drawLines, boolean drawPlanes, boolean drawVerticalLines) {
+    protected static void drawMirrorPlane(MatrixStack matrixStack, IRenderTypeBuffer.Impl renderTypeBuffer, Vec3d posA, Vec3d posB, Color c, boolean drawLines, boolean drawPlanes, boolean drawVerticalLines) {
 
-        GL11.glColor4d(c.getRed(), c.getGreen(), c.getBlue(), planeAlpha);
-        Tessellator tessellator = Tessellator.getInstance();
-        BufferBuilder bufferBuilder = tessellator.getBuffer();
+//        GL11.glColor4d(c.getRed(), c.getGreen(), c.getBlue(), planeAlpha);
+        Matrix4f matrixPos = matrixStack.getLast().getMatrix();
 
         if (drawPlanes) {
-            bufferBuilder.begin(GL11.GL_TRIANGLE_STRIP, DefaultVertexFormats.POSITION_COLOR);
+            IVertexBuilder buffer = RenderHandler.beginPlanes(renderTypeBuffer);
 
-            bufferBuilder.pos(posA.x, posA.y, posA.z).color(c.getRed(), c.getGreen(), c.getBlue(), planeAlpha).endVertex();
-            bufferBuilder.pos(posA.x, posB.y, posA.z).color(c.getRed(), c.getGreen(), c.getBlue(), planeAlpha).endVertex();
-            bufferBuilder.pos(posB.x, posA.y, posB.z).color(c.getRed(), c.getGreen(), c.getBlue(), planeAlpha).endVertex();
-            bufferBuilder.pos(posB.x, posB.y, posB.z).color(c.getRed(), c.getGreen(), c.getBlue(), planeAlpha).endVertex();
+            buffer.pos(matrixPos, (float) posA.x, (float) posA.y, (float) posA.z).color(c.getRed(), c.getGreen(), c.getBlue(), planeAlpha).endVertex();
+            buffer.pos(matrixPos, (float) posA.x, (float) posB.y, (float) posA.z).color(c.getRed(), c.getGreen(), c.getBlue(), planeAlpha).endVertex();
+            buffer.pos(matrixPos, (float) posB.x, (float) posA.y, (float) posB.z).color(c.getRed(), c.getGreen(), c.getBlue(), planeAlpha).endVertex();
+            buffer.pos(matrixPos, (float) posB.x, (float) posB.y, (float) posB.z).color(c.getRed(), c.getGreen(), c.getBlue(), planeAlpha).endVertex();
+            //backface (using triangle strip)
+            buffer.pos(matrixPos, (float) posA.x, (float) posA.y, (float) posA.z).color(c.getRed(), c.getGreen(), c.getBlue(), planeAlpha).endVertex();
+            buffer.pos(matrixPos, (float) posA.x, (float) posB.y, (float) posA.z).color(c.getRed(), c.getGreen(), c.getBlue(), planeAlpha).endVertex();
 
-            tessellator.draw();
+            RenderHandler.endPlanes(renderTypeBuffer);
         }
 
         if (drawLines) {
-            Vec3d middle = posA.add(posB).scale(0.5);
-            bufferBuilder.begin(GL11.GL_LINES, DefaultVertexFormats.POSITION_COLOR);
+            IVertexBuilder buffer = RenderHandler.beginLines(renderTypeBuffer);
 
-            bufferBuilder.pos(posA.x, middle.y, posA.z).color(c.getRed(), c.getGreen(), c.getBlue(), lineAlpha).endVertex();
-            bufferBuilder.pos(posB.x, middle.y, posB.z).color(c.getRed(), c.getGreen(), c.getBlue(), lineAlpha).endVertex();
+            Vec3d middle = posA.add(posB).scale(0.5);
+            buffer.pos(matrixPos, (float) posA.x, (float) middle.y, (float) posA.z).color(c.getRed(), c.getGreen(), c.getBlue(), lineAlpha).endVertex();
+            buffer.pos(matrixPos, (float) posB.x, (float) middle.y, (float) posB.z).color(c.getRed(), c.getGreen(), c.getBlue(), lineAlpha).endVertex();
             if (drawVerticalLines) {
-                bufferBuilder.pos(middle.x, posA.y, middle.z).color(c.getRed(), c.getGreen(), c.getBlue(), lineAlpha).endVertex();
-                bufferBuilder.pos(middle.x, posB.y, middle.z).color(c.getRed(), c.getGreen(), c.getBlue(), lineAlpha).endVertex();
+                buffer.pos(matrixPos, (float) middle.x, (float) posA.y, (float) middle.z).color(c.getRed(), c.getGreen(), c.getBlue(), lineAlpha).endVertex();
+                buffer.pos(matrixPos, (float) middle.x, (float) posB.y, (float) middle.z).color(c.getRed(), c.getGreen(), c.getBlue(), lineAlpha).endVertex();
             }
 
-            tessellator.draw();
+            RenderHandler.endLines(renderTypeBuffer);
         }
     }
 
-    protected static void drawMirrorPlaneY(Vec3d posA, Vec3d posB, Color c, boolean drawLines, boolean drawPlanes) {
+    protected static void drawMirrorPlaneY(MatrixStack matrixStack, IRenderTypeBuffer.Impl renderTypeBuffer, Vec3d posA, Vec3d posB, Color c, boolean drawLines, boolean drawPlanes) {
 
-        GL11.glColor4d(c.getRed(), c.getGreen(), c.getBlue(), c.getAlpha());
-        Tessellator tessellator = Tessellator.getInstance();
-        BufferBuilder bufferBuilder = tessellator.getBuffer();
+//        GL11.glColor4d(c.getRed(), c.getGreen(), c.getBlue(), c.getAlpha());
+        Matrix4f matrixPos = matrixStack.getLast().getMatrix();
 
         if (drawPlanes) {
-            bufferBuilder.begin(GL11.GL_TRIANGLE_STRIP, DefaultVertexFormats.POSITION_COLOR);
+            IVertexBuilder buffer = RenderHandler.beginPlanes(renderTypeBuffer);
 
-            bufferBuilder.pos(posA.x, posA.y, posA.z).color(c.getRed(), c.getGreen(), c.getBlue(), planeAlpha).endVertex();
-            bufferBuilder.pos(posA.x, posA.y, posB.z).color(c.getRed(), c.getGreen(), c.getBlue(), planeAlpha).endVertex();
-            bufferBuilder.pos(posB.x, posA.y, posA.z).color(c.getRed(), c.getGreen(), c.getBlue(), planeAlpha).endVertex();
-            bufferBuilder.pos(posB.x, posA.y, posB.z).color(c.getRed(), c.getGreen(), c.getBlue(), planeAlpha).endVertex();
+            buffer.pos(matrixPos, (float) posA.x, (float) posA.y, (float) posA.z).color(c.getRed(), c.getGreen(), c.getBlue(), planeAlpha).endVertex();
+            buffer.pos(matrixPos, (float) posA.x, (float) posA.y, (float) posB.z).color(c.getRed(), c.getGreen(), c.getBlue(), planeAlpha).endVertex();
+            buffer.pos(matrixPos, (float) posB.x, (float) posA.y, (float) posA.z).color(c.getRed(), c.getGreen(), c.getBlue(), planeAlpha).endVertex();
+            buffer.pos(matrixPos, (float) posB.x, (float) posA.y, (float) posB.z).color(c.getRed(), c.getGreen(), c.getBlue(), planeAlpha).endVertex();
+            //backface (using triangle strip)
+            buffer.pos(matrixPos, (float) posA.x, (float) posA.y, (float) posA.z).color(c.getRed(), c.getGreen(), c.getBlue(), planeAlpha).endVertex();
+            buffer.pos(matrixPos, (float) posA.x, (float) posA.y, (float) posB.z).color(c.getRed(), c.getGreen(), c.getBlue(), planeAlpha).endVertex();
 
-            tessellator.draw();
+            RenderHandler.endPlanes(renderTypeBuffer);
         }
 
         if (drawLines) {
+            IVertexBuilder buffer = RenderHandler.beginLines(renderTypeBuffer);
+
             Vec3d middle = posA.add(posB).scale(0.5);
-            bufferBuilder.begin(GL11.GL_LINES, DefaultVertexFormats.POSITION_COLOR);
+            buffer.pos(matrixPos, (float) middle.x, (float) middle.y, (float) posA.z).color(c.getRed(), c.getGreen(), c.getBlue(), lineAlpha).endVertex();
+            buffer.pos(matrixPos, (float) middle.x, (float) middle.y, (float) posB.z).color(c.getRed(), c.getGreen(), c.getBlue(), lineAlpha).endVertex();
+            buffer.pos(matrixPos, (float) posA.x, (float) middle.y, (float) middle.z).color(c.getRed(), c.getGreen(), c.getBlue(), lineAlpha).endVertex();
+            buffer.pos(matrixPos, (float) posB.x, (float) middle.y, (float) middle.z).color(c.getRed(), c.getGreen(), c.getBlue(), lineAlpha).endVertex();
 
-            bufferBuilder.pos(middle.x, middle.y, posA.z).color(c.getRed(), c.getGreen(), c.getBlue(), lineAlpha).endVertex();
-            bufferBuilder.pos(middle.x, middle.y, posB.z).color(c.getRed(), c.getGreen(), c.getBlue(), lineAlpha).endVertex();
-            bufferBuilder.pos(posA.x, middle.y, middle.z).color(c.getRed(), c.getGreen(), c.getBlue(), lineAlpha).endVertex();
-            bufferBuilder.pos(posB.x, middle.y, middle.z).color(c.getRed(), c.getGreen(), c.getBlue(), lineAlpha).endVertex();
-
-            tessellator.draw();
+            RenderHandler.endLines(renderTypeBuffer);
         }
     }
 
-    protected static void drawMirrorLines(Mirror.MirrorSettings m) {
+    protected static void drawMirrorLines(MatrixStack matrixStack, IRenderTypeBuffer.Impl renderTypeBuffer, Mirror.MirrorSettings m) {
+
+//        GL11.glColor4d(100, 100, 100, 255);
+        IVertexBuilder buffer = RenderHandler.beginLines(renderTypeBuffer);
+        Matrix4f matrixPos = matrixStack.getLast().getMatrix();
 
         Vec3d pos = m.position.add(epsilon);
 
-        GL11.glColor4d(100, 100, 100, 255);
-        GL11.glLineWidth(2);
-        Tessellator tessellator = Tessellator.getInstance();
-        BufferBuilder bufferBuilder = tessellator.getBuffer();
+        buffer.pos(matrixPos, (float) pos.x - m.radius, (float) pos.y, (float) pos.z).color(colorX.getRed(), colorX.getGreen(), colorX.getBlue(), lineAlpha).endVertex();
+        buffer.pos(matrixPos, (float) pos.x + m.radius, (float) pos.y, (float) pos.z).color(colorX.getRed(), colorX.getGreen(), colorX.getBlue(), lineAlpha).endVertex();
+        buffer.pos(matrixPos, (float) pos.x, (float) pos.y - m.radius, (float) pos.z).color(colorY.getRed(), colorY.getGreen(), colorY.getBlue(), lineAlpha).endVertex();
+        buffer.pos(matrixPos, (float) pos.x, (float) pos.y + m.radius, (float) pos.z).color(colorY.getRed(), colorY.getGreen(), colorY.getBlue(), lineAlpha).endVertex();
+        buffer.pos(matrixPos, (float) pos.x, (float) pos.y, (float) pos.z - m.radius).color(colorZ.getRed(), colorZ.getGreen(), colorZ.getBlue(), lineAlpha).endVertex();
+        buffer.pos(matrixPos, (float) pos.x, (float) pos.y, (float) pos.z + m.radius).color(colorZ.getRed(), colorZ.getGreen(), colorZ.getBlue(), lineAlpha).endVertex();
 
-        bufferBuilder.begin(GL11.GL_LINES, DefaultVertexFormats.POSITION_COLOR);
-
-        bufferBuilder.pos(pos.x - m.radius, pos.y, pos.z).color(colorX.getRed(), colorX.getGreen(), colorX.getBlue(), lineAlpha).endVertex();
-        bufferBuilder.pos(pos.x + m.radius, pos.y, pos.z).color(colorX.getRed(), colorX.getGreen(), colorX.getBlue(), lineAlpha).endVertex();
-        bufferBuilder.pos(pos.x, pos.y - m.radius, pos.z).color(colorY.getRed(), colorY.getGreen(), colorY.getBlue(), lineAlpha).endVertex();
-        bufferBuilder.pos(pos.x, pos.y + m.radius, pos.z).color(colorY.getRed(), colorY.getGreen(), colorY.getBlue(), lineAlpha).endVertex();
-        bufferBuilder.pos(pos.x, pos.y, pos.z - m.radius).color(colorZ.getRed(), colorZ.getGreen(), colorZ.getBlue(), lineAlpha).endVertex();
-        bufferBuilder.pos(pos.x, pos.y, pos.z + m.radius).color(colorZ.getRed(), colorZ.getGreen(), colorZ.getBlue(), lineAlpha).endVertex();
-
-        tessellator.draw();
+        RenderHandler.endLines(renderTypeBuffer);
     }
 }

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

@@ -1,83 +1,93 @@
 package nl.requios.effortlessbuilding.render;
 
-import net.minecraft.block.state.IBlockState;
+import com.mojang.blaze3d.matrix.MatrixStack;
+import com.mojang.blaze3d.platform.GlStateManager;
+import com.mojang.blaze3d.systems.RenderSystem;
+import com.mojang.blaze3d.vertex.IVertexBuilder;
+import net.minecraft.block.BlockState;
+import net.minecraft.block.Blocks;
 import net.minecraft.client.Minecraft;
-import net.minecraft.client.audio.PositionedSoundRecord;
-import net.minecraft.client.entity.EntityPlayerSP;
-import net.minecraft.client.gui.ScaledResolution;
-import net.minecraft.client.renderer.BlockRendererDispatcher;
-import net.minecraft.client.renderer.GlStateManager;
-import net.minecraft.client.renderer.RenderGlobal;
-import net.minecraft.client.renderer.texture.TextureMap;
+import net.minecraft.client.audio.SimpleSound;
+import net.minecraft.client.entity.player.ClientPlayerEntity;
+import net.minecraft.client.renderer.*;
+import net.minecraft.client.renderer.model.IBakedModel;
+import net.minecraft.client.renderer.texture.OverlayTexture;
+import net.minecraft.client.resources.I18n;
 import net.minecraft.client.settings.KeyBinding;
-import net.minecraft.entity.Entity;
-import net.minecraft.entity.player.EntityPlayer;
-import net.minecraft.init.SoundEvents;
-import net.minecraft.util.EnumHand;
-import net.minecraft.util.ResourceLocation;
+import net.minecraft.entity.player.PlayerEntity;
+import net.minecraft.server.MinecraftServer;
 import net.minecraft.util.SoundCategory;
-import net.minecraft.util.SoundEvent;
+import net.minecraft.util.SoundEvents;
 import net.minecraft.util.math.AxisAlignedBB;
 import net.minecraft.util.math.BlockPos;
 import net.minecraft.util.math.Vec3d;
-import net.minecraft.world.IWorldEventListener;
+import net.minecraft.util.math.shapes.VoxelShape;
 import net.minecraft.world.World;
+import net.minecraft.world.dimension.DimensionType;
+import net.minecraftforge.api.distmarker.Dist;
 import net.minecraftforge.client.event.RenderGameOverlayEvent;
 import net.minecraftforge.client.event.RenderWorldLastEvent;
+import net.minecraftforge.common.DimensionManager;
+import net.minecraftforge.eventbus.api.EventPriority;
+import net.minecraftforge.eventbus.api.SubscribeEvent;
 import net.minecraftforge.fml.common.Mod;
-import net.minecraftforge.fml.common.eventhandler.SubscribeEvent;
-import net.minecraftforge.fml.relauncher.Side;
 import nl.requios.effortlessbuilding.EffortlessBuilding;
+import nl.requios.effortlessbuilding.buildmode.ModeOptions;
 import nl.requios.effortlessbuilding.buildmode.ModeSettingsManager;
-import nl.requios.effortlessbuilding.buildmodifier.BuildModifiers;
 import nl.requios.effortlessbuilding.buildmodifier.ModifierSettingsManager;
 import nl.requios.effortlessbuilding.gui.buildmode.RadialMenu;
-import nl.requios.effortlessbuilding.compatibility.CompatHelper;
 import nl.requios.effortlessbuilding.helper.ReachHelper;
-import nl.requios.effortlessbuilding.helper.SurvivalHelper;
+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.lwjgl.input.Mouse;
 import org.lwjgl.opengl.GL11;
-import org.lwjgl.opengl.GL14;
-
-import javax.annotation.Nullable;
-import java.util.List;
 
 /***
  * Main render class for Effortless Building
  */
-@Mod.EventBusSubscriber(Side.CLIENT)
-public class RenderHandler implements IWorldEventListener {
+@Mod.EventBusSubscriber(value = Dist.CLIENT)
+public class RenderHandler {
 
     @SubscribeEvent
     public static void onRender(RenderWorldLastEvent event) {
-        EntityPlayer player = Minecraft.getMinecraft().player;
+        if(event.getPhase() != EventPriority.NORMAL)
+            return;
+
+        MatrixStack matrixStack = event.getMatrixStack();
+        BufferBuilder bufferBuilder = Tessellator.getInstance().getBuffer();
+        IRenderTypeBuffer.Impl renderTypeBuffer = IRenderTypeBuffer.getImpl(bufferBuilder);
+
+        PlayerEntity player = Minecraft.getInstance().player;
         ModeSettingsManager.ModeSettings modeSettings = ModeSettingsManager.getModeSettings(player);
         ModifierSettingsManager.ModifierSettings modifierSettings = ModifierSettingsManager.getModifierSettings(player);
 
-        begin(event.getPartialTicks());
+        Vec3d projectedView = Minecraft.getInstance().gameRenderer.getActiveRenderInfo().getProjectedView();
+
+        matrixStack.push();
+        matrixStack.translate(-projectedView.x, -projectedView.y, -projectedView.z);
 
         //Mirror and radial mirror lines and areas
-        ModifierRenderer.render(modifierSettings);
+        ModifierRenderer.render(matrixStack, renderTypeBuffer, modifierSettings);
 
         //Render block previews
-        BlockPreviewRenderer.render(player, modifierSettings, modeSettings);
+        BlockPreviewRenderer.render(matrixStack, renderTypeBuffer, player, modifierSettings, modeSettings);
 
-        end();
+        matrixStack.pop();
     }
 
     @SubscribeEvent
     //Display Radial Menu
     public static void onRenderGameOverlay(final RenderGameOverlayEvent.Post event) {
-        Minecraft mc = Minecraft.getMinecraft();
-        EntityPlayerSP player = mc.player;
+        Minecraft mc = Minecraft.getInstance();
+        ClientPlayerEntity player = mc.player;
 
         //check if chisel and bits tool in hand (and has menu)
-        final boolean hasChiselInHand = CompatHelper.chiselsAndBitsProxy.isHoldingChiselTool(EnumHand.MAIN_HAND);
+//        final boolean hasChiselInHand = CompatHelper.chiselsAndBitsProxy.isHoldingChiselTool(EnumHand.MAIN_HAND);
 
         final RenderGameOverlayEvent.ElementType type = event.getType();
-        if (type == RenderGameOverlayEvent.ElementType.ALL && !hasChiselInHand) {
+        //TODO 1.13 compatibility
+        if (type == RenderGameOverlayEvent.ElementType.ALL /*&& !hasChiselInHand*/) {
             final boolean wasVisible = RadialMenu.instance.isVisible();
 
             if (ClientProxy.keyBindings[3].isKeyDown()) {
@@ -95,12 +105,17 @@ public class RenderHandler implements IWorldEventListener {
                         playRadialMenuSound();
                         modeSettings.setBuildMode(RadialMenu.instance.switchTo);
                         ModeSettingsManager.setModeSettings(player, modeSettings);
-                        EffortlessBuilding.packetHandler.sendToServer(new ModeSettingsMessage(modeSettings));
+                        PacketHandler.INSTANCE.sendToServer(new ModeSettingsMessage(modeSettings));
 
-                        EffortlessBuilding.log(player, modeSettings.getBuildMode().name, true);
+                        EffortlessBuilding.log(player, I18n.format(modeSettings.getBuildMode().name), true);
                     }
 
-                    //TODO change buildmode settings
+                    //Perform button action
+                    ModeOptions.ActionEnum action = RadialMenu.instance.doAction;
+                    if (action != null) {
+                        ModeOptions.performAction(player, action);
+                        PacketHandler.INSTANCE.sendToServer(new ModeActionMessage(action));
+                    }
 
                     playRadialMenuSound();
                 }
@@ -111,25 +126,27 @@ public class RenderHandler implements IWorldEventListener {
 
             if (RadialMenu.instance.isVisible()) {
 
-                final ScaledResolution res = event.getResolution();
-                RadialMenu.instance.configure(res.getScaledWidth(), res.getScaledHeight());
+                int scaledWidth = mc.getMainWindow().getScaledWidth();
+                int scaledHeight = mc.getMainWindow().getScaledHeight();
+                RadialMenu.instance.configure(scaledWidth, scaledHeight);
 
                 if (!wasVisible) {
-                    mc.inGameHasFocus = false;
-                    mc.mouseHelper.ungrabMouseCursor();
+                    mc.mouseHelper.ungrabMouse();
                 }
 
-                if (mc.inGameHasFocus) {
+                if (mc.mouseHelper.isMouseGrabbed()) {
                     KeyBinding.unPressAllKeys();
                 }
 
-                final int k1 = Mouse.getX() * res.getScaledWidth() / mc.displayWidth;
-                final int l1 = res.getScaledHeight() - Mouse.getY() * res.getScaledHeight() / mc.displayHeight - 1;
+                final int mouseX = ((int) mc.mouseHelper.getMouseX()) * scaledWidth / mc.getMainWindow().getFramebufferWidth();
+                final int mouseY = scaledHeight - ((int) mc.mouseHelper.getMouseY()) * scaledHeight / mc.getMainWindow().getFramebufferHeight() - 1;
 
-                net.minecraftforge.client.ForgeHooksClient.drawScreen(RadialMenu.instance, k1, l1, event.getPartialTicks());
+                net.minecraftforge.client.ForgeHooksClient.drawScreen(RadialMenu.instance, mouseX, mouseY, event.getPartialTicks());
             } else {
-                if (wasVisible) {
-                    mc.setIngameFocus();
+                if (wasVisible &&
+                    RadialMenu.instance.doAction != ModeOptions.ActionEnum.OPEN_MODIFIER_SETTINGS &&
+                    RadialMenu.instance.doAction != ModeOptions.ActionEnum.OPEN_PLAYER_SETTINGS) {
+                    mc.mouseHelper.grabMouse();
                 }
             }
         }
@@ -138,165 +155,103 @@ public class RenderHandler implements IWorldEventListener {
     public static void playRadialMenuSound() {
         final float volume = 0.1f;
         if (volume >= 0.0001f) {
-            final PositionedSoundRecord psr = new PositionedSoundRecord(SoundEvents.UI_BUTTON_CLICK, SoundCategory.MASTER,
-                    volume, 1.0f, Minecraft.getMinecraft().player.getPosition());
-            Minecraft.getMinecraft().getSoundHandler().playSound(psr);
+            SimpleSound sound = new SimpleSound(SoundEvents.UI_BUTTON_CLICK, SoundCategory.MASTER, volume, 1.0f, Minecraft.getInstance().player.getPosition());
+            Minecraft.getInstance().getSoundHandler().play(sound);
         }
     }
 
-    private static void begin(float partialTicks) {
-        EntityPlayer player = Minecraft.getMinecraft().player;
-        double playerX = player.prevPosX + (player.posX - player.prevPosX) * partialTicks;
-        double playerY = player.prevPosY + (player.posY - player.prevPosY) * partialTicks;
-        double playerZ = player.prevPosZ + (player.posZ - player.prevPosZ) * partialTicks;
-        Vec3d playerPos = new Vec3d(playerX, playerY, playerZ);
-
-        GL11.glPushMatrix();
-        GL11.glTranslated(-playerPos.x, -playerPos.y, -playerPos.z);
-
-        GL11.glDepthMask(false);
+    protected static IVertexBuilder beginLines(IRenderTypeBuffer.Impl renderTypeBuffer) {
+        return renderTypeBuffer.getBuffer(BuildRenderTypes.LINES);
     }
 
-    protected static void beginLines() {
-        GL11.glPushAttrib(GL11.GL_ENABLE_BIT);
-        GL11.glDisable(GL11.GL_CULL_FACE);
-        GL11.glDisable(GL11.GL_LIGHTING);
-        GL11.glDisable(GL11.GL_TEXTURE_2D);
-
-        GL11.glEnable(GL11.GL_BLEND);
-        GL11.glBlendFunc(GL11.GL_SRC_ALPHA, GL11.GL_ONE_MINUS_SRC_ALPHA);
-
-        GL11.glLineWidth(2);
+    protected static void endLines(IRenderTypeBuffer.Impl renderTypeBuffer) {
+        renderTypeBuffer.finish();
     }
 
-    protected static void endLines() {
-        GL11.glPopAttrib();
+    protected static IVertexBuilder beginPlanes(IRenderTypeBuffer.Impl renderTypeBuffer){
+        return renderTypeBuffer.getBuffer(BuildRenderTypes.PLANES);
     }
 
-    protected static void beginBlockPreviews() {
-        GL11.glPushAttrib(GL11.GL_ENABLE_BIT);
-        GL11.glEnable(GL11.GL_CULL_FACE);
-        GL11.glEnable(GL11.GL_TEXTURE_2D);
-        Minecraft.getMinecraft().renderEngine.bindTexture(TextureMap.LOCATION_BLOCKS_TEXTURE);
-        Minecraft.getMinecraft().renderEngine.bindTexture(new ResourceLocation(EffortlessBuilding.MODID, "textures/shader_mask.png"));
-
-        GlStateManager.enableBlend();
-        GlStateManager.blendFunc(GL11.GL_SRC_ALPHA, GL11.GL_ONE_MINUS_SRC_ALPHA);
-        GL14.glBlendColor(1F, 1F, 1F, 0.8f);
+    protected static void endPlanes(IRenderTypeBuffer.Impl renderTypeBuffer){
+        renderTypeBuffer.finish();
     }
 
-    protected static void endBlockPreviews() {
-        ShaderHandler.releaseShader();
-        GlStateManager.disableBlend();
-        GL11.glPopAttrib();
+    protected static void renderBlockPreview(MatrixStack matrixStack, IRenderTypeBuffer.Impl renderTypeBuffer, BlockRendererDispatcher dispatcher,
+                                             BlockPos blockPos, BlockState blockState, float dissolve, BlockPos firstPos, BlockPos secondPos, boolean red) {
+        if (blockState == null) return;
+
+        matrixStack.push();
+        matrixStack.translate(blockPos.getX(), blockPos.getY(), blockPos.getZ());
+//        matrixStack.rotate(Vector3f.YP.rotationDegrees(-90f));
+        matrixStack.translate(-0.01f, -0.01f, -0.01f);
+        matrixStack.scale(1.02f, 1.02f, 1.02f);
+
+        //Begin block preview rendering
+        RenderType blockPreviewRenderType = BuildRenderTypes.getBlockPreviewRenderType(dissolve, blockPos, firstPos, secondPos, red);
+        IVertexBuilder buffer = renderTypeBuffer.getBuffer(blockPreviewRenderType);
+
+//        MinecraftServer server = Minecraft.getInstance().getIntegratedServer();
+//        World world = DimensionManager.getWorld(server, DimensionType.OVERWORLD, false, true);
+
+        try {
+            IBakedModel model = dispatcher.getModelForState(blockState);
+            dispatcher.getBlockModelRenderer().renderModelBrightnessColor(matrixStack.getLast(), buffer,
+                    blockState, model, 1f, 1f, 1f, 0, OverlayTexture.NO_OVERLAY);
+//        blockRendererDispatcher.getBlockModelRenderer().renderModel(world, blockRendererDispatcher.getModelForState(blockState),
+//                blockState, logicPos, matrixStack, renderTypeBuffer.getBuffer(renderType), true, new Random(), blockState.getPositionRandom(logicPos), i);
+        } catch (NullPointerException e) {
+            EffortlessBuilding.logger.warn("RenderHandler::renderBlockPreview cannot render " + blockState.getBlock().toString());
+
+            //Render outline as backup, escape out of the current renderstack
+            matrixStack.pop();
+            renderTypeBuffer.finish();
+            IVertexBuilder lineBuffer = beginLines(renderTypeBuffer);
+            renderBlockOutline(matrixStack, lineBuffer, blockPos, new Vec3d(1f, 1f, 1f));
+            endLines(renderTypeBuffer);
+            buffer = renderTypeBuffer.getBuffer(Atlases.getTranslucentBlockType()); //any type will do, as long as we have something on the stack
+            matrixStack.push();
         }
 
-    private static void end() {
-        GL11.glDepthMask(true);
-        GL11.glPopMatrix();
+        renderTypeBuffer.finish();
+        matrixStack.pop();
     }
 
-    protected static void renderBlockPreview(BlockRendererDispatcher dispatcher, BlockPos blockPos, IBlockState blockState) {
-        GlStateManager.pushMatrix();
-        GlStateManager.translate(blockPos.getX(), blockPos.getY(), blockPos.getZ());
-        GlStateManager.rotate(-90.0F, 0.0F, 1.0F, 0.0F);
-        GlStateManager.translate(-0.01f, -0.01f, 0.01f);
-        GlStateManager.scale(1.02f, 1.02f, 1.02f);
-        dispatcher.renderBlockBrightness(blockState, 0.85f);
-        GlStateManager.popMatrix();
-    }
-
-    protected static void renderBlockOutline(BlockPos pos, Vec3d color) {
-        renderBlockOutline(pos, pos, color);
+    protected static void renderBlockOutline(MatrixStack matrixStack, IVertexBuilder buffer, BlockPos pos, Vec3d color) {
+        renderBlockOutline(matrixStack, buffer, pos, pos, color);
     }
 
     //Renders outline. Pos1 has to be minimal x,y,z and pos2 maximal x,y,z
-    protected static void renderBlockOutline(BlockPos pos1, BlockPos pos2, Vec3d color) {
-        GL11.glLineWidth(2);
-
+    protected static void renderBlockOutline(MatrixStack matrixStack, IVertexBuilder buffer, BlockPos pos1, BlockPos pos2, Vec3d color) {
         AxisAlignedBB aabb = new AxisAlignedBB(pos1, pos2.add(1, 1, 1)).grow(0.0020000000949949026);
 
-        RenderGlobal.drawSelectionBoundingBox(aabb, (float) color.x, (float) color.y, (float) color.z, 0.4f);
+        WorldRenderer.drawBoundingBox(matrixStack, buffer, aabb, (float) color.x, (float) color.y, (float) color.z, 0.4f);
+//        WorldRenderer.drawSelectionBoundingBox(aabb, (float) color.x, (float) color.y, (float) color.z, 0.4f);
     }
 
-
-
-    //IWORLDEVENTLISTENER IMPLEMENTATION
-    @Override
-    public void notifyBlockUpdate(World worldIn, BlockPos pos, IBlockState oldState, IBlockState newState, int flags) {
-
-    }
-
-    @Override
-    public void notifyLightSet(BlockPos pos) {
-
-    }
-
-    @Override
-    public void markBlockRangeForRenderUpdate(int x1, int y1, int z1, int x2, int y2, int z2) {
-
-    }
-
-    @Override
-    public void playSoundToAllNearExcept(@Nullable EntityPlayer player, SoundEvent soundIn, SoundCategory category,
-                                         double x, double y, double z, float volume, float pitch) {
-
-    }
-
-    @Override
-    public void playRecord(SoundEvent soundIn, BlockPos pos) {
-
-    }
-
-    @Override
-    public void spawnParticle(int particleID, boolean ignoreRange, double xCoord, double yCoord, double zCoord,
-                              double xSpeed, double ySpeed, double zSpeed, int... parameters) {
-
-    }
-
-    @Override
-    public void spawnParticle(int id, boolean ignoreRange, boolean p_190570_3_, double x, double y, double z,
-                              double xSpeed, double ySpeed, double zSpeed, int... parameters) {
-
-    }
-
-    @Override
-    public void onEntityAdded(Entity entityIn) {
-
-    }
-
-    @Override
-    public void onEntityRemoved(Entity entityIn) {
-
-    }
-
-    @Override
-    public void broadcastSound(int soundID, BlockPos pos, int data) {
-
-    }
-
-    @Override
-    public void playEvent(EntityPlayer player, int type, BlockPos blockPosIn, int data) {
-
+    //Renders outline with given bounding box
+    protected static void renderBlockOutline(MatrixStack matrixStack, IVertexBuilder buffer, BlockPos pos, VoxelShape collisionShape, Vec3d color) {
+//        WorldRenderer.drawShape(collisionShape, pos.getX(), pos.getY(), pos.getZ(), (float) color.x, (float) color.y, (float) color.z, 0.4f);
+        WorldRenderer.drawVoxelShapeParts(matrixStack, buffer, collisionShape, pos.getX(), pos.getY(), pos.getZ(), (float) color.x, (float) color.y, (float) color.z, 0.4f);
     }
 
+    //TODO 1.14
     //Sends breaking progress for all coordinates to renderglobal, so all blocks get visually broken
-    @Override
-    public void sendBlockBreakProgress(int breakerId, BlockPos pos, int progress) {
-        Minecraft mc = Minecraft.getMinecraft();
-
-        ModifierSettingsManager.ModifierSettings modifierSettings = ModifierSettingsManager.getModifierSettings(mc.player);
-        if (!BuildModifiers.isEnabled(modifierSettings, pos)) return;
-
-        List<BlockPos> coordinates = BuildModifiers.findCoordinates(mc.player, pos);
-        for (int i = 1; i < coordinates.size(); i++) {
-            BlockPos coordinate = coordinates.get(i);
-            if (SurvivalHelper.canBreak(mc.world, mc.player, coordinate)) {
-                //Send i as entity id because only one block can be broken per id
-                //Unless i happens to be the player id, then take something else
-                int fakeId = mc.player.getEntityId() != i ? i : coordinates.size();
-                mc.renderGlobal.sendBlockBreakProgress(fakeId, coordinate, progress);
-            }
-        }
-    }
+//    @Override
+//    public void sendBlockBreakProgress(int breakerId, BlockPos pos, int progress) {
+//        Minecraft mc = Minecraft.getInstance();
+//
+//        ModifierSettingsManager.ModifierSettings modifierSettings = ModifierSettingsManager.getModifierSettings(mc.player);
+//        if (!BuildModifiers.isEnabled(modifierSettings, pos)) return;
+//
+//        List<BlockPos> coordinates = BuildModifiers.findCoordinates(mc.player, pos);
+//        for (int i = 1; i < coordinates.size(); i++) {
+//            BlockPos coordinate = coordinates.get(i);
+//            if (SurvivalHelper.canBreak(mc.world, mc.player, coordinate)) {
+//                //Send i as entity id because only one block can be broken per id
+//                //Unless i happens to be the player id, then take something else
+//                int fakeId = mc.player.getEntityId() != i ? i : coordinates.size();
+//                mc.renderGlobal.sendBlockBreakProgress(fakeId, coordinate, progress);
+//            }
+//        }
+//    }
 }