Added circle, cylinder and sphere buildmodes. Refactored buildmodes to use hierarchy classes, much less code duplication. Added support for multiple options per build mode.

Added alternative placement key (ctrl) that toggles between first two actions of first option.
Fixed crash when placing ladders.

.gitignore

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

LICENSE.txt

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

README.md

@@ -0,0 +1,3 @@
+This is the version for Minecraft 1.12.
+
+1.13 can be found here: https://bitbucket.org/Requios/effortless-building-1.13/src/master/

README.txt

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

build.gradle

@@ -1,146 +1,82 @@
 buildscript {
     repositories {
-        maven { url = 'https://files.minecraftforge.net/maven' }
         jcenter()
-        mavenCentral()
+        maven { url = "http://files.minecraftforge.net/maven" }
     }
     dependencies {
-        classpath group: 'net.minecraftforge.gradle', name: 'ForgeGradle', version: '3.+', changing: true
+        classpath 'net.minecraftforge.gradle:ForgeGradle:2.3-SNAPSHOT'
     }
 }
-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'
+apply plugin: 'net.minecraftforge.gradle.forge'
+//Only edit below this line, the above code adds and enables the necessary things for Forge to be setup.
 
-version = '1.15.2-2.21'
-group = 'nl.requios.effortlessbuilding' // http://maven.apache.org/guides/mini/guide-naming-conventions.html
-archivesBaseName = 'effortlessbuilding'
 
-sourceCompatibility = targetCompatibility = compileJava.sourceCompatibility = compileJava.targetCompatibility = '1.8' // Need this here so eclipse task generates correctly.
+version = "1.12.2-2.16"
+group = "nl.requios.effortlessbuilding" // http://maven.apache.org/guides/mini/guide-naming-conventions.html
+archivesBaseName = "effortlessbuilding"
+
+sourceCompatibility = targetCompatibility = '1.8' // Need this here so eclipse task generates correctly.
+compileJava {
+    sourceCompatibility = targetCompatibility = '1.8'
+}
 
 minecraft {
-    // The mappings can be changed at any time, and must be in the following format.
-    // snapshot_YYYYMMDD   Snapshot are built nightly.
-    // stable_#            Stables are built at the discretion of the MCP team.
-    // Use non-default mappings at your own risk. they may not always work.
-    // Simply re-run your setup task after changing the mappings to update your workspace.
-    mappings channel: 'snapshot', version: '20200514-1.15.1'
-    // makeObfSourceJar = false // an Srg named sources jar is made by default. uncomment this to disable.
+    version = "1.12.2-14.23.5.2825"
+    runDir = "run"
     
-    // accessTransformer = file('src/main/resources/META-INF/accesstransformer.cfg')
+    // 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"
+    // makeObfSourceJar = false // an Srg named sources jar is made by default. uncomment this to disable.
+}
 
-    // Default run configurations.
-    // These can be tweaked, removed, or duplicated as needed.
-    runs {
-        client {
-            workingDirectory project.file('run')
-
-            // Recommended logging data for a userdev environment (SCAN,REGISTRIES,REGISTRYDUMP)
-            property 'forge.logging.markers', 'REGISTRIES'
-
-            // Recommended logging level for the console
-            property 'forge.logging.console.level', 'debug'
-
-            mods {
-                effortlessbuilding {
-                    source sourceSets.main
-                }
-            }
-        }
-
-        server {
-            workingDirectory project.file('run')
-
-            // Recommended logging data for a userdev environment (SCAN,REGISTRIES,REGISTRYDUMP)
-            property 'forge.logging.markers', 'REGISTRIES'
-
-            // Recommended logging level for the console
-            property 'forge.logging.console.level', 'debug'
-
-            mods {
-                effortlessbuilding {
-                    source sourceSets.main
-                }
-            }
-        }
-
-        data {
-            workingDirectory project.file('run')
-
-            // Recommended logging data for a userdev environment (SCAN,REGISTRIES,REGISTRYDUMP)
-            property 'forge.logging.markers', 'REGISTRIES'
-
-            // Recommended logging level for the console
-            property 'forge.logging.console.level', 'debug'
-
-            args '--mod', 'effortlessbuilding', '--all', '--output', file('src/generated/resources/')
-
-            mods {
-                effortlessbuilding {
-                    source sourceSets.main
-                }
-            }
-        }
-    }
+repositories {
+	flatDir { dirs 'libs' }
 }
 
 dependencies {
-    // Specify the version of Minecraft to use, If this is any group other then 'net.minecraft' it is assumed
-    // that the dep is a ForgeGradle 'patcher' dependency. And it's patches will be applied.
-    // The userdev artifact is a special name and will get all sorts of transformations applied to it.
-    minecraft 'net.minecraftforge:forge:1.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
+    //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
 
-    // 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"
+    // 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'
 
-    // 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 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'
 
-    // The 'provided' configuration is for optional dependencies that exist at compile-time but might not at runtime.
-    // provided 'com.mod-buildcraft:buildcraft:6.0.8:dev'
-
-    // These dependencies get remapped to your current MCP mappings
-    // deobf 'com.mod-buildcraft:buildcraft:6.0.8:dev'
-
-    // For more info...
+    // for more info...
     // http://www.gradle.org/docs/current/userguide/artifact_dependencies_tutorial.html
     // http://www.gradle.org/docs/current/userguide/dependency_management.html
 
 }
 
-// Example for how to get properties into the manifest for reading by the runtime..
-jar {
-    manifest {
-        attributes([
-            "Specification-Title": "effortlessbuilding",
-            "Specification-Vendor": "requios",
-            "Specification-Version": "1", // We are version 1 of ourselves
-            "Implementation-Title": project.name,
-            "Implementation-Version": "${version}",
-            "Implementation-Vendor" :"requios",
-            "Implementation-Timestamp": new Date().format("yyyy-MM-dd'T'HH:mm:ssZ")
-        ])
+processResources {
+    // this will ensure that this task is redone when the versions change.
+    inputs.property "version", project.version
+    inputs.property "mcversion", project.minecraft.version
+
+    // replace stuff in mcmod.info, nothing else
+    from(sourceSets.main.resources.srcDirs) {
+        include 'mcmod.info'
+                
+        // replace version and mcversion
+        expand 'version':project.version, 'mcversion':project.minecraft.version
+    }
+        
+    // copy everything else except the mcmod.info
+    from(sourceSets.main.resources.srcDirs) {
+        exclude 'mcmod.info'
     }
 }
-
-// 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

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

gradle/wrapper/gradle-wrapper.properties

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

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

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

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

@@ -1,58 +1,58 @@
 package nl.requios.effortlessbuilding;
 
 import net.minecraft.block.Block;
-import net.minecraft.entity.player.PlayerEntity;
-import net.minecraft.inventory.container.Container;
-import net.minecraft.inventory.container.ContainerType;
+import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.item.Item;
 import net.minecraft.util.ResourceLocation;
-import net.minecraft.util.registry.Registry;
-import net.minecraft.util.text.StringTextComponent;
-import net.minecraftforge.common.MinecraftForge;
+import net.minecraft.util.SoundEvent;
+import net.minecraft.util.text.TextComponentString;
 import net.minecraftforge.common.capabilities.CapabilityManager;
-import net.minecraftforge.common.crafting.CraftingHelper;
-import net.minecraftforge.eventbus.api.SubscribeEvent;
-import net.minecraftforge.fml.DistExecutor;
-import net.minecraftforge.fml.ExtensionPoint;
-import net.minecraftforge.fml.ModLoadingContext;
+import net.minecraftforge.common.config.Config;
+import net.minecraftforge.common.config.ConfigManager;
 import net.minecraftforge.fml.common.Mod;
-import net.minecraftforge.fml.config.ModConfig;
-import net.minecraftforge.fml.event.lifecycle.FMLClientSetupEvent;
-import net.minecraftforge.fml.event.lifecycle.FMLCommonSetupEvent;
-import net.minecraftforge.fml.event.lifecycle.InterModEnqueueEvent;
-import net.minecraftforge.fml.event.lifecycle.InterModProcessEvent;
-import net.minecraftforge.fml.event.server.FMLServerStartingEvent;
-import net.minecraftforge.fml.javafmlmod.FMLJavaModLoadingContext;
+import net.minecraftforge.fml.common.Mod.EventHandler;
+import net.minecraftforge.fml.common.SidedProxy;
+import net.minecraftforge.fml.common.event.FMLInitializationEvent;
+import net.minecraftforge.fml.common.event.FMLPostInitializationEvent;
+import net.minecraftforge.fml.common.event.FMLPreInitializationEvent;
+import net.minecraftforge.fml.common.event.FMLServerStartingEvent;
+import net.minecraftforge.fml.common.network.NetworkRegistry;
+import net.minecraftforge.fml.common.network.simpleimpl.SimpleNetworkWrapper;
+import net.minecraftforge.fml.relauncher.Side;
+import nl.requios.effortlessbuilding.buildmode.BuildModes;
 import nl.requios.effortlessbuilding.capability.ModeCapabilityManager;
 import nl.requios.effortlessbuilding.capability.ModifierCapabilityManager;
 import nl.requios.effortlessbuilding.command.CommandReach;
 import nl.requios.effortlessbuilding.compatibility.CompatHelper;
-import nl.requios.effortlessbuilding.gui.RandomizerBagContainer;
+import nl.requios.effortlessbuilding.gui.RandomizerBagGuiHandler;
 import nl.requios.effortlessbuilding.item.ItemRandomizerBag;
 import nl.requios.effortlessbuilding.item.ItemReachUpgrade1;
 import nl.requios.effortlessbuilding.item.ItemReachUpgrade2;
 import nl.requios.effortlessbuilding.item.ItemReachUpgrade3;
-import nl.requios.effortlessbuilding.network.PacketHandler;
-import nl.requios.effortlessbuilding.proxy.ClientProxy;
+import nl.requios.effortlessbuilding.network.*;
 import nl.requios.effortlessbuilding.proxy.IProxy;
-import nl.requios.effortlessbuilding.proxy.ServerProxy;
-import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
 
-// The value here should match an entry in the META-INF/mods.toml file
-@Mod(EffortlessBuilding.MODID)
-@Mod.EventBusSubscriber(bus=Mod.EventBusSubscriber.Bus.MOD)
+@Mod(modid = EffortlessBuilding.MODID, name = EffortlessBuilding.NAME, version = EffortlessBuilding.VERSION)
+@Mod.EventBusSubscriber
 public class EffortlessBuilding
 {
     public static final String MODID = "effortlessbuilding";
     public static final String NAME = "Effortless Building";
-    public static final String VERSION = "1.15.2-2.21";
+    public static final String VERSION = "1.12.2-2.16";
 
+    @Mod.Instance(EffortlessBuilding.MODID)
     public static EffortlessBuilding instance;
 
-    public static final Logger logger = LogManager.getLogger();
+    public static Logger logger;
 
-    public static IProxy proxy = DistExecutor.runForDist(() -> ClientProxy::new, () -> ServerProxy::new);
+    @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 final ItemRandomizerBag ITEM_RANDOMIZER_BAG = new ItemRandomizerBag();
     public static final ItemReachUpgrade1 ITEM_REACH_UPGRADE_1 = new ItemReachUpgrade1();
@@ -69,89 +69,82 @@ public class EffortlessBuilding
             ITEM_REACH_UPGRADE_3
     };
 
-    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");
+    public static final int RANDOMIZER_BAG_GUI = 0;
 
-    public EffortlessBuilding() {
-        instance = this;
-
-        // 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);
-
-        //Register config
-        ModLoadingContext.get().registerConfig(ModConfig.Type.COMMON, BuildConfig.spec);
-
-        // Register ourselves for server and other game events we are interested in
-        MinecraftForge.EVENT_BUS.register(this);
-    }
-
-    @SubscribeEvent
-    public void setup(final FMLCommonSetupEvent event)
+    @EventHandler
+    // preInit "Run before anything else. Read your config, create blocks, items, etc, and register them with the GameRegistry."
+    public void preInit(FMLPreInitializationEvent event)
     {
-        CapabilityManager.INSTANCE.register(ModifierCapabilityManager.IModifierCapability.class, new ModifierCapabilityManager.Storage(), ModifierCapabilityManager.ModifierCapability::new);
-        CapabilityManager.INSTANCE.register(ModeCapabilityManager.IModeCapability.class, new ModeCapabilityManager.Storage(), ModeCapabilityManager.ModeCapability::new);
+        logger = event.getModLog();
 
-        PacketHandler.register();
+        CapabilityManager.INSTANCE.register(ModifierCapabilityManager.IModifierCapability.class, new ModifierCapabilityManager.Storage(), ModifierCapabilityManager.ModifierCapability.class);
+        CapabilityManager.INSTANCE.register(ModeCapabilityManager.IModeCapability.class, new ModeCapabilityManager.Storage(), ModeCapabilityManager.ModeCapability.class);
 
-        //TODO 1.13 config
-//        ConfigManager.sync(MODID, Config.Type.INSTANCE);
+        EffortlessBuilding.packetHandler.registerMessage(ModifierSettingsMessage.MessageHandler.class, ModifierSettingsMessage.class, 0, Side.SERVER);
+        EffortlessBuilding.packetHandler.registerMessage(ModifierSettingsMessage.MessageHandler.class, ModifierSettingsMessage.class, 0, Side.CLIENT);
 
-        proxy.setup(event);
+        EffortlessBuilding.packetHandler.registerMessage(ModeSettingsMessage.MessageHandler.class, ModeSettingsMessage.class, 1, Side.SERVER);
+        EffortlessBuilding.packetHandler.registerMessage(ModeSettingsMessage.MessageHandler.class, ModeSettingsMessage.class, 1, Side.CLIENT);
 
-        CompatHelper.setup();
+        EffortlessBuilding.packetHandler.registerMessage(ModeActionMessage.MessageHandler.class, ModeActionMessage.class, 2, Side.SERVER);
+        EffortlessBuilding.packetHandler.registerMessage(ModeActionMessage.MessageHandler.class, ModeActionMessage.class, 2, Side.CLIENT);
+
+        EffortlessBuilding.packetHandler.registerMessage(BlockPlacedMessage.MessageHandler.class, BlockPlacedMessage.class, 3, Side.SERVER);
+        EffortlessBuilding.packetHandler.registerMessage(BlockPlacedMessage.MessageHandler.class, BlockPlacedMessage.class, 3, Side.CLIENT);
+
+        EffortlessBuilding.packetHandler.registerMessage(BlockBrokenMessage.MessageHandler.class, BlockBrokenMessage.class, 4, Side.SERVER);
+        EffortlessBuilding.packetHandler.registerMessage(BlockBrokenMessage.MessageHandler.class, BlockBrokenMessage.class, 4, Side.CLIENT);
+
+        EffortlessBuilding.packetHandler.registerMessage(CancelModeMessage.MessageHandler.class, CancelModeMessage.class, 5, Side.SERVER);
+        EffortlessBuilding.packetHandler.registerMessage(CancelModeMessage.MessageHandler.class, CancelModeMessage.class, 5, Side.CLIENT);
+
+        EffortlessBuilding.packetHandler.registerMessage(RequestLookAtMessage.MessageHandler.class, RequestLookAtMessage.class, 6, Side.SERVER);
+        EffortlessBuilding.packetHandler.registerMessage(RequestLookAtMessage.MessageHandler.class, RequestLookAtMessage.class, 6, Side.CLIENT);
+
+        EffortlessBuilding.packetHandler.registerMessage(AddUndoMessage.MessageHandler.class, AddUndoMessage.class, 7, Side.SERVER);
+        EffortlessBuilding.packetHandler.registerMessage(AddUndoMessage.MessageHandler.class, AddUndoMessage.class, 7, Side.CLIENT);
+
+        EffortlessBuilding.packetHandler.registerMessage(ClearUndoMessage.MessageHandler.class, ClearUndoMessage.class, 8, Side.SERVER);
+        EffortlessBuilding.packetHandler.registerMessage(ClearUndoMessage.MessageHandler.class, ClearUndoMessage.class, 8, Side.CLIENT);
+
+        proxy.preInit(event);
     }
 
-    @SubscribeEvent
-    public void clientSetup(final FMLClientSetupEvent event) {
+    @EventHandler
+    // Do your mod setup. Build whatever data structures you care about.
+    // Register network handlers
+    public void init(FMLInitializationEvent event)
+    {
+        ConfigManager.sync(MODID, Config.Type.INSTANCE);
+        NetworkRegistry.INSTANCE.registerGuiHandler(EffortlessBuilding.instance, new RandomizerBagGuiHandler());
 
-        proxy.clientSetup(event);
+        proxy.init(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";});
+    @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 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));
+    @EventHandler
+    public void serverStarting(FMLServerStartingEvent event)
+    {
+        event.registerServerCommand(new CommandReach());
+        proxy.serverStarting(event);
     }
 
     public static void log(String msg){
         logger.info(msg);
     }
 
-    public static void log(PlayerEntity player, String msg){
+    public static void log(EntityPlayer player, String msg){
         log(player, msg, false);
     }
 
-    public static void log(PlayerEntity player, String msg, boolean actionBar){
-        player.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);
+    public static void log(EntityPlayer player, String msg, boolean actionBar){
+        player.sendStatusMessage(new TextComponentString(msg), actionBar);
     }
 }

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

@@ -1,22 +1,29 @@
 package nl.requios.effortlessbuilding;
 
-import net.minecraft.block.BlockState;
-import net.minecraft.block.Blocks;
+import net.minecraft.block.Block;
+import net.minecraft.block.state.IBlockState;
 import net.minecraft.entity.Entity;
-import net.minecraft.entity.player.PlayerEntity;
-import net.minecraft.entity.player.ServerPlayerEntity;
+import net.minecraft.entity.player.EntityPlayer;
+import net.minecraft.entity.player.EntityPlayerMP;
+import net.minecraft.init.Blocks;
+import net.minecraft.item.Item;
+import net.minecraft.item.ItemBlock;
 import net.minecraft.util.ResourceLocation;
 import net.minecraft.util.math.BlockPos;
+import net.minecraft.util.math.Vec3d;
 import net.minecraft.world.World;
-import net.minecraftforge.client.event.TextureStitchEvent;
+import net.minecraftforge.common.config.Config;
+import net.minecraftforge.common.config.ConfigManager;
 import net.minecraftforge.event.AttachCapabilitiesEvent;
+import net.minecraftforge.event.RegistryEvent;
 import net.minecraftforge.event.entity.player.PlayerEvent;
 import net.minecraftforge.event.world.BlockEvent;
-import net.minecraftforge.eventbus.api.SubscribeEvent;
+import net.minecraftforge.fml.client.event.ConfigChangedEvent;
 import net.minecraftforge.fml.common.Mod;
-import net.minecraftforge.fml.network.PacketDistributor;
+import net.minecraftforge.fml.common.eventhandler.SubscribeEvent;
 import nl.requios.effortlessbuilding.buildmode.BuildModes;
 import nl.requios.effortlessbuilding.buildmode.ModeSettingsManager;
+import nl.requios.effortlessbuilding.buildmodifier.BlockSet;
 import nl.requios.effortlessbuilding.buildmodifier.BuildModifiers;
 import nl.requios.effortlessbuilding.buildmodifier.ModifierSettingsManager;
 import nl.requios.effortlessbuilding.buildmodifier.UndoRedo;
@@ -25,33 +32,53 @@ import nl.requios.effortlessbuilding.capability.ModifierCapabilityManager;
 import nl.requios.effortlessbuilding.helper.ReachHelper;
 import nl.requios.effortlessbuilding.helper.SurvivalHelper;
 import nl.requios.effortlessbuilding.network.AddUndoMessage;
+import nl.requios.effortlessbuilding.network.BlockBrokenMessage;
 import nl.requios.effortlessbuilding.network.ClearUndoMessage;
-import nl.requios.effortlessbuilding.network.PacketHandler;
 import nl.requios.effortlessbuilding.network.RequestLookAtMessage;
+import scala.actors.threadpool.Arrays;
 
+import java.util.ArrayList;
 import java.util.List;
 
+import static net.minecraftforge.fml.common.gameevent.PlayerEvent.*;
+
 @Mod.EventBusSubscriber
 public class EventHandler
 {
 
     @SubscribeEvent
-    public static void attachCapabilities(AttachCapabilitiesEvent<Entity> event) {
-        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());
+    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()));
         }
     }
 
-    //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 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());
+        }
+    }
+
+    @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) {
@@ -60,13 +87,11 @@ public class EventHandler
 
     @SubscribeEvent
     //Only called serverside (except with lilypads...)
-    public static void onBlockPlaced(BlockEvent.EntityPlaceEvent event) {
-        if (event.getWorld().isRemote()) return;
-
-        if (!(event.getEntity() instanceof PlayerEntity)) return;
+    public static void onBlockPlaced(BlockEvent.PlaceEvent event) {
+        if (event.getWorld().isRemote) return;
 
         //Cancel event if necessary
-        ServerPlayerEntity player = ((ServerPlayerEntity) event.getEntity());
+        EntityPlayer player = event.getPlayer();
         BuildModes.BuildModeEnum buildMode = ModeSettingsManager.getModeSettings(player).getBuildMode();
         ModifierSettingsManager.ModifierSettings modifierSettings = ModifierSettingsManager.getModifierSettings(player);
 
@@ -75,26 +100,21 @@ public class EventHandler
         } 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()));
+            EffortlessBuilding.packetHandler.sendTo(new RequestLookAtMessage(true), (EntityPlayerMP) player);
+            EffortlessBuilding.packetHandler.sendTo(new AddUndoMessage(event.getPos(), event.getBlockSnapshot().getReplacedBlock(), event.getState()), (EntityPlayerMP) player);
         } else {
             //NORMAL mode, let vanilla handle block placing
             //But modifiers should still work
 
             //Send message to client, which sends message back with raytrace info
-            PacketHandler.INSTANCE.send(PacketDistributor.PLAYER.with(() -> player), new RequestLookAtMessage(false));
-            PacketHandler.INSTANCE.send(PacketDistributor.PLAYER.with(() -> player), new AddUndoMessage(event.getPos(), event.getBlockSnapshot().getReplacedBlock(), event.getState()));
+            EffortlessBuilding.packetHandler.sendTo(new RequestLookAtMessage(false), (EntityPlayerMP) player);
+            EffortlessBuilding.packetHandler.sendTo(new AddUndoMessage(event.getPos(), event.getBlockSnapshot().getReplacedBlock(), event.getState()), (EntityPlayerMP) player);
         }
-
-//        Stat<ResourceLocation> blocksPlacedStat = StatList.CUSTOM.get(new ResourceLocation(EffortlessBuilding.MODID, "blocks_placed"));
-//        player.getStats().increment(player, blocksPlacedStat, 1);
-//
-//        System.out.println(player.getStats().getValue(blocksPlacedStat));
     }
 
     @SubscribeEvent
     public static void onBlockBroken(BlockEvent.BreakEvent event) {
-        if (event.getWorld().isRemote()) return;
+        if (event.getWorld().isRemote) return;
 
         //Cancel event if necessary
         //If cant break far then dont cancel event ever
@@ -103,21 +123,21 @@ public class EventHandler
             event.setCanceled(true);
         } else {
             //NORMAL mode, let vanilla handle block breaking
-            //But modifiers and QuickReplace should still work
+            //But modifiers 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()));
+            EffortlessBuilding.packetHandler.sendTo(new AddUndoMessage(event.getPos(), event.getState(), Blocks.AIR.getDefaultState()), (EntityPlayerMP) event.getPlayer());
         }
     }
 
     @SubscribeEvent
     public static void breakSpeed(PlayerEvent.BreakSpeed event) {
         //Disable if config says so
-        if (!BuildConfig.survivalBalancers.increasedMiningTime.get()) return;
+        if (!BuildConfig.survivalBalancers.increasedMiningTime) return;
 
-        PlayerEntity player = event.getPlayer();
+        EntityPlayer player = event.getEntityPlayer();
         World world = player.world;
         BlockPos pos = event.getPos();
 
@@ -131,14 +151,14 @@ public class EventHandler
         for (int i = 1; i < coordinates.size(); i++) {
             BlockPos coordinate = coordinates.get(i);
             //get existing blockstates at those coordinates
-            BlockState blockState = world.getBlockState(coordinate);
+            IBlockState blockState = world.getBlockState(coordinate);
             //add hardness for each blockstate, if can break
             if (SurvivalHelper.canBreak(world, player, coordinate))
                 totalBlockHardness += blockState.getBlockHardness(world, coordinate);
         }
 
         //Grabbing percentage from config
-        float percentage = (float) BuildConfig.survivalBalancers.miningTimePercentage.get() / 100;
+        float percentage = (float) BuildConfig.survivalBalancers.miningTimePercentage / 100;
         totalBlockHardness *= percentage;
         totalBlockHardness += originalBlockHardness;
 
@@ -150,60 +170,37 @@ public class EventHandler
     }
 
     @SubscribeEvent
-    public static void onPlayerLoggedIn(PlayerEvent.PlayerLoggedInEvent event) {
-        PlayerEntity player = event.getPlayer();
+    public static void onPlayerLoggedIn(PlayerLoggedInEvent event) {
+        EntityPlayer player = event.player;
         ModifierSettingsManager.handleNewPlayer(player);
         ModeSettingsManager.handleNewPlayer(player);
     }
 
     @SubscribeEvent
-    public static void onPlayerLoggedOut(PlayerEvent.PlayerLoggedOutEvent event) {
-        PlayerEntity player = event.getPlayer();
+    public static void onPlayerLoggedOut(PlayerLoggedOutEvent event) {
+        EntityPlayer player = event.player;
         if (player.getEntityWorld().isRemote) return;
 
         UndoRedo.clear(player);
-        PacketHandler.INSTANCE.send(PacketDistributor.PLAYER.with(() -> (ServerPlayerEntity) player), new ClearUndoMessage());
+        EffortlessBuilding.packetHandler.sendTo(new ClearUndoMessage(), (EntityPlayerMP) player);
     }
 
     @SubscribeEvent
-    public static void onPlayerRespawn(PlayerEvent.PlayerRespawnEvent event) {
-        PlayerEntity player = event.getPlayer();
+    public static void onPlayerRespawn(PlayerRespawnEvent event) {
+        EntityPlayer player = event.player;
         ModifierSettingsManager.handleNewPlayer(player);
         ModeSettingsManager.handleNewPlayer(player);
     }
 
     @SubscribeEvent
-    public static void onPlayerChangedDimension(PlayerEvent.PlayerChangedDimensionEvent event) {
-        PlayerEntity player = event.getPlayer();
+    public static void onPlayerChangedDimension(PlayerChangedDimensionEvent event) {
+        EntityPlayer player = event.player;
         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));
+        EffortlessBuilding.packetHandler.sendTo(new ClearUndoMessage(), (EntityPlayerMP) player);
     }
 }

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

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

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

@@ -1,12 +1,13 @@
 package nl.requios.effortlessbuilding.buildmode;
 
-import net.minecraft.entity.player.PlayerEntity;
-import net.minecraft.util.Direction;
+import net.minecraft.entity.player.EntityPlayer;
+import net.minecraft.util.EnumFacing;
 import net.minecraft.util.math.BlockPos;
 import net.minecraft.util.math.Vec3d;
 
 import java.util.Dictionary;
 import java.util.Hashtable;
+import java.util.List;
 import java.util.UUID;
 
 public abstract class BaseBuildMode implements IBuildMode {
@@ -15,25 +16,25 @@ public abstract class BaseBuildMode implements IBuildMode {
     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, EnumFacing> sideHitTable = new Hashtable<>();
     protected Dictionary<UUID, Vec3d> hitVecTable = new Hashtable<>();
 
     @Override
-    public void initialize(PlayerEntity player) {
+    public void initialize(EntityPlayer player) {
         rightClickClientTable.put(player.getUniqueID(), 0);
         rightClickServerTable.put(player.getUniqueID(), 0);
-        firstPosTable.put(player.getUniqueID(), BlockPos.ZERO);
-        sideHitTable.put(player.getUniqueID(), Direction.UP);
+        firstPosTable.put(player.getUniqueID(), BlockPos.ORIGIN);
+        sideHitTable.put(player.getUniqueID(), EnumFacing.UP);
         hitVecTable.put(player.getUniqueID(), Vec3d.ZERO);
     }
 
     @Override
-    public Direction getSideHit(PlayerEntity player) {
+    public EnumFacing getSideHit(EntityPlayer player) {
         return sideHitTable.get(player.getUniqueID());
     }
 
     @Override
-    public Vec3d getHitVec(PlayerEntity player) {
+    public Vec3d getHitVec(EntityPlayer 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.PlayerEntity;
-import net.minecraft.util.Direction;
+import net.minecraft.entity.player.EntityPlayer;
+import net.minecraft.util.EnumFacing;
+import net.minecraft.util.EnumHand;
 import net.minecraft.util.math.BlockPos;
-import net.minecraft.util.math.RayTraceContext;
 import net.minecraft.util.math.RayTraceResult;
 import net.minecraft.util.math.Vec3d;
 import nl.requios.effortlessbuilding.EffortlessBuilding;
 import nl.requios.effortlessbuilding.buildmode.buildmodes.*;
-import nl.requios.effortlessbuilding.buildmodifier.BuildModifiers;
-import nl.requios.effortlessbuilding.buildmodifier.ModifierSettingsManager;
+import nl.requios.effortlessbuilding.buildmode.buildmodes.Circle;
+import nl.requios.effortlessbuilding.buildmode.buildmodes.Cylinder;
+import nl.requios.effortlessbuilding.buildmode.buildmodes.Sphere;
+import nl.requios.effortlessbuilding.buildmodifier.*;
 import nl.requios.effortlessbuilding.helper.ReachHelper;
 import nl.requios.effortlessbuilding.helper.SurvivalHelper;
 import nl.requios.effortlessbuilding.network.BlockBrokenMessage;
@@ -26,8 +28,8 @@ public class BuildModes {
 
     //Static variables are shared between client and server in singleplayer
     //We need them separate
-    public static Dictionary<PlayerEntity, Boolean> currentlyBreakingClient = new Hashtable<>();
-    public static Dictionary<PlayerEntity, Boolean> currentlyBreakingServer = new Hashtable<>();
+    public static Dictionary<EntityPlayer, Boolean> currentlyBreakingClient = new Hashtable<>();
+    public static Dictionary<EntityPlayer, Boolean> currentlyBreakingServer = new Hashtable<>();
 
     public enum BuildModeEnum {
         NORMAL("effortlessbuilding.mode.normal", new Normal()),
@@ -57,10 +59,10 @@ public class BuildModes {
     //Uses a network message to get the previous raytraceresult from the player
     //The server could keep track of all raytraceresults but this might lag with many players
     //Raytraceresult is needed for sideHit and hitVec
-    public static void onBlockPlacedMessage(PlayerEntity player, BlockPlacedMessage message) {
+    public static void onBlockPlacedMessage(EntityPlayer player, BlockPlacedMessage message) {
 
         //Check if not in the middle of breaking
-        Dictionary<PlayerEntity, Boolean> currentlyBreaking = player.world.isRemote ? currentlyBreakingClient : currentlyBreakingServer;
+        Dictionary<EntityPlayer, Boolean> currentlyBreaking = player.world.isRemote ? currentlyBreakingClient : currentlyBreakingServer;
         if (currentlyBreaking.get(player) != null && currentlyBreaking.get(player)) {
             //Cancel breaking
             initializeMode(player);
@@ -77,8 +79,7 @@ public class BuildModes {
             startPos = message.getBlockPos();
 
             //Offset in direction of sidehit if not quickreplace and not replaceable
-            //TODO 1.13 replaceable
-            boolean replaceable = player.world.getBlockState(startPos).getMaterial().isReplaceable();
+            boolean replaceable = player.world.getBlockState(startPos).getBlock().isReplaceable(player.world, startPos);
             boolean becomesDoubleSlab = SurvivalHelper.doesBecomeDoubleSlab(player, startPos, message.getSideHit());
             if (!modifierSettings.doQuickReplace() && !replaceable && !becomesDoubleSlab) {
                 startPos = startPos.offset(message.getSideHit());
@@ -112,7 +113,7 @@ public class BuildModes {
             coordinates = coordinates.subList(0, limit);
         }
 
-        Direction sideHit = buildMode.instance.getSideHit(player);
+        EnumFacing sideHit = buildMode.instance.getSideHit(player);
         if (sideHit == null) sideHit = message.getSideHit();
 
         Vec3d hitVec = buildMode.instance.getHitVec(player);
@@ -127,15 +128,15 @@ public class BuildModes {
     }
 
     //Use a network message to break blocks in the distance using clientside mouse input
-    public static void onBlockBrokenMessage(PlayerEntity player, BlockBrokenMessage message) {
+    public static void onBlockBrokenMessage(EntityPlayer player, BlockBrokenMessage message) {
         BlockPos startPos = message.isBlockHit() ? message.getBlockPos() : null;
         onBlockBroken(player, startPos, true);
     }
 
-    public static void onBlockBroken(PlayerEntity player, BlockPos startPos, boolean breakStartPos) {
+    public static void onBlockBroken(EntityPlayer player, BlockPos startPos, boolean breakStartPos) {
 
         //Check if not in the middle of placing
-        Dictionary<PlayerEntity, Boolean> currentlyBreaking = player.world.isRemote ? currentlyBreakingClient : currentlyBreakingServer;
+        Dictionary<EntityPlayer, Boolean> currentlyBreaking = player.world.isRemote ? currentlyBreakingClient : currentlyBreakingServer;
         if (currentlyBreaking.get(player) != null && !currentlyBreaking.get(player)) {
             //Cancel placing
             initializeMode(player);
@@ -153,7 +154,7 @@ public class BuildModes {
 
         //Get coordinates
         BuildModeEnum buildMode = modeSettings.getBuildMode();
-        List<BlockPos> coordinates = buildMode.instance.onRightClick(player, startPos, Direction.UP, Vec3d.ZERO, true);
+        List<BlockPos> coordinates = buildMode.instance.onRightClick(player, startPos, EnumFacing.UP, Vec3d.ZERO, true);
 
         if (coordinates.isEmpty()) {
             currentlyBreaking.put(player, true);
@@ -168,7 +169,7 @@ public class BuildModes {
         currentlyBreaking.remove(player);
     }
 
-    public static List<BlockPos> findCoordinates(PlayerEntity player, BlockPos startPos, boolean skipRaytrace) {
+    public static List<BlockPos> findCoordinates(EntityPlayer player, BlockPos startPos, boolean skipRaytrace) {
         List<BlockPos> coordinates = new ArrayList<>();
 
         ModeSettingsManager.ModeSettings modeSettings = ModeSettingsManager.getModeSettings(player);
@@ -177,33 +178,31 @@ public class BuildModes {
         return coordinates;
     }
 
-    public static void initializeMode(PlayerEntity player) {
+    public static void initializeMode(EntityPlayer player) {
         //Resetting mode, so not placing or breaking
-        Dictionary<PlayerEntity, Boolean> currentlyBreaking = player.world.isRemote ? currentlyBreakingClient : currentlyBreakingServer;
+        Dictionary<EntityPlayer, Boolean> currentlyBreaking = player.world.isRemote ? currentlyBreakingClient : currentlyBreakingServer;
         currentlyBreaking.remove(player);
 
         ModeSettingsManager.getModeSettings(player).getBuildMode().instance.initialize(player);
     }
 
-    public static boolean isCurrentlyPlacing(PlayerEntity player) {
-        Dictionary<PlayerEntity, Boolean> currentlyBreaking = player.world.isRemote ? currentlyBreakingClient : currentlyBreakingServer;
+    public static boolean isCurrentlyPlacing(EntityPlayer player) {
+        Dictionary<EntityPlayer, Boolean> currentlyBreaking = player.world.isRemote ? currentlyBreakingClient : currentlyBreakingServer;
         return currentlyBreaking.get(player) != null && !currentlyBreaking.get(player);
     }
 
-    public static boolean isCurrentlyBreaking(PlayerEntity player) {
-        Dictionary<PlayerEntity, Boolean> currentlyBreaking = player.world.isRemote ? currentlyBreakingClient : currentlyBreakingServer;
+    public static boolean isCurrentlyBreaking(EntityPlayer player) {
+        Dictionary<EntityPlayer, Boolean> currentlyBreaking = player.world.isRemote ? currentlyBreakingClient : currentlyBreakingServer;
         return currentlyBreaking.get(player) != null && currentlyBreaking.get(player);
     }
 
     //Either placing or breaking
-    public static boolean isActive(PlayerEntity player) {
-        Dictionary<PlayerEntity, Boolean> currentlyBreaking = player.world.isRemote ? currentlyBreakingClient : currentlyBreakingServer;
+    public static boolean isActive(EntityPlayer player) {
+        Dictionary<EntityPlayer, 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
@@ -229,43 +228,18 @@ public class BuildModes {
         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) {
+    public static boolean isCriteriaValid(Vec3d start, Vec3d look, int reach, EntityPlayer 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;
+            RayTraceResult rayTraceResult = player.world.rayTraceBlocks(start, lineBound, false, true, false);
+            intersects = rayTraceResult != null && rayTraceResult.typeOfHit == RayTraceResult.Type.BLOCK &&
+                         planeBound.subtract(rayTraceResult.hitVec).lengthSquared() > 4;
         }
 
         return planeBound.subtract(start).dotProduct(look) > 0 &&
                distToPlayerSq > 2 && distToPlayerSq < reach * reach &&
                !intersects;
     }
+
 }

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

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

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

@@ -1,6 +1,6 @@
 package nl.requios.effortlessbuilding.buildmode;
 
-import net.minecraft.entity.player.PlayerEntity;
+import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.util.text.TextFormatting;
 import nl.requios.effortlessbuilding.EffortlessBuilding;
 import nl.requios.effortlessbuilding.buildmodifier.ModifierSettingsManager;
@@ -14,7 +14,6 @@ public class ModeOptions {
         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"),
@@ -111,7 +110,7 @@ public class ModeOptions {
     }
 
     //Called on both client and server
-    public static void performAction(PlayerEntity player, ActionEnum action) {
+    public static void performAction(EntityPlayer player, ActionEnum action) {
         if (action == null) return;
 
         switch (action) {
@@ -131,10 +130,6 @@ public class ModeOptions {
                 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;
@@ -180,12 +175,8 @@ public class ModeOptions {
                 break;
         }
 
-        if (player.world.isRemote &&
-            action != ActionEnum.REPLACE &&
-            action != ActionEnum.OPEN_MODIFIER_SETTINGS &&
-            action != ActionEnum.OPEN_PLAYER_SETTINGS) {
-
-            EffortlessBuilding.logTranslate(player, "", action.name, "", true);
+        if (player.world.isRemote && action != ActionEnum.REPLACE && action != ActionEnum.OPEN_MODIFIER_SETTINGS) {
+            ClientProxy.logTranslate(action.name);
         }
     }
 }

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

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

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

@@ -1,9 +1,11 @@
 package nl.requios.effortlessbuilding.buildmode;
 
-import net.minecraft.entity.player.PlayerEntity;
-import net.minecraft.util.Direction;
+import net.minecraft.entity.player.EntityPlayer;
+import net.minecraft.util.EnumFacing;
 import net.minecraft.util.math.BlockPos;
 import net.minecraft.util.math.Vec3d;
+import nl.requios.effortlessbuilding.buildmode.buildmodes.DiagonalLine;
+import nl.requios.effortlessbuilding.buildmode.buildmodes.Floor;
 import nl.requios.effortlessbuilding.helper.ReachHelper;
 
 import java.util.*;
@@ -32,20 +34,20 @@ public abstract class ThreeClicksBuildMode extends BaseBuildMode {
 
         //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) {
+        public boolean isValid(Vec3d start, Vec3d look, int reach, EntityPlayer player, boolean skipRaytrace) {
 
             return BuildModes.isCriteriaValid(start, look, reach, player, skipRaytrace, lineBound, planeBound, distToPlayerSq);
         }
     }
 
     @Override
-    public void initialize(PlayerEntity player) {
+    public void initialize(EntityPlayer player) {
         super.initialize(player);
-        secondPosTable.put(player.getUniqueID(), BlockPos.ZERO);
+        secondPosTable.put(player.getUniqueID(), BlockPos.ORIGIN);
     }
 
     @Override
-    public List<BlockPos> onRightClick(PlayerEntity player, BlockPos blockPos, Direction sideHit, Vec3d hitVec, boolean skipRaytrace) {
+    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;
@@ -87,7 +89,7 @@ public abstract class ThreeClicksBuildMode extends BaseBuildMode {
     }
 
     @Override
-    public List<BlockPos> findCoordinates(PlayerEntity player, BlockPos blockPos, boolean skipRaytrace) {
+    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());
@@ -156,21 +158,21 @@ public abstract class ThreeClicksBuildMode extends BaseBuildMode {
     }
 
     //Finds the place of the second block pos
-    protected abstract BlockPos findSecondPos(PlayerEntity player, BlockPos firstPos, boolean skipRaytrace);
+    protected abstract BlockPos findSecondPos(EntityPlayer 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);
+    protected abstract BlockPos findThirdPos(EntityPlayer 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);
+    protected abstract List<BlockPos> getIntermediateBlocks(EntityPlayer 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);
+    protected abstract List<BlockPos> getFinalBlocks(EntityPlayer player, int x1, int y1, int z1, int x2, int y2, int z2, int x3, int y3, int z3);
 
     //Finds 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());
+    public static BlockPos findHeight(EntityPlayer player, BlockPos secondPos, boolean skipRaytrace) {
+        Vec3d look = player.getLookVec();
+        Vec3d start = new Vec3d(player.posX, player.posY + player.getEyeHeight(), player.posZ);
 
         List<HeightCriteria> criteriaList = new ArrayList<>(3);
 

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

@@ -1,10 +1,9 @@
 package nl.requios.effortlessbuilding.buildmode;
 
-import net.minecraft.entity.player.PlayerEntity;
-import net.minecraft.util.Direction;
+import net.minecraft.entity.player.EntityPlayer;
+import net.minecraft.util.EnumFacing;
 import net.minecraft.util.math.BlockPos;
 import net.minecraft.util.math.Vec3d;
-import nl.requios.effortlessbuilding.EffortlessBuilding;
 import nl.requios.effortlessbuilding.helper.ReachHelper;
 
 import java.util.ArrayList;
@@ -15,7 +14,7 @@ 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) {
+    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;
@@ -45,7 +44,7 @@ public abstract class TwoClicksBuildMode extends BaseBuildMode {
     }
 
     @Override
-    public List<BlockPos> findCoordinates(PlayerEntity player, BlockPos blockPos, boolean skipRaytrace) {
+    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());
@@ -80,8 +79,8 @@ public abstract class TwoClicksBuildMode extends BaseBuildMode {
     }
 
     //Finds the place of the second block pos based on criteria (floor must be on same height as first click, wall on same plane etc)
-    protected abstract BlockPos findSecondPos(PlayerEntity player, BlockPos firstPos, boolean skipRaytrace);
+    protected abstract BlockPos findSecondPos(EntityPlayer player, BlockPos firstPos, boolean skipRaytrace);
 
     //After first and second pos are known, we want all the blocks
-    protected abstract List<BlockPos> getAllBlocks(PlayerEntity player, int x1, int y1, int z1, int x2, int y2, int z2);
+    protected abstract List<BlockPos> getAllBlocks(EntityPlayer player, int x1, int y1, int z1, int x2, int y2, int z2);
 }

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

@@ -1,6 +1,6 @@
 package nl.requios.effortlessbuilding.buildmode.buildmodes;
 
-import net.minecraft.entity.player.PlayerEntity;
+import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.util.math.BlockPos;
 import net.minecraft.util.math.MathHelper;
 import nl.requios.effortlessbuilding.buildmode.TwoClicksBuildMode;
@@ -11,16 +11,16 @@ import java.util.*;
 public class Circle extends TwoClicksBuildMode {
 
     @Override
-    protected BlockPos findSecondPos(PlayerEntity player, BlockPos firstPos, boolean skipRaytrace) {
+    protected BlockPos findSecondPos(EntityPlayer 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) {
+    protected List<BlockPos> getAllBlocks(EntityPlayer player, int x1, int y1, int z1, int x2, int y2, int z2) {
         return getCircleBlocks(player, x1, y1, z1, x2, y2, z2);
     }
 
-    public static List<BlockPos> getCircleBlocks(PlayerEntity player, int x1, int y1, int z1, int x2, int y2, int z2) {
+    public static List<BlockPos> getCircleBlocks(EntityPlayer player, int x1, int y1, int z1, int x2, int y2, int z2) {
         List<BlockPos> list = new ArrayList<>();
 
         float centerX = x1;

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

@@ -1,35 +1,39 @@
 package nl.requios.effortlessbuilding.buildmode.buildmodes;
 
-import net.minecraft.entity.player.PlayerEntity;
+import net.minecraft.entity.player.EntityPlayer;
+import net.minecraft.util.EnumFacing;
 import net.minecraft.util.math.BlockPos;
+import net.minecraft.util.math.Vec3d;
+import nl.requios.effortlessbuilding.buildmode.IBuildMode;
 import nl.requios.effortlessbuilding.buildmode.ModeOptions;
 import nl.requios.effortlessbuilding.buildmode.ThreeClicksBuildMode;
+import nl.requios.effortlessbuilding.helper.ReachHelper;
 
 import java.util.*;
 
 public class Cube extends ThreeClicksBuildMode {
 
     @Override
-    protected BlockPos findSecondPos(PlayerEntity player, BlockPos firstPos, boolean skipRaytrace) {
+    protected BlockPos findSecondPos(EntityPlayer player, BlockPos firstPos, boolean skipRaytrace) {
         return Floor.findFloor(player, firstPos, skipRaytrace);
     }
 
     @Override
-    protected BlockPos findThirdPos(PlayerEntity player, BlockPos firstPos, BlockPos secondPos, boolean skipRaytrace) {
+    protected BlockPos findThirdPos(EntityPlayer 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) {
+    protected List<BlockPos> getIntermediateBlocks(EntityPlayer player, int x1, int y1, int z1, int x2, int y2, int z2) {
         return getFloorBlocksUsingCubeFill(player, x1, y1, z1, x2, y2, z2);
     }
 
     @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) {
+    protected List<BlockPos> getFinalBlocks(EntityPlayer player, int x1, int y1, int z1, int x2, int y2, int z2, int x3, int y3, int z3) {
         return getCubeBlocks(player, x1, y1, z1, x3, y3, z3);
     }
 
-    public static List<BlockPos> getFloorBlocksUsingCubeFill(PlayerEntity player, int x1, int y1, int z1, int x2, int y2, int z2) {
+    public static List<BlockPos> getFloorBlocksUsingCubeFill(EntityPlayer 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)
@@ -40,7 +44,7 @@ public class Cube extends ThreeClicksBuildMode {
         return list;
     }
 
-    public static List<BlockPos> getCubeBlocks(PlayerEntity player, int x1, int y1, int z1, int x2, int y2, int z2) {
+    public static List<BlockPos> getCubeBlocks(EntityPlayer player, int x1, int y1, int z1, int x2, int y2, int z2) {
         List<BlockPos> list = new ArrayList<>();
 
         switch (ModeOptions.getCubeFill()) {

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

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

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

@@ -1,9 +1,10 @@
 package nl.requios.effortlessbuilding.buildmode.buildmodes;
 
-import net.minecraft.entity.player.PlayerEntity;
+import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.util.math.BlockPos;
 import net.minecraft.util.math.Vec3d;
 import nl.requios.effortlessbuilding.buildmode.ThreeClicksBuildMode;
+import nl.requios.effortlessbuilding.helper.ReachHelper;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -11,29 +12,29 @@ import java.util.List;
 public class DiagonalLine extends ThreeClicksBuildMode {
 
     @Override
-    protected BlockPos findSecondPos(PlayerEntity player, BlockPos firstPos, boolean skipRaytrace) {
+    protected BlockPos findSecondPos(EntityPlayer player, BlockPos firstPos, boolean skipRaytrace) {
         return Floor.findFloor(player, firstPos, skipRaytrace);
     }
 
     @Override
-    protected BlockPos findThirdPos(PlayerEntity player, BlockPos firstPos, BlockPos secondPos, boolean skipRaytrace) {
+    protected BlockPos findThirdPos(EntityPlayer 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) {
+    protected List<BlockPos> getIntermediateBlocks(EntityPlayer 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) {
+    protected List<BlockPos> getFinalBlocks(EntityPlayer player, int x1, int y1, int z1, int x2, int y2, int z2, int x3, int y3, int z3) {
         //Add diagonal line from first to third
         return getDiagonalLineBlocks(player, x1, y1, z1, x3, y3, z3, 10);
     }
 
     //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) {
+    public static List<BlockPos> getDiagonalLineBlocks(EntityPlayer 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);

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

@@ -1,8 +1,9 @@
 package nl.requios.effortlessbuilding.buildmode.buildmodes;
 
-import net.minecraft.entity.player.PlayerEntity;
+import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.util.math.BlockPos;
 import nl.requios.effortlessbuilding.buildmode.ThreeClicksBuildMode;
+import nl.requios.effortlessbuilding.helper.ReachHelper;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -10,27 +11,27 @@ import java.util.List;
 public class DiagonalWall extends ThreeClicksBuildMode {
 
     @Override
-    protected BlockPos findSecondPos(PlayerEntity player, BlockPos firstPos, boolean skipRaytrace) {
+    protected BlockPos findSecondPos(EntityPlayer player, BlockPos firstPos, boolean skipRaytrace) {
         return Floor.findFloor(player, firstPos, skipRaytrace);
     }
 
     @Override
-    protected BlockPos findThirdPos(PlayerEntity player, BlockPos firstPos, BlockPos secondPos, boolean skipRaytrace) {
+    protected BlockPos findThirdPos(EntityPlayer 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) {
+    protected List<BlockPos> getIntermediateBlocks(EntityPlayer player, int x1, int y1, int z1, int x2, int y2, int z2) {
         return DiagonalLine.getDiagonalLineBlocks(player, x1, y1, z1, x2, y2, z2, 1);
     }
 
     @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) {
+    protected List<BlockPos> getFinalBlocks(EntityPlayer player, int x1, int y1, int z1, int x2, int y2, int z2, int x3, int y3, int z3) {
         return 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) {
+    public static List<BlockPos> getDiagonalWallBlocks(EntityPlayer player, int x1, int y1, int z1, int x2, int y2, int z2, int x3, int y3, int z3) {
         List<BlockPos> list = new ArrayList<>();
 
         //Get diagonal line blocks

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

@@ -1,6 +1,6 @@
 package nl.requios.effortlessbuilding.buildmode.buildmodes;
 
-import net.minecraft.entity.player.PlayerEntity;
+import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.util.math.BlockPos;
 import net.minecraft.util.math.Vec3d;
 import nl.requios.effortlessbuilding.buildmode.BuildModes;
@@ -23,20 +23,20 @@ public class Floor extends TwoClicksBuildMode {
 
         //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) {
+        public boolean isValid(Vec3d start, Vec3d look, int reach, EntityPlayer player, boolean skipRaytrace) {
 
             return BuildModes.isCriteriaValid(start, look, reach, player, skipRaytrace, planeBound, planeBound, distToPlayerSq);
         }
     }
 
     @Override
-    protected BlockPos findSecondPos(PlayerEntity player, BlockPos firstPos, boolean skipRaytrace) {
+    protected BlockPos findSecondPos(EntityPlayer 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());
+    public static BlockPos findFloor(EntityPlayer player, BlockPos firstPos, boolean skipRaytrace) {
+        Vec3d look = player.getLookVec();
+        Vec3d start = new Vec3d(player.posX, player.posY + player.getEyeHeight(), player.posZ);
 
         List<Criteria> criteriaList = new ArrayList<>(3);
 
@@ -58,11 +58,11 @@ public class Floor extends TwoClicksBuildMode {
     }
 
     @Override
-    protected List<BlockPos> getAllBlocks(PlayerEntity player, int x1, int y1, int z1, int x2, int y2, int z2) {
+    protected List<BlockPos> getAllBlocks(EntityPlayer player, int x1, int y1, int z1, int x2, int y2, int z2) {
         return getFloorBlocks(player, x1, y1, z1, x2, y2, z2);
     }
 
-    public static List<BlockPos> getFloorBlocks(PlayerEntity player, int x1, int y1, int z1, int x2, int y2, int z2) {
+    public static List<BlockPos> getFloorBlocks(EntityPlayer player, int x1, int y1, int z1, int x2, int y2, int z2) {
         List<BlockPos> list = new ArrayList<>();
 
         if (ModeOptions.getFill() == ModeOptions.ActionEnum.FULL)

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

@@ -1,9 +1,8 @@
 package nl.requios.effortlessbuilding.buildmode.buildmodes;
 
-import net.minecraft.entity.player.PlayerEntity;
+import net.minecraft.entity.player.EntityPlayer;
 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;
@@ -48,7 +47,7 @@ public class Line extends TwoClicksBuildMode {
 
         //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) {
+        public boolean isValid(Vec3d start, Vec3d look, int reach, EntityPlayer player, boolean skipRaytrace) {
 
             return BuildModes.isCriteriaValid(start, look, reach, player, skipRaytrace, lineBound, planeBound, distToPlayerSq);
         }
@@ -56,13 +55,13 @@ public class Line extends TwoClicksBuildMode {
     }
 
     @Override
-    protected BlockPos findSecondPos(PlayerEntity player, BlockPos firstPos, boolean skipRaytrace) {
+    protected BlockPos findSecondPos(EntityPlayer 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());
+    public static BlockPos findLine(EntityPlayer player, BlockPos firstPos, boolean skipRaytrace) {
+        Vec3d look = player.getLookVec();
+        Vec3d start = new Vec3d(player.posX, player.posY + player.getEyeHeight(), player.posZ);
 
         List<Criteria> criteriaList = new ArrayList<>(3);
 
@@ -110,11 +109,11 @@ public class Line extends TwoClicksBuildMode {
     }
 
     @Override
-    protected List<BlockPos> getAllBlocks(PlayerEntity player, int x1, int y1, int z1, int x2, int y2, int z2) {
+    protected List<BlockPos> getAllBlocks(EntityPlayer 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) {
+    public static List<BlockPos> getLineBlocks(EntityPlayer player, int x1, int y1, int z1, int x2, int y2, int z2) {
         List<BlockPos> list = new ArrayList<>();
 
         if (x1 != x2) {

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

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

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

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

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

@@ -1,6 +1,6 @@
 package nl.requios.effortlessbuilding.buildmode.buildmodes;
 
-import net.minecraft.entity.player.PlayerEntity;
+import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.util.math.BlockPos;
 import nl.requios.effortlessbuilding.buildmode.ModeOptions;
 import nl.requios.effortlessbuilding.buildmode.ThreeClicksBuildMode;
@@ -12,27 +12,27 @@ import java.util.List;
 public class SlopeFloor extends ThreeClicksBuildMode {
 
     @Override
-    protected BlockPos findSecondPos(PlayerEntity player, BlockPos firstPos, boolean skipRaytrace) {
+    protected BlockPos findSecondPos(EntityPlayer player, BlockPos firstPos, boolean skipRaytrace) {
         return Floor.findFloor(player, firstPos, skipRaytrace);
     }
 
     @Override
-    protected BlockPos findThirdPos(PlayerEntity player, BlockPos firstPos, BlockPos secondPos, boolean skipRaytrace) {
+    protected BlockPos findThirdPos(EntityPlayer 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) {
+    protected List<BlockPos> getIntermediateBlocks(EntityPlayer player, int x1, int y1, int z1, int x2, int y2, int z2) {
         return Floor.getFloorBlocks(player, x1, y1, z1, x2, y2, z2);
     }
 
     @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) {
+    protected List<BlockPos> getFinalBlocks(EntityPlayer player, int x1, int y1, int z1, int x2, int y2, int z2, int x3, int y3, int z3) {
         return getSlopeFloorBlocks(player, x1, y1, z1, x2, y2, z2, x3, y3, z3);
     }
 
     //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) {
+    public static List<BlockPos> getSlopeFloorBlocks(EntityPlayer player, int x1, int y1, int z1, int x2, int y2, int z2, int x3, int y3, int z3) {
         List<BlockPos> list = new ArrayList<>();
 
         int axisLimit = ReachHelper.getMaxBlocksPerAxis(player);

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

@@ -1,6 +1,6 @@
 package nl.requios.effortlessbuilding.buildmode.buildmodes;
 
-import net.minecraft.entity.player.PlayerEntity;
+import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.util.math.BlockPos;
 import net.minecraft.util.math.MathHelper;
 import nl.requios.effortlessbuilding.buildmode.ModeOptions;
@@ -12,26 +12,26 @@ import java.util.List;
 public class Sphere extends ThreeClicksBuildMode {
 
     @Override
-    public BlockPos findSecondPos(PlayerEntity player, BlockPos firstPos, boolean skipRaytrace) {
+    public BlockPos findSecondPos(EntityPlayer player, BlockPos firstPos, boolean skipRaytrace) {
         return Floor.findFloor(player, firstPos, skipRaytrace);
     }
 
     @Override
-    public BlockPos findThirdPos(PlayerEntity player, BlockPos firstPos, BlockPos secondPos, boolean skipRaytrace) {
+    public BlockPos findThirdPos(EntityPlayer 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) {
+    public List<BlockPos> getIntermediateBlocks(EntityPlayer player, int x1, int y1, int z1, int x2, int y2, int z2) {
         return Circle.getCircleBlocks(player, x1, y1, z1, x2, y2, z2);
     }
 
     @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) {
+    public List<BlockPos> getFinalBlocks(EntityPlayer 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) {
+    public static List<BlockPos> getSphereBlocks(EntityPlayer player, int x1, int y1, int z1, int x2, int y2, int z2, int x3, int y3, int z3) {
         List<BlockPos> list = new ArrayList<>();
 
         float centerX = x1;

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

@@ -1,6 +1,6 @@
 package nl.requios.effortlessbuilding.buildmode.buildmodes;
 
-import net.minecraft.entity.player.PlayerEntity;
+import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.util.math.BlockPos;
 import net.minecraft.util.math.Vec3d;
 import nl.requios.effortlessbuilding.buildmode.BuildModes;
@@ -26,20 +26,20 @@ public class Wall extends TwoClicksBuildMode {
 
         //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) {
+        public boolean isValid(Vec3d start, Vec3d look, int reach, EntityPlayer player, boolean skipRaytrace) {
 
             return BuildModes.isCriteriaValid(start, look, reach, player, skipRaytrace, planeBound, planeBound, distToPlayerSq);
         }
     }
 
     @Override
-    protected BlockPos findSecondPos(PlayerEntity player, BlockPos firstPos, boolean skipRaytrace) {
+    protected BlockPos findSecondPos(EntityPlayer 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());
+    public static BlockPos findWall(EntityPlayer player, BlockPos firstPos, boolean skipRaytrace) {
+        Vec3d look = player.getLookVec();
+        Vec3d start = new Vec3d(player.posX, player.posY + player.getEyeHeight(), player.posZ);
 
         List<Criteria> criteriaList = new ArrayList<>(3);
 
@@ -76,11 +76,11 @@ public class Wall extends TwoClicksBuildMode {
     }
 
     @Override
-    protected List<BlockPos> getAllBlocks(PlayerEntity player, int x1, int y1, int z1, int x2, int y2, int z2) {
+    protected List<BlockPos> getAllBlocks(EntityPlayer player, int x1, int y1, int z1, int x2, int y2, int z2) {
         return getWallBlocks(player, x1, y1, z1, x2, y2, z2);
     }
 
-    public static List<BlockPos> getWallBlocks(PlayerEntity player, int x1, int y1, int z1, int x2, int y2, int z2) {
+    public static List<BlockPos> getWallBlocks(EntityPlayer player, int x1, int y1, int z1, int x2, int y2, int z2) {
         List<BlockPos> list = new ArrayList<>();
 
         if (x1 == x2) {

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

@@ -1,10 +1,10 @@
 package nl.requios.effortlessbuilding.buildmodifier;
 
-import net.minecraft.block.BlockState;
-import net.minecraft.entity.player.PlayerEntity;
+import net.minecraft.block.state.IBlockState;
+import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.item.ItemStack;
-import net.minecraft.util.Direction;
-import net.minecraft.util.Hand;
+import net.minecraft.util.EnumFacing;
+import net.minecraft.util.EnumHand;
 import net.minecraft.util.math.BlockPos;
 import net.minecraft.util.math.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.ZERO;
+        public BlockPos offset = BlockPos.ORIGIN;
         public int count = 5;
 
         public ArraySettings() {
@@ -41,7 +41,7 @@ public class Array {
         }
     }
 
-    public static List<BlockPos> findCoordinates(PlayerEntity player, BlockPos startPos) {
+    public static List<BlockPos> findCoordinates(EntityPlayer 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<BlockState> findBlockStates(PlayerEntity player, BlockPos startPos, BlockState blockState, ItemStack itemStack, List<ItemStack> itemStacks) {
-        List<BlockState> blockStates = new ArrayList<>();
+    public static List<IBlockState> findBlockStates(EntityPlayer player, BlockPos startPos, IBlockState blockState, ItemStack itemStack, List<ItemStack> itemStacks) {
+        List<IBlockState> blockStates = new ArrayList<>();
 
         //find 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, Direction.UP, new Vec3d(0, 0, 0), Hand.MAIN_HAND);
+                        .getBlockStateFromItem(itemStack, player, startPos, EnumFacing.UP, new Vec3d(0, 0, 0), EnumHand.MAIN_HAND);
             }
 
             //blockState = blockState.getBlock().getStateForPlacement(player.world, pos, )

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

@@ -1,6 +1,6 @@
 package nl.requios.effortlessbuilding.buildmodifier;
 
-import net.minecraft.block.BlockState;
+import net.minecraft.block.state.IBlockState;
 import net.minecraft.util.math.BlockPos;
 import net.minecraft.util.math.Vec3d;
 
@@ -8,13 +8,13 @@ import java.util.List;
 
 public class BlockSet {
     private List<BlockPos> coordinates;
-    private List<BlockState> previousBlockStates;
-    private List<BlockState> newBlockStates;
+    private List<IBlockState> previousBlockStates;
+    private List<IBlockState> newBlockStates;
     private Vec3d hitVec;
     private BlockPos firstPos;
     private BlockPos secondPos;
 
-    public BlockSet(List<BlockPos> coordinates, List<BlockState> previousBlockStates, List<BlockState> newBlockStates, Vec3d hitVec,
+    public BlockSet(List<BlockPos> coordinates, List<IBlockState> previousBlockStates,  List<IBlockState> newBlockStates, Vec3d hitVec,
                     BlockPos firstPos, BlockPos secondPos) {
         this.coordinates = coordinates;
         this.previousBlockStates = previousBlockStates;
@@ -28,11 +28,11 @@ public class BlockSet {
         return coordinates;
     }
 
-    public List<BlockState> getPreviousBlockStates() {
+    public List<IBlockState> getPreviousBlockStates() {
         return previousBlockStates;
     }
 
-    public List<BlockState> getNewBlockStates() {
+    public List<IBlockState> getNewBlockStates() {
         return newBlockStates;
     }
 

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

@@ -1,17 +1,14 @@
 package nl.requios.effortlessbuilding.buildmodifier;
 
 import net.minecraft.block.Block;
-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.block.state.IBlockState;
+import net.minecraft.entity.player.EntityPlayer;
+import net.minecraft.init.Blocks;
+import net.minecraft.item.ItemBlock;
 import net.minecraft.item.ItemStack;
-import net.minecraft.item.ItemUseContext;
-import net.minecraft.util.Direction;
-import net.minecraft.util.Hand;
+import net.minecraft.util.EnumFacing;
+import net.minecraft.util.EnumHand;
 import net.minecraft.util.math.BlockPos;
-import net.minecraft.util.math.BlockRayTraceResult;
 import net.minecraft.util.math.Vec3d;
 import net.minecraft.world.World;
 import nl.requios.effortlessbuilding.compatibility.CompatHelper;
@@ -25,7 +22,7 @@ import java.util.*;
 public class BuildModifiers {
 
     //Called from BuildModes
-    public static void onBlockPlaced(PlayerEntity player, List<BlockPos> startCoordinates, Direction sideHit, Vec3d hitVec, boolean placeStartPos) {
+    public static void onBlockPlaced(EntityPlayer player, List<BlockPos> startCoordinates, EnumFacing sideHit, Vec3d hitVec, boolean placeStartPos) {
         World world = player.world;
         ItemRandomizerBag.renewRandomness();
 
@@ -35,14 +32,14 @@ public class BuildModifiers {
         //find coordinates and blockstates
         List<BlockPos> coordinates = findCoordinates(player, startCoordinates);
         List<ItemStack> itemStacks = new ArrayList<>();
-        List<BlockState> blockStates = findBlockStates(player, startCoordinates, hitVec, sideHit, itemStacks);
+        List<IBlockState> blockStates = findBlockStates(player, startCoordinates, hitVec, sideHit, itemStacks);
 
         //check if valid blockstates
         if (blockStates.size() == 0 || coordinates.size() != blockStates.size()) return;
 
         //remember previous blockstates for undo
-        List<BlockState> previousBlockStates = new ArrayList<>(coordinates.size());
-        List<BlockState> newBlockStates = new ArrayList<>(coordinates.size());
+        List<IBlockState> previousBlockStates = new ArrayList<>(coordinates.size());
+        List<IBlockState> newBlockStates = new ArrayList<>(coordinates.size());
         for (BlockPos coordinate : coordinates) {
             previousBlockStates.add(world.getBlockState(coordinate));
         }
@@ -58,17 +55,17 @@ public class BuildModifiers {
             //place blocks
             for (int i = placeStartPos ? 0 : 1; i < coordinates.size(); i++) {
                 BlockPos blockPos = coordinates.get(i);
-                BlockState blockState = blockStates.get(i);
+                IBlockState blockState = blockStates.get(i);
                 ItemStack itemStack = itemStacks.get(i);
 
-                if (world.isBlockPresent(blockPos)) {
+                if (world.isBlockLoaded(blockPos, true)) {
                     //check itemstack empty
                     if (itemStack.isEmpty()) {
                         //try to find new stack, otherwise continue
                         itemStack = InventoryHelper.findItemStackInInventory(player, blockState.getBlock());
                         if (itemStack.isEmpty()) continue;
                     }
-                    SurvivalHelper.placeBlock(world, player, blockPos, blockState, itemStack, Direction.UP, hitVec, false, false, false);
+                    SurvivalHelper.placeBlock(world, player, blockPos, blockState, itemStack, EnumFacing.UP, hitVec, false, false, false);
                 }
             }
 
@@ -90,9 +87,10 @@ public class BuildModifiers {
             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) {
+    public static void onBlockBroken(EntityPlayer player, List<BlockPos> startCoordinates, boolean breakStartPos) {
         World world = player.world;
 
         List<BlockPos> coordinates = findCoordinates(player, startCoordinates);
@@ -100,8 +98,8 @@ public class BuildModifiers {
         if (coordinates.isEmpty()) return;
 
         //remember previous blockstates for undo
-        List<BlockState> previousBlockStates = new ArrayList<>(coordinates.size());
-        List<BlockState> newBlockStates = new ArrayList<>(coordinates.size());
+        List<IBlockState> previousBlockStates = new ArrayList<>(coordinates.size());
+        List<IBlockState> newBlockStates = new ArrayList<>(coordinates.size());
         for (BlockPos coordinate : coordinates) {
             previousBlockStates.add(world.getBlockState(coordinate));
         }
@@ -110,7 +108,7 @@ public class BuildModifiers {
             BlockPreviewRenderer.onBlocksBroken();
 
             //list of air blockstates
-            for (int i = 0; i < coordinates.size(); i++) {
+            for (BlockPos coordinate : coordinates) {
                 newBlockStates.add(Blocks.AIR.getDefaultState());
             }
 
@@ -123,7 +121,7 @@ public class BuildModifiers {
             //break all those blocks
             for (int i = breakStartPos ? 0 : 1; i < coordinates.size(); i++) {
                 BlockPos coordinate = coordinates.get(i);
-                if (world.isBlockPresent(coordinate) && !world.isAirBlock(coordinate)) {
+                if (world.isBlockLoaded(coordinate, false)) {
                     if (!onlyInstaBreaking || world.getBlockState(coordinate).getBlockHardness(world, coordinate) == 0f) {
                         SurvivalHelper.breakBlock(world, player, coordinate, false);
                     }
@@ -148,7 +146,7 @@ public class BuildModifiers {
 
     }
 
-    public static List<BlockPos> findCoordinates(PlayerEntity player, List<BlockPos> posList) {
+    public static List<BlockPos> findCoordinates(EntityPlayer player, List<BlockPos> posList) {
         List<BlockPos> coordinates = new ArrayList<>();
         //Add current blocks being placed too
         coordinates.addAll(posList);
@@ -169,18 +167,18 @@ public class BuildModifiers {
         return coordinates;
     }
 
-    public static List<BlockPos> findCoordinates(PlayerEntity player, BlockPos blockPos) {
+    public static List<BlockPos> findCoordinates(EntityPlayer player, BlockPos blockPos) {
         return findCoordinates(player, new ArrayList<>(Arrays.asList(blockPos)));
     }
 
-    public static List<BlockState> findBlockStates(PlayerEntity player, List<BlockPos> posList, Vec3d hitVec, Direction facing, List<ItemStack> itemStacks) {
-        List<BlockState> blockStates = new ArrayList<>();
+    public static List<IBlockState> findBlockStates(EntityPlayer player, List<BlockPos> posList, Vec3d hitVec, EnumFacing facing, List<ItemStack> itemStacks) {
+        List<IBlockState> blockStates = new ArrayList<>();
         itemStacks.clear();
 
         //Get itemstack
-        ItemStack itemStack = player.getHeldItem(Hand.MAIN_HAND);
+        ItemStack itemStack = player.getHeldItem(EnumHand.MAIN_HAND);
         if (itemStack.isEmpty() || !CompatHelper.isItemBlockProxy(itemStack)) {
-            itemStack = player.getHeldItem(Hand.OFF_HAND);
+            itemStack = player.getHeldItem(EnumHand.OFF_HAND);
         }
         if (itemStack.isEmpty() || !CompatHelper.isItemBlockProxy(itemStack)) {
             return blockStates;
@@ -188,22 +186,22 @@ public class BuildModifiers {
 
         //Get ItemBlock stack
         ItemStack itemBlock = ItemStack.EMPTY;
-        if (itemStack.getItem() instanceof BlockItem) itemBlock = itemStack;
+        if (itemStack.getItem() instanceof ItemBlock) itemBlock = itemStack;
         else itemBlock = CompatHelper.getItemBlockFromStack(itemStack);
         ItemRandomizerBag.resetRandomness();
 
         //Add blocks in posList first
         for (BlockPos blockPos : posList) {
-            if (!(itemStack.getItem() instanceof BlockItem)) itemBlock = CompatHelper.getItemBlockFromStack(itemStack);
-            BlockState blockState = getBlockStateFromItem(itemBlock, player, blockPos, facing, hitVec, Hand.MAIN_HAND);
+            if (!(itemStack.getItem() instanceof ItemBlock)) itemBlock = CompatHelper.getItemBlockFromStack(itemStack);
+            IBlockState blockState = getBlockStateFromItem(itemBlock, player, blockPos, facing, hitVec, EnumHand.MAIN_HAND);
             blockStates.add(blockState);
             itemStacks.add(itemBlock);
         }
 
         for (BlockPos blockPos : posList) {
-            BlockState blockState = getBlockStateFromItem(itemBlock, player, blockPos, facing, hitVec, Hand.MAIN_HAND);
+            IBlockState blockState = getBlockStateFromItem(itemBlock, player, blockPos, facing, hitVec, EnumHand.MAIN_HAND);
 
-            List<BlockState> arrayBlockStates = Array.findBlockStates(player, blockPos, blockState, itemStack, itemStacks);
+            List<IBlockState> arrayBlockStates = Array.findBlockStates(player, blockPos, blockState, itemStack, itemStacks);
             blockStates.addAll(arrayBlockStates);
             blockStates.addAll(Mirror.findBlockStates(player, blockPos, blockState, itemStack, itemStacks));
             blockStates.addAll(RadialMirror.findBlockStates(player, blockPos, blockState, itemStack, itemStacks));
@@ -211,7 +209,7 @@ public class BuildModifiers {
             List<BlockPos> arrayCoordinates = Array.findCoordinates(player, blockPos);
             for (int i = 0; i < arrayCoordinates.size(); i++) {
                 BlockPos coordinate = arrayCoordinates.get(i);
-                BlockState blockState1 = arrayBlockStates.get(i);
+                IBlockState blockState1 = arrayBlockStates.get(i);
                 blockStates.addAll(Mirror.findBlockStates(player, coordinate, blockState1, itemStack, itemStacks));
                 blockStates.addAll(RadialMirror.findBlockStates(player, coordinate, blockState1, itemStack, itemStacks));
             }
@@ -236,8 +234,9 @@ public class BuildModifiers {
                modifierSettings.doQuickReplace();
     }
 
-    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))));
+    public static IBlockState getBlockStateFromItem(ItemStack itemStack, EntityPlayer player, BlockPos blockPos, EnumFacing facing, Vec3d hitVec, EnumHand hand) {
+        return Block.getBlockFromItem(itemStack.getItem()).getStateForPlacement(player.world, blockPos, facing,
+                ((float) hitVec.x), ((float) hitVec.y), ((float) hitVec.z), itemStack.getMetadata(), player, hand);
     }
 
     //Returns true if equal (or both null)

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

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

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

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

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

@@ -1,10 +1,10 @@
 package nl.requios.effortlessbuilding.buildmodifier;
 
-import net.minecraft.block.BlockState;
-import net.minecraft.entity.player.PlayerEntity;
+import net.minecraft.block.state.IBlockState;
+import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.item.ItemStack;
-import net.minecraft.util.Direction;
-import net.minecraft.util.Hand;
+import net.minecraft.util.EnumFacing;
+import net.minecraft.util.EnumHand;
 import net.minecraft.util.Mirror;
 import net.minecraft.util.Rotation;
 import net.minecraft.util.math.BlockPos;
@@ -44,7 +44,7 @@ public class RadialMirror {
         }
     }
 
-    public static List<BlockPos> findCoordinates(PlayerEntity player, BlockPos startPos) {
+    public static List<BlockPos> findCoordinates(EntityPlayer 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<BlockState> findBlockStates(PlayerEntity player, BlockPos startPos, BlockState blockState, ItemStack itemStack, List<ItemStack> itemStacks) {
-        List<BlockState> blockStates = new ArrayList<>();
+    public static List<IBlockState> findBlockStates(EntityPlayer player, BlockPos startPos, IBlockState blockState, ItemStack itemStack, List<ItemStack> itemStacks) {
+        List<IBlockState> blockStates = new ArrayList<>();
         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);
         }
 
-        BlockState newBlockState;
+        IBlockState 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, Direction.UP, new Vec3d(0, 0, 0), Hand.MAIN_HAND);
+                        .getBlockStateFromItem(itemStack, player, startPos, EnumFacing.UP, new Vec3d(0, 0, 0), EnumHand.MAIN_HAND);
 
                 newBlockState = rotateOriginalBlockState(startAngleToCenter, newBlockState);
             }
@@ -139,43 +139,43 @@ public class RadialMirror {
         return blockStates;
     }
 
-    private static BlockState rotateOriginalBlockState(double startAngleToCenter, BlockState blockState) {
-        BlockState newBlockState = blockState;
+    private static IBlockState rotateOriginalBlockState(double startAngleToCenter, IBlockState blockState) {
+        IBlockState newBlockState = blockState;
 
         if (startAngleToCenter < -0.751 * Math.PI || startAngleToCenter > 0.749 * Math.PI) {
-            newBlockState = blockState.rotate(Rotation.CLOCKWISE_180);
+            newBlockState = blockState.withRotation(Rotation.CLOCKWISE_180);
         } else if (startAngleToCenter < -0.251 * Math.PI) {
-            newBlockState = blockState.rotate(Rotation.COUNTERCLOCKWISE_90);
+            newBlockState = blockState.withRotation(Rotation.COUNTERCLOCKWISE_90);
         } else if (startAngleToCenter > 0.249 * Math.PI) {
-            newBlockState = blockState.rotate(Rotation.CLOCKWISE_90);
+            newBlockState = blockState.withRotation(Rotation.CLOCKWISE_90);
         }
 
         return newBlockState;
     }
 
-    private static BlockState rotateBlockState(Vec3d relVec, BlockState blockState, boolean alternate) {
-        BlockState newBlockState;
+    private static IBlockState rotateBlockState(Vec3d relVec, IBlockState blockState, boolean alternate) {
+        IBlockState newBlockState;
         double angleToCenter = MathHelper.atan2(relVec.x, relVec.z); //between -PI and PI
 
         if (angleToCenter < -0.751 * Math.PI || angleToCenter > 0.749 * Math.PI) {
-            newBlockState = blockState.rotate(Rotation.CLOCKWISE_180);
+            newBlockState = blockState.withRotation(Rotation.CLOCKWISE_180);
             if (alternate) {
-                newBlockState = newBlockState.mirror(Mirror.FRONT_BACK);
+                newBlockState = newBlockState.withMirror(Mirror.FRONT_BACK);
             }
         } else if (angleToCenter < -0.251 * Math.PI) {
-            newBlockState = blockState.rotate(Rotation.CLOCKWISE_90);
+            newBlockState = blockState.withRotation(Rotation.CLOCKWISE_90);
             if (alternate) {
-                newBlockState = newBlockState.mirror(Mirror.LEFT_RIGHT);
+                newBlockState = newBlockState.withMirror(Mirror.LEFT_RIGHT);
             }
         } else if (angleToCenter > 0.249 * Math.PI) {
-            newBlockState = blockState.rotate(Rotation.COUNTERCLOCKWISE_90);
+            newBlockState = blockState.withRotation(Rotation.COUNTERCLOCKWISE_90);
             if (alternate) {
-                newBlockState = newBlockState.mirror(Mirror.LEFT_RIGHT);
+                newBlockState = newBlockState.withMirror(Mirror.LEFT_RIGHT);
             }
         } else {
             newBlockState = blockState;
             if (alternate) {
-                newBlockState = newBlockState.mirror(Mirror.FRONT_BACK);
+                newBlockState = newBlockState.withMirror(Mirror.FRONT_BACK);
             }
         }
 

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

@@ -1,18 +1,15 @@
 package nl.requios.effortlessbuilding.buildmodifier;
 
 import net.minecraft.block.Block;
-import net.minecraft.block.BlockState;
-import net.minecraft.block.Blocks;
-import net.minecraft.entity.player.PlayerEntity;
-import net.minecraft.item.BlockItem;
+import net.minecraft.block.state.IBlockState;
+import net.minecraft.entity.player.EntityPlayer;
+import net.minecraft.init.Blocks;
 import net.minecraft.item.Item;
+import net.minecraft.item.ItemBlock;
 import net.minecraft.item.ItemStack;
-import net.minecraft.util.Direction;
+import net.minecraft.util.EnumFacing;
 import net.minecraft.util.math.BlockPos;
 import net.minecraft.util.math.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;
@@ -32,12 +29,12 @@ public class UndoRedo {
     private static Map<UUID, FixedStack<BlockSet>> redoStacksServer = new HashMap<>();
 
     //add to undo stack
-    public static void addUndo(PlayerEntity player, BlockSet blockSet) {
+    public static void addUndo(EntityPlayer 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()) {
+            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());
         }
@@ -53,26 +50,27 @@ public class UndoRedo {
 
         //If no stack exists, make one
         if (!undoStacks.containsKey(player.getUniqueID())) {
-            undoStacks.put(player.getUniqueID(), new FixedStack<>(new BlockSet[BuildConfig.survivalBalancers.undoStackSize.get()]));
+            undoStacks.put(player.getUniqueID(), new FixedStack<>(new BlockSet[BuildConfig.survivalBalancers.undoStackSize]));
         }
 
+
         undoStacks.get(player.getUniqueID()).push(blockSet);
     }
 
-    private static void addRedo(PlayerEntity player, BlockSet blockSet) {
+    private static void addRedo(EntityPlayer 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.put(player.getUniqueID(), new FixedStack<>(new BlockSet[BuildConfig.survivalBalancers.undoStackSize]));
         }
 
         redoStacks.get(player.getUniqueID()).push(blockSet);
     }
 
-    public static boolean undo(PlayerEntity player) {
+    public static boolean undo(EntityPlayer player) {
         Map<UUID, FixedStack<BlockSet>> undoStacks = player.world.isRemote ? undoStacksClient : undoStacksServer;
 
         if (!undoStacks.containsKey(player.getUniqueID())) return false;
@@ -83,8 +81,8 @@ public class UndoRedo {
 
         BlockSet blockSet = undoStack.pop();
         List<BlockPos> coordinates = blockSet.getCoordinates();
-        List<BlockState> previousBlockStates = blockSet.getPreviousBlockStates();
-        List<BlockState> newBlockStates = blockSet.getNewBlockStates();
+        List<IBlockState> previousBlockStates = blockSet.getPreviousBlockStates();
+        List<IBlockState> newBlockStates = blockSet.getNewBlockStates();
         Vec3d hitVec = blockSet.getHitVec();
 
         //Find up to date itemstacks in player inventory
@@ -101,27 +99,25 @@ public class UndoRedo {
                 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();
+                IBlockState previousBlockState = Blocks.AIR.getDefaultState();
+                if (itemStack.getItem() instanceof ItemBlock) {
+                    previousBlockState = previousBlockStates.get(i);//((ItemBlock) itemStack.getItem()).getBlock().getDefaultState();
                 }
 
-                if (player.world.isBlockPresent(coordinate)) {
+                if (player.world.isBlockLoaded(coordinate, true)) {
                     //check itemstack empty
                     if (itemStack.isEmpty()) {
                         itemStack = findItemStackInInventory(player, previousBlockStates.get(i));
                         //get blockstate from new itemstack
-                        if (!itemStack.isEmpty() && itemStack.getItem() instanceof BlockItem) {
-                            previousBlockState = ((BlockItem) itemStack.getItem()).getBlock().getDefaultState();
+                        if (!itemStack.isEmpty() && itemStack.getItem() instanceof ItemBlock) {
+                            previousBlockState = previousBlockStates.get(i);//((ItemBlock) 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);
+                    SurvivalHelper.placeBlock(player.world, player, coordinate, previousBlockState, itemStack, EnumFacing.UP, hitVec, true, false, false);
                 }
             }
         }
@@ -132,7 +128,7 @@ public class UndoRedo {
         return true;
     }
 
-    public static boolean redo(PlayerEntity player) {
+    public static boolean redo(EntityPlayer player) {
         Map<UUID, FixedStack<BlockSet>> redoStacks = player.world.isRemote ? redoStacksClient : redoStacksServer;
 
         if (!redoStacks.containsKey(player.getUniqueID())) return false;
@@ -143,8 +139,8 @@ public class UndoRedo {
 
         BlockSet blockSet = redoStack.pop();
         List<BlockPos> coordinates = blockSet.getCoordinates();
-        List<BlockState> previousBlockStates = blockSet.getPreviousBlockStates();
-        List<BlockState> newBlockStates = blockSet.getNewBlockStates();
+        List<IBlockState> previousBlockStates = blockSet.getPreviousBlockStates();
+        List<IBlockState> newBlockStates = blockSet.getNewBlockStates();
         Vec3d hitVec = blockSet.getHitVec();
 
         //Find up to date itemstacks in player inventory
@@ -161,26 +157,24 @@ public class UndoRedo {
                 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();
+                IBlockState newBlockState = Blocks.AIR.getDefaultState();
+                if (itemStack.getItem() instanceof ItemBlock) {
+                    newBlockState = newBlockStates.get(i);//((ItemBlock) itemStack.getItem()).getBlock().getDefaultState();
                 }
 
-                if (player.world.isBlockPresent(coordinate)) {
+                if (player.world.isBlockLoaded(coordinate, true)) {
                     //check itemstack empty
                     if (itemStack.isEmpty()) {
                         itemStack = findItemStackInInventory(player, newBlockStates.get(i));
                         //get blockstate from new itemstack
-                        if (!itemStack.isEmpty() && itemStack.getItem() instanceof BlockItem) {
-                            newBlockState = ((BlockItem) itemStack.getItem()).getBlock().getDefaultState();
+                        if (!itemStack.isEmpty() && itemStack.getItem() instanceof ItemBlock) {
+                            newBlockState = newBlockStates.get(i);//((ItemBlock) 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);
+                    SurvivalHelper.placeBlock(player.world, player, coordinate, newBlockState, itemStack, EnumFacing.UP, hitVec, true, false, false);
                 }
             }
         }
@@ -191,7 +185,7 @@ public class UndoRedo {
         return true;
     }
 
-    public static void clear(PlayerEntity player) {
+    public static void clear(EntityPlayer player) {
         Map<UUID, FixedStack<BlockSet>> undoStacks = player.world.isRemote ? undoStacksClient : undoStacksServer;
         Map<UUID, FixedStack<BlockSet>> redoStacks = player.world.isRemote ? redoStacksClient : redoStacksServer;
         if (undoStacks.containsKey(player.getUniqueID())) {
@@ -202,15 +196,15 @@ public class UndoRedo {
         }
     }
 
-    private static List<ItemStack> findItemStacksInInventory(PlayerEntity player, List<BlockState> blockStates) {
+    private static List<ItemStack> findItemStacksInInventory(EntityPlayer player, List<IBlockState> blockStates) {
         List<ItemStack> itemStacks = new ArrayList<>(blockStates.size());
-        for (BlockState blockState : blockStates) {
+        for (IBlockState blockState : blockStates) {
             itemStacks.add(findItemStackInInventory(player, blockState));
         }
         return itemStacks;
     }
 
-    private static ItemStack findItemStackInInventory(PlayerEntity player, BlockState blockState) {
+    private static ItemStack findItemStackInInventory(EntityPlayer player, IBlockState blockState) {
         ItemStack itemStack = ItemStack.EMPTY;
         if (blockState == null) return itemStack;
 
@@ -219,19 +213,12 @@ public class UndoRedo {
         // 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);
-                    }
-                }
+            Item itemDropped = blockState.getBlock().getItemDropped(blockState, player.world.rand, 10);
+            if (itemDropped instanceof ItemBlock) {
+                Block block = ((ItemBlock) itemDropped).getBlock();
+                itemStack = InventoryHelper.findItemStackInInventory(player, block);
             }
         }
 

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

@@ -0,0 +1,41 @@
+package nl.requios.effortlessbuilding.gui;
+
+import net.minecraft.entity.player.EntityPlayer;
+import net.minecraft.world.World;
+import net.minecraftforge.fml.common.network.IGuiHandler;
+import net.minecraftforge.fml.relauncher.Side;
+import net.minecraftforge.fml.relauncher.SideOnly;
+import net.minecraftforge.items.CapabilityItemHandler;
+import net.minecraftforge.items.IItemHandler;
+import nl.requios.effortlessbuilding.EffortlessBuilding;
+
+import javax.annotation.Nullable;
+
+public class RandomizerBagGuiHandler implements IGuiHandler {
+    @Nullable
+    @Override
+    public Object getServerGuiElement(int ID, EntityPlayer player, World world, int x, int y, int z) {
+        if (ID == EffortlessBuilding.RANDOMIZER_BAG_GUI) {
+            // Use the player's held item to create the container
+            IItemHandler capability = player.getHeldItemMainhand().hasCapability(CapabilityItemHandler.ITEM_HANDLER_CAPABILITY, null) ?
+                    player.getHeldItemMainhand().getCapability(CapabilityItemHandler.ITEM_HANDLER_CAPABILITY, null) :
+                    player.getHeldItemOffhand().getCapability(CapabilityItemHandler.ITEM_HANDLER_CAPABILITY, null);
+            return new RandomizerBagContainer(player.inventory, capability);
+        }
+        return null;
+    }
+
+    @Nullable
+    @Override
+    @SideOnly(Side.CLIENT)
+    public Object getClientGuiElement(int ID, EntityPlayer player, World world, int x, int y, int z) {
+        if (ID == EffortlessBuilding.RANDOMIZER_BAG_GUI) {
+            // Use the player's held item to create the client-side gui container
+            IItemHandler capability = player.getHeldItemMainhand().hasCapability(CapabilityItemHandler.ITEM_HANDLER_CAPABILITY, null) ?
+                    player.getHeldItemMainhand().getCapability(CapabilityItemHandler.ITEM_HANDLER_CAPABILITY, null) :
+                    player.getHeldItemOffhand().getCapability(CapabilityItemHandler.ITEM_HANDLER_CAPABILITY, null);
+            return new RandomizerBagGuiContainer(player.inventory, capability);
+        }
+        return null;
+    }
+}

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

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

@@ -1,304 +0,0 @@
-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,18 +3,11 @@ 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.ModeOptions;
 import nl.requios.effortlessbuilding.buildmode.ModeSettingsManager;
 import nl.requios.effortlessbuilding.proxy.ClientProxy;
 import org.apache.commons.lang3.text.WordUtils;
@@ -23,10 +16,14 @@ 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.*;
@@ -35,7 +32,7 @@ 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 Screen {
+public class RadialMenu extends GuiScreen {
 
     private final float TIME_SCALE = 0.01f;
     public static final RadialMenu instance = new RadialMenu();
@@ -46,10 +43,6 @@ public class RadialMenu extends Screen {
     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 ) );
     }
@@ -73,8 +66,8 @@ public class RadialMenu extends Screen {
     }
 
     public void configure(final int scaledWidth, final int scaledHeight ) {
-        Minecraft mc = Minecraft.getInstance();
-        font = mc.fontRenderer;
+        mc = Minecraft.getMinecraft();
+        fontRenderer = mc.fontRenderer;
         width = scaledWidth;
         height = scaledHeight;
     }
@@ -87,10 +80,10 @@ public class RadialMenu extends Screen {
 
         public final ActionEnum action;
         public String name;
-        public Direction textSide;
+        public EnumFacing textSide;
 
         public MenuButton(final String name, final ActionEnum action, final double x, final double y,
-                final Direction textSide) {
+                final EnumFacing textSide) {
             this.name = I18n.format(name);
             this.action = action;
             x1 = x - 10;
@@ -116,24 +109,24 @@ public class RadialMenu extends Screen {
     }
 
     @Override
-    public void render(final int mouseX, final int mouseY, final float partialTicks) {
+    public void drawScreen(final int mouseX, final int mouseY, final float partialTicks) {
         if (!isVisible()) return;
 
-        BuildModeEnum currentBuildMode = ModeSettingsManager.getModeSettings(Minecraft.getInstance().player).getBuildMode();
+        BuildModeEnum currentBuildMode = ModeSettingsManager.getModeSettings(Minecraft.getMinecraft().player).getBuildMode();
 
-        RenderSystem.pushMatrix();
-        RenderSystem.translatef( 0.0F, 0.0F, 200.0F );
+        GlStateManager.pushMatrix();
+        GlStateManager.translate( 0.0F, 0.0F, 200.0F );
 
         final int startColor = (int) ( visibility * 98 ) << 24;
         final int endColor = (int) ( visibility * 128 ) << 24;
 
-        fillGradient(0, 0, width, height, startColor, endColor);
+        drawGradientRect(0, 0, width, height, startColor, endColor);
 
-        RenderSystem.disableTexture();
-        RenderSystem.enableBlend();
-        RenderSystem.disableAlphaTest();
-        RenderSystem.blendFuncSeparate(GL11.GL_SRC_ALPHA, GL11.GL_ONE_MINUS_SRC_ALPHA, 1, 0);
-        RenderSystem.shadeModel(GL11.GL_SMOOTH);
+        GlStateManager.disableTexture2D();
+        GlStateManager.enableBlend();
+        GlStateManager.disableAlpha();
+        GlStateManager.tryBlendFuncSeparate(GL11.GL_SRC_ALPHA, GL11.GL_ONE_MINUS_SRC_ALPHA, 1, 0);
+        GlStateManager.shadeModel(GL11.GL_SMOOTH);
         final Tessellator tessellator = Tessellator.getInstance();
         final BufferBuilder buffer = tessellator.getBuffer();
 
@@ -142,14 +135,8 @@ public class RadialMenu extends Screen {
         final double middleX = width / 2.0;
         final double middleY = height / 2.0;
 
-        //Fix for high def (retina) displays: use custom mouse coordinates
-        //Borrowed from GameRenderer::updateCameraAndRender
-        Minecraft mc = Minecraft.getInstance();
-        int mouseXX = (int)(mc.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;
+        final double mouseXCenter = mouseX - middleX;
+        final double mouseYCenter = mouseY - middleY;
         double mouseRadians = Math.atan2(mouseYCenter, mouseXCenter);
 
         final double ringInnerEdge = 30;
@@ -171,18 +158,17 @@ public class RadialMenu extends Screen {
         }
 
         //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));
+        buttons.add(new MenuButton(ActionEnum.UNDO.name, ActionEnum.UNDO, -buttonDistance - 26, -13, EnumFacing.UP));
+        buttons.add(new MenuButton(ActionEnum.REDO.name, ActionEnum.REDO, -buttonDistance, -13, EnumFacing.UP));
+        buttons.add(new MenuButton(ActionEnum.OPEN_MODIFIER_SETTINGS.name, ActionEnum.OPEN_MODIFIER_SETTINGS, -buttonDistance - 26, 13, EnumFacing.DOWN));
+        buttons.add(new MenuButton(ActionEnum.REPLACE.name, ActionEnum.REPLACE, -buttonDistance, 13, EnumFacing.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));
+                buttons.add(new MenuButton(action.name, action, buttonDistance + j * 26, -13 + i * 39, EnumFacing.DOWN));
             }
         }
 
@@ -245,10 +231,10 @@ public class RadialMenu extends Screen {
                     switchTo = menuRegion.mode;
                 }
 
-                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();
+                buffer.pos(middleX + x1m1, middleY + y1m1, zLevel).color(r, g, b, a).endVertex();
+                buffer.pos(middleX + x2m1, middleY + y2m1, zLevel).color(r, g, b, a).endVertex();
+                buffer.pos(middleX + x2m2, middleY + y2m2, zLevel).color(r, g, b, a).endVertex();
+                buffer.pos(middleX + x1m2, middleY + y1m2, zLevel).color(r, g, b, a).endVertex();
 
                 currentMode++;
             }
@@ -284,22 +270,22 @@ public class RadialMenu extends Screen {
                 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();
+            buffer.pos(middleX + btn.x1, middleY + btn.y1, zLevel).color(r, g, b, a).endVertex();
+            buffer.pos(middleX + btn.x1, middleY + btn.y2, zLevel).color(r, g, b, a).endVertex();
+            buffer.pos(middleX + btn.x2, middleY + btn.y2, zLevel).color(r, g, b, a).endVertex();
+            buffer.pos(middleX + btn.x2, middleY + btn.y1, zLevel).color(r, g, b, a).endVertex();
         }
 
         tessellator.draw();
 
-        RenderSystem.shadeModel(GL11.GL_FLAT);
+        GlStateManager.shadeModel(GL11.GL_FLAT);
 
-        RenderSystem.translatef(0f, 0f, 5f);
-        RenderSystem.enableTexture();
-        RenderSystem.color3f(1f, 1f, 1f);
-        RenderSystem.disableBlend();
-        RenderSystem.enableAlphaTest();
-        mc.getTextureManager().bindTexture(AtlasTexture.LOCATION_BLOCKS_TEXTURE);
+        GlStateManager.translate(0f, 0f, 5f);
+        GlStateManager.enableTexture2D();
+        GlStateManager.color(1f, 1f, 1f, 1f);
+        GlStateManager.disableBlend();
+        GlStateManager.enableAlpha();
+        GlStateManager.bindTexture(Minecraft.getMinecraft().getTextureMapBlocks().getGlTextureId());
 
         buffer.begin(GL11.GL_QUADS, DefaultVertexFormats.POSITION_TEX_COLOR);
 
@@ -309,7 +295,7 @@ public class RadialMenu extends Screen {
             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 = ModClientEventHandler.getBuildModeIcon(menuRegion.mode);
+            final TextureAtlasSprite sprite = ClientProxy.getBuildModeIcon(menuRegion.mode);
 
             final double x1 = x - 8;
             final double x2 = x + 8;
@@ -324,10 +310,10 @@ public class RadialMenu extends Screen {
             final double v1 = 0;
             final double v2 = 16;
 
-            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();
+            buffer.pos(middleX + x1, middleY + y1, zLevel).tex(sprite.getInterpolatedU(u1), sprite.getInterpolatedV(v1)).color(f, f, f, a).endVertex();
+            buffer.pos(middleX + x1, middleY + y2, zLevel).tex(sprite.getInterpolatedU(u1), sprite.getInterpolatedV(v2)).color(f, f, f, a).endVertex();
+            buffer.pos(middleX + x2, middleY + y2, zLevel).tex(sprite.getInterpolatedU(u2), sprite.getInterpolatedV(v2)).color(f, f, f, a).endVertex();
+            buffer.pos(middleX + x2, middleY + y1, zLevel).tex(sprite.getInterpolatedU(u2), sprite.getInterpolatedV(v1)).color(f, f, f, a).endVertex();
         }
 
         //Draw action icons
@@ -341,7 +327,7 @@ public class RadialMenu extends Screen {
             final double v1 = 0;
             final double v2 = 16;
 
-            final TextureAtlasSprite sprite = ModClientEventHandler.getModeOptionIcon(button.action);
+            final TextureAtlasSprite sprite = ClientProxy.getModeOptionIcon(button.action);
 
             final double btnmiddleX = (button.x1 + button.x2) / 2 + 0.01;
             final double btnmiddleY = (button.y1 + button.y2) / 2 + 0.01;
@@ -350,25 +336,25 @@ public class RadialMenu extends Screen {
             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();
+            buffer.pos(middleX + btnx1, middleY + btny1, zLevel).tex(sprite.getInterpolatedU(u1), sprite.getInterpolatedV(v1)).color(f, f, f, a).endVertex();
+            buffer.pos(middleX + btnx1, middleY + btny2, zLevel).tex(sprite.getInterpolatedU(u1), sprite.getInterpolatedV(v2)).color(f, f, f, a).endVertex();
+            buffer.pos(middleX + btnx2, middleY + btny2, zLevel).tex(sprite.getInterpolatedU(u2), sprite.getInterpolatedV(v2)).color(f, f, f, a).endVertex();
+            buffer.pos(middleX + btnx2, middleY + btny1, zLevel).tex(sprite.getInterpolatedU(u2), sprite.getInterpolatedV(v1)).color(f, f, f, a).endVertex();
         }
 
         tessellator.draw();
 
         //Draw strings
-        //font.drawStringWithShadow("Actions", (int) (middleX - buttonDistance - 13) - font.getStringWidth("Actions") * 0.5f, (int) middleY - 38, 0xffffffff);
+        //fontRenderer.drawStringWithShadow("Actions", (int) (middleX - buttonDistance - 13) - fontRenderer.getStringWidth("Actions") * 0.5f, (int) middleY - 38, 0xffffffff);
 
         //Draw option strings
         for (int i = 0; i < currentBuildMode.options.length; i++) {
             OptionEnum option = options[i];
-            font.drawStringWithShadow(I18n.format(option.name), (int) (middleX + buttonDistance - 9), (int) middleY - 37 + i * 39, 0xeeeeeeff);
+            fontRenderer.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);
+        fontRenderer.drawStringWithShadow(credits, width - fontRenderer.getStringWidth(credits) - 4, height - 10, 0x88888888);
 
         //Draw buildmode text
         for (final MenuRegion menuRegion : modes) {
@@ -378,16 +364,16 @@ public class RadialMenu extends Screen {
                 final double y = (menuRegion.y1 + menuRegion.y2) * 0.5;
 
                 int fixed_x = (int) (x * textDistance);
-                final int fixed_y = (int) (y * textDistance) - font.FONT_HEIGHT / 2;
+                final int fixed_y = (int) (y * textDistance) - fontRenderer.FONT_HEIGHT / 2;
                 final String text = I18n.format(menuRegion.mode.name);
 
                 if ( x <= -0.2 ) {
-                    fixed_x -= font.getStringWidth(text);
+                    fixed_x -= fontRenderer.getStringWidth(text);
                 } else if ( -0.2 <= x && x <= 0.2 ) {
-                    fixed_x -= font.getStringWidth(text) / 2;
+                    fixed_x -= fontRenderer.getStringWidth(text) / 2;
                 }
 
-                font.drawStringWithShadow(text, (int) middleX + fixed_x, (int) middleY + fixed_y, 0xffffffff);
+                fontRenderer.drawStringWithShadow(text, (int) middleX + fixed_x, (int) middleY + fixed_y, 0xffffffff);
             }
         }
 
@@ -401,51 +387,51 @@ public class RadialMenu extends Screen {
 
                 //Add keybind in brackets
                 if (button.action == ActionEnum.UNDO) {
-                    keybind = ClientProxy.keyBindings[4].getLocalizedName();
+                    keybind = ClientProxy.keyBindings[4].getDisplayName();
                 }
                 if (button.action == ActionEnum.REDO) {
-                    keybind = ClientProxy.keyBindings[5].getLocalizedName();
+                    keybind = ClientProxy.keyBindings[5].getDisplayName();
                 }
                 if (button.action == ActionEnum.REPLACE) {
-                    keybind = ClientProxy.keyBindings[1].getLocalizedName();
+                    keybind = ClientProxy.keyBindings[1].getDisplayName();
                 }
                 if (button.action == ActionEnum.OPEN_MODIFIER_SETTINGS) {
-                    keybind = ClientProxy.keyBindings[0].getLocalizedName();
+                    keybind = ClientProxy.keyBindings[0].getDisplayName();
                 }
                 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";
+                        keybind = ClientProxy.keyBindings[6].getDisplayName();
+                        if (keybind.equals("LCONTROL")) keybind = "Ctrl";
                     }
                 }
                 if (!keybind.isEmpty()) keybindFormatted = TextFormatting.GRAY + "(" + WordUtils.capitalizeFully(keybind) + ")";
 
-                if (button.textSide == Direction.WEST) {
+                if (button.textSide == EnumFacing.WEST) {
 
-                    font.drawSplitString( text, (int) (middleX + button.x1 - 8 ) - font.getStringWidth(text),
+                    fontRenderer.drawSplitString( text, (int) (middleX + button.x1 - 8 ) - fontRenderer.getStringWidth(text),
                             (int) (middleY + button.y1 + 6), wrap, 0xffffffff);
 
-                } else if (button.textSide == Direction.EAST) {
+                } else if (button.textSide == EnumFacing.EAST) {
 
-                    font.drawSplitString(text, (int) (middleX + button.x2 + 8),
+                    fontRenderer.drawSplitString(text, (int) (middleX + button.x2 + 8),
                             (int) (middleY + button.y1 + 6 ), wrap, 0xffffffff);
 
-                } else if (button.textSide == Direction.UP || button.textSide == Direction.NORTH) {
+                } else if (button.textSide == EnumFacing.UP || button.textSide == EnumFacing.NORTH) {
 
-                    font.drawSplitString( keybindFormatted, (int) (middleX + (button.x1 + button.x2) * 0.5 - font.getStringWidth(keybindFormatted) * 0.5),
+                    fontRenderer.drawSplitString( keybindFormatted, (int) (middleX + (button.x1 + button.x2) * 0.5 - fontRenderer.getStringWidth(keybindFormatted) * 0.5),
                             (int) (middleY + button.y1 - 26), wrap,0xffffffff);
 
-                    font.drawSplitString( text, (int) (middleX + (button.x1 + button.x2) * 0.5 - font.getStringWidth(text) * 0.5),
+                    fontRenderer.drawSplitString( text, (int) (middleX + (button.x1 + button.x2) * 0.5 - fontRenderer.getStringWidth(text) * 0.5),
                             (int) (middleY + button.y1 - 14), wrap,0xffffffff);
 
-                } else if (button.textSide == Direction.DOWN || button.textSide == Direction.SOUTH) {
+                } else if (button.textSide == EnumFacing.DOWN || button.textSide == EnumFacing.SOUTH) {
 
-                    font.drawSplitString(text, (int) (middleX + (button.x1 + button.x2) * 0.5 - font.getStringWidth(text) * 0.5),
+                    fontRenderer.drawSplitString(text, (int) (middleX + (button.x1 + button.x2) * 0.5 - fontRenderer.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),
+                    fontRenderer.drawSplitString(keybindFormatted, (int) (middleX + (button.x1 + button.x2) * 0.5 - fontRenderer.getStringWidth(keybindFormatted) * 0.5),
                             (int) (middleY + button.y1 + 38), wrap, 0xffffffff);
 
                 }
@@ -453,7 +439,7 @@ public class RadialMenu extends Screen {
             }
         }
 
-        RenderSystem.popMatrix();
+        GlStateManager.popMatrix();
     }
 
     private boolean inTriangle(final double x1, final double y1, final double x2, final double y2,
@@ -472,21 +458,19 @@ public class RadialMenu extends Screen {
      * Called when the mouse is clicked. Args : mouseX, mouseY, clickedButton
      */
     @Override
-    public boolean mouseClicked(double mouseX, double mouseY, int mouseButton) {
+    protected void mouseClicked(int mouseX, int mouseY, int mouseButton ) {
         EffortlessBuilding.log("mouse clicked");
 
-        KeyBinding.updateKeyBindState();
-        KeyBinding.setKeyBindState(ClientProxy.keyBindings[3].getKey(), true);
+//        KeyBinding.updateKeyBindState();
+//        KeyBinding.setKeyBindState(ClientProxy.keyBindings[3].getKeyCode(), true);
 
-        if (mouseButton == 0) {
-            this.minecraft.displayGuiScreen(null);
-
-            if (this.minecraft.currentScreen == null) {
-                this.minecraft.setGameFocused(true);
-            }
-        }
-        return super.mouseClicked(mouseX, mouseY, mouseButton);
+//        if (mouseButton == 0) {
+//            this.mc.displayGuiScreen(null);
+//
+//            if (this.mc.currentScreen == null) {
+//                this.mc.setIngameFocus();
+//            }
+//        }
     }
-
 }
 

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

@@ -1,30 +1,27 @@
 package nl.requios.effortlessbuilding.gui.buildmodifier;
 
-import net.minecraft.client.gui.screen.Screen;
-import net.minecraft.client.gui.widget.Widget;
-import net.minecraft.client.gui.widget.button.Button;
+import net.minecraft.client.gui.GuiButton;
+import net.minecraft.client.gui.GuiScreen;
 import net.minecraft.util.math.BlockPos;
 import net.minecraft.util.text.TextFormatting;
-import net.minecraftforge.api.distmarker.Dist;
-import net.minecraftforge.api.distmarker.OnlyIn;
+import net.minecraftforge.fml.client.config.GuiCheckBox;
 import nl.requios.effortlessbuilding.EffortlessBuilding;
 import nl.requios.effortlessbuilding.buildmodifier.Array;
 import nl.requios.effortlessbuilding.buildmodifier.ModifierSettingsManager;
-import nl.requios.effortlessbuilding.gui.elements.GuiCheckBoxFixed;
 import nl.requios.effortlessbuilding.gui.elements.GuiCollapsibleScrollEntry;
 import nl.requios.effortlessbuilding.gui.elements.GuiNumberField;
 import nl.requios.effortlessbuilding.gui.elements.GuiScrollPane;
 import nl.requios.effortlessbuilding.helper.ReachHelper;
 
+import java.io.IOException;
 import java.util.ArrayList;
 import java.util.List;
 
-@OnlyIn(Dist.CLIENT)
 public class ArraySettingsGui extends GuiCollapsibleScrollEntry {
 
     protected List<GuiNumberField> arrayNumberFieldList = new ArrayList<>();
 
-    private GuiCheckBoxFixed buttonArrayEnabled;
+    private GuiCheckBox buttonArrayEnabled;
     private GuiNumberField textArrayOffsetX, textArrayOffsetY, textArrayOffsetZ, textArrayCount;
 
     public ArraySettingsGui(GuiScrollPane scrollPane) {
@@ -32,37 +29,31 @@ public class ArraySettingsGui extends GuiCollapsibleScrollEntry {
     }
 
     @Override
-    public void init(List<Widget> buttons) {
-        super.init(buttons);
+    public int initGui(int id, List<GuiButton> buttonList) {
+        id = super.initGui(id, buttonList);
 
         int y = top;
-        buttonArrayEnabled = new GuiCheckBoxFixed(left - 15 + 8, y, "", false) {
-            @Override
-            public void onClick(double mouseX, double mouseY) {
-                super.onClick(mouseX, mouseY);
-                setCollapsed(!buttonArrayEnabled.isChecked());
-            }
-        };
-        buttons.add(buttonArrayEnabled);
+        buttonArrayEnabled = new GuiCheckBox(id++, left - 15 + 8, y, "", false);
+        buttonList.add(buttonArrayEnabled);
 
         y = top + 20;
-        textArrayOffsetX = new GuiNumberField(font, buttons, left + 70, y, 50, 18);
+        textArrayOffsetX = new GuiNumberField(id++, id++, id++, fontRenderer, buttonList, left + 70, y, 50, 18);
         textArrayOffsetX.setNumber(0);
         textArrayOffsetX.setTooltip("How much each copy is shifted.");
         arrayNumberFieldList.add(textArrayOffsetX);
 
-        textArrayOffsetY = new GuiNumberField(font, buttons, left + 140, y, 50, 18);
+        textArrayOffsetY = new GuiNumberField(id++, id++, id++, fontRenderer, buttonList, left + 140, y, 50, 18);
         textArrayOffsetY.setNumber(0);
         textArrayOffsetY.setTooltip("How much each copy is shifted.");
         arrayNumberFieldList.add(textArrayOffsetY);
 
-        textArrayOffsetZ = new GuiNumberField(font, buttons, left + 210, y, 50, 18);
+        textArrayOffsetZ = new GuiNumberField(id++, id++, id++, fontRenderer, buttonList, left + 210, y, 50, 18);
         textArrayOffsetZ.setNumber(0);
         textArrayOffsetZ.setTooltip("How much each copy is shifted.");
         arrayNumberFieldList.add(textArrayOffsetZ);
 
         y = top + 50;
-        textArrayCount = new GuiNumberField(font, buttons, left + 55, y, 50, 18);
+        textArrayCount = new GuiNumberField(id++, id++, id++, fontRenderer, buttonList, left + 55, y, 50, 18);
         textArrayCount.setNumber(5);
         textArrayCount.setTooltip("How many copies should be made.");
         arrayNumberFieldList.add(textArrayCount);
@@ -78,51 +69,57 @@ 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.render(mouseX, mouseY, partialTicks);
+        buttonArrayEnabled.drawButton(this.mc, mouseX, mouseY, partialTicks);
         if (buttonArrayEnabled.isChecked()) {
             buttonArrayEnabled.y = yy;
-            font.drawString("Array enabled", left + offset, yy + 2, 0xFFFFFF);
+            fontRenderer.drawString("Array enabled", left + offset, yy + 2, 0xFFFFFF, true);
 
             yy = y + 20;
-            font.drawString("Offset", left + offset, yy + 5, 0xFFFFFF);
-            font.drawString("X", left + 50 + offset, yy + 5, 0xFFFFFF);
+            fontRenderer.drawString("Offset", left + offset, yy + 5, 0xFFFFFF, true);
+            fontRenderer.drawString("X", left + 50 + offset, yy + 5, 0xFFFFFF, true);
             textArrayOffsetX.y = yy;
-            font.drawString("Y", left + 120 + offset, yy + 5, 0xFFFFFF);
+            fontRenderer.drawString("Y", left + 120 + offset, yy + 5, 0xFFFFFF, true);
             textArrayOffsetY.y = yy;
-            font.drawString("Z", left + 190 + offset, yy + 5, 0xFFFFFF);
+            fontRenderer.drawString("Z", left + 190 + offset, yy + 5, 0xFFFFFF, true);
             textArrayOffsetZ.y = yy;
 
             yy = y + 50;
-            font.drawString("Count", left + offset, yy + 5, 0xFFFFFF);
+            fontRenderer.drawString("Count", left + offset, yy + 5, 0xFFFFFF, true);
             textArrayCount.y = yy;
 
             int currentReach = Math.max(-1, getArrayReach());
             int maxReach = ReachHelper.getMaxReach(mc.player);
             TextFormatting reachColor = isCurrentReachValid(currentReach, maxReach) ? TextFormatting.GRAY : TextFormatting.RED;
             String reachText = "Reach: " + reachColor + currentReach + TextFormatting.GRAY + "/" + TextFormatting.GRAY + maxReach;
-            font.drawString(reachText, left + 176 + offset, yy + 5, 0xFFFFFF);
+            fontRenderer.drawString(reachText, left + 176 + offset, yy + 5, 0xFFFFFF, true);
 
-            arrayNumberFieldList.forEach(numberField -> numberField.drawNumberField(mouseX, mouseY, partialTicks));
+            arrayNumberFieldList.forEach(numberField -> numberField.drawNumberField(this.mc, mouseX, mouseY, partialTicks));
         } else {
             buttonArrayEnabled.y = yy;
-            font.drawString("Array disabled", left + offset, yy + 2, 0x999999);
+            fontRenderer.drawString("Array disabled", left + offset, yy + 2, 0x999999, true);
         }
 
     }
 
-    public void drawTooltip(Screen guiScreen, int mouseX, int mouseY) {
+    public void drawTooltip(GuiScreen guiScreen, int mouseX, int mouseY) {
         //Draw tooltips last
         if (buttonArrayEnabled.isChecked())
         {
@@ -131,28 +128,43 @@ public class ArraySettingsGui extends GuiCollapsibleScrollEntry {
     }
 
     @Override
-    public boolean charTyped(char typedChar, int keyCode) {
-        super.charTyped(typedChar, keyCode);
+    public void updatePosition(int slotIndex, int x, int y, float partialTicks) {
+        super.updatePosition(slotIndex, x, y, partialTicks);
+    }
+
+    @Override
+    public void keyTyped(char typedChar, int keyCode) throws IOException {
+        super.keyTyped(typedChar, keyCode);
         for (GuiNumberField numberField : arrayNumberFieldList) {
-            numberField.charTyped(typedChar, keyCode);
+            numberField.keyTyped(typedChar, keyCode);
         }
-        return true;
     }
 
     @Override
     public boolean mousePressed(int slotIndex, int mouseX, int mouseY, int mouseEvent, int relativeX, int relativeY) {
+        super.mousePressed(slotIndex, mouseX, mouseY, mouseEvent, relativeX, relativeY);
         arrayNumberFieldList.forEach(numberField -> numberField.mouseClicked(mouseX, mouseY, mouseEvent));
 
         boolean insideArrayEnabledLabel = mouseX >= left && mouseX < right && relativeY >= -2 && relativeY < 12;
 
         if (insideArrayEnabledLabel) {
-            buttonArrayEnabled.playDownSound(this.mc.getSoundHandler());
-            buttonArrayEnabled.onClick(mouseX, mouseY);
+            buttonArrayEnabled.setIsChecked(!buttonArrayEnabled.isChecked());
+            buttonArrayEnabled.playPressSound(this.mc.getSoundHandler());
+            actionPerformed(buttonArrayEnabled);
         }
 
         return true;
     }
 
+    @Override
+    public void actionPerformed(GuiButton button) {
+        super.actionPerformed(button);
+        if (button == buttonArrayEnabled) {
+            setCollapsed(!buttonArrayEnabled.isChecked());
+        }
+        arrayNumberFieldList.forEach(numberField -> numberField.actionPerformed(button));
+    }
+
     public Array.ArraySettings getArraySettings() {
         boolean arrayEnabled = buttonArrayEnabled.isChecked();
         BlockPos arrayOffset = new BlockPos(0, 0, 0);

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

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

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

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

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

@@ -1,66 +0,0 @@
-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,19 +2,16 @@ package nl.requios.effortlessbuilding.gui.elements;
 
 import net.minecraft.client.Minecraft;
 import net.minecraft.client.gui.FontRenderer;
-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 net.minecraft.client.gui.GuiButton;
+import net.minecraft.client.gui.GuiScreen;
 
+import java.io.IOException;
 import java.util.List;
 
-@OnlyIn(Dist.CLIENT)
 public abstract class GuiCollapsibleScrollEntry implements GuiScrollPane.IScrollEntry {
 
     public GuiScrollPane scrollPane;
-    protected FontRenderer font;
+    protected FontRenderer fontRenderer;
     protected Minecraft mc;
 
     protected boolean isCollapsed = true;
@@ -22,24 +19,35 @@ public abstract class GuiCollapsibleScrollEntry implements GuiScrollPane.IScroll
 
     public GuiCollapsibleScrollEntry(GuiScrollPane scrollPane) {
         this.scrollPane = scrollPane;
-        this.font = scrollPane.font;
-        this.mc = Minecraft.getInstance();
+        this.fontRenderer = scrollPane.fontRenderer;
+        this.mc = scrollPane.parent.mc;
     }
 
     @Override
-    public void init(List<Widget> buttonList) {
-        left = scrollPane.getWidth() / 2 - 140;
-        right = scrollPane.getWidth() / 2 + 140;
-        top = scrollPane.getHeight() / 2 - 100;
-        bottom = scrollPane.getHeight() / 2 + 100;
+    public int initGui(int id, List<GuiButton> buttonList) {
+
+        left = scrollPane.width / 2 - 140;
+        right = scrollPane.width / 2 + 140;
+        top = scrollPane.height / 2 - 100;
+        bottom = scrollPane.height / 2 + 100;
+
+        return id;
     }
 
     @Override
     public void updateScreen() {
+
     }
 
     @Override
-    public void drawTooltip(Screen guiScreen, int mouseX, int mouseY) {
+    public void drawEntry(int slotIndex, int x, int y, int listWidth, int slotHeight, int mouseX, int mouseY,
+                          boolean isSelected, float partialTicks) {
+
+    }
+
+    @Override
+    public void drawTooltip(GuiScreen guiScreen, int mouseX, int mouseY) {
+
     }
 
     @Override
@@ -48,8 +56,8 @@ public abstract class GuiCollapsibleScrollEntry implements GuiScrollPane.IScroll
     }
 
     @Override
-    public boolean charTyped(char eventChar, int eventKey) {
-        return false;
+    public void keyTyped(char eventChar, int eventKey) throws IOException {
+
     }
 
     @Override
@@ -62,8 +70,14 @@ public abstract class GuiCollapsibleScrollEntry implements GuiScrollPane.IScroll
 
     }
 
+    @Override
+    public void actionPerformed(GuiButton button) {
+
+    }
+
     @Override
     public void onGuiClosed() {
+
     }
 
     @Override

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

@@ -1,30 +1,27 @@
 package nl.requios.effortlessbuilding.gui.elements;
 
 import net.minecraft.client.Minecraft;
-import net.minecraft.client.gui.widget.button.Button;
-import net.minecraft.client.gui.screen.Screen;
+import net.minecraft.client.gui.GuiButton;
+import net.minecraft.client.gui.GuiScreen;
 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;
 
-@OnlyIn(Dist.CLIENT)
-public class GuiIconButton extends Button {
+public class GuiIconButton extends GuiButton {
 
     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 x, int y, int iconX, int iconY, ResourceLocation resourceLocation, Button.IPressable onPress) {
-        this(x, y, 20, 20, iconX, iconY, 20, 20, 20, 0, resourceLocation, onPress);
+    public GuiIconButton(int buttonId, int x, int y, int iconX, int iconY, ResourceLocation resourceLocation) {
+        this(buttonId, x, y, 20, 20, iconX, iconY, 20, 20, 20, 0, resourceLocation);
     }
 
-    public GuiIconButton(int x, int y, int width, int height, int iconX, int iconY, int iconWidth, int iconHeight, int iconAltX, int iconAltY, ResourceLocation resourceLocation, Button.IPressable onPress) {
-        super(x, y, width, height, "", onPress);
+    public GuiIconButton(int buttonId, int x, int y, int width, int height, int iconX, int iconY, int iconWidth, int iconHeight, int iconAltX, int iconAltY, ResourceLocation resourceLocation) {
+        super(buttonId, x, y, width, height, "");
         this.iconX = iconX;
         this.iconY = iconY;
         this.iconWidth = iconWidth;
@@ -47,12 +44,12 @@ public class GuiIconButton extends Button {
     }
 
     @Override
-    public void render(int mouseX, int mouseY, float partialTicks) {
-        super.render(mouseX, mouseY, partialTicks);
+    public void drawButton(Minecraft mc, int mouseX, int mouseY, float partialTicks) {
+        super.drawButton(mc, mouseX, mouseY, partialTicks);
         if (this.visible)
         {
-            this.isHovered = mouseX >= this.x && mouseY >= this.y && mouseX < this.x + this.width && mouseY < this.y + this.height;
-            Minecraft.getInstance().getTextureManager().bindTexture(this.resourceLocation);
+            this.hovered = mouseX >= this.x && mouseY >= this.y && mouseX < this.x + this.width && mouseY < this.y + this.height;
+            mc.getTextureManager().bindTexture(this.resourceLocation);
             int currentIconX = this.iconX;
             int currentIconY = this.iconY;
 
@@ -62,18 +59,17 @@ public class GuiIconButton extends Button {
                 currentIconY += iconAltY;
             }
 
-            //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);
+            this.drawTexturedModalRect(this.x, this.y, currentIconX, currentIconY, this.iconWidth, this.iconHeight);
         }
     }
 
-    public void drawTooltip(Screen screen, int mouseX, int mouseY) {
+    public void drawTooltip(GuiScreen guiScreen, int mouseX, int mouseY) {
         boolean flag = mouseX >= x && mouseX < x + width && mouseY >= y && mouseY < y + height;
 
         if (flag) {
             List<String> textLines = new ArrayList<>();
             textLines.addAll(tooltip);
-            screen.renderTooltip(textLines, mouseX - 10, mouseY + 25);
+            guiScreen.drawHoveringText(textLines, mouseX - 10, mouseY + 25);
         }
     }
 }

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

@@ -1,68 +1,48 @@
 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;
 
-@OnlyIn(Dist.CLIENT)
-public class GuiNumberField extends AbstractGui {
+public class GuiNumberField extends Gui {
 
     public int x, y, width, height;
     public int buttonWidth = 10;
 
-    protected TextFieldWidget textField;
-    protected Button minusButton, plusButton;
+    protected GuiTextField textField;
+    protected GuiButton minusButton, plusButton;
 
     List<String> tooltip = new ArrayList<>();
 
-    public GuiNumberField(FontRenderer font, List<Widget> buttonList, int x, int y, int width, int height) {
+    public GuiNumberField(int id1, int id2, int id3, FontRenderer fontRenderer,
+                          List<GuiButton> buttonList, int x, int y, int width, int height) {
         this.x = x;
         this.y = y;
         this.width = width;
         this.height = height;
 
-        textField = new TextFieldWidget(font, x + buttonWidth + 1, y + 1, width - 2 * buttonWidth - 2, height - 2, "");
-        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);
-        });
+        textField = new GuiTextField(id1, fontRenderer, x + buttonWidth + 1, y + 1, width - 2 * buttonWidth - 2, height - 2);
+        minusButton = new GuiButton(id2, x, y - 1, buttonWidth, height + 2, "-");
+        plusButton  = new GuiButton(id3, x + width - buttonWidth, y - 1, buttonWidth, height + 2, "+");
 
         buttonList.add(minusButton);
         buttonList.add(plusButton);
     }
 
     public void setNumber(double number) {
-        textField.setText(DecimalFormat.getInstance().format(number));
+        DecimalFormat format = new DecimalFormat("0.#");
+        textField.setText(format.format(number));
     }
 
     public double getNumber() {
         if (textField.getText().isEmpty()) return 0;
-        try {
-            return DecimalFormat.getInstance().parse(textField.getText()).doubleValue();
-        } catch (ParseException e) {
-            return 0;
-        }
+        return Double.parseDouble(textField.getText());
     }
 
     public void setTooltip(String tooltip) {
@@ -73,7 +53,7 @@ public class GuiNumberField extends AbstractGui {
         this.tooltip = tooltip;
     }
 
-    public boolean mouseClicked(double mouseX, double mouseY, int mouseButton) {
+    public boolean mouseClicked(int mouseX, int mouseY, int mouseButton) {
         boolean result = textField.mouseClicked(mouseX, mouseY, mouseButton);
 
         //Check if clicked inside textfield
@@ -82,24 +62,24 @@ public class GuiNumberField extends AbstractGui {
         //Rightclicked inside textfield
         if (flag && mouseButton == 1) {
             textField.setText("");
-            textField.setFocused2(true);
+            textField.setFocused(true);
             result = true;
         }
 
         return result;
     }
 
-    public void drawNumberField(int mouseX, int mouseY, float partialTicks) {
+    public void drawNumberField(Minecraft mc, int mouseX, int mouseY, float partialTicks) {
         textField.y = y + 1;
         minusButton.y = y - 1;
         plusButton.y = y - 1;
 
-        textField.render(mouseX, mouseY, partialTicks);
-        minusButton.render(mouseX, mouseY, partialTicks);
-        plusButton.render(mouseX, mouseY, partialTicks);
+        textField.drawTextBox();
+        minusButton.drawButton(mc, mouseX, mouseY, partialTicks);
+        plusButton.drawButton(mc, mouseX, mouseY, partialTicks);
     }
 
-    public void drawTooltip(Screen screen, int mouseX, int mouseY) {
+    public void drawTooltip(GuiScreen guiScreen, int mouseX, int mouseY) {
         boolean insideTextField = mouseX >= x + buttonWidth && mouseX < x + width - buttonWidth && mouseY >= y && mouseY < y + height;
         boolean insideMinusButton = mouseX >= x && mouseX < x + buttonWidth && mouseY >= y && mouseY < y + height;
         boolean insidePlusButton = mouseX >= x + width - buttonWidth && mouseX < x + width && mouseY >= y && mouseY < y + height;
@@ -122,25 +102,37 @@ public class GuiNumberField extends AbstractGui {
             textLines.add("Hold " + TextFormatting.AQUA + "ctrl " + TextFormatting.RESET + "for " + TextFormatting.DARK_GREEN + "5");
         }
 
-        screen.renderTooltip(textLines, mouseX - 10, mouseY + 25);
+        guiScreen.drawHoveringText(textLines, mouseX - 10, mouseY + 25);
 
     }
 
+    public void actionPerformed(GuiButton button) {
+        float valueChanged = 1f;
+        if (GuiScreen.isCtrlKeyDown()) valueChanged = 5f;
+        if (GuiScreen.isShiftKeyDown()) valueChanged = 10f;
+
+        if (button == minusButton) {
+            setNumber(getNumber() - valueChanged);
+        }
+        if (button == plusButton) {
+            setNumber(getNumber() + valueChanged);
+        }
+    }
+
     public void update() {
-        textField.tick();
+        textField.updateCursorCounter();
     }
 
-    public boolean charTyped(char typedChar, int keyCode) {
-        if (!textField.isFocused()) return false;
+    public void keyTyped(char typedChar, int keyCode) throws IOException {
+        if (!textField.isFocused()) return;
 //        if (Character.isDigit(typedChar) || typedChar == '.' || typedChar == '-' || keyCode == Keyboard.KEY_BACK
 //            || keyCode == Keyboard.KEY_DELETE || keyCode == Keyboard.KEY_LEFT || keyCode == Keyboard.KEY_RIGHT
 //            || keyCode == Keyboard.KEY_UP || keyCode == Keyboard.KEY_DOWN) {
-            return textField.charTyped(typedChar, keyCode);
+            textField.textboxKeyTyped(typedChar, keyCode);
 //        }
     }
 
     //Scroll inside textfield to change number
-    //Disabled because entire screen can be scrolled
 //    public void handleMouseInput(int mouseX, int mouseY) {
 //        boolean insideTextField = mouseX >= x + buttonWidth && mouseX < x + width - buttonWidth && mouseY >= y && mouseY < y + height;
 //

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

@@ -1,186 +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.*;
-import net.minecraft.client.gui.screen.Screen;
-import net.minecraft.client.gui.widget.Widget;
+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.renderer.BufferBuilder;
+import net.minecraft.client.renderer.GlStateManager;
 import net.minecraft.client.renderer.Tessellator;
 import net.minecraft.client.renderer.vertex.DefaultVertexFormats;
 import net.minecraft.util.math.MathHelper;
-import net.minecraftforge.api.distmarker.Dist;
-import net.minecraftforge.api.distmarker.OnlyIn;
 import net.minecraftforge.common.MinecraftForge;
+import net.minecraftforge.fml.relauncher.Side;
+import net.minecraftforge.fml.relauncher.SideOnly;
+import org.lwjgl.input.Mouse;
 
+import java.io.IOException;
 import java.util.ArrayList;
 import java.util.List;
 
-@OnlyIn(Dist.CLIENT)
-public class GuiScrollPane extends SlotGui {
+@SideOnly(Side.CLIENT)
+public class GuiScrollPane extends GuiListExtended {
 
-    public Screen parent;
-    public FontRenderer font;
-    private List<IScrollEntry> listEntries;
-    private float scrollMultiplier = 1f;
+    public GuiScreen parent;
+    public FontRenderer fontRenderer;
+    public List<IScrollEntry> listEntries;
 
-    private int mouseX;
-    private int mouseY;
-
-    public GuiScrollPane(Screen parent, FontRenderer font, int top, int bottom) {
-        super(Minecraft.getInstance(), parent.width, parent.height, top, bottom, 100);
+    public GuiScrollPane(GuiScreen parent, FontRenderer fontRenderer, int top, int bottom) {
+        super(parent.mc, parent.width, parent.height, top, bottom, 100);
         this.parent = parent;
-        this.font = font;
-        this.renderSelection = false;
+        this.fontRenderer = fontRenderer;
+        this.setShowSelectionBox(false);
         listEntries = new ArrayList<>();
-        MinecraftForge.EVENT_BUS.register(this);
-    }
-
-    public IScrollEntry getListEntry(int index) {
-        return listEntries.get(index);
-    }
-
-    public void AddListEntry(IScrollEntry listEntry){
-        listEntries.add(listEntry);
     }
 
     @Override
-    protected int getItemCount() {
+    public IGuiListEntry getListEntry(int index) {
+        return listEntries.get(index);
+    }
+
+    @Override
+    protected int getSize() {
         return listEntries.size();
     }
 
     @Override
-    protected boolean isSelectedItem(int slotIndex) {
-        return false;
-    }
-
-    @Override
-    protected int getScrollbarPosition() {
+    protected int getScrollBarX() {
         //return width / 2 + 140 + 10;
         return width - 15;
     }
 
     @Override
-    public int getRowWidth() {
+    public int getListWidth() {
         return 280;
     }
 
     //Removed background
     @Override
-    public void render(int mouseXIn, int mouseYIn, float partialTicks)
+    public void drawScreen(int mouseXIn, int mouseYIn, float partialTicks)
     {
-        if (this.visible) {
+        if (this.visible)
+        {
             this.mouseX = mouseXIn;
             this.mouseY = mouseYIn;
-            this.renderBackground();
-            int scrollbarLeft = this.getScrollbarPosition();
-            int scrollbarRight = scrollbarLeft + 6;
-            this.capYPosition();
+            int scrollBarLeft = this.getScrollBarX();
+            int scrollBarRight = scrollBarLeft + 6;
+            this.bindAmountScrolled();
+            GlStateManager.disableLighting();
+            GlStateManager.disableFog();
 
             Tessellator tessellator = Tessellator.getInstance();
             BufferBuilder bufferbuilder = tessellator.getBuffer();
+            int insideLeft = this.left + this.width / 2 - this.getListWidth() / 2 + 2;
+            int insideTop = this.top + 4 - (int)this.amountScrolled;
 
-            int insideLeft = this.x0 + this.width / 2 - this.getRowWidth() / 2 + 2;
-            int insideTop = this.y0 + 4 - (int) this.yo;
-            if (this.renderHeader) {
-                this.renderHeader(insideLeft, insideTop, tessellator);
+            if (this.hasListHeader) {
+                this.drawListHeader(insideLeft, insideTop, tessellator);
             }
 
             //All entries
-            this.renderList(insideLeft, insideTop, mouseXIn, mouseYIn, partialTicks);
-            RenderSystem.disableDepthTest();
+            this.drawSelectionBox(insideLeft, insideTop, mouseXIn, mouseYIn, partialTicks);
+            GlStateManager.disableDepth();
 
             //Dirt overlays on top and bottom
-//            this.renderHoleBackground(0, this.y0, 255, 255);
-//            this.renderHoleBackground(this.y1, this.height, 255, 255);
+//            this.overlayBackground(0, this.top, 255, 255);
+//            this.overlayBackground(this.bottom, this.height, 255, 255);
 
-            RenderSystem.enableBlend();
-            RenderSystem.blendFuncSeparate(GlStateManager.SourceFactor.SRC_ALPHA, GlStateManager.DestFactor.ONE_MINUS_SRC_ALPHA, GlStateManager.SourceFactor.ZERO, GlStateManager.DestFactor.ONE);
-            RenderSystem.disableAlphaTest();
-            RenderSystem.shadeModel(7425);
-            RenderSystem.disableTexture();
+            GlStateManager.enableBlend();
+            GlStateManager.tryBlendFuncSeparate(GlStateManager.SourceFactor.SRC_ALPHA, GlStateManager.DestFactor.ONE_MINUS_SRC_ALPHA, GlStateManager.SourceFactor.ZERO, GlStateManager.DestFactor.ONE);
+            GlStateManager.disableAlpha();
+            GlStateManager.shadeModel(7425);
+            GlStateManager.disableTexture2D();
 
-            //top
+//            //top fade
 //            bufferbuilder.begin(7, DefaultVertexFormats.POSITION_TEX_COLOR);
-//            bufferbuilder.pos((double)this.x0, (double)(this.y0 + 4), 0.0D).tex(0.0D, 1.0D).color(0, 0, 0, 0).endVertex();
-//            bufferbuilder.pos((double)this.x1, (double)(this.y0 + 4), 0.0D).tex(1.0D, 1.0D).color(0, 0, 0, 0).endVertex();
-//            bufferbuilder.pos((double)this.x1, (double)this.y0, 0.0D).tex(1.0D, 0.0D).color(0, 0, 0, 255).endVertex();
-//            bufferbuilder.pos((double)this.x0, (double)this.y0, 0.0D).tex(0.0D, 0.0D).color(0, 0, 0, 255).endVertex();
+//            bufferbuilder.pos((double)this.left, (double)(this.top + 5), 0.0D).tex(0.0D, 1.0D).color(100, 100, 100, 0).endVertex();
+//            bufferbuilder.pos((double)this.right, (double)(this.top + 5), 0.0D).tex(1.0D, 1.0D).color(100, 100, 100, 0).endVertex();
+//            bufferbuilder.pos((double)this.right, (double)this.top, 0.0D).tex(1.0D, 0.0D).color(100, 100, 100, 100).endVertex();
+//            bufferbuilder.pos((double)this.left, (double)this.top, 0.0D).tex(0.0D, 0.0D).color(100, 100, 100, 100).endVertex();
 //            tessellator.draw();
 
-            //bottom
+//            //top line
 //            bufferbuilder.begin(7, DefaultVertexFormats.POSITION_TEX_COLOR);
-//            bufferbuilder.pos((double)this.x0, (double)this.y1, 0.0D).tex(0.0D, 1.0D).color(0, 0, 0, 255).endVertex();
-//            bufferbuilder.pos((double)this.x1, (double)this.y1, 0.0D).tex(1.0D, 1.0D).color(0, 0, 0, 255).endVertex();
-//            bufferbuilder.pos((double)this.x1, (double)(this.y1 - 4), 0.0D).tex(1.0D, 0.0D).color(0, 0, 0, 0).endVertex();
-//            bufferbuilder.pos((double)this.x0, (double)(this.y1 - 4), 0.0D).tex(0.0D, 0.0D).color(0, 0, 0, 0).endVertex();
+//            bufferbuilder.pos((double)this.left, (double)this.top, 0.0D).tex(0.0D, 1.0D).color(20, 20, 20, 255).endVertex();
+//            bufferbuilder.pos((double)this.right, (double)this.top, 0.0D).tex(1.0D, 1.0D).color(20, 20, 20, 255).endVertex();
+//            bufferbuilder.pos((double)this.right, (double)(this.top - 1), 0.0D).tex(1.0D, 0.0D).color(20, 20, 20, 255).endVertex();
+//            bufferbuilder.pos((double)this.left, (double)(this.top - 1), 0.0D).tex(0.0D, 0.0D).color(20, 20, 20, 255).endVertex();
+//            tessellator.draw();
+
+//            //bottom fade
+//            bufferbuilder.begin(7, DefaultVertexFormats.POSITION_TEX_COLOR);
+//            bufferbuilder.pos((double)this.left, (double)this.bottom, 0.0D).tex(0.0D, 1.0D).color(10, 10, 10, 100).endVertex();
+//            bufferbuilder.pos((double)this.right, (double)this.bottom, 0.0D).tex(1.0D, 1.0D).color(10, 10, 10, 100).endVertex();
+//            bufferbuilder.pos((double)this.right, (double)(this.bottom - 5), 0.0D).tex(1.0D, 0.0D).color(10, 10, 10, 0).endVertex();
+//            bufferbuilder.pos((double)this.left, (double)(this.bottom - 5), 0.0D).tex(0.0D, 0.0D).color(10, 10, 10, 0).endVertex();
+//            tessellator.draw();
+
+//            //bottom line
+//            bufferbuilder.begin(7, DefaultVertexFormats.POSITION_TEX_COLOR);
+//            bufferbuilder.pos((double)this.left, (double)(this.bottom + 1), 0.0D).tex(0.0D, 1.0D).color(20, 20, 20, 255).endVertex();
+//            bufferbuilder.pos((double)this.right, (double)(this.bottom + 1), 0.0D).tex(1.0D, 1.0D).color(20, 20, 20, 255).endVertex();
+//            bufferbuilder.pos((double)this.right, (double)this.bottom, 0.0D).tex(1.0D, 0.0D).color(20, 20, 20, 255).endVertex();
+//            bufferbuilder.pos((double)this.left, (double)this.bottom, 0.0D).tex(0.0D, 0.0D).color(20, 20, 20, 255).endVertex();
 //            tessellator.draw();
 
             //Draw scrollbar
             int maxScroll = this.getMaxScroll();
-            if (maxScroll > 0) {
-                int k1 = (int) ((float) ((this.y1 - this.y0) * (this.y1 - this.y0)) / (float) this.getMaxPosition());
-                k1 = MathHelper.clamp(k1, 32, this.y1 - this.y0 - 8);
-                int l1 = (int) this.yo * (this.y1 - this.y0 - k1) / maxScroll + this.y0;
-                if (l1 < this.y0) {
-                    l1 = this.y0;
+            if (maxScroll > 0)
+            {
+                int k1 = (this.bottom - this.top) * (this.bottom - this.top) / this.getContentHeight();
+                k1 = MathHelper.clamp(k1, 32, this.bottom - this.top - 8);
+                int l1 = (int)this.amountScrolled * (this.bottom - this.top - k1) / maxScroll + this.top;
+
+                if (l1 < this.top)
+                {
+                    l1 = this.top;
                 }
 
                 bufferbuilder.begin(7, DefaultVertexFormats.POSITION_TEX_COLOR);
-                bufferbuilder.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();
+                bufferbuilder.pos((double)scrollBarLeft, (double)this.bottom, 0.0D).tex(0.0D, 1.0D).color(0, 0, 0, 255).endVertex();
+                bufferbuilder.pos((double)scrollBarRight, (double)this.bottom, 0.0D).tex(1.0D, 1.0D).color(0, 0, 0, 255).endVertex();
+                bufferbuilder.pos((double)scrollBarRight, (double)this.top, 0.0D).tex(1.0D, 0.0D).color(0, 0, 0, 255).endVertex();
+                bufferbuilder.pos((double)scrollBarLeft, (double)this.top, 0.0D).tex(0.0D, 0.0D).color(0, 0, 0, 255).endVertex();
                 tessellator.draw();
+
                 bufferbuilder.begin(7, DefaultVertexFormats.POSITION_TEX_COLOR);
-                bufferbuilder.pos((double) scrollbarLeft, (double) (l1 + k1), 0.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();
+                bufferbuilder.pos((double)scrollBarLeft, (double)(l1 + k1), 0.0D).tex(0.0D, 1.0D).color(128, 128, 128, 255).endVertex();
+                bufferbuilder.pos((double)scrollBarRight, (double)(l1 + k1), 0.0D).tex(1.0D, 1.0D).color(128, 128, 128, 255).endVertex();
+                bufferbuilder.pos((double)scrollBarRight, (double)l1, 0.0D).tex(1.0D, 0.0D).color(128, 128, 128, 255).endVertex();
+                bufferbuilder.pos((double)scrollBarLeft, (double)l1, 0.0D).tex(0.0D, 0.0D).color(128, 128, 128, 255).endVertex();
                 tessellator.draw();
+
                 bufferbuilder.begin(7, DefaultVertexFormats.POSITION_TEX_COLOR);
-                bufferbuilder.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();
+                bufferbuilder.pos((double)scrollBarLeft, (double)(l1 + k1 - 1), 0.0D).tex(0.0D, 1.0D).color(192, 192, 192, 255).endVertex();
+                bufferbuilder.pos((double)(scrollBarRight - 1), (double)(l1 + k1 - 1), 0.0D).tex(1.0D, 1.0D).color(192, 192, 192, 255).endVertex();
+                bufferbuilder.pos((double)(scrollBarRight - 1), (double)l1, 0.0D).tex(1.0D, 0.0D).color(192, 192, 192, 255).endVertex();
+                bufferbuilder.pos((double)scrollBarLeft, (double)l1, 0.0D).tex(0.0D, 0.0D).color(192, 192, 192, 255).endVertex();
                 tessellator.draw();
             }
 
-            //this.renderDecorations(mouseXIn, mouseYIn);
-            RenderSystem.enableTexture();
-            RenderSystem.shadeModel(7424);
-            RenderSystem.enableAlphaTest();
-            RenderSystem.disableBlend();
+            GlStateManager.enableTexture2D();
+            GlStateManager.shadeModel(7424);
+            GlStateManager.enableAlpha();
+            GlStateManager.disableBlend();
         }
     }
 
     //SLOTHEIGHT MODIFICATIONS
     //SlotHeight is still relied on for determining how much to scroll
     @Override
-    protected int getMaxPosition() {
+    protected int getContentHeight() {
         //Add every entry height
-        int height = this.headerHeight;
+        int height = this.headerPadding;
         for (IScrollEntry entry : listEntries) {
             height += entry.getHeight();
         }
         return height;
     }
 
-    @Override
-    protected void renderBackground() {
-
-    }
-
-    @Override
-    protected void renderItem(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) {
+    public int getContentHeight(int count) {
         //Add all count entry heights
-        int height = this.headerHeight;
+        int height = this.headerPadding;
         for (int i = 0; i < count; i++) {
             IScrollEntry entry = listEntries.get(i);
             height += entry.getHeight();
@@ -188,31 +188,33 @@ public class GuiScrollPane extends SlotGui {
         return height;
     }
 
-    public int getSlotIndexFromScreenCoords(double posX, double posY) {
-        int left = this.x0 + (this.width - this.getRowWidth()) / 2;
-        int right = this.x0 + (this.width + this.getRowWidth()) / 2;
-        double relativeMouseY = getRelativeMouseY(mouseY, 0);
+    @Override
+    public int getSlotIndexFromScreenCoords(int posX, int posY) {
+        int left = this.left + (this.width - this.getListWidth()) / 2;
+        int right = this.left + (this.width + this.getListWidth()) / 2;
+        int relativeMouseY = getRelativeMouseY(mouseY, 0);
 
         //Iterate over every entry until relativeMouseY falls within its height
         for (int i = 0; i < listEntries.size(); i++) {
             IScrollEntry entry = listEntries.get(i);
             if (relativeMouseY <= entry.getHeight())
-                return posX < this.getScrollbarPosition() && posX >= left && posX <= right && i >= 0 &&
-                       relativeMouseY >= 0 && i < this.getItemCount() ? i : -1;
+                return posX < this.getScrollBarX() && posX >= left && posX <= right && i >= 0 &&
+                       relativeMouseY >= 0 && i < this.getSize() ? i : -1;
             relativeMouseY -= entry.getHeight();
         }
         return -1;
     }
 
     @Override
-    public boolean mouseClicked(double mouseX, double mouseY, int button) {
+    public boolean mouseClicked(int mouseX, int mouseY, int mouseEvent)
+    {
         int selectedSlot = this.getSlotIndexFromScreenCoords(mouseX, mouseY);
-        double relativeX = getRelativeMouseX(mouseX);
+        int relativeX = getRelativeMouseX(mouseX);
 
         //Always pass through mouseclicked, to be able to unfocus textfields
         for (int i = 0; i < this.listEntries.size(); i++) {
-            double relativeY = getRelativeMouseY(mouseY, i);
-            this.getListEntry(i).mousePressed(selectedSlot, (int) mouseX, (int) mouseY, button, (int) relativeX, (int) relativeY);
+            int relativeY = getRelativeMouseY(mouseY, i);
+            this.getListEntry(i).mousePressed(selectedSlot, mouseX, mouseY, mouseEvent, relativeX, relativeY);
         }
 
 
@@ -237,53 +239,60 @@ public class GuiScrollPane extends SlotGui {
     }
 
     @Override
-    public boolean mouseReleased(double mouseX, double mouseY, int button) {
-        for (int i = 0; i < this.getItemCount(); ++i)
+    public boolean mouseReleased(int x, int y, int mouseEvent)
+    {
+        for (int i = 0; i < this.getSize(); ++i)
         {
-            double relativeX = getRelativeMouseX(mouseX);
-            double relativeY = getRelativeMouseY(mouseY, i);
-            this.getListEntry(i).mouseReleased(i, (int) mouseX, (int) mouseY, button, (int) relativeX, (int) relativeY);
+            int relativeX = getRelativeMouseX(mouseX);
+            int relativeY = getRelativeMouseY(mouseY, i);
+            this.getListEntry(i).mouseReleased(i, x, y, mouseEvent, relativeX, relativeY);
         }
 
-        this.visible = true;
+        this.setEnabled(true);
         return false;
     }
 
+    @Override
     public void handleMouseInput() {
-        if (this.isMouseInList(this.mouseX, this.mouseY)) {
-            if (minecraft.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;
+        if (this.isMouseYWithinSlotBounds(this.mouseY)) {
+            if (Mouse.getEventButton() == 0 && Mouse.getEventButtonState() && this.mouseY >= this.top &&
+                this.mouseY <= this.bottom) {
+                int i = this.left + (this.width - this.getListWidth()) / 2;
+                int j = this.left + (this.width + this.getListWidth()) / 2;
                 int slotIndex = getSlotIndexFromScreenCoords(this.mouseX, this.mouseY);
-                double relativeMouseY = getRelativeMouseY(mouseY, slotIndex);
+                int relativeMouseY = getRelativeMouseY(mouseY, slotIndex);
 
                 if (slotIndex > -1) {
-                    this.mouseClicked(this.mouseX, this.mouseY, 0);
+                    this.elementClicked(slotIndex, false, this.mouseX, this.mouseY);
+                    this.selectedElement = slotIndex;
                 } else if (this.mouseX >= i && this.mouseX <= j && relativeMouseY < 0) {
-                    this.clickedHeader(this.mouseX - i, this.mouseY - this.y0 + (int) this.yo - 4);
+                    this.clickedHeader(this.mouseX - i, this.mouseY - this.top + (int) this.amountScrolled - 4);
                 }
             }
 
-            if (minecraft.mouseHelper.isLeftDown() && this.isVisible()) {
-                if (this.yDrag == -1) {
+            if (Mouse.isButtonDown(0) && this.getEnabled()) {
+                if (this.initialClickY == -1) {
                     boolean flag1 = true;
 
-                    if (this.mouseY >= this.y0 && this.mouseY <= this.y1) {
-                        int i2 = this.x0 + (this.width - this.getRowWidth()) / 2;
-                        int j2 = this.x0 + (this.width + this.getRowWidth()) / 2;
+                    if (this.mouseY >= this.top && this.mouseY <= this.bottom) {
+                        int i2 = this.left + (this.width - this.getListWidth()) / 2;
+                        int j2 = this.left + (this.width + this.getListWidth()) / 2;
                         int slotIndex = getSlotIndexFromScreenCoords(this.mouseX, this.mouseY);
-                        double relativeMouseY = getRelativeMouseY(mouseY, slotIndex);
+                        int relativeMouseY = getRelativeMouseY(mouseY, slotIndex);
 
                         if (slotIndex > -1) {
-                            this.mouseClicked(slotIndex, this.mouseX, this.mouseY);
+                            boolean flag = slotIndex == this.selectedElement &&
+                                           Minecraft.getSystemTime() - this.lastClicked < 250L;
+                            this.elementClicked(slotIndex, flag, this.mouseX, this.mouseY);
+                            this.selectedElement = slotIndex;
+                            this.lastClicked = Minecraft.getSystemTime();
                         } else if (this.mouseX >= i2 && this.mouseX <= j2 && relativeMouseY < 0) {
                             this.clickedHeader(this.mouseX - i2,
-                                    this.mouseY - this.y0 + (int) this.yo - 4);
+                                    this.mouseY - this.top + (int) this.amountScrolled - 4);
                             flag1 = false;
                         }
 
-                        int i3 = this.getScrollbarPosition();
+                        int i3 = this.getScrollBarX();
                         int j1 = i3 + 6;
 
                         if (this.mouseX >= i3 && this.mouseX <= j1) {
@@ -294,45 +303,56 @@ public class GuiScrollPane extends SlotGui {
                                 maxScroll = 1;
                             }
 
-                            int l1 = (int) ((float) ((this.y1 - this.y0) * (this.y1 - this.y0)) /
-                                            (float) this.getMaxPosition());
-                            l1 = MathHelper.clamp(l1, 32, this.y1 - this.y0 - 8);
-                            this.scrollMultiplier /= (float) (this.y1 - this.y0 - l1) / (float) maxScroll;
+                            int l1 = (int) ((float) ((this.bottom - this.top) * (this.bottom - this.top)) /
+                                            (float) this.getContentHeight());
+                            l1 = MathHelper.clamp(l1, 32, this.bottom - this.top - 8);
+                            this.scrollMultiplier /= (float) (this.bottom - this.top - l1) / (float) maxScroll;
                         } else {
                             this.scrollMultiplier = 1.0F;
                         }
 
                         if (flag1) {
-                            this.yDrag = this.mouseY;
+                            this.initialClickY = this.mouseY;
                         } else {
-                            this.yDrag = -2;
+                            this.initialClickY = -2;
                         }
                     } else {
-                        this.yDrag = -2;
+                        this.initialClickY = -2;
                     }
-                } else if (this.yDrag >= 0) {
-                    this.yo -= (float) (this.mouseY - this.yDrag) * this.scrollMultiplier;
-                    this.yDrag = this.mouseY;
+                } else if (this.initialClickY >= 0) {
+                    this.amountScrolled -= (float) (this.mouseY - this.initialClickY) * this.scrollMultiplier;
+                    this.initialClickY = this.mouseY;
                 }
             } else {
-                this.yDrag = -1;
+                this.initialClickY = -1;
             }
 
+            int i2 = Mouse.getEventDWheel();
+
+            if (i2 != 0) {
+                if (i2 > 0) {
+                    i2 = -1;
+                } else if (i2 < 0) {
+                    i2 = 1;
+                }
+
+                this.amountScrolled += (float) (i2 * this.slotHeight / 2);
+            }
         }
     }
 
     //Draw in center if it fits
     @Override
-    protected void renderList(int insideLeft, int insideTop, int mouseXIn, int mouseYIn, float partialTicks)
+    protected void drawSelectionBox(int insideLeft, int insideTop, int mouseXIn, int mouseYIn, float partialTicks)
     {
-        int itemCount = this.getItemCount();
+        int size = this.getSize();
         Tessellator tessellator = Tessellator.getInstance();
         BufferBuilder bufferbuilder = tessellator.getBuffer();
 
         //Find y to start with
-        int y = this.headerHeight + insideTop;
-        int contentHeight = getMaxPosition();
-        int insideHeight = this.y1 - this.y0 - 4;
+        int y = this.headerPadding + insideTop;
+        int contentHeight = getContentHeight();
+        int insideHeight = this.bottom - this.top - 4;
 
         if (contentHeight < insideHeight) {
             //it fits, so we can center it vertically
@@ -340,68 +360,67 @@ public class GuiScrollPane extends SlotGui {
         }
 
         //Draw all entries
-        for (int i = 0; i < itemCount; ++i)
+        for (int i = 0; i < size; ++i)
         {
             int entryHeight = listEntries.get(i).getHeight();
             int entryHeight2 = entryHeight - 4;
 
-            if (y > this.y1 || y + entryHeight2 < this.y0)
+            if (y > this.bottom || y + entryHeight2 < this.top)
             {
-                this.updateItemPosition(i, insideLeft, y, partialTicks);
+                this.updateItemPos(i, insideLeft, y, partialTicks);
             }
 
-            if (this.renderSelection && this.isSelectedItem(i)) {
-                int i1 = this.x0 + this.width / 2 - this.getRowWidth() / 2;
-                int j1 = this.x0 + this.width / 2 + this.getRowWidth() / 2;
-                RenderSystem.disableTexture();
-                float f = this.isFocused() ? 1.0F : 0.5F;
-                RenderSystem.color4f(f, f, f, 1.0F);
-                bufferbuilder.begin(7, DefaultVertexFormats.POSITION);
-                bufferbuilder.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();
+            if (this.showSelectionBox && this.isSelected(i))
+            {
+                int i1 = this.left + this.width / 2 - this.getListWidth() / 2;
+                int j1 = this.left + this.width / 2 + this.getListWidth() / 2;
+                GlStateManager.color(1.0F, 1.0F, 1.0F, 1.0F);
+                GlStateManager.disableTexture2D();
+                bufferbuilder.begin(7, DefaultVertexFormats.POSITION_TEX_COLOR);
+                bufferbuilder.pos((double)i1, (double)(y + entryHeight2 + 2), 0.0D).tex(0.0D, 1.0D).color(128, 128, 128, 255).endVertex();
+                bufferbuilder.pos((double)j1, (double)(y + entryHeight2 + 2), 0.0D).tex(1.0D, 1.0D).color(128, 128, 128, 255).endVertex();
+                bufferbuilder.pos((double)j1, (double)(y - 2), 0.0D).tex(1.0D, 0.0D).color(128, 128, 128, 255).endVertex();
+                bufferbuilder.pos((double)i1, (double)(y - 2), 0.0D).tex(0.0D, 0.0D).color(128, 128, 128, 255).endVertex();
+                bufferbuilder.pos((double)(i1 + 1), (double)(y + entryHeight2 + 1), 0.0D).tex(0.0D, 1.0D).color(0, 0, 0, 255).endVertex();
+                bufferbuilder.pos((double)(j1 - 1), (double)(y + entryHeight2 + 1), 0.0D).tex(1.0D, 1.0D).color(0, 0, 0, 255).endVertex();
+                bufferbuilder.pos((double)(j1 - 1), (double)(y - 1), 0.0D).tex(1.0D, 0.0D).color(0, 0, 0, 255).endVertex();
+                bufferbuilder.pos((double)(i1 + 1), (double)(y - 1), 0.0D).tex(0.0D, 0.0D).color(0, 0, 0, 255).endVertex();
                 tessellator.draw();
-                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();
+                GlStateManager.enableTexture2D();
             }
 
-            this.renderItem(i, insideLeft, y, entryHeight2, mouseXIn, mouseYIn, partialTicks);
+            this.drawSlot(i, insideLeft, y, entryHeight2, mouseXIn, mouseYIn, partialTicks);
             y += entryHeight;
         }
     }
 
-    private double getRelativeMouseX(double mouseX) {
-        int j = this.x0 + this.width / 2 - this.getRowWidth() / 2 + 2;
+    private int getRelativeMouseX(int mouseX) {
+        int j = this.left + this.width / 2 - this.getListWidth() / 2 + 2;
         return mouseX - j;
     }
 
-    private double getRelativeMouseY(double mouseY, int contentIndex) {
-        int k = this.y0 + 4 - this.getScroll() + getMaxPosition(contentIndex) + this.headerHeight;
-        double relativeMouseY = mouseY - k;
+    private int getRelativeMouseY(int mouseY, int contentIndex) {
+        int k = this.top + 4 - this.getAmountScrolled() + getContentHeight(contentIndex) + this.headerPadding;
+        int relativeMouseY = mouseY - k;
 
         //Content might be centered, adjust relative mouse y accordingly
-        int contentHeight = getMaxPosition();
-        int insideHeight = this.y1 - this.y0 - 4;
+        int contentHeight = getContentHeight();
+        int insideHeight = this.bottom - this.top - 4;
 
         if (contentHeight < insideHeight) {
             //it fits, so we can center it vertically
-            relativeMouseY -= (insideHeight - contentHeight) / 2f;
+            relativeMouseY -= (insideHeight - contentHeight) / 2;
         }
         return relativeMouseY;
     }
 
     //PASSTHROUGHS
-    public void init(List<Widget> buttonList) {
+    public int initGui(int id, List<GuiButton> buttonList) {
         for (IScrollEntry entry : this.listEntries) {
-            entry.init(buttonList);
+            id = entry.initGui(id, buttonList);
         }
+        registerScrollButtons(id++, id++);
+        return id;
     }
 
     public void updateScreen() {
@@ -409,16 +428,19 @@ public class GuiScrollPane extends SlotGui {
             entry.updateScreen();
     }
 
-    public void drawTooltip(Screen guiScreen, int mouseX, int mouseY) {
+    public void drawTooltip(GuiScreen guiScreen, int mouseX, int mouseY) {
         for (IScrollEntry entry : this.listEntries)
             entry.drawTooltip(guiScreen, mouseX, mouseY);
     }
 
-    @Override
-    public boolean charTyped(char eventChar, int eventKey) {
+    public void keyTyped(char eventChar, int eventKey) throws IOException {
         for (IScrollEntry entry : this.listEntries)
-            entry.charTyped(eventChar, eventKey);
-        return false;
+            entry.keyTyped(eventChar, eventKey);
+    }
+
+    public void actionPerformed(GuiButton button) {
+        for (IScrollEntry entry : this.listEntries)
+            entry.actionPerformed(button);
     }
 
     public void onGuiClosed() {
@@ -426,41 +448,19 @@ public class GuiScrollPane extends SlotGui {
             entry.onGuiClosed();
     }
 
-    //Make protected values available
-    public int getWidth() {
-        return width;
-    }
-
-    public int getHeight() {
-        return height;
-    }
-
-    public interface IScrollEntry {
-        void init(List<Widget> buttonList);
+    public interface IScrollEntry extends GuiListExtended.IGuiListEntry {
+        int initGui(int id, List<GuiButton> buttonList);
 
         void updateScreen();
 
-        void drawTooltip(Screen guiScreen, int mouseX, int mouseY);
+        void drawTooltip(GuiScreen guiScreen, int mouseX, int mouseY);
 
-        boolean charTyped(char eventChar, int eventKey);
+        void keyTyped(char eventChar, int eventKey) throws IOException;
+
+        void actionPerformed(GuiButton button);
 
         void onGuiClosed();
 
         int getHeight();
-
-        void updatePosition(int slotIndex, int x, int y, float partialTicks);
-
-        void drawEntry(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/InventoryHelper.java

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

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

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

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

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

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

@@ -1,25 +1,26 @@
 package nl.requios.effortlessbuilding.helper;
 
-import net.minecraft.advancements.CriteriaTriggers;
-import net.minecraft.block.*;
-import net.minecraft.block.SlabBlock;
+import net.minecraft.block.Block;
+import net.minecraft.block.BlockLiquid;
+import net.minecraft.block.BlockSlab;
+import net.minecraft.block.SoundType;
 import net.minecraft.block.material.Material;
-import net.minecraft.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.block.properties.IProperty;
+import net.minecraft.block.state.IBlockState;
 import net.minecraft.entity.Entity;
-import net.minecraft.block.Blocks;
+import net.minecraft.entity.player.EntityPlayer;
+import net.minecraft.init.Blocks;
+import net.minecraft.item.ItemBlock;
+import net.minecraft.item.ItemSlab;
 import net.minecraft.item.ItemStack;
-import net.minecraft.util.CachedBlockInfo;
-import net.minecraft.util.Direction;
-import net.minecraft.util.Hand;
+import net.minecraft.util.EnumFacing;
+import net.minecraft.util.EnumHand;
+import net.minecraft.util.SoundCategory;
+import net.minecraft.util.math.AxisAlignedBB;
 import net.minecraft.util.math.BlockPos;
 import net.minecraft.util.math.Vec3d;
-import net.minecraft.util.math.shapes.VoxelShape;
+import net.minecraft.world.IBlockAccess;
 import net.minecraft.world.World;
-import net.minecraftforge.common.ToolType;
 import nl.requios.effortlessbuilding.BuildConfig;
 import nl.requios.effortlessbuilding.buildmodifier.ModifierSettingsManager;
 import nl.requios.effortlessbuilding.compatibility.CompatHelper;
@@ -32,15 +33,15 @@ public class SurvivalHelper {
     //Used for all placing of blocks in this mod.
     //Checks if area is loaded, if player has the right permissions, if existing block can be replaced (drops it if so) and consumes an item from the stack.
     //Based on ItemBlock#onItemUse
-    public static boolean placeBlock(World world, PlayerEntity player, BlockPos pos, BlockState blockState,
-                                     ItemStack origstack, Direction facing, Vec3d hitVec, boolean skipPlaceCheck,
+    public static boolean placeBlock(World world, EntityPlayer player, BlockPos pos, IBlockState blockState,
+                                     ItemStack origstack, EnumFacing facing, Vec3d hitVec, boolean skipPlaceCheck,
                                      boolean skipCollisionCheck, boolean playSound) {
-        if (!world.isBlockPresent(pos)) return false;
+        if (!world.isBlockLoaded(pos, true)) return false;
         ItemStack itemstack = origstack;
 
         if (blockState.getBlock().isAir(blockState, world, pos) || itemstack.isEmpty()) {
             dropBlock(world, player, pos);
-            world.removeBlock(pos, false);
+            world.setBlockToAir(pos);
             return true;
         }
 
@@ -49,9 +50,9 @@ public class SurvivalHelper {
         if (CompatHelper.isItemBlockProxy(itemstack))
             itemstack = CompatHelper.getItemBlockByState(itemstack, blockState);
 
-        if (!(itemstack.getItem() instanceof BlockItem))
+        if (!(itemstack.getItem() instanceof ItemBlock))
             return false;
-        Block block = ((BlockItem) itemstack.getItem()).getBlock();
+        Block block = ((ItemBlock) itemstack.getItem()).getBlock();
 
 
         //More manual with ItemBlock#placeBlockAt
@@ -59,17 +60,10 @@ public class SurvivalHelper {
             //Drop existing block
             dropBlock(world, player, pos);
 
-            //TryPlace sets block with offset and reduces itemstack count in creative, so we copy only parts of it
-//            BlockItemUseContext blockItemUseContext = new BlockItemUseContext(world, player, itemstack, pos, facing, (float) hitVec.x, (float) hitVec.y, (float) hitVec.z);
-//            EnumActionResult result = ((ItemBlock) itemstack.getItem()).tryPlace(blockItemUseContext);
-            if (!world.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);
-            }
+            boolean placed = ((ItemBlock) itemstack.getItem()).placeBlockAt(itemstack, player, world, pos, facing, (float) hitVec.x, (float) hitVec.y, (float) hitVec.z, blockState);
+            if (!placed) return false;
 
-            BlockState afterState = world.getBlockState(pos);
+            IBlockState afterState = world.getBlockState(pos);
 
             if (playSound) {
                 SoundType soundtype = afterState.getBlock().getSoundType(afterState, world, pos, player);
@@ -111,8 +105,8 @@ public class SurvivalHelper {
 
     //Used for all breaking of blocks in this mod.
     //Checks if area is loaded, if appropriate tool is used in survival mode, and drops the block directly into the players inventory
-    public static boolean breakBlock(World world, PlayerEntity player, BlockPos pos, boolean skipChecks) {
-        if (!world.isBlockPresent(pos) && !world.isAirBlock(pos)) return false;
+    public static boolean breakBlock(World world, EntityPlayer player, BlockPos pos, boolean skipChecks) {
+        if (!world.isBlockLoaded(pos, false)) return false;
 
         //Check if can break
         if (skipChecks || canBreak(world, player, pos)) {
@@ -125,17 +119,17 @@ public class SurvivalHelper {
             //Damage tool
             player.getHeldItemMainhand().onBlockDestroyed(world, world.getBlockState(pos), pos, player);
 
-            world.removeBlock(pos, false);
+            world.setBlockToAir(pos);
             return true;
         }
         return false;
     }
 
     //Gives items directly to player
-    public static void dropBlock(World world, PlayerEntity player, BlockPos pos){
+    public static void dropBlock(World world, EntityPlayer player, BlockPos pos){
         if (player.isCreative()) return;
 
-        BlockState blockState = world.getBlockState(pos);
+        IBlockState blockState = world.getBlockState(pos);
         Block block = blockState.getBlock();
 
         block.harvestBlock(world, player, pos, blockState, world.getTileEntity(pos), player.getHeldItemMainhand());
@@ -182,17 +176,17 @@ public class SurvivalHelper {
      * @param sidePlacedOn
      * @return Whether the player may place the block at pos with itemstack
      */
-    public static boolean canPlace(World world, PlayerEntity player, BlockPos pos, BlockState newBlockState, ItemStack itemStack, boolean skipCollisionCheck, Direction sidePlacedOn) {
+    public static boolean canPlace(World world, EntityPlayer player, BlockPos pos, IBlockState newBlockState, ItemStack itemStack, boolean skipCollisionCheck, EnumFacing sidePlacedOn) {
 
         //Check if itemstack is correct
-        if (!(itemStack.getItem() instanceof BlockItem) || Block.getBlockFromItem(itemStack.getItem()) != newBlockState.getBlock()) {
+        if (!(itemStack.getItem() instanceof ItemBlock) || Block.getBlockFromItem(itemStack.getItem()) != newBlockState.getBlock()) {
 //            EffortlessBuilding.log(player, "Cannot (re)place block", true);
 //            EffortlessBuilding.log("SurvivalHelper#canPlace: itemstack " + itemStack.toString() + " does not match blockstate " + newBlockState.toString());
             //Happens when breaking blocks, no need to notify in that case
             return false;
         }
 
-        Block block = ((BlockItem) itemStack.getItem()).getBlock();
+        Block block = ((ItemBlock) itemStack.getItem()).getBlock();
 
         return !itemStack.isEmpty() && canPlayerEdit(player, world, pos, itemStack) &&
                mayPlace(world, block, newBlockState, pos, skipCollisionCheck, sidePlacedOn, player) &&
@@ -200,12 +194,13 @@ public class SurvivalHelper {
     }
 
     //Can be harvested with hand? (or in creative)
-    private static boolean canReplace(World world, PlayerEntity player, BlockPos pos){
+    private static boolean canReplace(World world, EntityPlayer player, BlockPos pos){
         if (player.isCreative()) return true;
 
-        BlockState state = world.getBlockState(pos);
+        IBlockState state = world.getBlockState(pos);
+        state = state.getBlock().getActualState(state, world, pos);
 
-        switch (BuildConfig.survivalBalancers.quickReplaceMiningLevel.get()) {
+        switch (BuildConfig.survivalBalancers.quickReplaceMiningLevel) {
             case -1: return state.getMaterial().isToolNotRequired();
             case 0: return state.getBlock().getHarvestLevel(state) <= 0;
             case 1: return state.getBlock().getHarvestLevel(state) <= 1;
@@ -217,11 +212,9 @@ public class SurvivalHelper {
     }
 
     //From EntityPlayer#canPlayerEdit
-    private static boolean canPlayerEdit(PlayerEntity player, World world, BlockPos pos, ItemStack stack)
+    private static boolean canPlayerEdit(EntityPlayer player, World world, BlockPos pos, ItemStack stack)
     {
-        if (!world.isBlockModifiable(player, pos)) return false;
-
-        if (player.abilities.allowEdit)
+        if (player.capabilities.allowEdit)
         {
             //True in creative and survival mode
             return true;
@@ -229,25 +222,24 @@ public class SurvivalHelper {
         else
         {
             //Adventure mode
-            CachedBlockInfo blockworldstate = new CachedBlockInfo(world, pos, false);
-            return stack.canPlaceOn(world.getTags(), blockworldstate);
-
+            Block block = world.getBlockState(pos).getBlock();
+            return stack.canPlaceOn(block) || stack.canEditBlocks();
         }
     }
 
     //From World#mayPlace
-    private static boolean mayPlace(World world, Block blockIn, BlockState newBlockState, BlockPos pos, boolean skipCollisionCheck, Direction sidePlacedOn, @Nullable Entity placer)
+    private static boolean mayPlace(World world, Block blockIn, IBlockState newBlockState, BlockPos pos, boolean skipCollisionCheck, EnumFacing sidePlacedOn, @Nullable Entity placer)
     {
-        BlockState iblockstate1 = world.getBlockState(pos);
-        VoxelShape voxelShape = skipCollisionCheck ? null : blockIn.getDefaultState().getCollisionShape(world, pos);
+        IBlockState iblockstate1 = world.getBlockState(pos);
+        AxisAlignedBB axisalignedbb = skipCollisionCheck ? Block.NULL_AABB : blockIn.getDefaultState().getCollisionBoundingBox(world, pos);
 
-        if (voxelShape != null && !world.checkNoEntityCollision(placer, voxelShape))
+        if (axisalignedbb != Block.NULL_AABB && !world.checkNoEntityCollision(axisalignedbb.offset(pos)))
         {
             return false;
         }
 
         //Check if double slab
-        if (placer != null && doesBecomeDoubleSlab(((PlayerEntity) placer), pos, sidePlacedOn)) {
+        if (placer != null && doesBecomeDoubleSlab(((EntityPlayer) placer), pos, sidePlacedOn)) {
             return true;
         }
 
@@ -257,27 +249,25 @@ public class SurvivalHelper {
             return false;
         }
 
-        //TODO 1.14 check what Material.CIRCUITS has become
-        if (iblockstate1.getMaterial() == Material.REDSTONE_LIGHT && blockIn == Blocks.ANVIL)
+        if (iblockstate1.getMaterial() == Material.CIRCUITS && blockIn == Blocks.ANVIL)
         {
             return true;
         }
 
         //Check quickreplace
-        if (placer instanceof PlayerEntity && ModifierSettingsManager.getModifierSettings(((PlayerEntity) placer)).doQuickReplace()) {
+        if (placer instanceof EntityPlayer && ModifierSettingsManager.getModifierSettings(((EntityPlayer) placer)).doQuickReplace()) {
             return true;
         }
 
-        //TODO 1.13 replaceable
-        return iblockstate1.getMaterial().isReplaceable() /*&& canPlaceBlockOnSide(world, pos, sidePlacedOn)*/;
+        return iblockstate1.getBlock().isReplaceable(world, pos) && blockIn.canPlaceBlockOnSide(world, pos, sidePlacedOn);
     }
 
 
 
     //Can break using held tool? (or in creative)
-    public static boolean canBreak(World world, PlayerEntity player, BlockPos pos) {
-        BlockState blockState = world.getBlockState(pos);
-        if (!world.getFluidState(pos).isEmpty()) return false;
+    public static boolean canBreak(World world, EntityPlayer player, BlockPos pos) {
+        IBlockState blockState = world.getBlockState(pos);
+        if (blockState.getBlock() instanceof BlockLiquid) return false;
 
         if (player.isCreative()) return true;
 
@@ -285,12 +275,13 @@ public class SurvivalHelper {
     }
 
     //From ForgeHooks#canHarvestBlock
-    public static boolean canHarvestBlock(@Nonnull Block block, @Nonnull PlayerEntity player, @Nonnull World world, @Nonnull BlockPos pos)
+    public static boolean canHarvestBlock(@Nonnull Block block, @Nonnull EntityPlayer player, @Nonnull IBlockAccess world, @Nonnull BlockPos pos)
     {
-        BlockState state = world.getBlockState(pos);
+        IBlockState state = world.getBlockState(pos);
+        state = state.getBlock().getActualState(state, world, pos);
 
         //Dont break bedrock
-        if (state.getBlockHardness(world, pos) < 0) {
+        if (state.getBlockHardness((World) world, pos) < 0) {
             return false;
         }
 
@@ -300,13 +291,13 @@ public class SurvivalHelper {
         }
 
         ItemStack stack = player.getHeldItemMainhand();
-        ToolType tool = block.getHarvestTool(state);
+        String tool = block.getHarvestTool(state);
         if (stack.isEmpty() || tool == null)
         {
             return player.canHarvestBlock(state);
         }
 
-        if (stack.getDamage() >= stack.getMaxDamage()) return false;
+        if (stack.getItemDamage() >= stack.getMaxDamage()) return false;
 
         int toolLevel = stack.getItem().getHarvestLevel(stack, tool, player, state);
         if (toolLevel < 0)
@@ -317,28 +308,27 @@ public class SurvivalHelper {
         return toolLevel >= block.getHarvestLevel(state);
     }
 
-    public static boolean doesBecomeDoubleSlab(PlayerEntity player, BlockPos pos, Direction facing) {
-        BlockState placedBlockState = player.world.getBlockState(pos);
+    public static boolean doesBecomeDoubleSlab(EntityPlayer player, BlockPos pos, EnumFacing facing) {
+        IBlockState placedBlockState = player.world.getBlockState(pos);
 
-        ItemStack itemstack = player.getHeldItem(Hand.MAIN_HAND);
+        ItemStack itemstack = player.getHeldItem(EnumHand.MAIN_HAND);
         if (CompatHelper.isItemBlockProxy(itemstack))
             itemstack = CompatHelper.getItemBlockFromStack(itemstack);
 
-        if (itemstack.isEmpty() || !(itemstack.getItem() instanceof BlockItem) || !(((BlockItem) itemstack.getItem()).getBlock() instanceof SlabBlock)) return false;
-        SlabBlock heldSlab = (SlabBlock) ((BlockItem) itemstack.getItem()).getBlock();
+        if (itemstack.isEmpty() || !(itemstack.getItem() instanceof ItemSlab)) return false;
+        BlockSlab heldSlab = (BlockSlab) ((ItemSlab) itemstack.getItem()).getBlock();
 
         if (placedBlockState.getBlock() == heldSlab) {
-            //TODO 1.13
-//            IProperty<?> variantProperty = heldSlab.getVariantProperty();
-//            Comparable<?> placedVariant = placedBlockState.getValue(variantProperty);
-//            BlockSlab.EnumBlockHalf placedHalf = placedBlockState.getValue(BlockSlab.HALF);
-//
-//            Comparable<?> heldVariant = heldSlab.getTypeForItem(itemstack);
-//
-//            if ((facing == EnumFacing.UP && placedHalf == BlockSlab.EnumBlockHalf.BOTTOM || facing == EnumFacing.DOWN && placedHalf == BlockSlab.EnumBlockHalf.TOP) && placedVariant == heldVariant)
-//            {
-//                return true;
-//            }
+            IProperty<?> variantProperty = heldSlab.getVariantProperty();
+            Comparable<?> placedVariant = placedBlockState.getValue(variantProperty);
+            BlockSlab.EnumBlockHalf placedHalf = placedBlockState.getValue(BlockSlab.HALF);
+
+            Comparable<?> heldVariant = heldSlab.getTypeForItem(itemstack);
+
+            if ((facing == EnumFacing.UP && placedHalf == BlockSlab.EnumBlockHalf.BOTTOM || facing == EnumFacing.DOWN && placedHalf == BlockSlab.EnumBlockHalf.TOP) && placedVariant == heldVariant)
+            {
+                return true;
+            }
         }
         return false;
     }

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

@@ -1,28 +1,22 @@
 package nl.requios.effortlessbuilding.item;
 
 import net.minecraft.block.Block;
-import net.minecraft.block.BlockState;
+import net.minecraft.block.state.IBlockState;
 import net.minecraft.client.util.ITooltipFlag;
-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.creativetab.CreativeTabs;
+import net.minecraft.entity.player.EntityPlayer;
+import net.minecraft.item.Item;
+import net.minecraft.item.ItemStack;
+import net.minecraft.nbt.NBTTagCompound;
+import net.minecraft.util.ActionResult;
+import net.minecraft.util.EnumActionResult;
+import net.minecraft.util.EnumFacing;
+import net.minecraft.util.EnumHand;
 import net.minecraft.util.math.BlockPos;
-import net.minecraft.util.math.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;
@@ -30,7 +24,6 @@ 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;
@@ -46,60 +39,52 @@ public class ItemRandomizerBag extends Item {
     private static Random rand = new Random(currentSeed);
 
     public ItemRandomizerBag() {
-        super(new Item.Properties().group(ItemGroup.TOOLS).maxStackSize(1));
-
         this.setRegistryName(EffortlessBuilding.MODID, "randomizer_bag");
+        this.setTranslationKey(this.getRegistryName().toString());
+
+        this.maxStackSize = 1;
+        this.setCreativeTab(CreativeTabs.TOOLS);
     }
 
     @Override
-    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();
+    public EnumActionResult onItemUse(EntityPlayer player, World world, BlockPos pos, EnumHand hand, EnumFacing facing, float hitX, float hitY, float hitZ) {
 
-        if (player == null) return ActionResultType.FAIL;
-
-        if (ctx.func_225518_g_()) { //ctx.isPlacerSneaking()
-            if (world.isRemote) return ActionResultType.SUCCESS;
+        if (player.isSneaking()) {
+            if (world.isRemote) return EnumActionResult.SUCCESS;
             //Open inventory
-            NetworkHooks.openGui((ServerPlayerEntity) player, new ContainerProvider(item));
+            player.openGui(EffortlessBuilding.instance, EffortlessBuilding.RANDOMIZER_BAG_GUI, world, 0, 0, 0);
         } else {
-            if (world.isRemote) return ActionResultType.SUCCESS;
+            if (world.isRemote) return EnumActionResult.SUCCESS;
 
             //Only place manually if in normal vanilla mode
             BuildModes.BuildModeEnum buildMode = ModeSettingsManager.getModeSettings(player).getBuildMode();
             ModifierSettingsManager.ModifierSettings modifierSettings = ModifierSettingsManager.getModifierSettings(player);
             if (buildMode != BuildModes.BuildModeEnum.NORMAL || modifierSettings.doQuickReplace()) {
-                return ActionResultType.FAIL;
+                return EnumActionResult.FAIL;
             }
 
             //Use item
             //Get bag inventory
-            //TODO offhand support
-            ItemStack bag = player.getHeldItem(Hand.MAIN_HAND);
+            ItemStack bag = player.getHeldItem(hand);
             IItemHandler bagInventory = getBagInventory(bag);
             if (bagInventory == null)
-                return ActionResultType.FAIL;
+                return EnumActionResult.FAIL;
 
             ItemStack toPlace = pickRandomStack(bagInventory);
-            if (toPlace.isEmpty()) return ActionResultType.FAIL;
+            if (toPlace.isEmpty()) return EnumActionResult.FAIL;
 
             //Previously: use onItemUse to place block (no synergy)
             //bag.setItemDamage(toPlace.getMetadata());
             //toPlace.onItemUse(player, world, pos, hand, facing, hitX, hitY, hitZ);
 
-            //TODO replaceable
-            if (!world.getBlockState(pos).getBlock().getMaterial(world.getBlockState(pos)).isReplaceable()) {
+            if (!world.getBlockState(pos).getBlock().isReplaceable(world, pos)) {
                 pos = pos.offset(facing);
             }
 
-            BlockItemUseContext blockItemUseContext = new BlockItemUseContext(new ItemUseContext(player, Hand.MAIN_HAND, new BlockRayTraceResult(hitVec, facing, pos, false)));
-            BlockState blockState = Block.getBlockFromItem(toPlace.getItem()).getStateForPlacement(blockItemUseContext);
+            IBlockState blockState = Block.getBlockFromItem(toPlace.getItem()).getStateForPlacement(world, pos, facing,
+                    hitX, hitY, hitZ, toPlace.getMetadata(), player, hand);
 
-            SurvivalHelper.placeBlock(world, player, pos, blockState, toPlace, facing, hitVec, false, false, true);
+            SurvivalHelper.placeBlock(world, player, pos, blockState, toPlace, facing, new Vec3d(hitX, hitY, hitZ), false, false, true);
 
             //Synergy
             //Works without calling
@@ -108,30 +93,30 @@ public class ItemRandomizerBag extends Item {
 //            Mirror.onBlockPlaced(placeEvent);
 //            Array.onBlockPlaced(placeEvent);
         }
-        return ActionResultType.SUCCESS;
+        return EnumActionResult.SUCCESS;
     }
 
     @Override
-    public ActionResult<ItemStack> onItemRightClick(World world, PlayerEntity player, Hand hand) {
+    public ActionResult<ItemStack> onItemRightClick(World world, EntityPlayer player, EnumHand hand) {
         ItemStack bag = player.getHeldItem(hand);
 
         if (player.isSneaking()) {
-            if (world.isRemote) return new ActionResult<>(ActionResultType.SUCCESS, bag);
+            if (world.isRemote) return new ActionResult<>(EnumActionResult.SUCCESS, bag);
             //Open inventory
-            NetworkHooks.openGui((ServerPlayerEntity) player, new ContainerProvider(bag));
+            player.openGui(EffortlessBuilding.instance, EffortlessBuilding.RANDOMIZER_BAG_GUI, world, 0, 0, 0);
         } else {
             //Use item
             //Get bag inventory
             IItemHandler bagInventory = getBagInventory(bag);
             if (bagInventory == null)
-                return new ActionResult<>(ActionResultType.FAIL, bag);
+                return new ActionResult<>(EnumActionResult.FAIL, bag);
 
             ItemStack toUse = pickRandomStack(bagInventory);
-            if (toUse.isEmpty()) return new ActionResult<>(ActionResultType.FAIL, bag);
+            if (toUse.isEmpty()) return new ActionResult<>(EnumActionResult.FAIL, bag);
 
             return toUse.useItemRightClick(world, player, hand);
         }
-        return new ActionResult<>(ActionResultType.PASS, bag);
+        return new ActionResult<>(EnumActionResult.PASS, bag);
     }
 
     /**
@@ -141,7 +126,8 @@ public class ItemRandomizerBag extends Item {
      * @return
      */
     public static IItemHandler getBagInventory(ItemStack bag) {
-        return bag.getCapability(CapabilityItemHandler.ITEM_HANDLER_CAPABILITY, null).orElse(null);
+        if (!bag.hasCapability(CapabilityItemHandler.ITEM_HANDLER_CAPABILITY, null)) return null;
+        return bag.getCapability(CapabilityItemHandler.ITEM_HANDLER_CAPABILITY, null);
     }
 
     /**
@@ -190,28 +176,25 @@ public class ItemRandomizerBag extends Item {
     }
 
     @Override
-    public int getUseDuration(ItemStack p_77626_1_) {
+    public int getMaxItemUseDuration(ItemStack stack) {
         return 1;
     }
 
     @Nullable
     @Override
-    public ICapabilityProvider initCapabilities(ItemStack stack, @Nullable CompoundNBT nbt) {
+    public ICapabilityProvider initCapabilities(ItemStack stack, @Nullable NBTTagCompound nbt) {
         return new ItemHandlerCapabilityProvider();
     }
 
     @Override
-    public void addInformation(ItemStack stack, @Nullable World world, List<ITextComponent> tooltip, ITooltipFlag flag) {
-        tooltip.add(new 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"));
-        }
+    public void addInformation(ItemStack stack, @Nullable World world, List<String> tooltip, ITooltipFlag flag) {
+        tooltip.add(TextFormatting.BLUE + "Rightclick" + TextFormatting.GRAY + " to place a random block");
+        tooltip.add(TextFormatting.BLUE + "Sneak + rightclick" + TextFormatting.GRAY + " to open inventory");
     }
 
     @Override
     public String getTranslationKey() {
-        return this.getRegistryName().toString();
+        return super.getTranslationKey();
     }
 
     public static void resetRandomness() {
@@ -222,24 +205,4 @@ 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,13 +1,12 @@
 package nl.requios.effortlessbuilding.item;
 
 import net.minecraft.client.util.ITooltipFlag;
-import net.minecraft.entity.player.PlayerEntity;
+import net.minecraft.creativetab.CreativeTabs;
+import net.minecraft.entity.EntityLivingBase;
+import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.item.Item;
-import net.minecraft.item.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;
@@ -21,16 +20,19 @@ 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, PlayerEntity player, Hand hand) {
+    public ActionResult<ItemStack> onItemRightClick(World world, EntityPlayer player, EnumHand hand) {
         if (player.isCreative()) {
             if (world.isRemote) EffortlessBuilding.log(player, "Reach upgrades are not necessary in creative.");
             if (world.isRemote) EffortlessBuilding.log(player, "Still want increased reach? Use the config.");
-            return new ActionResult<>(ActionResultType.PASS, player.getHeldItem(hand));
+            return new ActionResult<>(EnumActionResult.PASS, player.getHeldItem(hand));
         }
 
         ModifierSettingsManager.ModifierSettings modifierSettings = ModifierSettingsManager.getModifierSettings(player);
@@ -50,16 +52,16 @@ public class ItemReachUpgrade1 extends Item {
             SoundEvent soundEvent = new SoundEvent(new ResourceLocation("item.armor.equip_leather"));
             player.playSound(soundEvent, 1f, 1f);
         }
-        return new ActionResult<>(ActionResultType.PASS, player.getHeldItem(hand));
+        return new ActionResult<>(EnumActionResult.PASS, player.getHeldItem(hand));
     }
 
     @Override
-    public void addInformation(ItemStack stack, @Nullable World world, List<ITextComponent> tooltip, ITooltipFlag flag) {
-        tooltip.add(new StringTextComponent(TextFormatting.GRAY + "Consume to increase reach to " + TextFormatting.BLUE + BuildConfig.reach.maxReachLevel1.get()));
+    public void addInformation(ItemStack stack, @Nullable World world, List<String> tooltip, ITooltipFlag flag) {
+        tooltip.add(TextFormatting.GRAY + "Consume to increase reach to " + TextFormatting.BLUE + BuildConfig.reach.maxReachLevel1);
     }
 
     @Override
     public String getTranslationKey() {
-        return this.getRegistryName().toString();
+        return super.getTranslationKey();
     }
 }

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

@@ -1,13 +1,11 @@
 package nl.requios.effortlessbuilding.item;
 
 import net.minecraft.client.util.ITooltipFlag;
-import net.minecraft.entity.player.PlayerEntity;
+import net.minecraft.creativetab.CreativeTabs;
+import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.item.Item;
-import net.minecraft.item.ItemGroup;
 import net.minecraft.item.ItemStack;
 import net.minecraft.util.*;
-import net.minecraft.util.text.ITextComponent;
-import net.minecraft.util.text.StringTextComponent;
 import net.minecraft.util.text.TextFormatting;
 import net.minecraft.world.World;
 import nl.requios.effortlessbuilding.BuildConfig;
@@ -21,16 +19,19 @@ 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, PlayerEntity player, Hand hand) {
+    public ActionResult<ItemStack> onItemRightClick(World world, EntityPlayer player, EnumHand hand) {
         if (player.isCreative()) {
             if (world.isRemote) EffortlessBuilding.log(player, "Reach upgrades are not necessary in creative.");
             if (world.isRemote) EffortlessBuilding.log(player, "Still want increased reach? Use the config.");
-            return new ActionResult<>(ActionResultType.PASS, player.getHeldItem(hand));
+            return new ActionResult<>(EnumActionResult.PASS, player.getHeldItem(hand));
         }
 
         ModifierSettingsManager.ModifierSettings modifierSettings = ModifierSettingsManager.getModifierSettings(player);
@@ -54,17 +55,17 @@ public class ItemReachUpgrade2 extends Item {
             SoundEvent soundEvent = new SoundEvent(new ResourceLocation("item.armor.equip_leather"));
             player.playSound(soundEvent, 1f, 1f);
         }
-        return new ActionResult<>(ActionResultType.PASS, player.getHeldItem(hand));
+        return new ActionResult<>(EnumActionResult.PASS, player.getHeldItem(hand));
     }
 
     @Override
-    public void addInformation(ItemStack stack, @Nullable World world, List<ITextComponent> tooltip, ITooltipFlag flag) {
-        tooltip.add(new 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"));
+    public void addInformation(ItemStack stack, @Nullable World world, List<String> tooltip, ITooltipFlag flag) {
+        tooltip.add(TextFormatting.GRAY + "Consume to increase reach to " + TextFormatting.BLUE + BuildConfig.reach.maxReachLevel2);
+        tooltip.add(TextFormatting.GRAY + "Previous upgrades need to be consumed first");
     }
 
     @Override
     public String getTranslationKey() {
-        return this.getRegistryName().toString();
+        return super.getTranslationKey();
     }
 }

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

@@ -1,13 +1,11 @@
 package nl.requios.effortlessbuilding.item;
 
 import net.minecraft.client.util.ITooltipFlag;
-import net.minecraft.entity.player.PlayerEntity;
+import net.minecraft.creativetab.CreativeTabs;
+import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.item.Item;
-import net.minecraft.item.ItemGroup;
 import net.minecraft.item.ItemStack;
 import net.minecraft.util.*;
-import net.minecraft.util.text.ITextComponent;
-import net.minecraft.util.text.StringTextComponent;
 import net.minecraft.util.text.TextFormatting;
 import net.minecraft.world.World;
 import nl.requios.effortlessbuilding.BuildConfig;
@@ -21,16 +19,19 @@ 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, PlayerEntity player, Hand hand) {
+    public ActionResult<ItemStack> onItemRightClick(World world, EntityPlayer player, EnumHand hand) {
         if (player.isCreative()) {
             if (world.isRemote) EffortlessBuilding.log(player, "Reach upgrades are not necessary in creative.");
             if (world.isRemote) EffortlessBuilding.log(player, "Still want increased reach? Use the config.");
-            return new ActionResult<>(ActionResultType.PASS, player.getHeldItem(hand));
+            return new ActionResult<>(EnumActionResult.PASS, player.getHeldItem(hand));
         }
 
         ModifierSettingsManager.ModifierSettings modifierSettings = ModifierSettingsManager.getModifierSettings(player);
@@ -57,17 +58,17 @@ public class ItemReachUpgrade3 extends Item {
             SoundEvent soundEvent = new SoundEvent(new ResourceLocation("item.armor.equip_leather"));
             player.playSound(soundEvent, 1f, 1f);
         }
-        return new ActionResult<>(ActionResultType.PASS, player.getHeldItem(hand));
+        return new ActionResult<>(EnumActionResult.PASS, player.getHeldItem(hand));
     }
 
     @Override
-    public void addInformation(ItemStack stack, @Nullable World world, List<ITextComponent> tooltip, ITooltipFlag flag) {
-        tooltip.add(new 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"));
+    public void addInformation(ItemStack stack, @Nullable World world, List<String> tooltip, ITooltipFlag flag) {
+        tooltip.add(TextFormatting.GRAY + "Consume to increase reach to " + TextFormatting.BLUE + BuildConfig.reach.maxReachLevel3);
+        tooltip.add(TextFormatting.GRAY + "Previous upgrades need to be consumed first");
     }
 
     @Override
     public String getTranslationKey() {
-        return this.getRegistryName().toString();
+        return super.getTranslationKey();
     }
 }

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

@@ -1,35 +1,37 @@
 package nl.requios.effortlessbuilding.network;
 
+import io.netty.buffer.ByteBuf;
 import net.minecraft.block.Block;
-import net.minecraft.block.BlockState;
-import net.minecraft.entity.player.PlayerEntity;
-import net.minecraft.network.PacketBuffer;
+import net.minecraft.block.state.IBlockState;
+import net.minecraft.entity.player.EntityPlayer;
 import net.minecraft.util.math.BlockPos;
 import net.minecraft.util.math.Vec3d;
-import net.minecraftforge.fml.LogicalSide;
-import net.minecraftforge.fml.network.NetworkEvent;
+import net.minecraftforge.fml.common.network.simpleimpl.IMessage;
+import net.minecraftforge.fml.common.network.simpleimpl.IMessageHandler;
+import net.minecraftforge.fml.common.network.simpleimpl.MessageContext;
+import net.minecraftforge.fml.relauncher.Side;
 import nl.requios.effortlessbuilding.EffortlessBuilding;
 import nl.requios.effortlessbuilding.buildmodifier.BlockSet;
 import nl.requios.effortlessbuilding.buildmodifier.UndoRedo;
+import nl.requios.effortlessbuilding.proxy.ClientProxy;
 
 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 {
+public class AddUndoMessage implements IMessage {
     private BlockPos coordinate;
-    private BlockState previousBlockState;
-    private BlockState newBlockState;
+    private IBlockState previousBlockState;
+    private IBlockState newBlockState;
 
     public AddUndoMessage() {
-        coordinate = BlockPos.ZERO;
+        coordinate = BlockPos.ORIGIN;
         previousBlockState = null;
         newBlockState = null;
     }
 
-    public AddUndoMessage(BlockPos coordinate, BlockState previousBlockState, BlockState newBlockState) {
+    public AddUndoMessage(BlockPos coordinate, IBlockState previousBlockState, IBlockState newBlockState) {
         this.coordinate = coordinate;
         this.previousBlockState = previousBlockState;
         this.newBlockState = newBlockState;
@@ -39,49 +41,54 @@ public class AddUndoMessage {
         return coordinate;
     }
 
-    public BlockState getPreviousBlockState() {
+    public IBlockState getPreviousBlockState() {
         return previousBlockState;
     }
 
-    public BlockState getNewBlockState() {
+    public IBlockState 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));
+    @Override
+    public void toBytes(ByteBuf buf) {
+        buf.writeInt(this.coordinate.getX());
+        buf.writeInt(this.coordinate.getY());
+        buf.writeInt(this.coordinate.getZ());
+        buf.writeInt(Block.getStateId(this.previousBlockState));
+        buf.writeInt(Block.getStateId(this.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);
+    @Override
+    public void fromBytes(ByteBuf buf) {
+        coordinate = new BlockPos(buf.readInt(), buf.readInt(), buf.readInt());
+        previousBlockState = Block.getStateById(buf.readInt());
+        newBlockState = Block.getStateById(buf.readInt());
     }
 
-    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
+    // The params of the IMessageHandler are <REQ, REPLY>
+    public static class MessageHandler implements IMessageHandler<AddUndoMessage, IMessage> {
+        // Do note that the default constructor is required, but implicitly defined in this case
+
+        @Override
+        public IMessage onMessage(AddUndoMessage message, MessageContext ctx) {
+            //EffortlessBuilding.log("message received on " + ctx.side + " side");
+
+            if (ctx.side == Side.CLIENT){
+                //Received clientside
+
+                EffortlessBuilding.proxy.getThreadListenerFromContext(ctx).addScheduledTask(() -> {
+                    EntityPlayer player = EffortlessBuilding.proxy.getPlayerEntityFromContext(ctx);
 
-                    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 ArrayList<IBlockState>() {{add(message.getPreviousBlockState());}},
+                            new ArrayList<IBlockState>() {{add(message.getNewBlockState());}},
                             new Vec3d(0,0,0),
                             message.getCoordinate(), message.getCoordinate()));
-                }
-            });
-            ctx.get().setPacketHandled(true);
+                });
+            }
+            return null;
         }
     }
 }

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

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

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

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

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

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

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

@@ -1,44 +1,57 @@
 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 io.netty.buffer.ByteBuf;
+import net.minecraft.block.Block;
+import net.minecraft.block.state.IBlockState;
+import net.minecraft.entity.player.EntityPlayer;
+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.relauncher.Side;
 import nl.requios.effortlessbuilding.EffortlessBuilding;
+import nl.requios.effortlessbuilding.buildmodifier.BlockSet;
 import nl.requios.effortlessbuilding.buildmodifier.UndoRedo;
+import nl.requios.effortlessbuilding.proxy.ClientProxy;
 
-import java.util.function.Supplier;
+import java.util.ArrayList;
 
 /***
  * Sends a message to the client asking to clear the undo and redo stacks.
  */
-public class ClearUndoMessage {
+public class ClearUndoMessage implements IMessage {
 
     public ClearUndoMessage() {
     }
 
-    public static void encode(ClearUndoMessage message, PacketBuffer buf) {
-
+    @Override
+    public void toBytes(ByteBuf buf) {
     }
 
-    public static ClearUndoMessage decode(PacketBuffer buf) {
-        return new ClearUndoMessage();
+    @Override
+    public void fromBytes(ByteBuf buf) {
     }
 
-    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);
+    // The params of the IMessageHandler are <REQ, REPLY>
+    public static class MessageHandler implements IMessageHandler<ClearUndoMessage, IMessage> {
+        // Do note that the default constructor is required, but implicitly defined in this case
+
+        @Override
+        public IMessage onMessage(ClearUndoMessage message, MessageContext ctx) {
+            //EffortlessBuilding.log("message received on " + ctx.side + " side");
+
+            if (ctx.side == Side.CLIENT){
+                //Received clientside
+
+                EffortlessBuilding.proxy.getThreadListenerFromContext(ctx).addScheduledTask(() -> {
+                    EntityPlayer player = EffortlessBuilding.proxy.getPlayerEntityFromContext(ctx);
 
                     //Add to undo stack clientside
                     UndoRedo.clear(player);
-                }
-            });
-            ctx.get().setPacketHandled(true);
+                });
+            }
+            return null;
         }
     }
 }

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

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

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

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

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

@@ -1,24 +1,25 @@
 package nl.requios.effortlessbuilding.network;
 
-import net.minecraft.entity.player.PlayerEntity;
-import net.minecraft.network.PacketBuffer;
+import io.netty.buffer.ByteBuf;
+import net.minecraft.entity.player.EntityPlayer;
+import net.minecraft.util.IThreadListener;
 import net.minecraft.util.math.BlockPos;
 import net.minecraft.util.math.Vec3d;
-import net.minecraftforge.fml.network.NetworkEvent;
+import net.minecraftforge.fml.common.network.simpleimpl.IMessage;
+import net.minecraftforge.fml.common.network.simpleimpl.IMessageHandler;
+import net.minecraftforge.fml.common.network.simpleimpl.MessageContext;
 import nl.requios.effortlessbuilding.EffortlessBuilding;
 import nl.requios.effortlessbuilding.buildmodifier.Array;
 import nl.requios.effortlessbuilding.buildmodifier.Mirror;
 import nl.requios.effortlessbuilding.buildmodifier.ModifierSettingsManager;
 import nl.requios.effortlessbuilding.buildmodifier.RadialMirror;
 
-import java.util.function.Supplier;
-
-import static nl.requios.effortlessbuilding.buildmodifier.ModifierSettingsManager.ModifierSettings;
+import static nl.requios.effortlessbuilding.buildmodifier.ModifierSettingsManager.*;
 
 /**
  * Shares modifier settings (see ModifierSettingsManager) between server and client
  */
-public class ModifierSettingsMessage {
+public class ModifierSettingsMessage implements IMessage {
 
     private ModifierSettings modifierSettings;
 
@@ -29,9 +30,10 @@ public class ModifierSettingsMessage {
         this.modifierSettings = modifierSettings;
     }
 
-    public static void encode(ModifierSettingsMessage message, PacketBuffer buf) {
+    @Override
+    public void toBytes(ByteBuf buf) {
         //MIRROR
-        Mirror.MirrorSettings m = message.modifierSettings.getMirrorSettings();
+        Mirror.MirrorSettings m = modifierSettings.getMirrorSettings();
         buf.writeBoolean(m != null);
         if (m != null) {
             buf.writeBoolean(m.enabled);
@@ -47,7 +49,7 @@ public class ModifierSettingsMessage {
         }
 
         //ARRAY
-        Array.ArraySettings a = message.modifierSettings.getArraySettings();
+        Array.ArraySettings a = modifierSettings.getArraySettings();
         buf.writeBoolean(a != null);
         if (a != null) {
             buf.writeBoolean(a.enabled);
@@ -57,12 +59,12 @@ public class ModifierSettingsMessage {
             buf.writeInt(a.count);
         }
 
-        buf.writeBoolean(message.modifierSettings.doQuickReplace());
+        buf.writeBoolean(modifierSettings.doQuickReplace());
 
-        buf.writeInt(message.modifierSettings.getReachUpgrade());
+        buf.writeInt(modifierSettings.getReachUpgrade());
 
         //RADIAL MIRROR
-        RadialMirror.RadialMirrorSettings r = message.modifierSettings.getRadialMirrorSettings();
+        RadialMirror.RadialMirrorSettings r = modifierSettings.getRadialMirrorSettings();
         buf.writeBoolean(r != null);
         if (r != null) {
             buf.writeBoolean(r.enabled);
@@ -77,7 +79,8 @@ public class ModifierSettingsMessage {
         }
     }
 
-    public static ModifierSettingsMessage decode(PacketBuffer buf) {
+    @Override
+    public void fromBytes(ByteBuf buf) {
         //MIRROR
         Mirror.MirrorSettings m = new Mirror.MirrorSettings();
         if (buf.readBoolean()) {
@@ -90,7 +93,7 @@ public class ModifierSettingsMessage {
             boolean mirrorDrawLines = buf.readBoolean();
             boolean mirrorDrawPlanes = buf.readBoolean();
             m = new Mirror.MirrorSettings(mirrorEnabled, mirrorPosition, mirrorX, mirrorY, mirrorZ, mirrorRadius,
-                    mirrorDrawLines, mirrorDrawPlanes);
+                            mirrorDrawLines, mirrorDrawPlanes);
         }
 
         //ARRAY
@@ -117,26 +120,35 @@ public class ModifierSettingsMessage {
             boolean radialMirrorDrawLines = buf.readBoolean();
             boolean radialMirrorDrawPlanes = buf.readBoolean();
             r = new RadialMirror.RadialMirrorSettings(radialMirrorEnabled, radialMirrorPosition, radialMirrorSlices,
-                    radialMirrorAlternate, radialMirrorRadius, radialMirrorDrawLines, radialMirrorDrawPlanes);
+                            radialMirrorAlternate, radialMirrorRadius, radialMirrorDrawLines, radialMirrorDrawPlanes);
         }
 
-        ModifierSettings modifierSettings = new ModifierSettings(m, a, r, quickReplace, reachUpgrade);
-        return new ModifierSettingsMessage(modifierSettings);
+        modifierSettings = new ModifierSettings(m, a, r, quickReplace, reachUpgrade);
     }
 
-    public static class Handler
-    {
-        public static void handle(ModifierSettingsMessage message, Supplier<NetworkEvent.Context> ctx)
-        {
-            ctx.get().enqueueWork(() -> {
-                PlayerEntity player = EffortlessBuilding.proxy.getPlayerEntityFromContext(ctx);
+    // The params of the IMessageHandler are <REQ, REPLY>
+    public static class MessageHandler implements IMessageHandler<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);
 
                 // Sanitize
-                ModifierSettingsManager.sanitize(message.modifierSettings, player);
+                ModifierSettingsManager.sanitize(modifierSettings, player);
 
-                ModifierSettingsManager.setModifierSettings(player, message.modifierSettings);
+                ModifierSettingsManager.setModifierSettings(player, modifierSettings);
             });
-            ctx.get().setPacketHandled(true);
+            // No response packet
+            return null;
         }
     }
 }

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

@@ -1,32 +0,0 @@
-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,21 +1,27 @@
 package nl.requios.effortlessbuilding.network;
 
-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.minecraftforge.fml.LogicalSide;
-import net.minecraftforge.fml.network.NetworkEvent;
+import io.netty.buffer.ByteBuf;
+import net.minecraft.block.Block;
+import net.minecraft.block.state.IBlockState;
+import net.minecraft.entity.player.EntityPlayer;
+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.relauncher.Side;
 import nl.requios.effortlessbuilding.EffortlessBuilding;
+import nl.requios.effortlessbuilding.buildmodifier.BlockSet;
+import nl.requios.effortlessbuilding.buildmodifier.UndoRedo;
 import nl.requios.effortlessbuilding.proxy.ClientProxy;
 
-import java.util.function.Supplier;
+import java.util.ArrayList;
 
 /***
  * Sends a message to the client asking for its lookat (objectmouseover) data.
  * This is then sent back with a BlockPlacedMessage.
  */
-public class RequestLookAtMessage {
+public class RequestLookAtMessage implements IMessage {
     private boolean placeStartPos;
 
     public RequestLookAtMessage() {
@@ -30,35 +36,38 @@ public class RequestLookAtMessage {
         return placeStartPos;
     }
 
-    public static void encode(RequestLookAtMessage message, PacketBuffer buf) {
-        buf.writeBoolean(message.placeStartPos);
+    @Override
+    public void toBytes(ByteBuf buf) {
+        buf.writeBoolean(this.placeStartPos);
     }
 
-    public static RequestLookAtMessage decode(PacketBuffer buf) {
-        boolean placeStartPos = buf.readBoolean();
-        return new RequestLookAtMessage(placeStartPos);
+    @Override
+    public void fromBytes(ByteBuf buf) {
+        placeStartPos = buf.readBoolean();
     }
 
-    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
-                    PlayerEntity player = EffortlessBuilding.proxy.getPlayerEntityFromContext(ctx);
+    // 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
 
-                    //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());
-                    }
-                }
-            });
-            ctx.get().setPacketHandled(true);
+        @Override
+        public IMessage onMessage(RequestLookAtMessage message, MessageContext ctx) {
+            //EffortlessBuilding.log("message received on " + ctx.side + " side");
+
+            if (ctx.side == Side.CLIENT){
+                //Received clientside
+                //Send back your info
+
+//                EffortlessBuilding.proxy.getThreadListenerFromContext(ctx).addScheduledTask(() -> {
+//                    EntityPlayer 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.
+                return new BlockPlacedMessage(ClientProxy.previousLookAt, message.getPlaceStartPos());
+            }
+            return null;
         }
     }
 }

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

@@ -1,79 +0,0 @@
-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,104 +1,173 @@
 package nl.requios.effortlessbuilding.proxy;
 
-import net.minecraft.block.BlockState;
+import net.minecraft.block.Block;
 import net.minecraft.block.SoundType;
+import net.minecraft.block.state.IBlockState;
 import net.minecraft.client.Minecraft;
-import net.minecraft.client.entity.player.ClientPlayerEntity;
-import net.minecraft.client.gui.ScreenManager;
-import net.minecraft.client.gui.screen.Screen;
+import net.minecraft.client.entity.EntityPlayerSP;
+import net.minecraft.client.gui.GuiScreen;
+import net.minecraft.client.renderer.block.model.ModelResourceLocation;
 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.client.util.InputMappings;
-import net.minecraft.entity.player.PlayerEntity;
-import net.minecraft.item.BlockItem;
+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.item.ItemStack;
-import net.minecraft.util.Hand;
+import net.minecraft.util.EnumHand;
+import net.minecraft.util.IThreadListener;
 import net.minecraft.util.ResourceLocation;
 import net.minecraft.util.SoundCategory;
-import net.minecraft.util.math.*;
+import net.minecraft.util.math.BlockPos;
+import net.minecraft.util.math.RayTraceResult;
 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.InputEvent;
+import net.minecraftforge.client.event.ModelRegistryEvent;
 import net.minecraftforge.client.event.TextureStitchEvent;
+import net.minecraftforge.client.model.ModelLoader;
+import net.minecraftforge.client.settings.IKeyConflictContext;
 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.event.entity.EntityJoinWorldEvent;
 import net.minecraftforge.fml.client.registry.ClientRegistry;
 import net.minecraftforge.fml.common.Mod;
-import net.minecraftforge.fml.event.lifecycle.FMLClientSetupEvent;
-import net.minecraftforge.fml.event.lifecycle.FMLCommonSetupEvent;
-import net.minecraftforge.fml.network.NetworkEvent;
+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.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 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.network.*;
+import nl.requios.effortlessbuilding.render.RenderHandler;
 import nl.requios.effortlessbuilding.render.ShaderHandler;
-import org.lwjgl.glfw.GLFW;
+import nl.requios.effortlessbuilding.network.*;
+import org.lwjgl.input.Keyboard;
 
 import javax.annotation.Nullable;
 import java.util.HashMap;
-import java.util.function.Supplier;
 
-@Mod.EventBusSubscriber(value = {Dist.CLIENT})
+@Mod.EventBusSubscriber(Side.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;
 
-    @Override
-    public void setup(FMLCommonSetupEvent event) {}
+    private static final HashMap<BuildModes.BuildModeEnum, TextureAtlasSprite> buildModeIcons = new HashMap<>();
+    private static final HashMap<ModeOptions.ActionEnum, TextureAtlasSprite> modeOptionIcons = new HashMap<>();
 
     @Override
-    public void clientSetup(FMLClientSetupEvent event) {
+    public void preInit(FMLPreInitializationEvent event) {
+        ShaderHandler.init();
+    }
+
+    @Override
+    public void init(FMLInitializationEvent event) {
         // register key bindings
         keyBindings = new KeyBinding[7];
 
         // instantiate the key bindings
-        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") {
+        keyBindings[0] = new KeyBinding("key.effortlessbuilding.hud.desc", KeyConflictContext.UNIVERSAL, Keyboard.KEY_ADD, "key.effortlessbuilding.category");
+        keyBindings[1] = new KeyBinding("key.effortlessbuilding.replace.desc", KeyConflictContext.IN_GAME, Keyboard.KEY_SUBTRACT, "key.effortlessbuilding.category");
+        keyBindings[2] = new KeyBinding("key.effortlessbuilding.creative.desc", KeyConflictContext.IN_GAME, Keyboard.KEY_NONE, "key.effortlessbuilding.category");
+        keyBindings[3] = new KeyBinding("key.effortlessbuilding.mode.desc", KeyConflictContext.IN_GAME, Keyboard.KEY_LMENU, "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;
+                if (other.getKeyCode() == 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");
+        keyBindings[4] = new KeyBinding("key.effortlessbuilding.undo.desc", KeyConflictContext.IN_GAME, KeyModifier.CONTROL, Keyboard.KEY_Z, "key.effortlessbuilding.category");
+        keyBindings[5] = new KeyBinding("key.effortlessbuilding.redo.desc", KeyConflictContext.IN_GAME, KeyModifier.CONTROL, Keyboard.KEY_Y, "key.effortlessbuilding.category");
+        keyBindings[6] = new KeyBinding("key.effortlessbuilding.altplacement.desc", KeyConflictContext.IN_GAME, Keyboard.KEY_LCONTROL, "key.effortlessbuilding.category");
+//        keyBindings[7] = new KeyBinding("Reload shaders", Keyboard.KEY_TAB, "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));
     }
 
-    public PlayerEntity getPlayerEntityFromContext(Supplier<NetworkEvent.Context> ctx){
-        return (ctx.get().getDirection().getReceptionSide() == LogicalSide.CLIENT ? Minecraft.getInstance().player : ctx.get().getSender());
+    @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));
+        }
+
+        for ( final ModeOptions.ActionEnum action : ModeOptions.ActionEnum.values() )
+        {
+            final ResourceLocation sprite = new ResourceLocation("effortlessbuilding", "icons/" + action.name().toLowerCase());
+            modeOptionIcons.put( action, map.registerSprite(sprite));
+        }
+    }
+
+    public static TextureAtlasSprite getBuildModeIcon(BuildModes.BuildModeEnum mode) {
+        return buildModeIcons.get(mode);
+    }
+
+    public static TextureAtlasSprite getModeOptionIcon(ModeOptions.ActionEnum action) {
+        return modeOptionIcons.get(action);
     }
 
     @SubscribeEvent
@@ -108,7 +177,7 @@ public class ClientProxy implements IProxy {
             onMouseInput();
 
             //Update previousLookAt
-            RayTraceResult objectMouseOver = Minecraft.getInstance().objectMouseOver;
+            RayTraceResult objectMouseOver = Minecraft.getMinecraft().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;
 
@@ -118,84 +187,69 @@ public class ClientProxy implements IProxy {
                 return;
             }
 
-            if (objectMouseOver.getType() == RayTraceResult.Type.BLOCK) {
-                if (currentLookAt.getType() != RayTraceResult.Type.BLOCK) {
+            if (objectMouseOver.typeOfHit == RayTraceResult.Type.BLOCK) {
+                if (currentLookAt.typeOfHit != RayTraceResult.Type.BLOCK) {
                     currentLookAt = objectMouseOver;
                     previousLookAt = objectMouseOver;
                 } else {
-                    if (((BlockRayTraceResult) currentLookAt).getPos() != ((BlockRayTraceResult) objectMouseOver).getPos()) {
+                    if (currentLookAt.getBlockPos() != objectMouseOver.getBlockPos()) {
                         previousLookAt = currentLookAt;
                         currentLookAt = objectMouseOver;
                     }
                 }
             }
-
         } else if (event.phase == TickEvent.Phase.END){
-            Screen gui = Minecraft.getInstance().currentScreen;
-            if(gui == null || !gui.isPauseScreen()) {
+            GuiScreen gui = Minecraft.getMinecraft().currentScreen;
+            if(gui == null || !gui.doesGuiPauseGame()) {
                 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;
+        Minecraft mc = Minecraft.getMinecraft();
+        EntityPlayerSP player = mc.player;
         if (player == null) return;
         BuildModes.BuildModeEnum buildMode = ModeSettingsManager.getModeSettings(player).getBuildMode();
 
-        if (Minecraft.getInstance().currentScreen != null ||
+        if (Minecraft.getMinecraft().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 ||
+                ItemStack currentItemStack = player.getHeldItem(EnumHand.MAIN_HAND);
+                if (currentItemStack.getItem() instanceof ItemBlock ||
                     (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, lookingAt == null ? new BlockPlacedMessage() : new BlockPlacedMessage(lookingAt, true));
+                    EffortlessBuilding.packetHandler.sendToServer(lookingAt == null ? new BlockPlacedMessage() : new BlockPlacedMessage(lookingAt, true));
 
-                        BuildModes.onBlockPlacedMessage(player, new BlockPlacedMessage(blockLookingAt, true));
-                        PacketHandler.INSTANCE.sendToServer(new BlockPlacedMessage(blockLookingAt, true));
+                    //play sound if further than normal
+                    if (lookingAt != null && lookingAt.typeOfHit == RayTraceResult.Type.BLOCK &&
+                        (lookingAt.hitVec.subtract(player.getPositionEyes(1f))).lengthSquared() > 25f &&
+                        itemStack.getItem() instanceof ItemBlock) {
 
-                        //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());
+                        IBlockState state = ((ItemBlock) itemStack.getItem()).getBlock().getDefaultState();
+                        BlockPos blockPos = lookingAt.getBlockPos();
+                        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(EnumHand.MAIN_HAND);
                     }
                 }
-            }
-            else if (buildMode == BuildModes.BuildModeEnum.NORMAL_PLUS) {
+            } else if (buildMode == BuildModes.BuildModeEnum.NORMAL_PLUS) {
                 placeCooldown--;
                 if (ModeOptions.getBuildSpeed() == ModeOptions.ActionEnum.FAST_SPEED) placeCooldown = 0;
             }
@@ -216,28 +270,21 @@ public class ClientProxy implements IProxy {
                 if (!ReachHelper.canBreakFar(player)) return;
 
                 RayTraceResult lookingAt = getLookingAt(player);
-                if (lookingAt != null && lookingAt.getType() == RayTraceResult.Type.BLOCK) {
-                    BlockRayTraceResult blockLookingAt = (BlockRayTraceResult) lookingAt;
+                BuildModes.onBlockBrokenMessage(player, lookingAt == null ? new BlockBrokenMessage() : new BlockBrokenMessage(lookingAt));
+                EffortlessBuilding.packetHandler.sendToServer(lookingAt == null ? new BlockBrokenMessage() : new BlockBrokenMessage(lookingAt));
 
-                    BuildModes.onBlockBrokenMessage(player, new BlockBrokenMessage(blockLookingAt));
-                    PacketHandler.INSTANCE.sendToServer(new BlockBrokenMessage(blockLookingAt));
+                //play sound if further than normal
+                if (lookingAt != null && lookingAt.typeOfHit == RayTraceResult.Type.BLOCK &&
+                    (lookingAt.hitVec.subtract(player.getPositionEyes(1f))).lengthSquared() > 25f) {
 
-                    //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());
+                    BlockPos blockPos = lookingAt.getBlockPos();
+                    IBlockState 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(EnumHand.MAIN_HAND);
                 }
-            }
-            else if (buildMode == BuildModes.BuildModeEnum.NORMAL_PLUS) {
+            } else if (buildMode == BuildModes.BuildModeEnum.NORMAL_PLUS) {
                 breakCooldown--;
                 if (ModeOptions.getBuildSpeed() == ModeOptions.ActionEnum.FAST_SPEED) breakCooldown = 0;
             }
@@ -247,11 +294,18 @@ public class ClientProxy implements IProxy {
         } else {
             breakCooldown = 0;
         }
+
+        if (mc.gameSettings.keyBindAttack.isPressed()) {
+            if (RadialMenu.instance.isVisible()) {
+                EffortlessBuilding.log(player, "mouse click");
+            }
+        }
+
     }
 
-    @SubscribeEvent(receiveCanceled = true)
+    @SubscribeEvent(priority = EventPriority.NORMAL, receiveCanceled = true)
     public static void onKeyPress(InputEvent.KeyInputEvent event) {
-        ClientPlayerEntity player = Minecraft.getInstance().player;
+        EntityPlayerSP player = Minecraft.getMinecraft().player;
 
         //Remember to send packet to server if necessary
         //Show Modifier Settings GUI
@@ -263,17 +317,17 @@ public class ClientProxy implements IProxy {
         if (keyBindings[1].isPressed()) {
             ModifierSettingsManager.ModifierSettings modifierSettings = ModifierSettingsManager.getModifierSettings(player);
             modifierSettings.setQuickReplace(!modifierSettings.doQuickReplace());
-            EffortlessBuilding.log(player, "Set " + TextFormatting.GOLD + "Quick Replace " + TextFormatting.RESET + (
+            EffortlessBuilding.log(player, "Set "+ TextFormatting.GOLD + "Quick Replace " + TextFormatting.RESET + (
                     modifierSettings.doQuickReplace() ? "on" : "off"));
-            PacketHandler.INSTANCE.sendToServer(new ModifierSettingsMessage(modifierSettings));
+            EffortlessBuilding.packetHandler.sendToServer(new ModifierSettingsMessage(modifierSettings));
         }
 
         //Creative/survival mode toggle
         if (keyBindings[2].isPressed()) {
             if (player.isCreative()) {
-                player.sendChatMessage("/gamemode survival");
+                player.sendChatMessage("/gamemode 0");
             } else {
-                player.sendChatMessage("/gamemode creative");
+                player.sendChatMessage("/gamemode 1");
             }
         }
 
@@ -281,14 +335,14 @@ public class ClientProxy implements IProxy {
         if (keyBindings[4].isPressed()) {
             ModeOptions.ActionEnum action = ModeOptions.ActionEnum.UNDO;
             ModeOptions.performAction(player, action);
-            PacketHandler.INSTANCE.sendToServer(new ModeActionMessage(action));
+            EffortlessBuilding.packetHandler.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));
+            EffortlessBuilding.packetHandler.sendToServer(new ModeActionMessage(action));
         }
 
         //Change placement mode
@@ -300,10 +354,10 @@ public class ClientProxy implements IProxy {
                 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]));
+                        EffortlessBuilding.packetHandler.sendToServer(new ModeActionMessage(option.actions[1]));
                     } else {
                         ModeOptions.performAction(player, option.actions[0]);
-                        PacketHandler.INSTANCE.sendToServer(new ModeActionMessage(option.actions[0]));
+                        EffortlessBuilding.packetHandler.sendToServer(new ModeActionMessage(option.actions[0]));
                     }
                 }
             }
@@ -318,8 +372,8 @@ public class ClientProxy implements IProxy {
     }
 
     public static void openModifierSettings() {
-        Minecraft mc = Minecraft.getInstance();
-        ClientPlayerEntity player = mc.player;
+        Minecraft mc = Minecraft.getMinecraft();
+        EntityPlayerSP player = mc.player;
 
         RadialMenu.instance.setVisibility(0f);
 
@@ -335,45 +389,29 @@ public class ClientProxy implements IProxy {
         }
     }
 
-    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) {
-        PlayerEntity player = Minecraft.getInstance().player;
+        EntityPlayer player = Minecraft.getMinecraft().player;
         if (player != null) {
             BuildModes.initializeMode(player);
         }
     }
 
     @Nullable
-    public static RayTraceResult getLookingAt(PlayerEntity player) {
-        World world = player.world;
+    public static RayTraceResult getLookingAt(EntityPlayer player) {
+//        World world = player.world;
 
         //base distance off of player ability (config)
         float raytraceRange = ReachHelper.getPlacementReach(player);
 
-        Vec3d look = player.getLookVec();
-        Vec3d start = new Vec3d(player.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));
+//        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);
     }
 
-    @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);
+    public static void logTranslate(String key) {
+        EffortlessBuilding.log(Minecraft.getMinecraft().player, I18n.format(key), true);
     }
 }

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

@@ -1,18 +1,43 @@
 package nl.requios.effortlessbuilding.proxy;
 
-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;
+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 java.util.function.Supplier;
+public interface IProxy
+{
+    /**
+     * Register entities and networking.
+     */
+    void preInit(FMLPreInitializationEvent event);
 
-public interface IProxy {
-    void setup(final FMLCommonSetupEvent event);
+    /**
+     * Register event listeners, recipes and advancements.
+     */
+    void init(FMLInitializationEvent event);
 
-    void clientSetup(final FMLClientSetupEvent 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);
 
-    PlayerEntity getPlayerEntityFromContext(Supplier<NetworkEvent.Context> ctx);
+    /**
+     * Server commands should be registered here.
+     */
+    void serverStarting(FMLServerStartingEvent event);
 
-    void logTranslate(PlayerEntity player, String prefix, String translationKey, String suffix, boolean actionBar);
+    /**
+     * 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);
 }

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

@@ -1,32 +1,45 @@
 package nl.requios.effortlessbuilding.proxy;
 
-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;
+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 java.util.function.Supplier;
-
-public class ServerProxy implements IProxy {
+public class ServerProxy implements IProxy
+{
     //Only physical server! Singleplayer server is seen as clientproxy
     @Override
-    public void setup(FMLCommonSetupEvent event) {
-
+    public void preInit(FMLPreInitializationEvent event)
+    {
     }
 
     @Override
-    public void clientSetup(FMLClientSetupEvent event) {}
-
-    public PlayerEntity getPlayerEntityFromContext(Supplier<NetworkEvent.Context> ctx){
-        return ctx.get().getSender();
+    public void init(FMLInitializationEvent event)
+    {
     }
 
     @Override
-    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));
+    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();
     }
 }

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

@@ -1,23 +1,21 @@
 package nl.requios.effortlessbuilding.render;
 
-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.block.state.IBlockState;
 import net.minecraft.client.Minecraft;
-import net.minecraft.client.entity.player.ClientPlayerEntity;
+import net.minecraft.client.entity.EntityPlayerSP;
 import net.minecraft.client.renderer.BlockRendererDispatcher;
-import net.minecraft.client.renderer.IRenderTypeBuffer;
-import net.minecraft.client.renderer.texture.AtlasTexture;
-import net.minecraft.entity.player.PlayerEntity;
+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.item.ItemStack;
-import net.minecraft.util.Direction;
+import net.minecraft.util.EnumFacing;
+import net.minecraft.util.ResourceLocation;
 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 net.minecraftforge.fml.relauncher.Side;
+import net.minecraftforge.fml.relauncher.SideOnly;
 import nl.requios.effortlessbuilding.BuildConfig;
 import nl.requios.effortlessbuilding.EffortlessBuilding;
 import nl.requios.effortlessbuilding.buildmode.BuildModes;
@@ -28,21 +26,24 @@ import nl.requios.effortlessbuilding.buildmodifier.BuildModifiers;
 import nl.requios.effortlessbuilding.buildmodifier.ModifierSettingsManager;
 import nl.requios.effortlessbuilding.buildmodifier.ModifierSettingsManager.ModifierSettings;
 import nl.requios.effortlessbuilding.compatibility.CompatHelper;
+import nl.requios.effortlessbuilding.helper.InventoryHelper;
 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.*;
+import org.lwjgl.opengl.ARBMultitexture;
+import org.lwjgl.opengl.ARBShaderObjects;
+import org.lwjgl.opengl.GL11;
 
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.List;
 import java.util.function.Consumer;
 
-@OnlyIn(Dist.CLIENT)
+@SideOnly(Side.CLIENT)
 public class BlockPreviewRenderer {
     private static List<BlockPos> previousCoordinates;
-    private static List<BlockState> previousBlockStates;
+    private static List<IBlockState> previousBlockStates;
     private static List<ItemStack> previousItemStacks;
     private static BlockPos previousFirstPos;
     private static BlockPos previousSecondPos;
@@ -51,13 +52,13 @@ public class BlockPreviewRenderer {
     static class PlacedData {
         float time;
         List<BlockPos> coordinates;
-        List<BlockState> blockStates;
+        List<IBlockState> blockStates;
         List<ItemStack> itemStacks;
         BlockPos firstPos;
         BlockPos secondPos;
         boolean breaking;
 
-        public PlacedData(float time, List<BlockPos> coordinates, List<BlockState> blockStates,
+        public PlacedData(float time, List<BlockPos> coordinates, List<IBlockState> blockStates,
                           List<ItemStack> itemStacks, BlockPos firstPos, BlockPos secondPos, boolean breaking) {
             this.time = time;
             this.coordinates = coordinates;
@@ -71,49 +72,52 @@ public class BlockPreviewRenderer {
 
     private static List<PlacedData> placedDataList = new ArrayList<>();
 
-    public static void render(MatrixStack matrixStack, IRenderTypeBuffer.Impl renderTypeBuffer, PlayerEntity player, ModifierSettings modifierSettings, ModeSettings modeSettings) {
+    private static final int primaryTextureUnit = 0;
+    private static final int secondaryTextureUnit = 2;
+
+    public static void render(EntityPlayer player, ModifierSettings modifierSettings, ModeSettings modeSettings) {
 
         //Render placed blocks with dissolve effect
         //Use fancy shader if config allows, otherwise no dissolve
-        if (BuildConfig.visuals.useShaders.get()) {
+        if (BuildConfig.visuals.useShaders) {
+            RenderHandler.beginBlockPreviews();
             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.get();
+                    double totalTime = MathHelper.clampedLerp(30, 60, placed.firstPos.distanceSq(placed.secondPos) / 100.0) * BuildConfig.visuals.dissolveTimeMultiplier;
                     float dissolve = (ClientProxy.ticksInGame - placed.time) / (float) totalTime;
-                    renderBlockPreviews(matrixStack, renderTypeBuffer, placed.coordinates, placed.blockStates, placed.itemStacks, dissolve, placed.firstPos, placed.secondPos, false, placed.breaking);
+                    renderBlockPreviews(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.get();
+            double totalTime = MathHelper.clampedLerp(30, 60, placed.firstPos.distanceSq(placed.secondPos) / 100.0) * BuildConfig.visuals.dissolveTimeMultiplier;
             return placed.time + totalTime < ClientProxy.ticksInGame;
         });
 
         //Render block previews
         RayTraceResult lookingAt = ClientProxy.getLookingAt(player);
-        if (modeSettings.getBuildMode() == BuildModes.BuildModeEnum.NORMAL) lookingAt = Minecraft.getInstance().objectMouseOver;
+        if (modeSettings.getBuildMode() == BuildModes.BuildModeEnum.NORMAL) lookingAt = Minecraft.getMinecraft().objectMouseOver;
 
         ItemStack mainhand = player.getHeldItemMainhand();
         boolean toolInHand = !(!mainhand.isEmpty() && CompatHelper.isItemBlockProxy(mainhand));
 
         BlockPos startPos = null;
-        Direction sideHit = null;
+        EnumFacing 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.getType() == RayTraceResult.Type.BLOCK) {
-            BlockRayTraceResult blockLookingAt = (BlockRayTraceResult) lookingAt;
-            startPos = blockLookingAt.getPos();
+        if (lookingAt != null && lookingAt.typeOfHit == RayTraceResult.Type.BLOCK) {
+            startPos = lookingAt.getBlockPos();
 
             //Check if tool (or none) in hand
-            //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());
+            boolean replaceable = player.world.getBlockState(startPos).getBlock().isReplaceable(player.world, startPos);
+            boolean becomesDoubleSlab = SurvivalHelper.doesBecomeDoubleSlab(player, startPos, lookingAt.sideHit);
             if (!modifierSettings.doQuickReplace() && !toolInHand && !replaceable && !becomesDoubleSlab) {
-                startPos = startPos.offset(blockLookingAt.getFace());
+                startPos = startPos.offset(lookingAt.sideHit);
             }
 
             //Get under tall grass and other replaceable blocks
@@ -121,8 +125,8 @@ public class BlockPreviewRenderer {
                 startPos = startPos.down();
             }
 
-            sideHit = blockLookingAt.getFace();
-            hitVec = blockLookingAt.getHitVec();
+            sideHit = lookingAt.sideHit;
+            hitVec = lookingAt.hitVec;
         }
 
         //Dont render if in normal mode and modifiers are disabled
@@ -145,8 +149,8 @@ public class BlockPreviewRenderer {
                 //get coordinates
                 List<BlockPos> startCoordinates = BuildModes.findCoordinates(player, startPos, breaking || modifierSettings.doQuickReplace());
 
-                //Remember first and last point for the shader
-                BlockPos firstPos = BlockPos.ZERO, secondPos = BlockPos.ZERO;
+                BlockPos firstPos = BlockPos.ORIGIN, secondPos = BlockPos.ORIGIN;
+                //Remember first and last pos for the shader
                 if (!startCoordinates.isEmpty()) {
                     firstPos = startCoordinates.get(0);
                     secondPos = startCoordinates.get(startCoordinates.size() - 1);
@@ -167,7 +171,7 @@ public class BlockPreviewRenderer {
 
                 //Get blockstates
                 List<ItemStack> itemStacks = new ArrayList<>();
-                List<BlockState> blockStates = new ArrayList<>();
+                List<IBlockState> blockStates = new ArrayList<>();
                 if (breaking) {
                     //Find blockstate of world
                     for (BlockPos coordinate : newCoordinates) {
@@ -208,20 +212,26 @@ public class BlockPreviewRenderer {
                     int blockCount;
 
                     //Use fancy shader if config allows, otherwise outlines
-                    if (BuildConfig.visuals.useShaders.get() && newCoordinates.size() < BuildConfig.visuals.shaderTreshold.get()) {
-                        blockCount = renderBlockPreviews(matrixStack, renderTypeBuffer, newCoordinates, blockStates, itemStacks, 0f, firstPos, secondPos, !breaking, breaking);
+                    if (BuildConfig.visuals.useShaders && newCoordinates.size() < BuildConfig.visuals.shaderTreshold) {
+
+                        RenderHandler.beginBlockPreviews();
+
+                        blockCount = renderBlockPreviews(newCoordinates, blockStates, itemStacks, 0f, firstPos, secondPos, !breaking, breaking);
+
+                        RenderHandler.endBlockPreviews();
                     } else {
-                        IVertexBuilder buffer = RenderHandler.beginLines(renderTypeBuffer);
+
+                        RenderHandler.beginLines();
 
                         Vec3d color = new Vec3d(1f, 1f, 1f);
                         if (breaking) color = new Vec3d(1f, 0f, 0f);
 
                         for (int i = newCoordinates.size() - 1; i >= 0; i--) {
-                            VoxelShape collisionShape = blockStates.get(i).getCollisionShape(player.world, newCoordinates.get(i));
-                            RenderHandler.renderBlockOutline(matrixStack, buffer, newCoordinates.get(i), collisionShape, color);
+                            AxisAlignedBB boundingBox = blockStates.get(i).getBoundingBox(player.world, newCoordinates.get(i));
+                            RenderHandler.renderBlockOutline(newCoordinates.get(i), boundingBox, color);
                         }
 
-                        RenderHandler.endLines(renderTypeBuffer);
+                        RenderHandler.endLines();
 
                         blockCount = newCoordinates.size();
                     }
@@ -257,30 +267,29 @@ public class BlockPreviewRenderer {
 
             }
 
-            IVertexBuilder buffer = RenderHandler.beginLines(renderTypeBuffer);
+            RenderHandler.beginLines();
             //Draw outlines if tool in hand
             //Find proper raytrace: either normal range or increased range depending on canBreakFar
-            RayTraceResult objectMouseOver = Minecraft.getInstance().objectMouseOver;
+            RayTraceResult objectMouseOver = Minecraft.getMinecraft().objectMouseOver;
             RayTraceResult breakingRaytrace = ReachHelper.canBreakFar(player) ? lookingAt : objectMouseOver;
-            if (toolInHand && breakingRaytrace != null && breakingRaytrace.getType() == RayTraceResult.Type.BLOCK) {
-                BlockRayTraceResult blockBreakingRaytrace = (BlockRayTraceResult) breakingRaytrace;
-                List<BlockPos> breakCoordinates = BuildModifiers.findCoordinates(player, blockBreakingRaytrace.getPos());
+            if (toolInHand && breakingRaytrace != null && breakingRaytrace.typeOfHit == RayTraceResult.Type.BLOCK) {
+                List<BlockPos> breakCoordinates = BuildModifiers.findCoordinates(player, breakingRaytrace.getBlockPos());
 
                 //Only render first outline if further than normal reach
-                boolean excludeFirst = objectMouseOver != null && objectMouseOver.getType() == RayTraceResult.Type.BLOCK;
+                boolean excludeFirst = objectMouseOver != null && objectMouseOver.typeOfHit == RayTraceResult.Type.BLOCK;
                 for (int i = excludeFirst ? 1 : 0; i < breakCoordinates.size(); i++) {
                     BlockPos coordinate = breakCoordinates.get(i);
 
-                    BlockState blockState = player.world.getBlockState(coordinate);
+                    IBlockState blockState = player.world.getBlockState(coordinate);
                     if (!blockState.getBlock().isAir(blockState, player.world, coordinate)) {
                         if (SurvivalHelper.canBreak(player.world, player, coordinate) || i == 0) {
-                            VoxelShape collisionShape = blockState.getCollisionShape(player.world, coordinate);
-                            RenderHandler.renderBlockOutline(matrixStack, buffer, coordinate, collisionShape, new Vec3d(0f, 0f, 0f));
+                            AxisAlignedBB boundingBox = blockState.getBoundingBox(player.world, coordinate);
+                            RenderHandler.renderBlockOutline(coordinate, boundingBox, new Vec3d(0f, 0f, 0f));
                         }
                     }
                 }
             }
-            RenderHandler.endLines(renderTypeBuffer);
+            RenderHandler.endLines();
         }
     }
 
@@ -288,32 +297,35 @@ public class BlockPreviewRenderer {
     public static boolean doRenderBlockPreviews(ModifierSettings modifierSettings, ModeSettings modeSettings, BlockPos startPos) {
         return modeSettings.getBuildMode() != BuildModes.BuildModeEnum.NORMAL ||
                (startPos != null && BuildModifiers.isEnabled(modifierSettings, startPos)) ||
-               BuildConfig.visuals.alwaysShowBlockPreview.get();
+               BuildConfig.visuals.alwaysShowBlockPreview;
     }
 
-    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) {
-        PlayerEntity player = Minecraft.getInstance().player;
+    protected static int renderBlockPreviews(List<BlockPos> coordinates, List<IBlockState> blockStates,
+                                              List<ItemStack> itemStacks, float dissolve, BlockPos firstPos,
+                                              BlockPos secondPos, boolean checkCanPlace, boolean red) {
+        EntityPlayer player = Minecraft.getMinecraft().player;
         ModifierSettings modifierSettings = ModifierSettingsManager.getModifierSettings(player);
-        BlockRendererDispatcher dispatcher = Minecraft.getInstance().getBlockRendererDispatcher();
+        BlockRendererDispatcher dispatcher = Minecraft.getMinecraft().getBlockRendererDispatcher();
         int blocksValid = 0;
 
         if (coordinates.isEmpty()) return blocksValid;
 
         for (int i = coordinates.size() - 1; i >= 0; i--) {
             BlockPos blockPos = coordinates.get(i);
-            BlockState blockState = blockStates.get(i);
+            IBlockState 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.getNewBlockState(blockPos) == blockState*/) || //TODO enable (breaks the breaking shader)
-                SurvivalHelper.canPlace(player.world, player, blockPos, blockState, itemstack, modifierSettings.doQuickReplace(), Direction.UP)) {
+            if ((!checkCanPlace /*&& player.world.getNewBlockState(blockPos) == blockState*/) || //TODO enable (breaks breaking shader)
+                SurvivalHelper.canPlace(player.world, player, blockPos, blockState, itemstack, modifierSettings.doQuickReplace(), EnumFacing.UP)) {
 
-                RenderHandler.renderBlockPreview(matrixStack, renderTypeBuffer, dispatcher, blockPos, blockState, dissolve, firstPos, secondPos, red);
+                ShaderHandler.useShader(ShaderHandler.dissolve, generateShaderCallback(dissolve,
+                        new Vec3d(blockPos), new Vec3d(firstPos), new Vec3d(secondPos),
+                        blockPos == secondPos, red));
+                RenderHandler.renderBlockPreview(dispatcher, blockPos, blockState);
                 blocksValid++;
             }
         }
@@ -324,9 +336,9 @@ public class BlockPreviewRenderer {
         onBlocksPlaced(previousCoordinates, previousItemStacks, previousBlockStates, previousFirstPos, previousSecondPos);
     }
 
-    public static void onBlocksPlaced(List<BlockPos> coordinates, List<ItemStack> itemStacks, List<BlockState> blockStates,
+    public static void onBlocksPlaced(List<BlockPos> coordinates, List<ItemStack> itemStacks, List<IBlockState> blockStates,
                                       BlockPos firstPos, BlockPos secondPos) {
-        ClientPlayerEntity player = Minecraft.getInstance().player;
+        EntityPlayerSP player = Minecraft.getMinecraft().player;
         ModifierSettings modifierSettings = ModifierSettingsManager.getModifierSettings(player);
         ModeSettings modeSettings = ModeSettingsManager.getModeSettings(player);
 
@@ -335,7 +347,7 @@ public class BlockPreviewRenderer {
 
             //Save current coordinates, blockstates and itemstacks
             if (!coordinates.isEmpty() && blockStates.size() == coordinates.size() &&
-                coordinates.size() > 1 && coordinates.size() < BuildConfig.visuals.shaderTreshold.get()) {
+                coordinates.size() > 1 && coordinates.size() < BuildConfig.visuals.shaderTreshold) {
 
                 placedDataList.add(new PlacedData(ClientProxy.ticksInGame, coordinates, blockStates,
                         itemStacks, firstPos, secondPos, false));
@@ -348,9 +360,9 @@ public class BlockPreviewRenderer {
         onBlocksBroken(previousCoordinates, previousItemStacks, previousBlockStates, previousFirstPos, previousSecondPos);
     }
 
-    public static void onBlocksBroken(List<BlockPos> coordinates, List<ItemStack> itemStacks, List<BlockState> blockStates,
+    public static void onBlocksBroken(List<BlockPos> coordinates, List<ItemStack> itemStacks, List<IBlockState> blockStates,
                                       BlockPos firstPos, BlockPos secondPos) {
-        ClientPlayerEntity player = Minecraft.getInstance().player;
+        EntityPlayerSP player = Minecraft.getMinecraft().player;
         ModifierSettings modifierSettings = ModifierSettingsManager.getModifierSettings(player);
         ModeSettings modeSettings = ModeSettingsManager.getModeSettings(player);
 
@@ -359,7 +371,7 @@ public class BlockPreviewRenderer {
 
             //Save current coordinates, blockstates and itemstacks
             if (!coordinates.isEmpty() && blockStates.size() == coordinates.size() &&
-                coordinates.size() > 1 && coordinates.size() < BuildConfig.visuals.shaderTreshold.get()) {
+                coordinates.size() > 1 && coordinates.size() < BuildConfig.visuals.shaderTreshold) {
 
                 sortOnDistanceToPlayer(coordinates, player);
 
@@ -370,13 +382,53 @@ public class BlockPreviewRenderer {
 
     }
 
+    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");
 
-    private static void sortOnDistanceToPlayer(List<BlockPos> coordinates, PlayerEntity player) {
+            GlStateManager.enableTexture2D();
+            GL11.glGetInteger(GL11.GL_TEXTURE_BINDING_2D);
+
+            //mask
+            ARBShaderObjects.glUniform1iARB(maskUniform, secondaryTextureUnit);
+            OpenGlHelper.setActiveTexture(ARBMultitexture.GL_TEXTURE0_ARB + secondaryTextureUnit);
+            GL11.glBindTexture(GL11.GL_TEXTURE_2D, mc.renderEngine.getTexture(ShaderHandler.shaderMaskTextureLocation).getGlTextureId());
+
+            //image
+            ARBShaderObjects.glUniform1iARB(imageUniform, primaryTextureUnit);
+            OpenGlHelper.setActiveTexture(ARBMultitexture.GL_TEXTURE0_ARB + primaryTextureUnit);
+            GL11.glBindTexture(GL11.GL_TEXTURE_2D, mc.renderEngine.getTexture(TextureMap.LOCATION_BLOCKS_TEXTURE).getGlTextureId());
+
+            //blockpos
+            ARBShaderObjects.glUniform3fARB(blockposUniform, (float) blockpos.x, (float) blockpos.y, (float) blockpos.z);
+            ARBShaderObjects.glUniform3fARB(firstposUniform, (float) firstpos.x, (float) firstpos.y, (float) firstpos.z);
+            ARBShaderObjects.glUniform3fARB(secondposUniform, (float) secondpos.x, (float) secondpos.y, (float) secondpos.z);
+
+            //dissolve
+            ARBShaderObjects.glUniform1fARB(percentileUniform, dissolve);
+            //highlight
+            ARBShaderObjects.glUniform1iARB(highlightUniform, highlight ? 1 : 0);
+            //red
+            ARBShaderObjects.glUniform1iARB(redUniform, red ? 1 : 0);
+        };
+    }
+
+    private static void sortOnDistanceToPlayer(List<BlockPos> coordinates, EntityPlayer player) {
 
         Collections.sort(coordinates, (lhs, rhs) -> {
             // -1 - less than, 1 - greater than, 0 - equal
-            double lhsDistanceToPlayer = new Vec3d(lhs).subtract(player.getEyePosition(1f)).lengthSquared();
-            double rhsDistanceToPlayer = new Vec3d(rhs).subtract(player.getEyePosition(1f)).lengthSquared();
+            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);
         });
 

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

@@ -1,245 +0,0 @@
-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,23 +1,18 @@
 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.api.distmarker.Dist;
-import net.minecraftforge.api.distmarker.OnlyIn;
+import net.minecraftforge.fml.relauncher.Side;
+import net.minecraftforge.fml.relauncher.SideOnly;
 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;
 
-import java.awt.*;
-
-@OnlyIn(Dist.CLIENT)
+@SideOnly(Side.CLIENT)
 public class ModifierRenderer {
 
     protected static final Color colorX = new Color(255, 72, 52);
@@ -28,7 +23,9 @@ 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(MatrixStack matrixStack, IRenderTypeBuffer.Impl renderTypeBuffer, ModifierSettingsManager.ModifierSettings modifierSettings) {
+    public static void render(ModifierSettingsManager.ModifierSettings modifierSettings) {
+        RenderHandler.beginLines();
+
         //Mirror lines and areas
         Mirror.MirrorSettings m = modifierSettings.getMirrorSettings();
         if (m != null && m.enabled && (m.mirrorX || m.mirrorY || m.mirrorZ))
@@ -41,28 +38,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(matrixStack, renderTypeBuffer, posA, posB, colorX, m.drawLines, m.drawPlanes, true);
+                drawMirrorPlane(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(matrixStack, renderTypeBuffer, posA, posB, colorY, m.drawLines, m.drawPlanes);
+                drawMirrorPlaneY(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(matrixStack, renderTypeBuffer, posA, posB, colorZ, m.drawLines, m.drawPlanes, true);
+                drawMirrorPlane(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(matrixStack, renderTypeBuffer, m);
+                drawMirrorLines(m);
             }
         }
 
@@ -83,95 +80,96 @@ 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(matrixStack, renderTypeBuffer, posA, posB, colorRadial, r.drawLines, r.drawPlanes, false);
+                drawMirrorPlane(posA, posB, colorRadial, r.drawLines, r.drawPlanes, false);
             }
         }
+
+        RenderHandler.endLines();
     }
 
 
     //----Mirror----
 
-    protected static void drawMirrorPlane(MatrixStack matrixStack, IRenderTypeBuffer.Impl renderTypeBuffer, Vec3d posA, Vec3d posB, Color c, boolean drawLines, boolean drawPlanes, boolean drawVerticalLines) {
+    protected static void drawMirrorPlane(Vec3d posA, Vec3d posB, Color c, boolean drawLines, boolean drawPlanes, boolean drawVerticalLines) {
 
-//        GL11.glColor4d(c.getRed(), c.getGreen(), c.getBlue(), planeAlpha);
-        Matrix4f matrixPos = matrixStack.getLast().getMatrix();
+        GL11.glColor4d(c.getRed(), c.getGreen(), c.getBlue(), planeAlpha);
+        Tessellator tessellator = Tessellator.getInstance();
+        BufferBuilder bufferBuilder = tessellator.getBuffer();
 
         if (drawPlanes) {
-            IVertexBuilder buffer = RenderHandler.beginPlanes(renderTypeBuffer);
+            bufferBuilder.begin(GL11.GL_TRIANGLE_STRIP, DefaultVertexFormats.POSITION_COLOR);
 
-            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();
+            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();
 
-            RenderHandler.endPlanes(renderTypeBuffer);
+            tessellator.draw();
         }
 
         if (drawLines) {
-            IVertexBuilder buffer = RenderHandler.beginLines(renderTypeBuffer);
-
             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();
+            bufferBuilder.begin(GL11.GL_LINES, DefaultVertexFormats.POSITION_COLOR);
+
+            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();
             if (drawVerticalLines) {
-                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();
+                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();
             }
 
-            RenderHandler.endLines(renderTypeBuffer);
+            tessellator.draw();
         }
     }
 
-    protected static void drawMirrorPlaneY(MatrixStack matrixStack, IRenderTypeBuffer.Impl renderTypeBuffer, Vec3d posA, Vec3d posB, Color c, boolean drawLines, boolean drawPlanes) {
+    protected static void drawMirrorPlaneY(Vec3d posA, Vec3d posB, Color c, boolean drawLines, boolean drawPlanes) {
 
-//        GL11.glColor4d(c.getRed(), c.getGreen(), c.getBlue(), c.getAlpha());
-        Matrix4f matrixPos = matrixStack.getLast().getMatrix();
+        GL11.glColor4d(c.getRed(), c.getGreen(), c.getBlue(), c.getAlpha());
+        Tessellator tessellator = Tessellator.getInstance();
+        BufferBuilder bufferBuilder = tessellator.getBuffer();
 
         if (drawPlanes) {
-            IVertexBuilder buffer = RenderHandler.beginPlanes(renderTypeBuffer);
+            bufferBuilder.begin(GL11.GL_TRIANGLE_STRIP, DefaultVertexFormats.POSITION_COLOR);
 
-            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();
+            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();
 
-            RenderHandler.endPlanes(renderTypeBuffer);
+            tessellator.draw();
         }
 
         if (drawLines) {
-            IVertexBuilder buffer = RenderHandler.beginLines(renderTypeBuffer);
-
             Vec3d middle = posA.add(posB).scale(0.5);
-            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.begin(GL11.GL_LINES, DefaultVertexFormats.POSITION_COLOR);
 
-            RenderHandler.endLines(renderTypeBuffer);
+            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();
         }
     }
 
-    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();
+    protected static void drawMirrorLines(Mirror.MirrorSettings m) {
 
         Vec3d pos = m.position.add(epsilon);
 
-        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();
+        GL11.glColor4d(100, 100, 100, 255);
+        GL11.glLineWidth(2);
+        Tessellator tessellator = Tessellator.getInstance();
+        BufferBuilder bufferBuilder = tessellator.getBuffer();
 
-        RenderHandler.endLines(renderTypeBuffer);
+        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();
     }
 }

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

@@ -1,93 +1,86 @@
 package nl.requios.effortlessbuilding.render;
 
-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.block.state.IBlockState;
 import net.minecraft.client.Minecraft;
-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.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.resources.I18n;
 import net.minecraft.client.settings.KeyBinding;
-import net.minecraft.entity.player.PlayerEntity;
-import net.minecraft.server.MinecraftServer;
+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.util.SoundCategory;
-import net.minecraft.util.SoundEvents;
+import net.minecraft.util.SoundEvent;
 import net.minecraft.util.math.AxisAlignedBB;
 import net.minecraft.util.math.BlockPos;
 import net.minecraft.util.math.Vec3d;
-import net.minecraft.util.math.shapes.VoxelShape;
+import net.minecraft.world.IWorldEventListener;
 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(value = Dist.CLIENT)
-public class RenderHandler {
+@Mod.EventBusSubscriber(Side.CLIENT)
+public class RenderHandler implements IWorldEventListener {
 
     @SubscribeEvent
     public static void onRender(RenderWorldLastEvent event) {
-        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;
+        EntityPlayer player = Minecraft.getMinecraft().player;
         ModeSettingsManager.ModeSettings modeSettings = ModeSettingsManager.getModeSettings(player);
         ModifierSettingsManager.ModifierSettings modifierSettings = ModifierSettingsManager.getModifierSettings(player);
 
-        Vec3d projectedView = Minecraft.getInstance().gameRenderer.getActiveRenderInfo().getProjectedView();
-
-        matrixStack.push();
-        matrixStack.translate(-projectedView.x, -projectedView.y, -projectedView.z);
+        begin(event.getPartialTicks());
 
         //Mirror and radial mirror lines and areas
-        ModifierRenderer.render(matrixStack, renderTypeBuffer, modifierSettings);
+        ModifierRenderer.render(modifierSettings);
 
         //Render block previews
-        BlockPreviewRenderer.render(matrixStack, renderTypeBuffer, player, modifierSettings, modeSettings);
+        BlockPreviewRenderer.render(player, modifierSettings, modeSettings);
 
-        matrixStack.pop();
+        end();
     }
 
     @SubscribeEvent
     //Display Radial Menu
-    public static void onRenderGameOverlay(final RenderGameOverlayEvent.Post event) {
-        Minecraft mc = Minecraft.getInstance();
-        ClientPlayerEntity player = mc.player;
+    public static void onRenderGameOverlay(final RenderGameOverlayEvent.Post event ) {
+        Minecraft mc = Minecraft.getMinecraft();
+        EntityPlayerSP 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();
-        //TODO 1.13 compatibility
-        if (type == RenderGameOverlayEvent.ElementType.ALL /*&& !hasChiselInHand*/) {
+        if (type == RenderGameOverlayEvent.ElementType.ALL && !hasChiselInHand) {
             final boolean wasVisible = RadialMenu.instance.isVisible();
 
             if (ClientProxy.keyBindings[3].isKeyDown()) {
@@ -105,7 +98,7 @@ public class RenderHandler {
                         playRadialMenuSound();
                         modeSettings.setBuildMode(RadialMenu.instance.switchTo);
                         ModeSettingsManager.setModeSettings(player, modeSettings);
-                        PacketHandler.INSTANCE.sendToServer(new ModeSettingsMessage(modeSettings));
+                        EffortlessBuilding.packetHandler.sendToServer(new ModeSettingsMessage(modeSettings));
 
                         EffortlessBuilding.log(player, I18n.format(modeSettings.getBuildMode().name), true);
                     }
@@ -114,7 +107,7 @@ public class RenderHandler {
                     ModeOptions.ActionEnum action = RadialMenu.instance.doAction;
                     if (action != null) {
                         ModeOptions.performAction(player, action);
-                        PacketHandler.INSTANCE.sendToServer(new ModeActionMessage(action));
+                        EffortlessBuilding.packetHandler.sendToServer(new ModeActionMessage(action));
                     }
 
                     playRadialMenuSound();
@@ -126,27 +119,25 @@ public class RenderHandler {
 
             if (RadialMenu.instance.isVisible()) {
 
-                int scaledWidth = mc.getMainWindow().getScaledWidth();
-                int scaledHeight = mc.getMainWindow().getScaledHeight();
-                RadialMenu.instance.configure(scaledWidth, scaledHeight);
+                final ScaledResolution res = event.getResolution();
+                RadialMenu.instance.configure(res.getScaledWidth(), res.getScaledHeight());
 
                 if (!wasVisible) {
-                    mc.mouseHelper.ungrabMouse();
+                    mc.inGameHasFocus = false;
+                    mc.mouseHelper.ungrabMouseCursor();
                 }
 
-                if (mc.mouseHelper.isMouseGrabbed()) {
+                if (mc.inGameHasFocus) {
                     KeyBinding.unPressAllKeys();
                 }
 
-                final int mouseX = ((int) mc.mouseHelper.getMouseX()) * scaledWidth / mc.getMainWindow().getFramebufferWidth();
-                final int mouseY = scaledHeight - ((int) mc.mouseHelper.getMouseY()) * scaledHeight / mc.getMainWindow().getFramebufferHeight() - 1;
+                final int mouseX = Mouse.getX() * res.getScaledWidth() / mc.displayWidth;
+                final int mouseY = res.getScaledHeight() - Mouse.getY() * res.getScaledHeight() / mc.displayHeight - 1;
 
                 net.minecraftforge.client.ForgeHooksClient.drawScreen(RadialMenu.instance, mouseX, mouseY, event.getPartialTicks());
             } else {
-                if (wasVisible &&
-                    RadialMenu.instance.doAction != ModeOptions.ActionEnum.OPEN_MODIFIER_SETTINGS &&
-                    RadialMenu.instance.doAction != ModeOptions.ActionEnum.OPEN_PLAYER_SETTINGS) {
-                    mc.mouseHelper.grabMouse();
+                if (wasVisible && RadialMenu.instance.doAction != ModeOptions.ActionEnum.OPEN_MODIFIER_SETTINGS) {
+                    mc.setIngameFocus();
                 }
             }
         }
@@ -155,103 +146,191 @@ public class RenderHandler {
     public static void playRadialMenuSound() {
         final float volume = 0.1f;
         if (volume >= 0.0001f) {
-            SimpleSound sound = new SimpleSound(SoundEvents.UI_BUTTON_CLICK, SoundCategory.MASTER, volume, 1.0f, Minecraft.getInstance().player.getPosition());
-            Minecraft.getInstance().getSoundHandler().play(sound);
+            final PositionedSoundRecord psr = new PositionedSoundRecord(SoundEvents.UI_BUTTON_CLICK, SoundCategory.MASTER,
+                    volume, 1.0f, Minecraft.getMinecraft().player.getPosition());
+            Minecraft.getMinecraft().getSoundHandler().playSound(psr);
         }
     }
 
-    protected static IVertexBuilder beginLines(IRenderTypeBuffer.Impl renderTypeBuffer) {
-        return renderTypeBuffer.getBuffer(BuildRenderTypes.LINES);
+    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 void endLines(IRenderTypeBuffer.Impl renderTypeBuffer) {
-        renderTypeBuffer.finish();
+    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 IVertexBuilder beginPlanes(IRenderTypeBuffer.Impl renderTypeBuffer){
-        return renderTypeBuffer.getBuffer(BuildRenderTypes.PLANES);
+    protected static void endLines() {
+        GL11.glPopAttrib();
     }
 
-    protected static void endPlanes(IRenderTypeBuffer.Impl renderTypeBuffer){
-        renderTypeBuffer.finish();
+    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(ShaderHandler.shaderMaskTextureLocation);
+
+        GlStateManager.enableBlend();
+        GlStateManager.blendFunc(GL11.GL_SRC_ALPHA, GL11.GL_ONE_MINUS_SRC_ALPHA);
+        GL14.glBlendColor(1F, 1F, 1F, 0.8f);
     }
 
-    protected static void renderBlockPreview(MatrixStack matrixStack, IRenderTypeBuffer.Impl renderTypeBuffer, BlockRendererDispatcher dispatcher,
-                                             BlockPos blockPos, BlockState blockState, float dissolve, BlockPos firstPos, BlockPos secondPos, boolean red) {
+    protected static void endBlockPreviews() {
+        ShaderHandler.releaseShader();
+        GlStateManager.disableBlend();
+
+        GL11.glPopAttrib();
+    }
+
+    private static void end() {
+        GL11.glDepthMask(true);
+        GL11.glPopMatrix();
+    }
+
+    protected static void renderBlockPreview(BlockRendererDispatcher dispatcher, BlockPos blockPos, IBlockState blockState) {
         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);
+        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);
 
         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);
+            dispatcher.renderBlockBrightness(blockState, 0.85f);
         } 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();
+            //Render outline as backup
+            GlStateManager.popMatrix();
+//            ShaderHandler.releaseShader();
+            GL11.glDisable(GL11.GL_LIGHTING);
+            renderBlockOutline(blockPos, new Vec3d(1f, 1f, 1f));
+            GL11.glEnable(GL11.GL_LIGHTING);
+            GlStateManager.pushMatrix();
         }
 
-        renderTypeBuffer.finish();
-        matrixStack.pop();
+        GlStateManager.popMatrix();
     }
 
-    protected static void renderBlockOutline(MatrixStack matrixStack, IVertexBuilder buffer, BlockPos pos, Vec3d color) {
-        renderBlockOutline(matrixStack, buffer, pos, pos, color);
+    protected static void renderBlockOutline(BlockPos pos, Vec3d color) {
+        renderBlockOutline(pos, pos, color);
     }
 
     //Renders outline. Pos1 has to be minimal x,y,z and pos2 maximal x,y,z
-    protected static void renderBlockOutline(MatrixStack matrixStack, IVertexBuilder buffer, BlockPos pos1, BlockPos pos2, Vec3d color) {
+    protected static void renderBlockOutline(BlockPos pos1, BlockPos pos2, Vec3d color) {
+        GL11.glLineWidth(2);
+
         AxisAlignedBB aabb = new AxisAlignedBB(pos1, pos2.add(1, 1, 1)).grow(0.0020000000949949026);
 
-        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);
+        RenderGlobal.drawSelectionBoundingBox(aabb, (float) color.x, (float) color.y, (float) color.z, 0.4f);
     }
 
     //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);
+    protected static void renderBlockOutline(BlockPos pos, AxisAlignedBB boundingBox, Vec3d color) {
+        GL11.glLineWidth(2);
+
+        AxisAlignedBB aabb = boundingBox.offset(pos).grow(0.0020000000949949026);
+
+        RenderGlobal.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) {
+
     }
 
-    //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.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);
-//            }
-//        }
-//    }
+    @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);
+            }
+        }
+    }
 }

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

@@ -12,6 +12,7 @@
  */
 package nl.requios.effortlessbuilding.render;
 
+import net.minecraft.client.renderer.OpenGlHelper;
 import net.minecraft.util.ResourceLocation;
 import nl.requios.effortlessbuilding.BuildConfig;
 import nl.requios.effortlessbuilding.EffortlessBuilding;
@@ -45,7 +46,7 @@ public final class ShaderHandler {
         if(!doUseShaders())
             return;
 
-//        rawColor = createProgram("/assets/effortlessbuilding/shaders/raw_color", FRAG);
+        rawColor = createProgram("/assets/effortlessbuilding/shaders/raw_color", FRAG);
         dissolve = createProgram("/assets/effortlessbuilding/shaders/dissolve", VERT + FRAG);
     }
 
@@ -73,15 +74,7 @@ public final class ShaderHandler {
     }
 
     public static boolean doUseShaders() {
-        //Extracted from OpenGLHelper in 1.13 and earlier
-        //Can probably be simplified
-        GLCapabilities glcapabilities = GL.getCapabilities();
-        boolean openGL14 = glcapabilities.OpenGL14 || glcapabilities.GL_EXT_blend_func_separate;
-        boolean openGL21 = glcapabilities.OpenGL21;
-        boolean framebufferSupported = openGL14 && (glcapabilities.GL_ARB_framebuffer_object || glcapabilities.GL_EXT_framebuffer_object || glcapabilities.OpenGL30);
-        boolean shadersAvailable = openGL21 || glcapabilities.GL_ARB_vertex_shader && glcapabilities.GL_ARB_fragment_shader && glcapabilities.GL_ARB_shader_objects;
-        boolean shadersSupported = framebufferSupported && shadersAvailable;
-        return BuildConfig.visuals.useShaders.get() && shadersSupported;
+        return BuildConfig.visuals.useShaders && OpenGlHelper.shadersSupported;
     }
 
     private static int createProgram(String s, int sides) {

src/main/resources/META-INF/mods.toml

@@ -1,52 +0,0 @@
-# This is an example mods.toml file. It contains the data relating to the loading mods.
-# There are several mandatory fields (#mandatory), and many more that are optional (#optional).
-# The overall format is standard TOML format, v0.5.0.
-# Note that there are a couple of TOML lists in this file.
-# Find more information on toml format here:  https://github.com/toml-lang/toml
-# The name of the mod loader type to load - for regular FML @Mod mods it should be javafml
-modLoader="javafml" #mandatory
-# A version range to match for said mod loader - for regular FML @Mod it will be the forge version
-loaderVersion="[31,)" #mandatory This is typically bumped every Minecraft version by Forge. See our download page for lists of versions.
-# A URL to refer people to when problems occur with this mod
-issueTrackerURL="http://my.issue.tracker/" #optional
-# A list of mods - how many allowed here is determined by the individual mod loader
-[[mods]] #mandatory
-# The modid of the mod
-modId="effortlessbuilding" #mandatory
-# The version number of the mod - there's a few well known ${} variables useable here or just hardcode it
-version="${file.jarVersion}" #mandatory
- # A display name for the mod
-displayName="Effortless Building" #mandatory
-# A URL to query for updates for this mod. See the JSON update specification <here>
-#updateJSONURL="example.com" #optional
-# A URL for the "homepage" for this mod, displayed in the mod UI
-displayURL="https://minecraft.curseforge.com/projects/effortless-building" #optional
-# A file name (in the root of the mod JAR) containing a logo for display
-logoFile="logo.png" #optional
-# A text field displayed in the mod UI
-credits="" #optional
-# A text field displayed in the mod UI
-authors="Requios" #optional
-# The description text for the mod (multi line!) (#mandatory)
-description='''
-Makes building easier by providing tools like mirrors, arrays, QuickReplace and a block randomizer. For survival and creative mode.
-'''
-# A dependency - use the . to indicate dependency for a specific modid. Dependencies are optional.
-[[dependencies.examplemod]] #optional
-    # the modid of the dependency
-    modId="forge" #mandatory
-    # Does this dependency have to exist - if not, ordering below must be specified
-    mandatory=true #mandatory
-    # The version range of the dependency
-    versionRange="[31,)" #mandatory
-    # An ordering relationship for the dependency - BEFORE or AFTER required if the relationship is not mandatory
-    ordering="NONE"
-    # Side this dependency is applied on - BOTH, CLIENT or SERVER
-    side="BOTH"
-# Here's another dependency
-[[dependencies.examplemod]]
-    modId="minecraft"
-    mandatory=true
-    versionRange="[1.15.2]"
-    ordering="NONE"
-    side="BOTH"

src/main/resources/assets/effortlessbuilding/lang/en_us.json

@@ -1,60 +0,0 @@
-{
-	"effortlessbuilding.screen.modifier_settings": "Modifier Settings",
-	"effortlessbuilding.screen.radial_menu": "Build Modes",
-	"effortlessbuilding.screen.randomizer_bag": "Randomizer Bag",
-	"effortlessbuilding.screen.player_settings": "Player Settings",
-
-    "key.effortlessbuilding.category": "Effortless Building",
-    "key.effortlessbuilding.hud.desc": "Modifier Menu",
-    "key.effortlessbuilding.replace.desc": "Toggle QuickReplace",
-    "key.effortlessbuilding.creative.desc": "Toggle Survival/Creative Mode",
-    "key.effortlessbuilding.mode.desc": "Radial Menu",
-    "key.effortlessbuilding.undo.desc": "Undo",
-    "key.effortlessbuilding.redo.desc": "Redo",
-    "key.effortlessbuilding.altplacement.desc": "Alternative placement",
-
-    "effortlessbuilding:randomizer_bag": "Randomizer Bag",
-    "effortlessbuilding:reach_upgrade1": "Reach Upgrade 1",
-    "effortlessbuilding:reach_upgrade2": "Reach Upgrade 2",
-    "effortlessbuilding:reach_upgrade3": "Reach Upgrade 3",
-
-    "effortlessbuilding.mode.normal": "Normal",
-    "effortlessbuilding.mode.normal_plus": "Normal+",
-    "effortlessbuilding.mode.line": "Line",
-    "effortlessbuilding.mode.wall": "Wall",
-    "effortlessbuilding.mode.floor": "Floor",
-    "effortlessbuilding.mode.diagonal_line": "Diagonal Line",
-    "effortlessbuilding.mode.diagonal_wall": "Diagonal Wall",
-    "effortlessbuilding.mode.slope_floor": "Slope Floor",
-    "effortlessbuilding.mode.cube": "Cube",
-    "effortlessbuilding.mode.circle": "Circle",
-    "effortlessbuilding.mode.cylinder": "Cylinder",
-    "effortlessbuilding.mode.sphere": "Sphere",
-
-    "effortlessbuilding.action.undo": "Undo",
-    "effortlessbuilding.action.redo": "Redo",
-    "effortlessbuilding.action.replace": "Replace",
-    "effortlessbuilding.action.open_modifier_settings": "Open Modifier Settings",
-	"effortlessbuilding.action.open_player_settings": "Open Settings",
-	
-    "effortlessbuilding.action.build_speed": "Build Speed",
-    "effortlessbuilding.action.filling": "Filling",
-    "effortlessbuilding.action.raised_edge": "Raised Edge",
-    "effortlessbuilding.action.thickness": "Line Thickness",
-    "effortlessbuilding.action.circle_start": "Start Point",
-
-    "effortlessbuilding.action.normal_speed": "Normal",
-    "effortlessbuilding.action.fast_speed": "Fast",
-    "effortlessbuilding.action.full": "Filled",
-    "effortlessbuilding.action.hollow": "Hollow",
-    "effortlessbuilding.action.skeleton": "Skeleton",
-    "effortlessbuilding.action.short_edge": "Short Edge",
-    "effortlessbuilding.action.long_edge": "Long Edge",
-    "effortlessbuilding.action.thickness_1": "1 Block Thick",
-    "effortlessbuilding.action.thickness_3": "3 Blocks Thick",
-    "effortlessbuilding.action.thickness_5": "5 Blocks Thick",
-    "effortlessbuilding.action.start_center": "Middle",
-    "effortlessbuilding.action.start_corner": "Corner",
-
-    "commands.reach.usage": "/reach <level>"
-}

src/main/resources/assets/effortlessbuilding/lang/en_us.lang

@@ -0,0 +1,52 @@
+key.effortlessbuilding.category=Effortless Building
+key.effortlessbuilding.hud.desc=Modifier Menu
+key.effortlessbuilding.replace.desc=Toggle QuickReplace
+key.effortlessbuilding.creative.desc=Toggle Survival/Creative Mode
+key.effortlessbuilding.mode.desc=Radial Menu
+key.effortlessbuilding.undo.desc=Undo
+key.effortlessbuilding.redo.desc=Redo
+key.effortlessbuilding.altplacement.desc=Alternative placement
+
+item.effortlessbuilding:randomizer_bag.name=Randomizer Bag
+item.effortlessbuilding:reach_upgrade1.name=Reach Upgrade 1
+item.effortlessbuilding:reach_upgrade2.name=Reach Upgrade 2
+item.effortlessbuilding:reach_upgrade3.name=Reach Upgrade 3
+
+effortlessbuilding.mode.normal=Normal
+effortlessbuilding.mode.normal_plus=Normal+
+effortlessbuilding.mode.line=Line
+effortlessbuilding.mode.wall=Wall
+effortlessbuilding.mode.floor=Floor
+effortlessbuilding.mode.diagonal_line=Diagonal Line
+effortlessbuilding.mode.diagonal_wall=Diagonal Wall
+effortlessbuilding.mode.slope_floor=Slope Floor
+effortlessbuilding.mode.cube=Cube
+effortlessbuilding.mode.circle=Circle
+effortlessbuilding.mode.cylinder=Cylinder
+effortlessbuilding.mode.sphere=Sphere
+
+effortlessbuilding.action.undo=Undo
+effortlessbuilding.action.redo=Redo
+effortlessbuilding.action.replace=Replace
+effortlessbuilding.action.open_modifier_settings=Open Modifier Settings
+
+effortlessbuilding.action.build_speed=Build Speed
+effortlessbuilding.action.filling=Filling
+effortlessbuilding.action.raised_edge=Raised Edge
+effortlessbuilding.action.thickness=Line Thickness
+effortlessbuilding.action.circle_start=Start Point
+
+effortlessbuilding.action.normal_speed=Normal
+effortlessbuilding.action.fast_speed=Fast
+effortlessbuilding.action.full=Filled
+effortlessbuilding.action.hollow=Hollow
+effortlessbuilding.action.skeleton=Skeleton
+effortlessbuilding.action.short_edge=Short Edge
+effortlessbuilding.action.long_edge=Long Edge
+effortlessbuilding.action.thickness_1=1 Block Thick
+effortlessbuilding.action.thickness_3=3 Blocks Thick
+effortlessbuilding.action.thickness_5=5 Blocks Thick
+effortlessbuilding.action.start_center=Middle
+effortlessbuilding.action.start_corner=Corner
+
+commands.reach.usage=/reach <level>

src/main/resources/assets/effortlessbuilding/recipes/_factories.json

@@ -0,0 +1,5 @@
+{
+    "conditions": {
+        "enable_reach_upgrades": "nl.requios.effortlessbuilding.helper.ReachConditionFactory"
+    }
+}

src/main/resources/assets/effortlessbuilding/recipes/randomizer_bag.json

@@ -10,7 +10,8 @@
             "item": "minecraft:leather"
         },
 		"O": {
-            "tag": "minecraft:planks"
+            "item": "minecraft:planks",
+			"data": 32767
         }
     },
     "result": {

src/main/resources/assets/effortlessbuilding/recipes/reach_upgrade1.json

@@ -1,4 +1,7 @@
 {
+    "conditions": [{
+        "type": "effortlessbuilding:enable_reach_upgrades"
+    }],
     "type": "minecraft:crafting_shaped",
     "pattern": [
         " S",

src/main/resources/assets/effortlessbuilding/recipes/reach_upgrade2.json

@@ -1,4 +1,7 @@
 {
+    "conditions": [{
+        "type": "effortlessbuilding:enable_reach_upgrades"
+    }],
     "type": "minecraft:crafting_shaped",
     "pattern": [
         " M",

src/main/resources/assets/effortlessbuilding/recipes/reach_upgrade3.json

@@ -1,4 +1,7 @@
 {
+    "conditions": [{
+        "type": "effortlessbuilding:enable_reach_upgrades"
+    }],
     "type": "minecraft:crafting_shaped",
     "pattern": [
         " FE",

src/main/resources/assets/effortlessbuilding/shaders/dissolve.frag

@@ -101,4 +101,4 @@ void main() {
     if (maskgs * 0.3 + place * 0.7 <= dissolve)
     	gl_FragColor = vec4(texcolor.rgb, 0.0);
     else gl_FragColor = color;
-}
+}