Merged in 1.19 (pull request #4)

1.19

Approved-by: Requios

.gitignore

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

LICENSE.txt

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

README.txt

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

build.gradle

@@ -1,77 +1,140 @@
 buildscript {
     repositories {
-        jcenter()
+        maven { url = 'https://files.minecraftforge.net/maven' }
-        maven { url = "http://files.minecraftforge.net/maven" }
+        mavenCentral()
     }
     dependencies {
-        classpath 'net.minecraftforge.gradle:ForgeGradle:2.3-SNAPSHOT'
+        classpath group: 'net.minecraftforge.gradle', name: 'ForgeGradle', version: '5.1+', changing: true
     }
 }
-apply plugin: 'net.minecraftforge.gradle.forge'
+apply plugin: 'net.minecraftforge.gradle'
-//Only edit below this line, the above code adds and enables the necessary things for Forge to be setup.
+// Only edit below this line, the above code adds and enables the necessary things for Forge to be setup.
+apply plugin: 'eclipse'
+apply plugin: 'maven-publish'
 
+version = '1.18-2.34'
+group = 'nl.requios.effortlessbuilding' // http://maven.apache.org/guides/mini/guide-naming-conventions.html
+archivesBaseName = 'effortlessbuilding'
 
-version = "1.0"
+// Mojang ships Java 17 to end users in 1.18+, so your mod should target Java 17.
-group = "nl.requios.effortlessbuilding" // http://maven.apache.org/guides/mini/guide-naming-conventions.html
+java.toolchain.languageVersion = JavaLanguageVersion.of(17)
-archivesBaseName = "effortlessbuilding"
-
-sourceCompatibility = targetCompatibility = '1.8' // Need this here so eclipse task generates correctly.
-compileJava {
-    sourceCompatibility = targetCompatibility = '1.8'
-}
 
 minecraft {
-    version = "1.12.2-14.23.4.2705"
+    // The mappings can be changed at any time, and must be in the following format.
-    runDir = "run"
+    // snapshot_YYYYMMDD   Snapshot are built nightly.
-    
+    // stable_#            Stables are built at the discretion of the MCP team.
-    // the mappings can be changed at any time, and must be in the following format.
-    // snapshot_YYYYMMDD   snapshot are built nightly.
-    // stable_#            stables are built at the discretion of the MCP team.
     // Use non-default mappings at your own risk. they may not always work.
-    // simply re-run your setup task after changing the mappings to update your workspace.
+    // Simply re-run your setup task after changing the mappings to update your workspace.
-    mappings = "snapshot_20171003"
+    mappings channel: 'official', version: '1.19'
+    accessTransformer = file('src/main/resources/META-INF/accesstransformer.cfg')
     // makeObfSourceJar = false // an Srg named sources jar is made by default. uncomment this to disable.
+
+    // Default run configurations.
+    // These can be tweaked, removed, or duplicated as needed.
+    runs {
+        client {
+            workingDirectory project.file('run')
+
+            // Recommended logging data for a userdev environment (SCAN,REGISTRIES,REGISTRYDUMP)
+            property 'forge.logging.markers', 'REGISTRIES'
+
+            // Recommended logging level for the console
+            property 'forge.logging.console.level', 'debug'
+
+            mods {
+                effortlessbuilding {
+                    source sourceSets.main
+                }
+            }
+        }
+
+        server {
+            workingDirectory project.file('run')
+
+            // Recommended logging data for a userdev environment (SCAN,REGISTRIES,REGISTRYDUMP)
+            property 'forge.logging.markers', 'REGISTRIES'
+
+            // Recommended logging level for the console
+            property 'forge.logging.console.level', 'debug'
+
+            mods {
+                effortlessbuilding {
+                    source sourceSets.main
+                }
+            }
+        }
+
+        data {
+            workingDirectory project.file('run')
+
+            // Recommended logging data for a userdev environment (SCAN,REGISTRIES,REGISTRYDUMP)
+            property 'forge.logging.markers', 'REGISTRIES'
+
+            // Recommended logging level for the console
+            property 'forge.logging.console.level', 'debug'
+
+            // Specify the modid for data generation, where to output the resulting resource, and where to look for existing resources.
+            args '--mod', 'effortlessbuilding', '--all', '--output', file('src/generated/resources/'), '--existing', file('src/main/resources/')
+
+            mods {
+                effortlessbuilding {
+                    source sourceSets.main
+                }
+            }
+        }
+    }
 }
 
 dependencies {
-    // you may put jars on which you depend on in ./libs
+    // Specify the version of Minecraft to use, If this is any group other then 'net.minecraft' it is assumed
-    // or you may define them like so..
+    // that the dep is a ForgeGradle 'patcher' dependency. And it's patches will be applied.
-    //compile "some.group:artifact:version:classifier"
+    // The userdev artifact is a special name and will get all sorts of transformations applied to it.
-    //compile "some.group:artifact:version"
+    minecraft 'net.minecraftforge:forge:1.19-41.0.99'
 
-    // real examples
+    // Real mod deobf dependency examples - these get remapped to your current mappings
-    //compile 'com.mod-buildcraft:buildcraft:6.0.8:dev'  // adds buildcraft to the dev env
+    // compileOnly fg.deobf("mezz.jei:jei-${mc_version}:${jei_version}:api") // Adds JEI API as a compile dependency
-    //compile 'com.googlecode.efficient-java-matrix-library:ejml:0.24' // adds ejml to the dev env
+    // runtimeOnly fg.deobf("mezz.jei:jei-${mc_version}:${jei_version}") // Adds the full JEI mod as a runtime dependency
+    // implementation fg.deobf("com.tterrag.registrate:Registrate:MC${mc_version}-${registrate_version}") // Adds registrate as a dependency
 
-    // the 'provided' configuration is for optional dependencies that exist at compile-time but might not at runtime.
+    // Examples using mod jars from ./libs
-    //provided 'com.mod-buildcraft:buildcraft:6.0.8:dev'
+    // implementation fg.deobf("blank:coolmod-${mc_version}:${coolmod_version}")
 
-    // the deobf configurations:  'deobfCompile' and 'deobfProvided' are the same as the normal compile and provided,
+    // For more info...
-    // 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'
-
-    // for more info...
     // http://www.gradle.org/docs/current/userguide/artifact_dependencies_tutorial.html
     // http://www.gradle.org/docs/current/userguide/dependency_management.html
 
 }
 
-processResources {
+// Example for how to get properties into the manifest for reading by the runtime..
-    // this will ensure that this task is redone when the versions change.
+jar {
-    inputs.property "version", project.version
+    manifest {
-    inputs.property "mcversion", project.minecraft.version
+        attributes([
-
+            "Specification-Title": "effortlessbuilding",
-    // replace stuff in mcmod.info, nothing else
+            "Specification-Vendor": "requios",
-    from(sourceSets.main.resources.srcDirs) {
+            "Specification-Version": "1", // We are version 1 of ourselves
-        include 'mcmod.info'
+            "Implementation-Title": project.name,
-                
+            "Implementation-Version": "${version}",
-        // replace version and mcversion
+            "Implementation-Vendor" :"requios",
-        expand 'version':project.version, 'mcversion':project.minecraft.version
+            "Implementation-Timestamp": new Date().format("yyyy-MM-dd'T'HH:mm:ssZ")
-    }
+        ])
-        
+    }
-    // 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

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

gradle/wrapper/gradle-wrapper.properties

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

gradlew

@@ -1,79 +1,129 @@
-#!/usr/bin/env bash
+#!/bin/sh
+
+#
+# Copyright <20> 2015-2021 the original authors.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#      https://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
 
 ##############################################################################
-##
+#
-##  Gradle start up script for UN*X
+#   Gradle start up script for POSIX generated by Gradle.
-##
+#
+#   Important for running:
+#
+#   (1) You need a POSIX-compliant shell to run this script. If your /bin/sh is
+#       noncompliant, but you have some other compliant shell such as ksh or
+#       bash, then to run this script, type that shell name before the whole
+#       command line, like:
+#
+#           ksh Gradle
+#
+#       Busybox and similar reduced shells will NOT work, because this script
+#       requires all of these POSIX shell features:
+#         * functions;
+#         * expansions <20>$var<61>, <20>${var}<7D>, <20>${var:-default}<7D>, <20>${var+SET}<7D>,
+#           <20>${var#prefix}<7D>, <20>${var%suffix}<7D>, and <20>$( cmd )<29>;
+#         * compound commands having a testable exit status, especially <20>case<73>;
+#         * various built-in commands including <20>command<6E>, <20>set<65>, and <20>ulimit<69>.
+#
+#   Important for patching:
+#
+#   (2) This script targets any POSIX shell, so it avoids extensions provided
+#       by Bash, Ksh, etc; in particular arrays are avoided.
+#
+#       The "traditional" practice of packing multiple parameters into a
+#       space-separated string is a well documented source of bugs and security
+#       problems, so this is (mostly) avoided, by progressively accumulating
+#       options in "$@", and eventually passing that to Java.
+#
+#       Where the inherited environment variables (DEFAULT_JVM_OPTS, JAVA_OPTS,
+#       and GRADLE_OPTS) rely on word-splitting, this is performed explicitly;
+#       see the in-line comments for details.
+#
+#       There are tweaks for specific operating systems such as AIX, CygWin,
+#       Darwin, MinGW, and NonStop.
+#
+#   (3) This script is generated from the Groovy template
+#       https://github.com/gradle/gradle/blob/master/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
+#       within the Gradle project.
+#
+#       You can find Gradle at https://github.com/gradle/gradle/.
+#
 ##############################################################################
 
-# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
+# Attempt to set APP_HOME
-DEFAULT_JVM_OPTS=""
+
+# Resolve links: $0 may be a link
+app_path=$0
+
+# Need this for daisy-chained symlinks.
+while
+    APP_HOME=${app_path%"${app_path##*/}"}  # leaves a trailing /; empty if no leading path
+    [ -h "$app_path" ]
+do
+    ls=$( ls -ld "$app_path" )
+    link=${ls#*' -> '}
+    case $link in             #(
+      /*)   app_path=$link ;; #(
+      *)    app_path=$APP_HOME$link ;;
+    esac
+done
+
+APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit
 
 APP_NAME="Gradle"
-APP_BASE_NAME=`basename "$0"`
+APP_BASE_NAME=${0##*/}
+
+# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
+DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
 
 # Use the maximum available, or set MAX_FD != -1 to use that value.
-MAX_FD="maximum"
+MAX_FD=maximum
 
-warn ( ) {
+warn () {
     echo "$*"
-}
+} >&2
 
-die ( ) {
+die () {
     echo
     echo "$*"
     echo
     exit 1
-}
+} >&2
 
 # OS specific support (must be 'true' or 'false').
 cygwin=false
 msys=false
 darwin=false
-case "`uname`" in
+nonstop=false
-  CYGWIN* )
+case "$( uname )" in                #(
-    cygwin=true
+  CYGWIN* )         cygwin=true  ;; #(
-    ;;
+  Darwin* )         darwin=true  ;; #(
-  Darwin* )
+  MSYS* | MINGW* )  msys=true    ;; #(
-    darwin=true
+  NONSTOP* )        nonstop=true ;;
-    ;;
-  MINGW* )
-    msys=true
-    ;;
 esac
 
-# For Cygwin, ensure paths are in UNIX format before anything is touched.
-if $cygwin ; then
-    [ -n "$JAVA_HOME" ] && JAVA_HOME=`cygpath --unix "$JAVA_HOME"`
-fi
-
-# Attempt to set APP_HOME
-# Resolve links: $0 may be a link
-PRG="$0"
-# Need this for relative symlinks.
-while [ -h "$PRG" ] ; do
-    ls=`ls -ld "$PRG"`
-    link=`expr "$ls" : '.*-> \(.*\)$'`
-    if expr "$link" : '/.*' > /dev/null; then
-        PRG="$link"
-    else
-        PRG=`dirname "$PRG"`"/$link"
-    fi
-done
-SAVED="`pwd`"
-cd "`dirname \"$PRG\"`/" >&-
-APP_HOME="`pwd -P`"
-cd "$SAVED" >&-
-
 CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar
 
+
 # Determine the Java command to use to start the JVM.
 if [ -n "$JAVA_HOME" ] ; then
     if [ -x "$JAVA_HOME/jre/sh/java" ] ; then
         # IBM's JDK on AIX uses strange locations for the executables
-        JAVACMD="$JAVA_HOME/jre/sh/java"
+        JAVACMD=$JAVA_HOME/jre/sh/java
     else
-        JAVACMD="$JAVA_HOME/bin/java"
+        JAVACMD=$JAVA_HOME/bin/java
     fi
     if [ ! -x "$JAVACMD" ] ; then
         die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME
@@ -82,7 +132,7 @@ Please set the JAVA_HOME variable in your environment to match the
 location of your Java installation."
     fi
 else
-    JAVACMD="java"
+    JAVACMD=java
     which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
 
 Please set the JAVA_HOME variable in your environment to match the
@@ -90,75 +140,95 @@ location of your Java installation."
 fi
 
 # Increase the maximum file descriptors if we can.
-if [ "$cygwin" = "false" -a "$darwin" = "false" ] ; then
+if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then
-    MAX_FD_LIMIT=`ulimit -H -n`
+    case $MAX_FD in #(
-    if [ $? -eq 0 ] ; then
+      max*)
-        if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ] ; then
+        MAX_FD=$( ulimit -H -n ) ||
-            MAX_FD="$MAX_FD_LIMIT"
+            warn "Could not query maximum file descriptor limit"
-        fi
+    esac
-        ulimit -n $MAX_FD
+    case $MAX_FD in  #(
-        if [ $? -ne 0 ] ; then
+      '' | soft) :;; #(
-            warn "Could not set maximum file descriptor limit: $MAX_FD"
+      *)
-        fi
+        ulimit -n "$MAX_FD" ||
-    else
+            warn "Could not set maximum file descriptor limit to $MAX_FD"
-        warn "Could not query maximum file descriptor limit: $MAX_FD_LIMIT"
-    fi
-fi
-
-# For Darwin, add options to specify how the application appears in the dock
-if $darwin; then
-    GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\""
-fi
-
-# For Cygwin, switch paths to Windows format before running java
-if $cygwin ; then
-    APP_HOME=`cygpath --path --mixed "$APP_HOME"`
-    CLASSPATH=`cygpath --path --mixed "$CLASSPATH"`
-
-    # We build the pattern for arguments to be converted via cygpath
-    ROOTDIRSRAW=`find -L / -maxdepth 1 -mindepth 1 -type d 2>/dev/null`
-    SEP=""
-    for dir in $ROOTDIRSRAW ; do
-        ROOTDIRS="$ROOTDIRS$SEP$dir"
-        SEP="|"
-    done
-    OURCYGPATTERN="(^($ROOTDIRS))"
-    # Add a user-defined pattern to the cygpath arguments
-    if [ "$GRADLE_CYGPATTERN" != "" ] ; then
-        OURCYGPATTERN="$OURCYGPATTERN|($GRADLE_CYGPATTERN)"
-    fi
-    # Now convert the arguments - kludge to limit ourselves to /bin/sh
-    i=0
-    for arg in "$@" ; do
-        CHECK=`echo "$arg"|egrep -c "$OURCYGPATTERN" -`
-        CHECK2=`echo "$arg"|egrep -c "^-"`                                 ### Determine if an option
-
-        if [ $CHECK -ne 0 ] && [ $CHECK2 -eq 0 ] ; then                    ### Added a condition
-            eval `echo args$i`=`cygpath --path --ignore --mixed "$arg"`
-        else
-            eval `echo args$i`="\"$arg\""
-        fi
-        i=$((i+1))
-    done
-    case $i in
-        (0) set -- ;;
-        (1) set -- "$args0" ;;
-        (2) set -- "$args0" "$args1" ;;
-        (3) set -- "$args0" "$args1" "$args2" ;;
-        (4) set -- "$args0" "$args1" "$args2" "$args3" ;;
-        (5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;;
-        (6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;;
-        (7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;;
-        (8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;;
-        (9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;;
     esac
 fi
 
-# Split up the JVM_OPTS And GRADLE_OPTS values into an array, following the shell quoting and substitution rules
+# Collect all arguments for the java command, stacking in reverse order:
-function splitJvmOpts() {
+#   * args from the command line
-    JVM_OPTS=("$@")
+#   * the main class name
-}
+#   * -classpath
-eval splitJvmOpts $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS
+#   * -D...appname settings
-JVM_OPTS[${#JVM_OPTS[*]}]="-Dorg.gradle.appname=$APP_BASE_NAME"
+#   * --module-path (only if needed)
+#   * DEFAULT_JVM_OPTS, JAVA_OPTS, and GRADLE_OPTS environment variables.
 
-exec "$JAVACMD" "${JVM_OPTS[@]}" -classpath "$CLASSPATH" org.gradle.wrapper.GradleWrapperMain "$@"
+# For Cygwin or MSYS, switch paths to Windows format before running java
+if "$cygwin" || "$msys" ; then
+    APP_HOME=$( cygpath --path --mixed "$APP_HOME" )
+    CLASSPATH=$( cygpath --path --mixed "$CLASSPATH" )
+
+    JAVACMD=$( cygpath --unix "$JAVACMD" )
+
+    # Now convert the arguments - kludge to limit ourselves to /bin/sh
+    for arg do
+        if
+            case $arg in                                #(
+              -*)   false ;;                            # don't mess with options #(
+              /?*)  t=${arg#/} t=/${t%%/*}              # looks like a POSIX filepath
+                    [ -e "$t" ] ;;                      #(
+              *)    false ;;
+            esac
+        then
+            arg=$( cygpath --path --ignore --mixed "$arg" )
+        fi
+        # Roll the args list around exactly as many times as the number of
+        # args, so each arg winds up back in the position where it started, but
+        # possibly modified.
+        #
+        # NB: a `for` loop captures its iteration list before it begins, so
+        # changing the positional parameters here affects neither the number of
+        # iterations, nor the values presented in `arg`.
+        shift                   # remove old arg
+        set -- "$@" "$arg"      # push replacement arg
+    done
+fi
+
+# Collect all arguments for the java command;
+#   * $DEFAULT_JVM_OPTS, $JAVA_OPTS, and $GRADLE_OPTS can contain fragments of
+#     shell script including quotes and variable substitutions, so put them in
+#     double quotes to make sure that they get re-expanded; and
+#   * put everything else in single quotes, so that it's not re-expanded.
+
+set -- \
+        "-Dorg.gradle.appname=$APP_BASE_NAME" \
+        -classpath "$CLASSPATH" \
+        org.gradle.wrapper.GradleWrapperMain \
+        "$@"
+
+# Use "xargs" to parse quoted args.
+#
+# With -n1 it outputs one arg per line, with the quotes and backslashes removed.
+#
+# In Bash we could simply go:
+#
+#   readarray ARGS < <( xargs -n1 <<<"$var" ) &&
+#   set -- "${ARGS[@]}" "$@"
+#
+# but POSIX shell has neither arrays nor command substitution, so instead we
+# post-process each arg (as a line of input to sed) to backslash-escape any
+# character that might be a shell metacharacter, then use eval to reverse
+# that process (while maintaining the separation between arguments), and wrap
+# the whole thing up as a single "set" statement.
+#
+# This will of course break if any of these variables contains a newline or
+# an unmatched quote.
+#
+
+eval "set -- $(
+        printf '%s\n' "$DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS" |
+        xargs -n1 |
+        sed ' s~[^-[:alnum:]+,./:=@_]~\\&~g; ' |
+        tr '\n' ' '
+    )" '"$@"'
+
+exec "$JAVACMD" "$@"

gradlew.bat

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

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

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

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

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

@@ -1,207 +0,0 @@
-package nl.requios.effortlessbuilding;
-
-import net.minecraft.block.Block;
-import net.minecraft.block.state.IBlockState;
-import net.minecraft.entity.player.EntityPlayer;
-import net.minecraft.entity.player.EntityPlayerMP;
-import net.minecraft.item.ItemBlock;
-import net.minecraft.item.ItemStack;
-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.world.World;
-import net.minecraftforge.event.world.BlockEvent;
-import nl.requios.effortlessbuilding.helper.ReachHelper;
-import nl.requios.effortlessbuilding.helper.SurvivalHelper;
-import nl.requios.effortlessbuilding.item.ItemRandomizerBag;
-import nl.requios.effortlessbuilding.network.BlockBrokenMessage;
-import nl.requios.effortlessbuilding.network.BlockPlacedMessage;
-
-import java.util.ArrayList;
-import java.util.List;
-
-public class BuildModifiers {
-
-    //Uses a network message to get the previous raytraceresult from the player
-    //The server could keep track of all raytraceresults but this might lag with many players
-    //Raytraceresult is needed for sideHit and hitVec
-    public static void onBlockPlacedMessage(EntityPlayer player, BlockPlacedMessage message) {
-        if (!message.isBlockHit() || message.getBlockPos() == null) return;
-
-        World world = player.world;
-        ItemRandomizerBag.renewRandomness();
-
-        BlockPos startPos = message.getBlockPos();
-
-        //Offset in direction of sidehit if not quickreplace and not replaceable
-        BuildSettingsManager.BuildSettings buildSettings = BuildSettingsManager.getBuildSettings(player);
-        boolean replaceable = world.getBlockState(startPos).getBlock().isReplaceable(player.world, startPos);
-        if (!buildSettings.doQuickReplace() && !replaceable) {
-            startPos = startPos.offset(message.getSideHit());
-        }
-
-        //Get under tall grass and other replaceable blocks
-        if (buildSettings.doQuickReplace() && replaceable) {
-            startPos = startPos.down();
-        }
-
-        //Check if player reach does not exceed startpos
-        int maxReach = ReachHelper.getMaxReach(player);
-        if (player.getPosition().distanceSq(startPos) > maxReach * maxReach) {
-            EffortlessBuilding.log(player, "Placement exceeds your reach.");
-            return;
-        }
-
-        //Format hitvec to 0.x
-        Vec3d hitVec = message.getHitVec();
-        hitVec = new Vec3d(Math.abs(hitVec.x - ((int) hitVec.x)), Math.abs(hitVec.y - ((int) hitVec.y)), Math.abs(hitVec.z - ((int) hitVec.z)));
-
-        //find coordinates and blockstates
-        List<BlockPos> coordinates = findCoordinates(player, startPos);
-        List<ItemStack> itemStacks = new ArrayList<>();
-        List<IBlockState> blockStates = findBlockStates(player, startPos, hitVec, message.getSideHit(), itemStacks);
-
-        //check if valid blockstates
-        if (blockStates.size() == 0 || coordinates.size() != blockStates.size()) return;
-
-        //place blocks
-        for (int i = 0; i < coordinates.size(); i++) {
-            BlockPos blockPos = coordinates.get(i);
-            IBlockState blockState = blockStates.get(i);
-            ItemStack itemStack = itemStacks.get(i);
-
-            if (world.isBlockLoaded(blockPos, true)) {
-                //check itemstack empty
-                if (itemStack.isEmpty()) continue;
-                SurvivalHelper.placeBlock(world, player, blockPos, blockState, itemStack, EnumFacing.UP, true, false);
-            }
-        }
-    }
-
-    public static void onBlockPlaced(BlockEvent.PlaceEvent event) {
-        if (event.getWorld().isRemote) return;
-
-        BuildSettingsManager.BuildSettings buildSettings = BuildSettingsManager.getBuildSettings(event.getPlayer());
-        //Only use own place event if anything is enabled
-        if (isEnabled(buildSettings, event.getPos())) {
-            //EffortlessBuilding.packetHandler.sendTo(new BlockPlacedMessage(), (EntityPlayerMP) event.getPlayer());
-            event.setCanceled(true);
-        }
-
-    }
-
-    //Use a network message to break blocks in the distance using clientside mouse input
-    public static void onBlockBrokenMessage(EntityPlayer player, BlockBrokenMessage message) {
-        BlockPos blockPos = message.getBlockPos();
-        if (ReachHelper.canBreakFar(player) && message.isBlockHit()) {
-            BlockEvent.BreakEvent event = new BlockEvent.BreakEvent(player.world, blockPos, player.world.getBlockState(blockPos), player);
-            onBlockBroken(event);
-        }
-    }
-
-    public static void onBlockBroken(BlockEvent.BreakEvent event) {
-        if (event.getWorld().isRemote) return;
-
-        BuildSettingsManager.BuildSettings buildSettings = BuildSettingsManager.getBuildSettings(event.getPlayer());
-        //Only use own break event if anything is enabled
-        if (isEnabled(buildSettings, event.getPos())) {
-            //get coordinates
-            List<BlockPos> coordinates = findCoordinates(event.getPlayer(), event.getPos());
-
-            //break all those blocks
-            for (BlockPos coordinate : coordinates) {
-                if (event.getWorld().isBlockLoaded(coordinate, false)) {
-                    SurvivalHelper.breakBlock(event.getWorld(), event.getPlayer(), coordinate);
-                }
-            }
-        }
-    }
-
-    public static List<BlockPos> findCoordinates(EntityPlayer player, BlockPos startPos) {
-        List<BlockPos> coordinates = new ArrayList<>();
-        //Add current block being placed too
-        coordinates.add(startPos);
-
-        List<BlockPos> arrayCoordinates = Array.findCoordinates(player, startPos);
-        coordinates.addAll(arrayCoordinates);
-        coordinates.addAll(Mirror.findCoordinates(player, startPos));
-        coordinates.addAll(RadialMirror.findCoordinates(player, startPos));
-        //get mirror for each array coordinate
-        for (BlockPos coordinate : arrayCoordinates) {
-            coordinates.addAll(Mirror.findCoordinates(player, coordinate));
-            coordinates.addAll(RadialMirror.findCoordinates(player, coordinate));
-        }
-
-        return coordinates;
-    }
-
-    public static List<IBlockState> findBlockStates(EntityPlayer player, BlockPos startPos, Vec3d hitVec, EnumFacing facing, List<ItemStack> itemStacks) {
-        List<IBlockState> blockStates = new ArrayList<>();
-        itemStacks.clear();
-
-        //Get itemstack
-        ItemStack itemStack = player.getHeldItem(EnumHand.MAIN_HAND);
-        if (itemStack.isEmpty() || !(itemStack.getItem() instanceof ItemBlock || itemStack.getItem() instanceof ItemRandomizerBag)) {
-            itemStack = player.getHeldItem(EnumHand.OFF_HAND);
-        }
-        if (itemStack.isEmpty() || !(itemStack.getItem() instanceof ItemBlock || itemStack.getItem() instanceof ItemRandomizerBag)) {
-            return blockStates;
-        }
-
-        //Get ItemBlock stack
-        ItemStack itemBlock = ItemStack.EMPTY;
-        if (itemStack.getItem() instanceof ItemBlock) itemBlock = itemStack;
-        ItemRandomizerBag.resetRandomness();
-        if (itemStack.getItem() instanceof ItemRandomizerBag) itemBlock = ItemRandomizerBag.pickRandomStack(ItemRandomizerBag.getBagInventory(itemStack));
-
-        IBlockState blockState = getBlockStateFromItem(itemBlock, player, startPos, facing, hitVec, EnumHand.MAIN_HAND);
-        //Add current block being placed too
-        blockStates.add(blockState);
-        itemStacks.add(itemStack);
-
-        List<IBlockState> arrayBlockStates = Array.findBlockStates(player, startPos, blockState, itemStack, itemStacks);
-        blockStates.addAll(arrayBlockStates);
-        blockStates.addAll(Mirror.findBlockStates(player, startPos, blockState, itemStack, itemStacks));
-        blockStates.addAll(RadialMirror.findBlockStates(player, startPos, blockState, itemStack, itemStacks));
-        //add mirror for each array coordinate
-        List<BlockPos> arrayCoordinates = Array.findCoordinates(player, startPos);
-        for (int i = 0; i < arrayCoordinates.size(); i++) {
-            BlockPos coordinate = arrayCoordinates.get(i);
-            IBlockState blockState1 = arrayBlockStates.get(i);
-            blockStates.addAll(Mirror.findBlockStates(player, coordinate, blockState1, itemStack, itemStacks));
-            blockStates.addAll(RadialMirror.findBlockStates(player, coordinate, blockState1, itemStack, itemStacks));
-        }
-
-        //Adjust blockstates for torches and ladders etc to place on a valid side
-        //TODO optimize findCoordinates (done twice now)
-        //TODO fix mirror
-//        List<BlockPos> coordinates = findCoordinates(player, startPos);
-//        for (int i = 0; i < blockStates.size(); i++) {
-//            blockStates.set(i, blockStates.get(i).getBlock().getStateForPlacement(player.world, coordinates.get(i), facing,
-//                    (float) hitVec.x, (float) hitVec.y, (float) hitVec.z, itemStacks.get(i).getMetadata(), player, EnumHand.MAIN_HAND));
-//        }
-
-        return blockStates;
-    }
-
-    public static boolean isEnabled(BuildSettingsManager.BuildSettings buildSettings, BlockPos startPos) {
-        return Mirror.isEnabled(buildSettings.getMirrorSettings(), startPos) ||
-               Array.isEnabled(buildSettings.getArraySettings()) ||
-               RadialMirror.isEnabled(buildSettings.getRadialMirrorSettings(), startPos) ||
-               buildSettings.doQuickReplace();
-    }
-
-    public static IBlockState getBlockStateFromItem(ItemStack itemStack, EntityPlayer player, BlockPos blockPos, EnumFacing facing, Vec3d hitVec, EnumHand hand) {
-        return Block.getBlockFromItem(itemStack.getItem()).getStateForPlacement(player.world, blockPos, facing,
-                ((float) hitVec.x), ((float) hitVec.y), ((float) hitVec.z), itemStack.getMetadata(), player, hand);
-    }
-
-    //Returns true if equal (or both null)
-    public static boolean compareCoordinates(List<BlockPos> coordinates1, List<BlockPos> coordinates2) {
-        if (coordinates1 == null && coordinates2 == null) return true;
-        if (coordinates1 == null || coordinates2 == null) return false;
-
-        return coordinates1.equals(coordinates2);
-    }
-}

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

@@ -1,184 +0,0 @@
-package nl.requios.effortlessbuilding;
-
-import net.minecraft.entity.player.EntityPlayer;
-import net.minecraft.entity.player.EntityPlayerMP;
-import net.minecraftforge.fml.common.Mod;
-import net.minecraftforge.fml.common.eventhandler.SubscribeEvent;
-import net.minecraftforge.fml.common.gameevent.PlayerEvent;
-import nl.requios.effortlessbuilding.capability.BuildModifierCapabilityManager;
-import nl.requios.effortlessbuilding.helper.ReachHelper;
-import nl.requios.effortlessbuilding.network.BuildSettingsMessage;
-
-@Mod.EventBusSubscriber
-public class BuildSettingsManager {
-
-    //Retrieves the buildsettings of a player through the buildModifierCapability capability
-    //Never returns null
-    public static BuildSettings getBuildSettings(EntityPlayer player){
-        if (player.hasCapability(BuildModifierCapabilityManager.buildModifierCapability, null)) {
-            BuildModifierCapabilityManager.IBuildModifierCapability capability = player.getCapability(
-                    BuildModifierCapabilityManager.buildModifierCapability, null);
-            if (capability.getBuildModifierData() == null) {
-                capability.setBuildModifierData(new BuildSettings());
-            }
-            return capability.getBuildModifierData();
-        }
-        throw new IllegalArgumentException("Player does not have buildModifierCapability capability");
-    }
-
-    public static void setBuildSettings(EntityPlayer player, BuildSettings buildSettings) {
-        if (player == null) {
-            EffortlessBuilding.log("Cannot set buildsettings, player is null");
-            return;
-        }
-        if (player.hasCapability(BuildModifierCapabilityManager.buildModifierCapability, null)) {
-            BuildModifierCapabilityManager.IBuildModifierCapability capability = player.getCapability(
-                    BuildModifierCapabilityManager.buildModifierCapability, null);
-            capability.setBuildModifierData(buildSettings);
-        } else {
-            EffortlessBuilding.log(player, "Saving buildsettings failed.");
-        }
-    }
-
-    public static String sanitize(BuildSettings buildSettings, EntityPlayer player) {
-        int maxReach = ReachHelper.getMaxReach(player);
-        String error = "";
-
-        //Mirror settings
-        Mirror.MirrorSettings m = buildSettings.getMirrorSettings();
-        if (m.radius < 1) {
-            m.radius = 1;
-            error += "Mirror size has to be at least 1. This has been corrected. ";
-        }
-        if (m.getReach() > maxReach) {
-            m.radius = maxReach / 2;
-            error += "Mirror exceeds your maximum reach of " + (maxReach / 2) + ". Radius has been set to "+ (maxReach / 2) + ". ";
-        }
-
-        //Array settings
-        Array.ArraySettings a = buildSettings.getArraySettings();
-        if (a.count < 0) {
-            a.count = 0;
-            error += "Array count may not be negative. It has been reset to 0.";
-        }
-
-        if (a.getReach() > maxReach) {
-            a.count = 0;
-            error += "Array exceeds your maximum reach of " + maxReach + ". Array count has been reset to 0. ";
-        }
-
-        //Radial mirror settings
-        RadialMirror.RadialMirrorSettings r = buildSettings.getRadialMirrorSettings();
-        if (r.slices < 2) {
-            r.slices = 2;
-            error += "Radial mirror needs to have at least 2 slices. Slices has been set to 2.";
-        }
-
-        if (r.radius < 1) {
-            r.radius = 1;
-            error += "Radial mirror radius has to be at least 1. This has been corrected. ";
-        }
-        if (r.getReach() > maxReach) {
-            r.radius = maxReach / 2;
-            error += "Radial mirror exceeds your maximum reach of " + (maxReach / 2) + ". Radius has been set to "+ (maxReach / 2) + ". ";
-        }
-
-        //Other
-        if (buildSettings.reachUpgrade < 0) {
-            buildSettings.reachUpgrade = 0;
-        }
-        if (buildSettings.reachUpgrade > 3) {
-            buildSettings.reachUpgrade = 3;
-        }
-
-        return error;
-    }
-
-    public static class BuildSettings {
-        private Mirror.MirrorSettings mirrorSettings;
-        private Array.ArraySettings arraySettings;
-        private RadialMirror.RadialMirrorSettings radialMirrorSettings;
-        private boolean quickReplace = false;
-        private int reachUpgrade = 0;
-
-        public BuildSettings() {
-            mirrorSettings = new Mirror.MirrorSettings();
-            arraySettings = new Array.ArraySettings();
-        }
-
-        public BuildSettings(Mirror.MirrorSettings mirrorSettings, Array.ArraySettings arraySettings,
-                             RadialMirror.RadialMirrorSettings radialMirrorSettings, boolean quickReplace, int reachUpgrade) {
-            this.mirrorSettings = mirrorSettings;
-            this.arraySettings = arraySettings;
-            this.radialMirrorSettings = radialMirrorSettings;
-            this.quickReplace = quickReplace;
-            this.reachUpgrade = reachUpgrade;
-        }
-
-        public Mirror.MirrorSettings getMirrorSettings() {
-            return mirrorSettings;
-        }
-
-        public void setMirrorSettings(Mirror.MirrorSettings mirrorSettings) {
-            this.mirrorSettings = mirrorSettings;
-        }
-
-        public Array.ArraySettings getArraySettings() {
-            return arraySettings;
-        }
-
-        public void setArraySettings(Array.ArraySettings arraySettings) {
-            this.arraySettings = arraySettings;
-        }
-
-        public RadialMirror.RadialMirrorSettings getRadialMirrorSettings() {
-            return radialMirrorSettings;
-        }
-
-        public void setRadialMirrorSettings(RadialMirror.RadialMirrorSettings radialMirrorSettings) {
-            this.radialMirrorSettings = radialMirrorSettings;
-        }
-
-        public boolean doQuickReplace() {
-            return quickReplace;
-        }
-
-        public void setQuickReplace(boolean quickReplace) {
-            this.quickReplace = quickReplace;
-        }
-
-        public int getReachUpgrade() {
-            return reachUpgrade;
-        }
-
-        public void setReachUpgrade(int reachUpgrade) {
-            this.reachUpgrade = reachUpgrade;
-        }
-    }
-
-    @SubscribeEvent
-    public static void onPlayerLoggedIn(PlayerEvent.PlayerLoggedInEvent event) {
-        EntityPlayer player = event.player;
-        handleNewPlayer(player);
-    }
-
-    @SubscribeEvent
-    public static void onPlayerRespawn(PlayerEvent.PlayerRespawnEvent event) {
-        EntityPlayer player = event.player;
-        handleNewPlayer(player);
-    }
-
-    private static void handleNewPlayer(EntityPlayer player){
-        if (getBuildSettings(player) == null) {
-            setBuildSettings(player, new BuildSettings());
-        }
-
-        //Only on server
-        if (!player.world.isRemote) {
-            //Send to client
-            BuildSettingsMessage msg = new BuildSettingsMessage(getBuildSettings(player));
-            EffortlessBuilding.packetHandler.sendTo(msg, (EntityPlayerMP) player);
-        }
-    }
-}
-

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

@@ -1,127 +1,113 @@
 package nl.requios.effortlessbuilding;
 
-import net.minecraft.block.Block;
+import net.minecraft.network.chat.Component;
-import net.minecraft.entity.player.EntityPlayer;
+import net.minecraft.world.entity.player.Player;
-import net.minecraft.item.Item;
+import net.minecraft.world.inventory.AbstractContainerMenu;
-import net.minecraft.util.text.TextComponentString;
+import net.minecraft.world.inventory.MenuType;
-import net.minecraftforge.common.capabilities.CapabilityManager;
+import net.minecraft.world.item.Item;
-import net.minecraftforge.common.config.Config;
+import net.minecraftforge.common.capabilities.RegisterCapabilitiesEvent;
-import net.minecraftforge.common.config.ConfigManager;
+import net.minecraftforge.eventbus.api.SubscribeEvent;
+import net.minecraftforge.fml.DistExecutor;
+import net.minecraftforge.fml.ModLoadingContext;
 import net.minecraftforge.fml.common.Mod;
-import net.minecraftforge.fml.common.Mod.EventHandler;
+import net.minecraftforge.fml.config.ModConfig;
-import net.minecraftforge.fml.common.SidedProxy;
+import net.minecraftforge.fml.event.lifecycle.FMLClientSetupEvent;
-import net.minecraftforge.fml.common.event.FMLInitializationEvent;
+import net.minecraftforge.fml.event.lifecycle.FMLCommonSetupEvent;
-import net.minecraftforge.fml.common.event.FMLPostInitializationEvent;
+import net.minecraftforge.fml.javafmlmod.FMLJavaModLoadingContext;
-import net.minecraftforge.fml.common.event.FMLPreInitializationEvent;
+import net.minecraftforge.network.IContainerFactory;
-import net.minecraftforge.fml.common.event.FMLServerStartingEvent;
+import net.minecraftforge.registries.RegistryObject;
-import net.minecraftforge.fml.common.network.NetworkRegistry;
+import net.minecraftforge.registries.DeferredRegister;
-import net.minecraftforge.fml.common.network.simpleimpl.SimpleNetworkWrapper;
+import net.minecraftforge.registries.ForgeRegistries;
-import net.minecraftforge.fml.relauncher.Side;
+import nl.requios.effortlessbuilding.capability.ModeCapabilityManager;
-import nl.requios.effortlessbuilding.capability.BuildModifierCapabilityManager;
+import nl.requios.effortlessbuilding.capability.ModifierCapabilityManager;
-import nl.requios.effortlessbuilding.command.CommandReach;
+import nl.requios.effortlessbuilding.compatibility.CompatHelper;
-import nl.requios.effortlessbuilding.gui.RandomizerBagGuiHandler;
+import nl.requios.effortlessbuilding.gui.DiamondRandomizerBagContainer;
-import nl.requios.effortlessbuilding.item.ItemRandomizerBag;
+import nl.requios.effortlessbuilding.gui.GoldenRandomizerBagContainer;
-import nl.requios.effortlessbuilding.item.ItemReachUpgrade1;
+import nl.requios.effortlessbuilding.gui.RandomizerBagContainer;
-import nl.requios.effortlessbuilding.item.ItemReachUpgrade2;
+import nl.requios.effortlessbuilding.item.*;
-import nl.requios.effortlessbuilding.item.ItemReachUpgrade3;
+import nl.requios.effortlessbuilding.network.PacketHandler;
-import nl.requios.effortlessbuilding.network.BlockBrokenMessage;
+import nl.requios.effortlessbuilding.proxy.ClientProxy;
-import nl.requios.effortlessbuilding.network.BlockPlacedMessage;
-import nl.requios.effortlessbuilding.network.BuildSettingsMessage;
 import nl.requios.effortlessbuilding.proxy.IProxy;
+import nl.requios.effortlessbuilding.proxy.ServerProxy;
+import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
 
-@Mod(modid = EffortlessBuilding.MODID, name = EffortlessBuilding.NAME, version = EffortlessBuilding.VERSION)
+@Mod(EffortlessBuilding.MODID)
-@Mod.EventBusSubscriber
+public class EffortlessBuilding {
-public class EffortlessBuilding
+
-{
 	public static final String MODID = "effortlessbuilding";
-    public static final String NAME = "Effortless Building";
+	public static final Logger logger = LogManager.getLogger();
-    public static final String VERSION = "1.0";
 
-    @Mod.Instance(EffortlessBuilding.MODID)
 	public static EffortlessBuilding instance;
+	public static IProxy proxy = DistExecutor.runForDist(() -> ClientProxy::new, () -> ServerProxy::new);
 
-    public static Logger logger;
+	//Registration
+	private static final DeferredRegister<Item> ITEMS = DeferredRegister.create(ForgeRegistries.ITEMS, MODID);
+	private static final DeferredRegister<MenuType<?>> CONTAINERS = DeferredRegister.create(ForgeRegistries.MENU_TYPES, EffortlessBuilding.MODID);
 
-    @SidedProxy(
+	public static final RegistryObject<Item> RANDOMIZER_BAG_ITEM = ITEMS.register("randomizer_bag", RandomizerBagItem::new);
-        clientSide="nl.requios.effortlessbuilding.proxy.ClientProxy",
+	public static final RegistryObject<Item> GOLDEN_RANDOMIZER_BAG_ITEM = ITEMS.register("golden_randomizer_bag", GoldenRandomizerBagItem::new);
-        serverSide="nl.requios.effortlessbuilding.proxy.ServerProxy"
+	public static final RegistryObject<Item> DIAMOND_RANDOMIZER_BAG_ITEM = ITEMS.register("diamond_randomizer_bag", DiamondRandomizerBagItem::new);
-    )
+	public static final RegistryObject<Item> REACH_UPGRADE_1_ITEM = ITEMS.register("reach_upgrade1", ReachUpgrade1Item::new);
-    public static IProxy proxy;
+	public static final RegistryObject<Item> REACH_UPGRADE_2_ITEM = ITEMS.register("reach_upgrade2", ReachUpgrade2Item::new);
+	public static final RegistryObject<Item> REACH_UPGRADE_3_ITEM = ITEMS.register("reach_upgrade3", ReachUpgrade3Item::new);
 
-    public static final SimpleNetworkWrapper packetHandler = NetworkRegistry.INSTANCE.newSimpleChannel(EffortlessBuilding.MODID);
+	public static final RegistryObject<MenuType<RandomizerBagContainer>> RANDOMIZER_BAG_CONTAINER = CONTAINERS.register("randomizer_bag", () -> registerContainer(RandomizerBagContainer::new));
+	public static final RegistryObject<MenuType<GoldenRandomizerBagContainer>> GOLDEN_RANDOMIZER_BAG_CONTAINER = CONTAINERS.register("golden_randomizer_bag", () -> registerContainer(GoldenRandomizerBagContainer::new));
+	public static final RegistryObject<MenuType<DiamondRandomizerBagContainer>> DIAMOND_RANDOMIZER_BAG_CONTAINER = CONTAINERS.register("diamond_randomizer_bag", () -> registerContainer(DiamondRandomizerBagContainer::new));
 
-    public static final ItemRandomizerBag ITEM_RANDOMIZER_BAG = new ItemRandomizerBag();
+	public EffortlessBuilding() {
-    public static final ItemReachUpgrade1 ITEM_REACH_UPGRADE_1 = new ItemReachUpgrade1();
+		instance = this;
-    public static final ItemReachUpgrade2 ITEM_REACH_UPGRADE_2 = new ItemReachUpgrade2();
-    public static final ItemReachUpgrade3 ITEM_REACH_UPGRADE_3 = new ItemReachUpgrade3();
 
-    public static final Block[] BLOCKS = {
+		// Register ourselves for server and other game events we are interested in
-    };
+		FMLJavaModLoadingContext.get().getModEventBus().register(this);
 
-    public static final Item[] ITEMS = {
+		ITEMS.register(FMLJavaModLoadingContext.get().getModEventBus());
-            ITEM_RANDOMIZER_BAG,
+		CONTAINERS.register(FMLJavaModLoadingContext.get().getModEventBus());
-            ITEM_REACH_UPGRADE_1,
-            ITEM_REACH_UPGRADE_2,
-            ITEM_REACH_UPGRADE_3
-    };
 
-    public static final int RANDOMIZER_BAG_GUI = 0;
+		//Register config
-
+		ModLoadingContext.get().registerConfig(ModConfig.Type.COMMON, BuildConfig.spec);
-    @EventHandler
-    // preInit "Run before anything else. Read your config, create blocks, items, etc, and register them with the GameRegistry."
-    public void preInit(FMLPreInitializationEvent event)
-    {
-        logger = event.getModLog();
-
-        CapabilityManager.INSTANCE.register(
-                BuildModifierCapabilityManager.IBuildModifierCapability.class, new BuildModifierCapabilityManager.Storage(), BuildModifierCapabilityManager.BuildModifierCapability.class);
-
-        EffortlessBuilding.packetHandler.registerMessage(BuildSettingsMessage.MessageHandler.class, BuildSettingsMessage.class, 0, Side.SERVER);
-        EffortlessBuilding.packetHandler.registerMessage(BuildSettingsMessage.MessageHandler.class, BuildSettingsMessage.class, 0, Side.CLIENT);
-
-        EffortlessBuilding.packetHandler.registerMessage(BlockPlacedMessage.MessageHandler.class, BlockPlacedMessage.class, 1, Side.SERVER);
-        EffortlessBuilding.packetHandler.registerMessage(BlockPlacedMessage.MessageHandler.class, BlockPlacedMessage.class, 1, Side.CLIENT);
-
-        EffortlessBuilding.packetHandler.registerMessage(BlockBrokenMessage.MessageHandler.class, BlockBrokenMessage.class, 2, Side.SERVER);
-
-        proxy.preInit(event);
 	}
 
-    @EventHandler
+	public static <T extends AbstractContainerMenu> MenuType<T> registerContainer(IContainerFactory<T> fact){
-    // Do your mod setup. Build whatever data structures you care about.
+		MenuType<T> type = new MenuType<T>(fact);
-    // Register network handlers
+		return type;
-    public void init(FMLInitializationEvent event)
-    {
-        ConfigManager.sync(MODID, Config.Type.INSTANCE);
-        NetworkRegistry.INSTANCE.registerGuiHandler(EffortlessBuilding.instance, new RandomizerBagGuiHandler());
-
-        proxy.init(event);
 	}
 
-    @EventHandler
+	@SubscribeEvent
-    // postInit "Handle interaction with other mods, complete your setup based on this."
+	public void setup(final FMLCommonSetupEvent event) {
-    public void postInit(FMLPostInitializationEvent event)
+		PacketHandler.register();
-    {
+
-        proxy.postInit(event);
+		proxy.setup(event);
+
+		CompatHelper.setup();
 	}
 
-    @EventHandler
+	@SubscribeEvent
-    public void serverStarting(FMLServerStartingEvent event)
+	public void clientSetup(final FMLClientSetupEvent event) {
-    {
+		proxy.clientSetup(event);
-        event.registerServerCommand(new CommandReach());
-        proxy.serverStarting(event);
 	}
 
-    public static void log(String msg){
+	@SubscribeEvent
+	public void registerCapabilities(RegisterCapabilitiesEvent event){
+		event.register(ModifierCapabilityManager.IModifierCapability.class);
+		event.register(ModeCapabilityManager.IModeCapability.class);
+	}
+
+	public static void log(String msg) {
 		logger.info(msg);
 	}
 
-    public static void log(EntityPlayer player, String msg){
+	public static void log(Player player, String msg) {
 		log(player, msg, false);
 	}
 
-    public static void log(EntityPlayer player, String msg, boolean actionBar){
+	public static void log(Player player, String msg, boolean actionBar) {
-        player.sendStatusMessage(new TextComponentString(msg), actionBar);
+		player.displayClientMessage(Component.literal(msg), actionBar);
+	}
+
+	//Log with translation supported, call either on client or server (which then sends a message)
+	public static void logTranslate(Player player, String prefix, String translationKey, String suffix, boolean actionBar) {
+		proxy.logTranslate(player, prefix, translationKey, suffix, actionBar);
 	}
 }

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

@@ -1,114 +1,163 @@
 package nl.requios.effortlessbuilding;
 
-import net.minecraft.block.Block;
+import net.minecraft.world.level.block.Blocks;
-import net.minecraft.block.state.IBlockState;
+import net.minecraft.world.entity.Entity;
-import net.minecraft.entity.Entity;
+import net.minecraft.world.entity.player.Player;
-import net.minecraft.entity.player.EntityPlayer;
+import net.minecraft.server.level.ServerPlayer;
-import net.minecraft.item.Item;
+import net.minecraft.resources.ResourceLocation;
-import net.minecraft.item.ItemBlock;
+import net.minecraftforge.common.util.FakePlayer;
-import net.minecraft.util.ResourceLocation;
-import net.minecraft.util.math.BlockPos;
-import net.minecraft.world.World;
-import net.minecraftforge.common.config.Config;
-import net.minecraftforge.common.config.ConfigManager;
 import net.minecraftforge.event.AttachCapabilitiesEvent;
-import net.minecraftforge.event.RegistryEvent;
+import net.minecraftforge.event.RegisterCommandsEvent;
 import net.minecraftforge.event.entity.player.PlayerEvent;
-import net.minecraftforge.event.world.BlockEvent;
+import net.minecraftforge.event.level.BlockEvent;
-import net.minecraftforge.fml.client.event.ConfigChangedEvent;
+import net.minecraftforge.eventbus.api.SubscribeEvent;
 import net.minecraftforge.fml.common.Mod;
-import net.minecraftforge.fml.common.eventhandler.SubscribeEvent;
+import net.minecraftforge.network.PacketDistributor;
-import nl.requios.effortlessbuilding.capability.BuildModifierCapabilityManager;
+import nl.requios.effortlessbuilding.buildmode.BuildModes;
-import nl.requios.effortlessbuilding.helper.SurvivalHelper;
+import nl.requios.effortlessbuilding.buildmode.ModeSettingsManager;
+import nl.requios.effortlessbuilding.buildmodifier.ModifierSettingsManager;
+import nl.requios.effortlessbuilding.buildmodifier.UndoRedo;
+import nl.requios.effortlessbuilding.capability.ModeCapabilityManager;
+import nl.requios.effortlessbuilding.capability.ModifierCapabilityManager;
+import nl.requios.effortlessbuilding.helper.ReachHelper;
+import nl.requios.effortlessbuilding.network.AddUndoMessage;
+import nl.requios.effortlessbuilding.network.ClearUndoMessage;
+import nl.requios.effortlessbuilding.network.PacketHandler;
+import nl.requios.effortlessbuilding.network.RequestLookAtMessage;
 
-import java.util.List;
+@Mod.EventBusSubscriber(modid = EffortlessBuilding.MODID, bus = Mod.EventBusSubscriber.Bus.FORGE)
-
+public class EventHandler {
-@Mod.EventBusSubscriber
-public class EventHandler
-{
-
-    @SubscribeEvent
-    public static void registerBlocks(RegistryEvent.Register<Block> event)
-    {
-        event.getRegistry().registerAll(EffortlessBuilding.BLOCKS);
-    }
-
-    @SubscribeEvent
-    public static void registerItems(RegistryEvent.Register<Item> event)
-    {
-        event.getRegistry().registerAll(EffortlessBuilding.ITEMS);
-
-        for (Block block : EffortlessBuilding.BLOCKS)
-        {
-            event.getRegistry().register(new ItemBlock(block).setRegistryName(block.getRegistryName()));
-        }
-    }
 
 	@SubscribeEvent
 	public static void attachCapabilities(AttachCapabilitiesEvent<Entity> event) {
-        if (event.getObject() instanceof EntityPlayer) {
+		if (event.getObject() instanceof FakePlayer) return;
-            event.addCapability(new ResourceLocation(EffortlessBuilding.MODID, "BuildModifier"), new BuildModifierCapabilityManager.Provider());
+		if (event.getObject() instanceof Player) {
+			event.addCapability(new ResourceLocation(EffortlessBuilding.MODID, "build_modifier"), new ModifierCapabilityManager.Provider());
+			event.addCapability(new ResourceLocation(EffortlessBuilding.MODID, "build_mode"), new ModeCapabilityManager.Provider());
 		}
 	}
 
 	@SubscribeEvent
-    public void onConfigChangedEvent(ConfigChangedEvent.OnConfigChangedEvent event)
+	public static void onBlockPlaced(BlockEvent.EntityPlaceEvent event) {
-    {
+		if (event.getLevel().isClientSide()) return;
-        if (event.getModID().equals(EffortlessBuilding.MODID))
+
-        {
+		if (!(event.getEntity() instanceof Player)) return;
-            ConfigManager.sync(EffortlessBuilding.MODID, Config.Type.INSTANCE);
+
-        }
+		if (event.getEntity() instanceof FakePlayer) return;
+
+		//Cancel event if necessary
+		ServerPlayer player = ((ServerPlayer) event.getEntity());
+		BuildModes.BuildModeEnum buildMode = ModeSettingsManager.getModeSettings(player).getBuildMode();
+		ModifierSettingsManager.ModifierSettings modifierSettings = ModifierSettingsManager.getModifierSettings(player);
+
+		if (buildMode != BuildModes.BuildModeEnum.NORMAL) {
+			event.setCanceled(true);
+		} else if (modifierSettings.doQuickReplace()) {
+			//Cancel event and send message if QuickReplace
+			event.setCanceled(true);
+			PacketHandler.INSTANCE.send(PacketDistributor.PLAYER.with(() -> player), new RequestLookAtMessage(true));
+			PacketHandler.INSTANCE.send(PacketDistributor.PLAYER.with(() -> player), new AddUndoMessage(event.getPos(), event.getBlockSnapshot().getReplacedBlock(), event.getState()));
+		} else {
+			//NORMAL mode, let vanilla handle block placing
+			//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()));
 		}
 
-//    @SubscribeEvent
+//        Stat<ResourceLocation> blocksPlacedStat = StatList.CUSTOM.get(new ResourceLocation(EffortlessBuilding.MODID, "blocks_placed"));
-//    public static void onServerTick(TickEvent.ServerTickEvent event) {
+//        player.getStats().increment(player, blocksPlacedStat, 1);
 //
-//    }
+//        System.out.println(player.getStats().getValue(blocksPlacedStat));
-
-    @SubscribeEvent
-    public static void onBlockPlaced(BlockEvent.PlaceEvent event) {
-        //Still call it to cancel event
-        BuildModifiers.onBlockPlaced(event);
 	}
 
 	@SubscribeEvent
 	public static void onBlockBroken(BlockEvent.BreakEvent event) {
-        BuildModifiers.onBlockBroken(event);
+		if (event.getLevel().isClientSide()) return;
+
+		if (event.getPlayer() instanceof FakePlayer) return;
+
+		//Cancel event if necessary
+		//If cant break far then dont cancel event ever
+		BuildModes.BuildModeEnum buildMode = ModeSettingsManager.getModeSettings(event.getPlayer()).getBuildMode();
+		if (buildMode != BuildModes.BuildModeEnum.NORMAL && ReachHelper.canBreakFar(event.getPlayer())) {
+			event.setCanceled(true);
+		} else {
+			//NORMAL mode, let vanilla handle block breaking
+			//But modifiers and QuickReplace should still work
+			//Dont break the original block yourself, otherwise Tinkers Hammer and Veinminer won't work
+			BuildModes.onBlockBroken(event.getPlayer(), event.getPos(), false);
+
+			//Add to undo stack in client
+			if (event.getPlayer() instanceof ServerPlayer && event.getState() != null && event.getPos() != null) {
+				PacketDistributor.PacketTarget packetTarget = PacketDistributor.PLAYER.with(() -> (ServerPlayer) event.getPlayer());
+				if (packetTarget != null)
+					PacketHandler.INSTANCE.send(packetTarget, new AddUndoMessage(event.getPos(), event.getState(), Blocks.AIR.defaultBlockState()));
+			}
+		}
 	}
 
 	@SubscribeEvent
-    public static void breakSpeed(PlayerEvent.BreakSpeed event) {
+	public static void onPlayerLoggedIn(PlayerEvent.PlayerLoggedInEvent event) {
-        //Disable if config says so
+		if (event.getEntity() instanceof FakePlayer) return;
-        if (!BuildConfig.survivalBalancers.increasedMiningTime) return;
+		Player player = event.getEntity();
-
+		ModifierSettingsManager.handleNewPlayer(player);
-        EntityPlayer player = event.getEntityPlayer();
+		ModeSettingsManager.handleNewPlayer(player);
-        World world = player.world;
-        BlockPos pos = event.getPos();
-
-        //EffortlessBuilding.log(player, String.valueOf(event.getNewSpeed()));
-
-        float originalBlockHardness = event.getState().getBlockHardness(world, pos);
-        float totalBlockHardness = 0;
-        //get coordinates
-        List<BlockPos> coordinates = BuildModifiers.findCoordinates(player, pos);
-        for (int i = 1; i < coordinates.size(); i++) {
-            BlockPos coordinate = coordinates.get(i);
-            //get existing blockstates at those coordinates
-            IBlockState blockState = world.getBlockState(coordinate);
-            //add hardness for each blockstate, if can break
-            if (SurvivalHelper.canBreak(world, player, coordinate))
-                totalBlockHardness += blockState.getBlockHardness(world, coordinate);
 	}
 
-        //Grabbing percentage from config
+	@SubscribeEvent
-        float percentage = (float) BuildConfig.survivalBalancers.miningTimePercentage / 100;
+	public static void onPlayerLoggedOut(PlayerEvent.PlayerLoggedOutEvent event) {
-        totalBlockHardness *= percentage;
+		if (event.getEntity() instanceof FakePlayer) return;
-        totalBlockHardness += originalBlockHardness;
+		Player player = event.getEntity();
+		if (player.getCommandSenderWorld().isClientSide) return;
 
-        float newSpeed = event.getOriginalSpeed() / totalBlockHardness * originalBlockHardness;
+		UndoRedo.clear(player);
-        if (Float.isNaN(newSpeed) || newSpeed == 0f) newSpeed = 1f;
+		PacketHandler.INSTANCE.send(PacketDistributor.PLAYER.with(() -> (ServerPlayer) player), new ClearUndoMessage());
-        event.setNewSpeed(newSpeed);
+	}
 
-        //EffortlessBuilding.log(player, String.valueOf(event.getNewSpeed()));
+	@SubscribeEvent
+	public static void onPlayerRespawn(PlayerEvent.PlayerRespawnEvent event) {
+		if (event.getEntity() instanceof FakePlayer) return;
+		Player player = event.getEntity();
+		ModifierSettingsManager.handleNewPlayer(player);
+		ModeSettingsManager.handleNewPlayer(player);
+	}
+
+	@SubscribeEvent
+	public static void onPlayerChangedDimension(PlayerEvent.PlayerChangedDimensionEvent event) {
+		if (event.getEntity() instanceof FakePlayer) return;
+		Player player = event.getEntity();
+		if (player.getCommandSenderWorld().isClientSide) return;
+
+		//Set build mode to normal
+		ModeSettingsManager.ModeSettings modeSettings = ModeSettingsManager.getModeSettings(player);
+		modeSettings.setBuildMode(BuildModes.BuildModeEnum.NORMAL);
+		ModeSettingsManager.setModeSettings(player, modeSettings);
+
+		//Disable modifiers
+		ModifierSettingsManager.ModifierSettings modifierSettings = ModifierSettingsManager.getModifierSettings(player);
+		modifierSettings.getMirrorSettings().enabled = false;
+		modifierSettings.getRadialMirrorSettings().enabled = false;
+		modifierSettings.getArraySettings().enabled = false;
+		ModifierSettingsManager.setModifierSettings(player, modifierSettings);
+
+		ModifierSettingsManager.handleNewPlayer(player);
+		ModeSettingsManager.handleNewPlayer(player);
+
+		UndoRedo.clear(player);
+		PacketHandler.INSTANCE.send(PacketDistributor.PLAYER.with(() -> (ServerPlayer) player), new ClearUndoMessage());
+	}
+
+	@SubscribeEvent
+	public static void onPlayerClone(PlayerEvent.Clone event) {
+		if (event.getEntity() instanceof FakePlayer) return;
+		//Attach capabilities on death, otherwise crash
+		Player oldPlayer = event.getOriginal();
+		oldPlayer.revive();
+
+		Player newPlayer = event.getEntity();
+		ModifierSettingsManager.setModifierSettings(newPlayer, ModifierSettingsManager.getModifierSettings(oldPlayer));
+		ModeSettingsManager.setModeSettings(newPlayer, ModeSettingsManager.getModeSettings(oldPlayer));
 	}
 }

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

@@ -1,225 +0,0 @@
-package nl.requios.effortlessbuilding;
-
-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.util.EnumFacing;
-import net.minecraft.util.EnumHand;
-import net.minecraft.util.math.BlockPos;
-import net.minecraft.util.math.Vec3d;
-import net.minecraftforge.items.IItemHandler;
-import nl.requios.effortlessbuilding.item.ItemRandomizerBag;
-
-import java.util.ArrayList;
-import java.util.List;
-
-public class Mirror {
-
-    public static class MirrorSettings {
-        public boolean enabled = false;
-        public Vec3d position = new Vec3d(0.5, 64.5, 0.5);
-        public boolean mirrorX = true, mirrorY = false, mirrorZ = false;
-        public int radius = 20;
-        public boolean drawLines = true, drawPlanes = true;
-
-        public MirrorSettings() {
-        }
-
-        public MirrorSettings(boolean mirrorEnabled, Vec3d position, boolean mirrorX, boolean mirrorY, boolean mirrorZ, int radius, boolean drawLines, boolean drawPlanes) {
-            this.enabled = mirrorEnabled;
-            this.position = position;
-            this.mirrorX = mirrorX;
-            this.mirrorY = mirrorY;
-            this.mirrorZ = mirrorZ;
-            this.radius = radius;
-            this.drawLines = drawLines;
-            this.drawPlanes = drawPlanes;
-        }
-
-        public int getReach() {
-            return radius * 2;
-        }
-    }
-    
-    public static List<BlockPos> findCoordinates(EntityPlayer player, BlockPos startPos) {
-        List<BlockPos> coordinates = new ArrayList<>();
-
-        //find mirrorsettings for the player
-        MirrorSettings m = BuildSettingsManager.getBuildSettings(player).getMirrorSettings();
-        if (!isEnabled(m, startPos)) return coordinates;
-
-        if (m.mirrorX) coordinateMirrorX(m, startPos, coordinates);
-        if (m.mirrorY) coordinateMirrorY(m, startPos, coordinates);
-        if (m.mirrorZ) coordinateMirrorZ(m, startPos, coordinates);
-
-        return coordinates;
-    }
-
-    private static void coordinateMirrorX(MirrorSettings m, BlockPos oldBlockPos, List<BlockPos> coordinates) {
-        //find mirror position
-        double x = m.position.x + (m.position.x - oldBlockPos.getX() - 0.5);
-        BlockPos newBlockPos = new BlockPos(x, oldBlockPos.getY(), oldBlockPos.getZ());
-        coordinates.add(newBlockPos);
-
-        if (m.mirrorY) coordinateMirrorY(m, newBlockPos, coordinates);
-        if (m.mirrorZ) coordinateMirrorZ(m, newBlockPos, coordinates);
-    }
-
-    private static void coordinateMirrorY(MirrorSettings m, BlockPos oldBlockPos, List<BlockPos> coordinates) {
-        //find mirror position
-        double y = m.position.y + (m.position.y - oldBlockPos.getY() - 0.5);
-        BlockPos newBlockPos = new BlockPos(oldBlockPos.getX(), y, oldBlockPos.getZ());
-        coordinates.add(newBlockPos);
-
-        if (m.mirrorZ) coordinateMirrorZ(m, newBlockPos, coordinates);
-    }
-
-    private static void coordinateMirrorZ(MirrorSettings m, BlockPos oldBlockPos, List<BlockPos> coordinates) {
-        //find mirror position
-        double z = m.position.z + (m.position.z - oldBlockPos.getZ() - 0.5);
-        BlockPos newBlockPos = new BlockPos(oldBlockPos.getX(), oldBlockPos.getY(), z);
-        coordinates.add(newBlockPos);
-    }
-
-    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 = BuildSettingsManager.getBuildSettings(player).getMirrorSettings();
-        if (!isEnabled(m, startPos)) return blockStates;
-
-        //Randomizer bag synergy
-        IItemHandler bagInventory = null;
-        if (!itemStack.isEmpty() && itemStack.getItem() instanceof ItemRandomizerBag) {
-            bagInventory = ItemRandomizerBag.getBagInventory(itemStack);
-        }
-
-        if (m.mirrorX) blockStateMirrorX(player, m, startPos, blockState, bagInventory, itemStack, EnumHand.MAIN_HAND, blockStates, itemStacks);
-        if (m.mirrorY) blockStateMirrorY(player, m, startPos, blockState, bagInventory, itemStack, EnumHand.MAIN_HAND, blockStates, itemStacks);
-        if (m.mirrorZ) blockStateMirrorZ(player, m, startPos, blockState, bagInventory, itemStack, EnumHand.MAIN_HAND, blockStates, itemStacks);
-
-        return blockStates;
-    }
-
-    private static void blockStateMirrorX(EntityPlayer player, MirrorSettings m, BlockPos oldBlockPos, IBlockState oldBlockState,
-                                          IItemHandler bagInventory, ItemStack itemStack, EnumHand hand, List<IBlockState> blockStates, List<ItemStack> itemStacks) {
-        //find mirror position
-        double x = m.position.x + (m.position.x - oldBlockPos.getX() - 0.5);
-        BlockPos newBlockPos = new BlockPos(x, oldBlockPos.getY(), oldBlockPos.getZ());
-
-        //Randomizer bag synergy
-        if (bagInventory != null) {
-            itemStack = ItemRandomizerBag.pickRandomStack(bagInventory);
-            oldBlockState = BuildModifiers.getBlockStateFromItem(itemStack, player, oldBlockPos, EnumFacing.UP, new Vec3d(0, 0, 0), hand);
-        }
-
-        //Find blockstate
-        IBlockState newBlockState = oldBlockState == null ? null : oldBlockState.withMirror(net.minecraft.util.Mirror.FRONT_BACK);
-
-        //Store blockstate and itemstack
-        blockStates.add(newBlockState);
-        itemStacks.add(itemStack);
-
-        if (m.mirrorY) blockStateMirrorY(player, m, newBlockPos, newBlockState, bagInventory, itemStack, hand, blockStates, itemStacks);
-        if (m.mirrorZ) blockStateMirrorZ(player, m, newBlockPos, newBlockState, bagInventory, itemStack, hand, blockStates, itemStacks);
-    }
-
-    private static void blockStateMirrorY(EntityPlayer player, MirrorSettings m, BlockPos oldBlockPos, IBlockState oldBlockState,
-                                          IItemHandler bagInventory, ItemStack itemStack, EnumHand hand, List<IBlockState> blockStates, List<ItemStack> itemStacks) {
-        //find mirror position
-        double y = m.position.y + (m.position.y - oldBlockPos.getY() - 0.5);
-        BlockPos newBlockPos = new BlockPos(oldBlockPos.getX(), y, oldBlockPos.getZ());
-
-        //Randomizer bag synergy
-        if (bagInventory != null) {
-            itemStack = ItemRandomizerBag.pickRandomStack(bagInventory);
-            oldBlockState = BuildModifiers.getBlockStateFromItem(itemStack, player, oldBlockPos, EnumFacing.UP, new Vec3d(0, 0, 0), hand);
-        }
-
-        //Find blockstate
-        IBlockState newBlockState = oldBlockState == null ? null : getVerticalMirror(oldBlockState);
-
-        //Store blockstate and itemstack
-        blockStates.add(newBlockState);
-        itemStacks.add(itemStack);
-
-        if (m.mirrorZ) blockStateMirrorZ(player, m, newBlockPos, newBlockState, bagInventory, itemStack, hand, blockStates, itemStacks);
-    }
-
-    private static void blockStateMirrorZ(EntityPlayer player, MirrorSettings m, BlockPos oldBlockPos, IBlockState oldBlockState,
-                                          IItemHandler bagInventory, ItemStack itemStack, EnumHand hand, List<IBlockState> blockStates, List<ItemStack> itemStacks) {
-        //find mirror position
-        double z = m.position.z + (m.position.z - oldBlockPos.getZ() - 0.5);
-        BlockPos newBlockPos = new BlockPos(oldBlockPos.getX(), oldBlockPos.getY(), z);
-
-        //Randomizer bag synergy
-        if (bagInventory != null) {
-            itemStack = ItemRandomizerBag.pickRandomStack(bagInventory);
-            oldBlockState = BuildModifiers.getBlockStateFromItem(itemStack, player, oldBlockPos, EnumFacing.UP, new Vec3d(0, 0, 0), hand);
-        }
-
-        //Find blockstate
-        IBlockState newBlockState = oldBlockState == null ? null : oldBlockState.withMirror(net.minecraft.util.Mirror.LEFT_RIGHT);
-
-        //Store blockstate and itemstack
-        blockStates.add(newBlockState);
-        itemStacks.add(itemStack);
-    }
-
-    public static boolean isEnabled(MirrorSettings m, BlockPos startPos) {
-        if (m == null || !m.enabled || (!m.mirrorX && !m.mirrorY && !m.mirrorZ)) return false;
-
-        //within mirror distance
-        if (startPos.getX() + 0.5 < m.position.x - m.radius || startPos.getX() + 0.5 > m.position.x + m.radius ||
-            startPos.getY() + 0.5 < m.position.y - m.radius || startPos.getY() + 0.5 > m.position.y + m.radius ||
-            startPos.getZ() + 0.5 < m.position.z - m.radius || startPos.getZ() + 0.5 > m.position.z + m.radius)
-            return false;
-
-        return true;
-    }
-
-    private static IBlockState getVerticalMirror(IBlockState blockState) {
-        //Stairs
-        if (blockState.getBlock() instanceof BlockStairs) {
-            if (blockState.getValue(BlockStairs.HALF) == BlockStairs.EnumHalf.BOTTOM) {
-                return blockState.withProperty(BlockStairs.HALF, BlockStairs.EnumHalf.TOP);
-            } else {
-                return blockState.withProperty(BlockStairs.HALF, BlockStairs.EnumHalf.BOTTOM);
-            }
-        }
-
-        //Slabs
-        if (blockState.getBlock() instanceof BlockSlab) {
-            if (((BlockSlab) blockState.getBlock()).isDouble()) return blockState;
-            if (blockState.getValue(BlockSlab.HALF) == BlockSlab.EnumBlockHalf.BOTTOM) {
-                return blockState.withProperty(BlockSlab.HALF, BlockSlab.EnumBlockHalf.TOP);
-            } else {
-                return blockState.withProperty(BlockSlab.HALF, BlockSlab.EnumBlockHalf.BOTTOM);
-            }
-        }
-
-        //Buttons, endrod, observer, piston
-        if (blockState.getBlock() instanceof BlockDirectional) {
-            if (blockState.getValue(BlockDirectional.FACING) == EnumFacing.DOWN) {
-                return blockState.withProperty(BlockDirectional.FACING, EnumFacing.UP);
-            } else if (blockState.getValue(BlockDirectional.FACING) == EnumFacing.UP) {
-                return blockState.withProperty(BlockDirectional.FACING, EnumFacing.DOWN);
-            }
-        }
-
-        //Dispenser, dropper
-        if (blockState.getBlock() instanceof BlockDispenser) {
-            if (blockState.getValue(BlockDispenser.FACING) == EnumFacing.DOWN) {
-                return blockState.withProperty(BlockDispenser.FACING, EnumFacing.UP);
-            } else if (blockState.getValue(BlockDispenser.FACING) == EnumFacing.UP) {
-                return blockState.withProperty(BlockDispenser.FACING, EnumFacing.DOWN);
-            }
-        }
-
-        return blockState;
-    }
-}

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

@@ -0,0 +1,31 @@
+package nl.requios.effortlessbuilding;
+
+import com.mojang.blaze3d.vertex.DefaultVertexFormat;
+import net.minecraft.client.Minecraft;
+import net.minecraft.client.renderer.ShaderInstance;
+import net.minecraft.client.renderer.texture.TextureAtlas;
+import net.minecraft.client.renderer.texture.TextureAtlasSprite;
+import net.minecraft.resources.ResourceLocation;
+import net.minecraftforge.api.distmarker.Dist;
+import net.minecraftforge.client.event.RegisterShadersEvent;
+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 nl.requios.effortlessbuilding.render.BuildRenderTypes;
+
+import java.io.IOException;
+import java.util.HashMap;
+
+@Mod.EventBusSubscriber(bus = Mod.EventBusSubscriber.Bus.MOD, value = {Dist.CLIENT})
+public class ModClientEventHandler {
+
+	@SubscribeEvent
+	public static void registerShaders(RegisterShadersEvent event) throws IOException {
+		event.registerShader(new ShaderInstance(event.getResourceManager(),
+				new ResourceLocation(EffortlessBuilding.MODID, "dissolve"),
+				DefaultVertexFormat.BLOCK),
+				shaderInstance -> BuildRenderTypes.dissolveShaderInstance = shaderInstance);
+	}
+}

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

@@ -0,0 +1,94 @@
+package nl.requios.effortlessbuilding.buildmode.buildmodes;
+
+import net.minecraft.world.entity.player.Player;
+import net.minecraft.core.BlockPos;
+import net.minecraft.world.phys.Vec3;
+import nl.requios.effortlessbuilding.buildmode.BuildModes;
+import nl.requios.effortlessbuilding.buildmode.ModeOptions;
+import nl.requios.effortlessbuilding.buildmode.TwoClicksBuildMode;
+import nl.requios.effortlessbuilding.helper.ReachHelper;
+
+import java.util.ArrayList;
+import java.util.List;
+
+public class Floor extends TwoClicksBuildMode {
+
+	public static BlockPos findFloor(Player player, BlockPos firstPos, boolean skipRaytrace) {
+		Vec3 look = BuildModes.getPlayerLookVec(player);
+		Vec3 start = new Vec3(player.getX(), player.getY() + player.getEyeHeight(), player.getZ());
+
+		List<Criteria> criteriaList = new ArrayList<>(3);
+
+		//Y
+		Vec3 yBound = BuildModes.findYBound(firstPos.getY(), start, look);
+		criteriaList.add(new Criteria(yBound, start));
+
+		//Remove invalid criteria
+		int reach = ReachHelper.getPlacementReach(player) * 4; //4 times as much as normal placement reach
+		criteriaList.removeIf(criteria -> !criteria.isValid(start, look, reach, player, skipRaytrace));
+
+		//If none are valid, return empty list of blocks
+		if (criteriaList.isEmpty()) return null;
+
+		//Then only 1 can be valid, return that one
+		Criteria selected = criteriaList.get(0);
+
+		return new BlockPos(selected.planeBound);
+	}
+
+	public static List<BlockPos> getFloorBlocks(Player player, int x1, int y1, int z1, int x2, int y2, int z2) {
+		List<BlockPos> list = new ArrayList<>();
+
+		if (ModeOptions.getFill() == ModeOptions.ActionEnum.FULL)
+			addFloorBlocks(list, x1, x2, y1, z1, z2);
+		else
+			addHollowFloorBlocks(list, x1, x2, y1, z1, z2);
+
+		return list;
+	}
+
+	public static void addFloorBlocks(List<BlockPos> list, int x1, int x2, int y, int z1, int z2) {
+
+		for (int l = x1; x1 < x2 ? l <= x2 : l >= x2; l += x1 < x2 ? 1 : -1) {
+
+			for (int n = z1; z1 < z2 ? n <= z2 : n >= z2; n += z1 < z2 ? 1 : -1) {
+
+				list.add(new BlockPos(l, y, n));
+			}
+		}
+	}
+
+	public static void addHollowFloorBlocks(List<BlockPos> list, int x1, int x2, int y, int z1, int z2) {
+		Line.addXLineBlocks(list, x1, x2, y, z1);
+		Line.addXLineBlocks(list, x1, x2, y, z2);
+		Line.addZLineBlocks(list, z1, z2, x1, y);
+		Line.addZLineBlocks(list, z1, z2, x2, y);
+	}
+
+	@Override
+	protected BlockPos findSecondPos(Player player, BlockPos firstPos, boolean skipRaytrace) {
+		return findFloor(player, firstPos, skipRaytrace);
+	}
+
+	@Override
+	protected List<BlockPos> getAllBlocks(Player player, int x1, int y1, int z1, int x2, int y2, int z2) {
+		return getFloorBlocks(player, x1, y1, z1, x2, y2, z2);
+	}
+
+	static class Criteria {
+		Vec3 planeBound;
+		double distToPlayerSq;
+
+		Criteria(Vec3 planeBound, Vec3 start) {
+			this.planeBound = planeBound;
+			this.distToPlayerSq = this.planeBound.subtract(start).lengthSqr();
+		}
+
+		//check if its not behind the player and its not too close and not too far
+		//also check if raytrace from player to block does not intersect blocks
+		public boolean isValid(Vec3 start, Vec3 look, int reach, Player player, boolean skipRaytrace) {
+
+			return BuildModes.isCriteriaValid(start, look, reach, player, skipRaytrace, planeBound, planeBound, distToPlayerSq);
+		}
+	}
+}

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

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

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

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

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

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

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

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

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

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

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

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

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

@@ -0,0 +1,135 @@
+package nl.requios.effortlessbuilding.buildmode.buildmodes;
+
+import net.minecraft.world.entity.player.Player;
+import net.minecraft.core.BlockPos;
+import net.minecraft.world.phys.Vec3;
+import nl.requios.effortlessbuilding.buildmode.BuildModes;
+import nl.requios.effortlessbuilding.buildmode.ModeOptions;
+import nl.requios.effortlessbuilding.buildmode.TwoClicksBuildMode;
+import nl.requios.effortlessbuilding.helper.ReachHelper;
+
+import java.util.ArrayList;
+import java.util.List;
+
+public class Wall extends TwoClicksBuildMode {
+
+	public static BlockPos findWall(Player player, BlockPos firstPos, boolean skipRaytrace) {
+		Vec3 look = BuildModes.getPlayerLookVec(player);
+		Vec3 start = new Vec3(player.getX(), player.getY() + player.getEyeHeight(), player.getZ());
+
+		List<Criteria> criteriaList = new ArrayList<>(3);
+
+		//X
+		Vec3 xBound = BuildModes.findXBound(firstPos.getX(), start, look);
+		criteriaList.add(new Criteria(xBound, firstPos, start, look));
+
+		//Z
+		Vec3 zBound = BuildModes.findZBound(firstPos.getZ(), start, look);
+		criteriaList.add(new Criteria(zBound, firstPos, start, look));
+
+		//Remove invalid criteria
+		int reach = ReachHelper.getPlacementReach(player) * 4; //4 times as much as normal placement reach
+		criteriaList.removeIf(criteria -> !criteria.isValid(start, look, reach, player, skipRaytrace));
+
+		//If none are valid, return empty list of blocks
+		if (criteriaList.isEmpty()) return null;
+
+		//If only 1 is valid, choose that one
+		Criteria selected = criteriaList.get(0);
+
+		//If multiple are valid, choose based on criteria
+		if (criteriaList.size() > 1) {
+			//Select the one that is closest
+			//Limit the angle to not be too extreme
+			for (int i = 1; i < criteriaList.size(); i++) {
+				Criteria criteria = criteriaList.get(i);
+				if (criteria.distToPlayerSq < selected.distToPlayerSq && Math.abs(criteria.angle) - Math.abs(selected.angle) < 3)
+					selected = criteria;
+			}
+		}
+
+		return new BlockPos(selected.planeBound);
+	}
+
+	public static List<BlockPos> getWallBlocks(Player player, int x1, int y1, int z1, int x2, int y2, int z2) {
+		List<BlockPos> list = new ArrayList<>();
+
+		if (x1 == x2) {
+			if (ModeOptions.getFill() == ModeOptions.ActionEnum.FULL)
+				addXWallBlocks(list, x1, y1, y2, z1, z2);
+			else
+				addXHollowWallBlocks(list, x1, y1, y2, z1, z2);
+		} else {
+			if (ModeOptions.getFill() == ModeOptions.ActionEnum.FULL)
+				addZWallBlocks(list, x1, x2, y1, y2, z1);
+			else
+				addZHollowWallBlocks(list, x1, x2, y1, y2, z1);
+		}
+
+		return list;
+	}
+
+	public static void addXWallBlocks(List<BlockPos> list, int x, int y1, int y2, int z1, int z2) {
+
+		for (int z = z1; z1 < z2 ? z <= z2 : z >= z2; z += z1 < z2 ? 1 : -1) {
+
+			for (int y = y1; y1 < y2 ? y <= y2 : y >= y2; y += y1 < y2 ? 1 : -1) {
+				list.add(new BlockPos(x, y, z));
+			}
+		}
+	}
+
+	public static void addZWallBlocks(List<BlockPos> list, int x1, int x2, int y1, int y2, int z) {
+
+		for (int x = x1; x1 < x2 ? x <= x2 : x >= x2; x += x1 < x2 ? 1 : -1) {
+
+			for (int y = y1; y1 < y2 ? y <= y2 : y >= y2; y += y1 < y2 ? 1 : -1) {
+				list.add(new BlockPos(x, y, z));
+			}
+		}
+	}
+
+	public static void addXHollowWallBlocks(List<BlockPos> list, int x, int y1, int y2, int z1, int z2) {
+		Line.addZLineBlocks(list, z1, z2, x, y1);
+		Line.addZLineBlocks(list, z1, z2, x, y2);
+		Line.addYLineBlocks(list, y1, y2, x, z1);
+		Line.addYLineBlocks(list, y1, y2, x, z2);
+	}
+
+	public static void addZHollowWallBlocks(List<BlockPos> list, int x1, int x2, int y1, int y2, int z) {
+		Line.addXLineBlocks(list, x1, x2, y1, z);
+		Line.addXLineBlocks(list, x1, x2, y2, z);
+		Line.addYLineBlocks(list, y1, y2, x1, z);
+		Line.addYLineBlocks(list, y1, y2, x2, z);
+	}
+
+	@Override
+	protected BlockPos findSecondPos(Player player, BlockPos firstPos, boolean skipRaytrace) {
+		return findWall(player, firstPos, skipRaytrace);
+	}
+
+	@Override
+	protected List<BlockPos> getAllBlocks(Player player, int x1, int y1, int z1, int x2, int y2, int z2) {
+		return getWallBlocks(player, x1, y1, z1, x2, y2, z2);
+	}
+
+	static class Criteria {
+		Vec3 planeBound;
+		double distToPlayerSq;
+		double angle;
+
+		Criteria(Vec3 planeBound, BlockPos firstPos, Vec3 start, Vec3 look) {
+			this.planeBound = planeBound;
+			this.distToPlayerSq = this.planeBound.subtract(start).lengthSqr();
+			Vec3 wall = this.planeBound.subtract(Vec3.atLowerCornerOf(firstPos));
+			this.angle = wall.x * look.x + wall.z * look.z; //dot product ignoring y (looking up/down should not affect this angle)
+		}
+
+		//check if its not behind the player and its not too close and not too far
+		//also check if raytrace from player to block does not intersect blocks
+		public boolean isValid(Vec3 start, Vec3 look, int reach, Player player, boolean skipRaytrace) {
+
+			return BuildModes.isCriteriaValid(start, look, reach, player, skipRaytrace, planeBound, planeBound, distToPlayerSq);
+		}
+	}
+}

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

@@ -1,171 +0,0 @@
-package nl.requios.effortlessbuilding.capability;
-
-import net.minecraft.nbt.NBTBase;
-import net.minecraft.nbt.NBTTagCompound;
-import net.minecraft.util.EnumFacing;
-import net.minecraft.util.math.BlockPos;
-import net.minecraft.util.math.Vec3d;
-import net.minecraftforge.common.capabilities.Capability;
-import net.minecraftforge.common.capabilities.CapabilityInject;
-import net.minecraftforge.common.capabilities.ICapabilitySerializable;
-import net.minecraftforge.event.entity.player.PlayerEvent;
-import net.minecraftforge.fml.common.Mod;
-import net.minecraftforge.fml.common.eventhandler.SubscribeEvent;
-import nl.requios.effortlessbuilding.Array;
-import nl.requios.effortlessbuilding.BuildSettingsManager.BuildSettings;
-import nl.requios.effortlessbuilding.Mirror;
-import nl.requios.effortlessbuilding.RadialMirror;
-
-import javax.annotation.Nonnull;
-import javax.annotation.Nullable;
-
-@Mod.EventBusSubscriber
-public class BuildModifierCapabilityManager {
-
-    @CapabilityInject(IBuildModifierCapability.class)
-    public final static Capability<IBuildModifierCapability> buildModifierCapability = null;
-
-    public interface IBuildModifierCapability {
-        BuildSettings getBuildModifierData();
-
-        void setBuildModifierData(BuildSettings buildSettings);
-    }
-
-    public static class BuildModifierCapability implements IBuildModifierCapability {
-        private BuildSettings buildSettings;
-
-        @Override
-        public BuildSettings getBuildModifierData() {
-            return buildSettings;
-        }
-
-        @Override
-        public void setBuildModifierData(BuildSettings buildSettings) {
-            this.buildSettings = buildSettings;
-        }
-    }
-
-    public static class Storage implements Capability.IStorage<IBuildModifierCapability> {
-        @Override
-        public NBTBase writeNBT(Capability<IBuildModifierCapability> capability, IBuildModifierCapability instance, EnumFacing side) {
-            NBTTagCompound compound = new NBTTagCompound();
-            BuildSettings buildSettings = instance.getBuildModifierData();
-            if (buildSettings == null) buildSettings = new BuildSettings();
-
-            //MIRROR
-            Mirror.MirrorSettings m = buildSettings.getMirrorSettings();
-            if (m == null) m = new Mirror.MirrorSettings();
-            compound.setBoolean("mirrorEnabled", m.enabled);
-            compound.setDouble("mirrorPosX", m.position.x);
-            compound.setDouble("mirrorPosY", m.position.y);
-            compound.setDouble("mirrorPosZ", m.position.z);
-            compound.setBoolean("mirrorX", m.mirrorX);
-            compound.setBoolean("mirrorY", m.mirrorY);
-            compound.setBoolean("mirrorZ", m.mirrorZ);
-            compound.setInteger("mirrorRadius", m.radius);
-            compound.setBoolean("mirrorDrawLines", m.drawLines);
-            compound.setBoolean("mirrorDrawPlanes", m.drawPlanes);
-
-            //ARRAY
-            Array.ArraySettings a = buildSettings.getArraySettings();
-            if (a == null) a = new Array.ArraySettings();
-            compound.setBoolean("arrayEnabled", a.enabled);
-            compound.setInteger("arrayOffsetX", a.offset.getX());
-            compound.setInteger("arrayOffsetY", a.offset.getY());
-            compound.setInteger("arrayOffsetZ", a.offset.getZ());
-            compound.setInteger("arrayCount", a.count);
-
-            compound.setInteger("reachUpgrade", buildSettings.getReachUpgrade());
-
-            //compound.setBoolean("quickReplace", buildSettings.doQuickReplace()); dont save quickreplace
-
-            //RADIAL MIRROR
-            RadialMirror.RadialMirrorSettings r = buildSettings.getRadialMirrorSettings();
-            if (r == null) r = new RadialMirror.RadialMirrorSettings();
-            compound.setBoolean("radialMirrorEnabled", r.enabled);
-            compound.setDouble("radialMirrorPosX", r.position.x);
-            compound.setDouble("radialMirrorPosY", r.position.y);
-            compound.setDouble("radialMirrorPosZ", r.position.z);
-            compound.setInteger("radialMirrorSlices", r.slices);
-            compound.setBoolean("radialMirrorAlternate", r.alternate);
-            compound.setInteger("radialMirrorRadius", r.radius);
-            compound.setBoolean("radialMirrorDrawLines", r.drawLines);
-            compound.setBoolean("radialMirrorDrawPlanes", r.drawPlanes);
-
-            return compound;
-        }
-
-        @Override
-        public void readNBT(Capability<IBuildModifierCapability> capability, IBuildModifierCapability instance, EnumFacing side, NBTBase nbt) {
-            NBTTagCompound compound = (NBTTagCompound) nbt;
-
-            //MIRROR
-            boolean mirrorEnabled = compound.getBoolean("mirrorEnabled");
-            Vec3d mirrorPosition = new Vec3d(compound.getDouble("mirrorPosX"), compound.getDouble("mirrorPosY"), compound.getDouble("mirrorPosZ"));
-            boolean mirrorX = compound.getBoolean("mirrorX");
-            boolean mirrorY = compound.getBoolean("mirrorY");
-            boolean mirrorZ = compound.getBoolean("mirrorZ");
-            int mirrorRadius = compound.getInteger("mirrorRadius");
-            boolean mirrorDrawLines = compound.getBoolean("mirrorDrawLines");
-            boolean mirrorDrawPlanes = compound.getBoolean("mirrorDrawPlanes");
-            Mirror.MirrorSettings mirrorSettings = new Mirror.MirrorSettings(mirrorEnabled, mirrorPosition, mirrorX, mirrorY, mirrorZ, mirrorRadius, mirrorDrawLines, mirrorDrawPlanes);
-
-            //ARRAY
-            boolean arrayEnabled = compound.getBoolean("arrayEnabled");
-            BlockPos arrayOffset = new BlockPos(compound.getInteger("arrayOffsetX"), compound.getInteger("arrayOffsetY"), compound.getInteger("arrayOffsetZ"));
-            int arrayCount = compound.getInteger("arrayCount");
-            Array.ArraySettings arraySettings = new Array.ArraySettings(arrayEnabled, arrayOffset, arrayCount);
-
-            int reachUpgrade = compound.getInteger("reachUpgrade");
-
-            //boolean quickReplace = compound.getBoolean("quickReplace"); //dont load quickreplace
-
-            //RADIAL MIRROR
-            boolean radialMirrorEnabled = compound.getBoolean("radialMirrorEnabled");
-            Vec3d radialMirrorPosition = new Vec3d(compound.getDouble("radialMirrorPosX"), compound.getDouble("radialMirrorPosY"), compound.getDouble("radialMirrorPosZ"));
-            int radialMirrorSlices = compound.getInteger("radialMirrorSlices");
-            boolean radialMirrorAlternate = compound.getBoolean("radialMirrorAlternate");
-            int radialMirrorRadius = compound.getInteger("radialMirrorRadius");
-            boolean radialMirrorDrawLines = compound.getBoolean("radialMirrorDrawLines");
-            boolean radialMirrorDrawPlanes = compound.getBoolean("radialMirrorDrawPlanes");
-            RadialMirror.RadialMirrorSettings radialMirrorSettings = new RadialMirror.RadialMirrorSettings(radialMirrorEnabled, radialMirrorPosition,
-                    radialMirrorSlices, radialMirrorAlternate, radialMirrorRadius, radialMirrorDrawLines, radialMirrorDrawPlanes);
-
-            BuildSettings buildSettings = new BuildSettings(mirrorSettings, arraySettings, radialMirrorSettings, false, reachUpgrade);
-            instance.setBuildModifierData(buildSettings);
-        }
-    }
-
-    public static class Provider implements ICapabilitySerializable<NBTBase> {
-        IBuildModifierCapability inst = buildModifierCapability.getDefaultInstance();
-
-        @Override
-        public boolean hasCapability(@Nonnull Capability<?> capability, @Nullable EnumFacing facing) {
-            return capability == buildModifierCapability;
-        }
-
-        @Override
-        public <T> T getCapability(@Nonnull Capability<T> capability, @Nullable EnumFacing facing) {
-            if (capability == buildModifierCapability) return buildModifierCapability.<T>cast(inst);
-            return null;
-        }
-
-        @Override
-        public NBTBase serializeNBT() {
-            return buildModifierCapability.getStorage().writeNBT(buildModifierCapability, inst, null);
-        }
-
-        @Override
-        public void deserializeNBT(NBTBase nbt) {
-            buildModifierCapability.getStorage().readNBT(buildModifierCapability, inst, null, nbt);
-        }
-    }
-
-    // Allows for the capability to persist after death.
-    @SubscribeEvent
-    public static void clonePlayer(PlayerEvent.Clone event) {
-        IBuildModifierCapability original = event.getOriginal().getCapability(buildModifierCapability, null);
-        IBuildModifierCapability clone = event.getEntity().getCapability(buildModifierCapability, null);
-        clone.setBuildModifierData(original.getBuildModifierData());
-    }
-}

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

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

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

@@ -0,0 +1,108 @@
+package nl.requios.effortlessbuilding.capability;
+
+import net.minecraft.nbt.CompoundTag;
+import net.minecraft.nbt.Tag;
+import net.minecraft.core.Direction;
+import net.minecraftforge.common.capabilities.*;
+import net.minecraftforge.common.util.LazyOptional;
+import net.minecraftforge.event.entity.player.PlayerEvent;
+import net.minecraftforge.eventbus.api.SubscribeEvent;
+import net.minecraftforge.fml.common.Mod;
+import nl.requios.effortlessbuilding.buildmode.BuildModes;
+
+import javax.annotation.Nonnull;
+import javax.annotation.Nullable;
+
+import nl.requios.effortlessbuilding.buildmode.ModeSettingsManager.ModeSettings;
+
+@Mod.EventBusSubscriber
+public class ModeCapabilityManager {
+
+	public static Capability<IModeCapability> MODE_CAPABILITY = CapabilityManager.get(new CapabilityToken<>(){});
+
+	// Allows for the capability to persist after death.
+	@SubscribeEvent
+	public static void clonePlayer(PlayerEvent.Clone event) {
+		LazyOptional<IModeCapability> original = event.getOriginal().getCapability(MODE_CAPABILITY, null);
+		LazyOptional<IModeCapability> clone = event.getEntity().getCapability(MODE_CAPABILITY, null);
+		clone.ifPresent(cloneModeCapability ->
+			original.ifPresent(originalModeCapability ->
+				cloneModeCapability.setModeData(originalModeCapability.getModeData())));
+	}
+
+	public interface IModeCapability {
+		ModeSettings getModeData();
+
+		void setModeData(ModeSettings modeSettings);
+	}
+
+	public static class ModeCapability implements IModeCapability {
+		private ModeSettings modeSettings;
+
+		@Override
+		public ModeSettings getModeData() {
+			return modeSettings;
+		}
+
+		@Override
+		public void setModeData(ModeSettings modeSettings) {
+			this.modeSettings = modeSettings;
+		}
+	}
+
+	public static class Provider extends CapabilityProvider<Provider> implements ICapabilitySerializable<Tag> {
+
+		private IModeCapability instance = new ModeCapability();
+		private LazyOptional<IModeCapability> modeCapabilityOptional = LazyOptional.of(() -> instance);
+
+		public Provider() {
+			super(Provider.class);
+			gatherCapabilities();
+		}
+
+		@Nonnull
+		@Override
+		public <T> LazyOptional<T> getCapability(@Nonnull Capability<T> cap, @Nullable Direction side) {
+			if (cap == MODE_CAPABILITY) return modeCapabilityOptional.cast();
+			return LazyOptional.empty();
+		}
+
+		@Override
+		public void invalidateCaps() {
+			super.invalidateCaps();
+			modeCapabilityOptional.invalidate();
+		}
+
+		@Override
+		public void reviveCaps() {
+			super.reviveCaps();
+			modeCapabilityOptional = LazyOptional.of(() -> instance);
+		}
+
+		@Override
+		public Tag serializeNBT() {
+			CompoundTag compound = new CompoundTag();
+			ModeSettings modeSettings = instance.getModeData();
+			if (modeSettings == null) modeSettings = new ModeSettings();
+
+			//compound.putInteger("buildMode", modeSettings.getBuildMode().ordinal());
+
+			//TODO add mode settings
+
+			return compound;
+		}
+
+		@Override
+		public void deserializeNBT(Tag nbt) {
+			CompoundTag compound = (CompoundTag) nbt;
+
+			//BuildModes.BuildModeEnum buildMode = BuildModes.BuildModeEnum.values()[compound.getInteger("buildMode")];
+
+			//TODO add mode settings
+
+			ModeSettings modeSettings = new ModeSettings(BuildModes.BuildModeEnum.NORMAL);
+			instance.setModeData(modeSettings);
+		}
+
+	}
+}

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

@@ -0,0 +1,186 @@
+package nl.requios.effortlessbuilding.capability;
+
+import net.minecraft.nbt.CompoundTag;
+import net.minecraft.nbt.Tag;
+import net.minecraft.core.Direction;
+import net.minecraft.core.BlockPos;
+import net.minecraft.world.phys.Vec3;
+import net.minecraftforge.common.capabilities.*;
+import net.minecraftforge.common.util.INBTSerializable;
+import net.minecraftforge.common.util.LazyOptional;
+import net.minecraftforge.event.entity.player.PlayerEvent;
+import net.minecraftforge.eventbus.api.SubscribeEvent;
+import net.minecraftforge.fml.common.Mod;
+import nl.requios.effortlessbuilding.buildmodifier.Array;
+import nl.requios.effortlessbuilding.buildmodifier.Mirror;
+import nl.requios.effortlessbuilding.buildmodifier.RadialMirror;
+
+import javax.annotation.Nonnull;
+import javax.annotation.Nullable;
+
+import nl.requios.effortlessbuilding.buildmodifier.ModifierSettingsManager.ModifierSettings;
+
+@Mod.EventBusSubscriber
+public class ModifierCapabilityManager {
+
+	public final static Capability<IModifierCapability> MODIFIER_CAPABILITY = CapabilityManager.get(new CapabilityToken<>(){});
+
+	// Allows for the capability to persist after death.
+	@SubscribeEvent
+	public static void clonePlayer(PlayerEvent.Clone event) {
+		LazyOptional<IModifierCapability> original = event.getOriginal().getCapability(MODIFIER_CAPABILITY, null);
+		LazyOptional<IModifierCapability> clone = event.getEntity().getCapability(MODIFIER_CAPABILITY, null);
+		clone.ifPresent(cloneModifierCapability ->
+			original.ifPresent(originalModifierCapability ->
+				cloneModifierCapability.setModifierData(originalModifierCapability.getModifierData())));
+	}
+
+	public interface IModifierCapability {
+		ModifierSettings getModifierData();
+
+		void setModifierData(ModifierSettings modifierSettings);
+	}
+
+	public static class ModifierCapability implements IModifierCapability {
+		private ModifierSettings modifierSettings;
+
+		@Override
+		public ModifierSettings getModifierData() {
+			return modifierSettings;
+		}
+
+		@Override
+		public void setModifierData(ModifierSettings modifierSettings) {
+			this.modifierSettings = modifierSettings;
+		}
+	}
+
+	public static class Provider extends CapabilityProvider<Provider> implements INBTSerializable<Tag> {
+
+		private final IModifierCapability instance = new ModifierCapability();
+		private LazyOptional<IModifierCapability> modifierCapabilityOptional = LazyOptional.of(() -> instance);
+
+		public Provider() {
+			super(Provider.class);
+			gatherCapabilities();
+		}
+
+		@Nonnull
+		@Override
+		public <T> LazyOptional<T> getCapability(@Nonnull Capability<T> cap, @Nullable Direction side) {
+			if (cap == MODIFIER_CAPABILITY) return modifierCapabilityOptional.cast();
+			return LazyOptional.empty();
+		}
+
+		@Override
+		public void invalidateCaps() {
+			super.invalidateCaps();
+			modifierCapabilityOptional.invalidate();
+		}
+
+		@Override
+		public void reviveCaps() {
+			super.reviveCaps();
+			modifierCapabilityOptional = LazyOptional.of(() -> instance);
+		}
+
+		@Override
+		public Tag serializeNBT() {
+			CompoundTag compound = new CompoundTag();
+			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);
+
+			//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.putInt("reachUpgrade", modifierSettings.getReachUpgrade());
+
+			//compound.putBoolean("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);
+
+			return compound;
+		}
+
+		@Override
+		public void deserializeNBT(Tag nbt) {
+			CompoundTag compound = (CompoundTag) nbt;
+
+			//MIRROR
+			boolean mirrorEnabled = compound.getBoolean("mirrorEnabled");
+			Vec3 mirrorPosition = new Vec3(
+					compound.getDouble("mirrorPosX"),
+					compound.getDouble("mirrorPosY"),
+					compound.getDouble("mirrorPosZ"));
+			boolean mirrorX = compound.getBoolean("mirrorX");
+			boolean mirrorY = compound.getBoolean("mirrorY");
+			boolean mirrorZ = compound.getBoolean("mirrorZ");
+			int mirrorRadius = compound.getInt("mirrorRadius");
+			boolean mirrorDrawLines = compound.getBoolean("mirrorDrawLines");
+			boolean mirrorDrawPlanes = compound.getBoolean("mirrorDrawPlanes");
+			Mirror.MirrorSettings mirrorSettings = new Mirror.MirrorSettings(mirrorEnabled, mirrorPosition, mirrorX, mirrorY, mirrorZ, mirrorRadius, mirrorDrawLines, mirrorDrawPlanes);
+
+			//ARRAY
+			boolean arrayEnabled = compound.getBoolean("arrayEnabled");
+			BlockPos arrayOffset = new BlockPos(
+					compound.getInt("arrayOffsetX"),
+					compound.getInt("arrayOffsetY"),
+					compound.getInt("arrayOffsetZ"));
+			int arrayCount = compound.getInt("arrayCount");
+			Array.ArraySettings arraySettings = new Array.ArraySettings(arrayEnabled, arrayOffset, arrayCount);
+
+			int reachUpgrade = compound.getInt("reachUpgrade");
+
+			//boolean quickReplace = compound.getBoolean("quickReplace"); //dont load quickreplace
+
+			//RADIAL MIRROR
+			boolean radialMirrorEnabled = compound.getBoolean("radialMirrorEnabled");
+			Vec3 radialMirrorPosition = new Vec3(
+					compound.getDouble("radialMirrorPosX"),
+					compound.getDouble("radialMirrorPosY"),
+					compound.getDouble("radialMirrorPosZ"));
+			int radialMirrorSlices = compound.getInt("radialMirrorSlices");
+			boolean radialMirrorAlternate = compound.getBoolean("radialMirrorAlternate");
+			int radialMirrorRadius = compound.getInt("radialMirrorRadius");
+			boolean radialMirrorDrawLines = compound.getBoolean("radialMirrorDrawLines");
+			boolean radialMirrorDrawPlanes = compound.getBoolean("radialMirrorDrawPlanes");
+			RadialMirror.RadialMirrorSettings radialMirrorSettings = new RadialMirror.RadialMirrorSettings(radialMirrorEnabled, radialMirrorPosition,
+					radialMirrorSlices, radialMirrorAlternate, radialMirrorRadius, radialMirrorDrawLines, radialMirrorDrawPlanes);
+
+			ModifierSettings modifierSettings = new ModifierSettings(mirrorSettings, arraySettings, radialMirrorSettings, false, reachUpgrade);
+			instance.setModifierData(modifierSettings);
+		}
+
+	}
+}

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

@@ -1,43 +0,0 @@
-package nl.requios.effortlessbuilding.command;
-
-import net.minecraft.command.CommandBase;
-import net.minecraft.command.CommandException;
-import net.minecraft.command.ICommandSender;
-import net.minecraft.command.WrongUsageException;
-import net.minecraft.entity.player.EntityPlayerMP;
-import net.minecraft.server.MinecraftServer;
-import net.minecraft.util.text.TextComponentString;
-import nl.requios.effortlessbuilding.BuildSettingsManager;
-import nl.requios.effortlessbuilding.EffortlessBuilding;
-import nl.requios.effortlessbuilding.network.BuildSettingsMessage;
-
-public class CommandReach extends CommandBase {
-    @Override
-    public String getName() {
-        return "reach";
-    }
-
-    @Override
-    public String getUsage(ICommandSender sender) {
-        return "commands.reach.usage";
-    }
-
-    @Override
-    public void execute(MinecraftServer server, ICommandSender sender, String[] args) throws CommandException {
-        if (args.length != 1) {
-            throw new WrongUsageException("commands.reach.usage");
-        }
-
-        if (sender instanceof EntityPlayerMP) {
-            EntityPlayerMP player = (EntityPlayerMP) sender;
-            //Set reach level to args[0]
-            BuildSettingsManager.BuildSettings buildSettings = BuildSettingsManager.getBuildSettings(player);
-            buildSettings.setReachUpgrade(Integer.valueOf(args[0]));
-            BuildSettingsManager.setBuildSettings(player, buildSettings);
-            //Send to client
-            EffortlessBuilding.packetHandler.sendTo(new BuildSettingsMessage(buildSettings), player);
-
-            sender.sendMessage(new TextComponentString("Reach level of " + sender.getName() + " set to " + buildSettings.getReachUpgrade()));
-        }
-    }
-}

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

@@ -0,0 +1,63 @@
+package nl.requios.effortlessbuilding.compatibility;
+
+import net.minecraft.world.level.block.state.BlockState;
+import net.minecraft.world.item.BlockItem;
+import net.minecraft.world.item.Item;
+import net.minecraft.world.item.ItemStack;
+import net.minecraftforge.items.IItemHandler;
+import nl.requios.effortlessbuilding.item.AbstractRandomizerBagItem;
+
+public class CompatHelper {
+
+	public static void setup() {
+
+	}
+
+	// Check if the item given is a proxy for blocks. For now, we check for the randomizer bag,
+	// /dank/null, or plain old blocks.
+	public static boolean isItemBlockProxy(ItemStack stack) {
+		Item item = stack.getItem();
+		if (item instanceof BlockItem)
+			return true;
+		return item instanceof AbstractRandomizerBagItem;
+	}
+
+	// Get the block to be placed by this proxy. For the /dank/null, it's the slot stack
+	// pointed to by nbt integer selectedIndex.
+	public static ItemStack getItemBlockFromStack(ItemStack proxy) {
+		Item proxyItem = proxy.getItem();
+
+		if (proxyItem instanceof BlockItem)
+			return proxy;
+
+		//Randomizer Bag
+		if (proxyItem instanceof AbstractRandomizerBagItem) {
+			ItemStack itemStack = proxy;
+			while (!(itemStack.getItem() instanceof BlockItem || itemStack.isEmpty())) {
+				if (itemStack.getItem() instanceof AbstractRandomizerBagItem) {
+					AbstractRandomizerBagItem randomizerBagItem = (AbstractRandomizerBagItem) itemStack.getItem();
+					itemStack = randomizerBagItem.pickRandomStack(randomizerBagItem.getBagInventory(itemStack));
+				}
+			}
+			return itemStack;
+		}
+
+		return ItemStack.EMPTY;
+	}
+
+	public static ItemStack getItemBlockByState(ItemStack stack, BlockState state) {
+		if (state == null) return ItemStack.EMPTY;
+
+		Item blockItem = Item.byBlock(state.getBlock());
+		if (stack.getItem() instanceof BlockItem)
+			return stack;
+		else if (stack.getItem() instanceof AbstractRandomizerBagItem) {
+			AbstractRandomizerBagItem randomizerBagItem = (AbstractRandomizerBagItem) stack.getItem();
+			IItemHandler bagInventory = randomizerBagItem.getBagInventory(stack);
+			return randomizerBagItem.findStack(bagInventory, blockItem);
+		}
+
+		return ItemStack.EMPTY;
+	}
+
+}

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

@@ -1,211 +0,0 @@
-package nl.requios.effortlessbuilding.gui;
-
-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.fml.client.config.GuiCheckBox;
-import nl.requios.effortlessbuilding.Array;
-import nl.requios.effortlessbuilding.BuildSettingsManager;
-import nl.requios.effortlessbuilding.EffortlessBuilding;
-import nl.requios.effortlessbuilding.helper.ReachHelper;
-
-import java.io.IOException;
-import java.util.ArrayList;
-import java.util.List;
-
-public class ArraySettingsGui extends GuiCollapsibleScrollEntry {
-
-    protected List<GuiNumberField> arrayNumberFieldList = new ArrayList<>();
-
-    private GuiCheckBox buttonArrayEnabled;
-    private GuiNumberField textArrayOffsetX, textArrayOffsetY, textArrayOffsetZ, textArrayCount;
-
-    public ArraySettingsGui(GuiScrollPane scrollPane) {
-        super(scrollPane);
-    }
-
-    @Override
-    public int initGui(int id, List<GuiButton> buttonList) {
-        id = super.initGui(id, buttonList);
-
-        int y = top;
-        buttonArrayEnabled = new GuiCheckBox(id++, left - 15 + 8, y, "", false);
-        buttonList.add(buttonArrayEnabled);
-
-        y = top + 20;
-        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(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(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(id++, id++, id++, fontRenderer, buttonList, left + 55, y, 50, 18);
-        textArrayCount.setNumber(5);
-        textArrayCount.setTooltip("How many copies should be made.");
-        arrayNumberFieldList.add(textArrayCount);
-
-        BuildSettingsManager.BuildSettings buildSettings = BuildSettingsManager.getBuildSettings(mc.player);
-        if (buildSettings != null) {
-            Array.ArraySettings a = buildSettings.getArraySettings();
-            buttonArrayEnabled.setIsChecked(a.enabled);
-            textArrayOffsetX.setNumber(a.offset.getX());
-            textArrayOffsetY.setNumber(a.offset.getY());
-            textArrayOffsetZ.setNumber(a.offset.getZ());
-            textArrayCount.setNumber(a.count);
-        }
-
-        setCollapsed(!buttonArrayEnabled.isChecked());
-
-        return id;
-    }
-
-    @Override
-    public void updateScreen() {
-        super.updateScreen();
-        arrayNumberFieldList.forEach(GuiNumberField::update);
-    }
-
-    @Override
-    public void drawEntry(int slotIndex, int x, int y, int listWidth, int slotHeight, int mouseX, int mouseY,
-                          boolean isSelected, float partialTicks) {
-        super.drawEntry(slotIndex, x, y, listWidth, slotHeight, mouseX, mouseY, isSelected, partialTicks);
-
-        int yy = y;
-        int offset = 8;
-
-        buttonArrayEnabled.drawButton(this.mc, mouseX, mouseY, partialTicks);
-        if (buttonArrayEnabled.isChecked()) {
-            buttonArrayEnabled.y = yy;
-            fontRenderer.drawString("Array enabled", left + offset, yy + 2, 0xFFFFFF, true);
-
-            yy = y + 20;
-            fontRenderer.drawString("Offset", left + offset, yy + 5, 0xFFFFFF, true);
-            fontRenderer.drawString("X", left + 50 + offset, yy + 5, 0xFFFFFF, true);
-            textArrayOffsetX.y = yy;
-            fontRenderer.drawString("Y", left + 120 + offset, yy + 5, 0xFFFFFF, true);
-            textArrayOffsetY.y = yy;
-            fontRenderer.drawString("Z", left + 190 + offset, yy + 5, 0xFFFFFF, true);
-            textArrayOffsetZ.y = yy;
-
-            yy = y + 50;
-            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;
-            fontRenderer.drawString(reachText, left + 176 + offset, yy + 5, 0xFFFFFF, true);
-
-            arrayNumberFieldList.forEach(numberField -> numberField.drawNumberField(this.mc, mouseX, mouseY, partialTicks));
-        } else {
-            buttonArrayEnabled.y = yy;
-            fontRenderer.drawString("Array disabled", left + offset, yy + 2, 0x999999, true);
-        }
-
-    }
-
-    public void drawTooltip(GuiScreen guiScreen, int mouseX, int mouseY) {
-        //Draw tooltips last
-        if (buttonArrayEnabled.isChecked())
-        {
-            arrayNumberFieldList.forEach(numberField -> numberField.drawTooltip(scrollPane.parent, mouseX, mouseY));
-        }
-    }
-
-    @Override
-    public void updatePosition(int slotIndex, int x, int y, float partialTicks) {
-        super.updatePosition(slotIndex, x, y, partialTicks);
-    }
-
-    @Override
-    public void keyTyped(char typedChar, int keyCode) throws IOException {
-        super.keyTyped(typedChar, keyCode);
-        for (GuiNumberField numberField : arrayNumberFieldList) {
-            numberField.keyTyped(typedChar, keyCode);
-        }
-    }
-
-    @Override
-    public boolean mousePressed(int slotIndex, int mouseX, int mouseY, int mouseEvent, int relativeX, int relativeY) {
-         super.mousePressed(slotIndex, mouseX, mouseY, mouseEvent, relativeX, relativeY);
-        arrayNumberFieldList.forEach(numberField -> numberField.mouseClicked(mouseX, mouseY, mouseEvent));
-
-        boolean insideArrayEnabledLabel = mouseX >= left && mouseX < right && relativeY >= -2 && relativeY < 12;
-
-        if (insideArrayEnabledLabel) {
-            buttonArrayEnabled.setIsChecked(!buttonArrayEnabled.isChecked());
-            buttonArrayEnabled.playPressSound(this.mc.getSoundHandler());
-            actionPerformed(buttonArrayEnabled);
-        }
-
-        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);
-        try {
-            arrayOffset = new BlockPos(textArrayOffsetX.getNumber(), textArrayOffsetY.getNumber(), textArrayOffsetZ.getNumber());
-        } catch (NumberFormatException | NullPointerException ex) {
-            EffortlessBuilding.log(mc.player, "Array offset not a valid number.");
-        }
-
-        int arrayCount = 5;
-        try {
-            arrayCount = (int) textArrayCount.getNumber();
-        } catch (NumberFormatException | NullPointerException ex) {
-            EffortlessBuilding.log(mc.player, "Array count not a valid number.");
-        }
-
-        return new Array.ArraySettings(arrayEnabled, arrayOffset, arrayCount);
-    }
-
-    @Override
-    protected String getName() {
-        return "Array";
-    }
-
-    @Override
-    protected int getExpandedHeight() {
-        return 80;
-    }
-
-    private int getArrayReach() {
-        try
-        {
-            //find largest offset
-            double x = Math.abs(textArrayOffsetX.getNumber());
-            double y = Math.abs(textArrayOffsetY.getNumber());
-            double z = Math.abs(textArrayOffsetZ.getNumber());
-            double largestOffset = Math.max(Math.max(x, y), z);
-            return (int) (largestOffset * textArrayCount.getNumber());
-        } catch (NumberFormatException | NullPointerException ex) {
-            return -1;
-        }
-    }
-
-    private boolean isCurrentReachValid(int currentReach, int maxReach) {
-        return currentReach <= maxReach && currentReach > -1;
-    }
-}

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

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

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

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

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

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

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

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

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

@@ -1,103 +0,0 @@
-package nl.requios.effortlessbuilding.gui;
-
-import net.minecraft.client.Minecraft;
-import net.minecraft.client.gui.FontRenderer;
-import net.minecraft.client.gui.GuiButton;
-import net.minecraft.client.gui.GuiScreen;
-
-import java.io.IOException;
-import java.util.List;
-
-public abstract class GuiCollapsibleScrollEntry implements GuiScrollPane.IScrollEntry {
-
-    public GuiScrollPane scrollPane;
-    protected FontRenderer fontRenderer;
-    protected Minecraft mc;
-
-    protected boolean isCollapsed = true;
-    protected int left, right, top, bottom;
-
-    public GuiCollapsibleScrollEntry(GuiScrollPane scrollPane) {
-        this.scrollPane = scrollPane;
-        this.fontRenderer = scrollPane.fontRenderer;
-        this.mc = scrollPane.parent.mc;
-    }
-
-    @Override
-    public int initGui(int id, List<GuiButton> buttonList) {
-
-        left = scrollPane.width / 2 - 140;
-        right = scrollPane.width / 2 + 140;
-        top = scrollPane.height / 2 - 100;
-        bottom = scrollPane.height / 2 + 100;
-
-        return id;
-    }
-
-    @Override
-    public void updateScreen() {
-
-    }
-
-    @Override
-    public void drawEntry(int slotIndex, int x, int y, int listWidth, int slotHeight, int mouseX, int mouseY,
-                          boolean isSelected, float partialTicks) {
-
-    }
-
-    @Override
-    public void drawTooltip(GuiScreen guiScreen, int mouseX, int mouseY) {
-
-    }
-
-    @Override
-    public void updatePosition(int slotIndex, int x, int y, float partialTicks) {
-
-    }
-
-    @Override
-    public void keyTyped(char eventChar, int eventKey) throws IOException {
-
-    }
-
-    @Override
-    public boolean mousePressed(int slotIndex, int mouseX, int mouseY, int mouseEvent, int relativeX, int relativeY) {
-        return false;
-    }
-
-    @Override
-    public void mouseReleased(int slotIndex, int x, int y, int mouseEvent, int relativeX, int relativeY) {
-
-    }
-
-    @Override
-    public void actionPerformed(GuiButton button) {
-
-    }
-
-    @Override
-    public void onGuiClosed() {
-
-    }
-
-    @Override
-    public int getHeight() {
-        return isCollapsed ? getCollapsedHeight() : getExpandedHeight();
-    }
-
-    public void setCollapsed(boolean collapsed) {
-        this.isCollapsed = collapsed;
-    }
-
-    protected String getName() {
-        return "Collapsible scroll entry";
-    }
-
-    protected int getCollapsedHeight() {
-        return 24;
-    }
-
-    protected int getExpandedHeight() {
-        return 100;
-    }
-}

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

@@ -1,75 +0,0 @@
-package nl.requios.effortlessbuilding.gui;
-
-import net.minecraft.client.Minecraft;
-import net.minecraft.client.gui.GuiButton;
-import net.minecraft.client.gui.GuiScreen;
-import net.minecraft.util.ResourceLocation;
-
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.List;
-
-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 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 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;
-        this.iconHeight = iconHeight;
-        this.iconAltX = iconAltX;
-        this.iconAltY = iconAltY;
-        this.resourceLocation = resourceLocation;
-    }
-
-    public void setTooltip(String tooltip) {
-        setTooltip(Arrays.asList(tooltip));
-    }
-
-    public void setTooltip(List<String> tooltip) {
-        this.tooltip = tooltip;
-    }
-
-    public void setUseAlternateIcon(boolean useAlternateIcon) {
-        this.useAltIcon = useAlternateIcon;
-    }
-
-    @Override
-    public void drawButton(Minecraft mc, int mouseX, int mouseY, float partialTicks) {
-        super.drawButton(mc, mouseX, mouseY, partialTicks);
-        if (this.visible)
-        {
-            this.hovered = mouseX >= this.x && mouseY >= this.y && mouseX < this.x + this.width && mouseY < this.y + this.height;
-            mc.getTextureManager().bindTexture(this.resourceLocation);
-            int currentIconX = this.iconX;
-            int currentIconY = this.iconY;
-
-            if (useAltIcon)
-            {
-                currentIconX += iconAltX;
-                currentIconY += iconAltY;
-            }
-
-            this.drawTexturedModalRect(this.x, this.y, currentIconX, currentIconY, this.iconWidth, this.iconHeight);
-        }
-    }
-
-    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);
-            guiScreen.drawHoveringText(textLines, mouseX - 10, mouseY + 25);
-        }
-    }
-}

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

@@ -1,151 +0,0 @@
-package nl.requios.effortlessbuilding.gui;
-
-import net.minecraft.client.Minecraft;
-import net.minecraft.client.gui.*;
-import net.minecraft.util.text.TextFormatting;
-
-import java.io.IOException;
-import java.text.DecimalFormat;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.List;
-
-public class GuiNumberField extends Gui {
-
-    int x, y, width, height;
-    int buttonWidth = 10;
-
-    protected GuiTextField textField;
-    protected GuiButton minusButton, plusButton;
-
-    List<String> tooltip = new ArrayList<>();
-
-    public GuiNumberField(int id1, int id2, int id3, FontRenderer fontRenderer,
-                          List<GuiButton> buttonList, int x, int y, int width, int height) {
-        this.x = x;
-        this.y = y;
-        this.width = width;
-        this.height = height;
-
-        textField = new GuiTextField(id1, fontRenderer, x + buttonWidth + 1, y + 1, width - 2 * buttonWidth - 2, height - 2);
-        minusButton = new GuiButton(id2, x, y - 1, buttonWidth, height + 2, "-");
-        plusButton  = new GuiButton(id3, x + width - buttonWidth, y - 1, buttonWidth, height + 2, "+");
-
-        buttonList.add(minusButton);
-        buttonList.add(plusButton);
-    }
-
-    public void setNumber(double number) {
-        DecimalFormat format = new DecimalFormat("0.#");
-        textField.setText(format.format(number));
-    }
-
-    public double getNumber() {
-        if (textField.getText().isEmpty()) return 0;
-        return Double.parseDouble(textField.getText());
-    }
-
-    public void setTooltip(String tooltip) {
-        setTooltip(Arrays.asList(tooltip));
-    }
-
-    public void setTooltip(List<String> tooltip) {
-        this.tooltip = tooltip;
-    }
-
-    public boolean mouseClicked(int mouseX, int mouseY, int mouseButton) {
-        boolean result = textField.mouseClicked(mouseX, mouseY, mouseButton);
-
-        //Check if clicked inside textfield
-        boolean flag = mouseX >= x + buttonWidth && mouseX < x + width - buttonWidth && mouseY >= y && mouseY < y + height;
-
-        //Rightclicked inside textfield
-        if (flag && mouseButton == 1) {
-            textField.setText("");
-            textField.setFocused(true);
-            result = true;
-        }
-
-        return result;
-    }
-
-    public void drawNumberField(Minecraft mc, int mouseX, int mouseY, float partialTicks) {
-        textField.y = y + 1;
-        minusButton.y = y - 1;
-        plusButton.y = y - 1;
-
-        textField.drawTextBox();
-        minusButton.drawButton(mc, mouseX, mouseY, partialTicks);
-        plusButton.drawButton(mc, mouseX, mouseY, partialTicks);
-    }
-
-    public void drawTooltip(GuiScreen guiScreen, int mouseX, int mouseY) {
-        boolean insideTextField = mouseX >= x + buttonWidth && mouseX < x + width - buttonWidth && mouseY >= y && mouseY < y + height;
-        boolean insideMinusButton = mouseX >= x && mouseX < x + buttonWidth && mouseY >= y && mouseY < y + height;
-        boolean insidePlusButton = mouseX >= x + width - buttonWidth && mouseX < x + width && mouseY >= y && mouseY < y + height;
-
-        List<String> textLines = new ArrayList<>();
-
-        if (insideTextField) {
-            if (!tooltip.isEmpty())
-                textLines.addAll(tooltip);
-//            textLines.add(TextFormatting.GRAY + "Tip: try scrolling.");
-        }
-
-        if (insideMinusButton) {
-            textLines.add("Hold " + TextFormatting.AQUA + "shift " + TextFormatting.RESET + "for " + TextFormatting.RED + "10");
-            textLines.add("Hold " + TextFormatting.AQUA + "ctrl " + TextFormatting.RESET + "for " + TextFormatting.RED + "5");
-        }
-
-        if (insidePlusButton) {
-            textLines.add("Hold " + TextFormatting.AQUA + "shift " + TextFormatting.RESET + "for " + TextFormatting.DARK_GREEN + "10");
-            textLines.add("Hold " + TextFormatting.AQUA + "ctrl " + TextFormatting.RESET + "for " + TextFormatting.DARK_GREEN + "5");
-        }
-
-        guiScreen.drawHoveringText(textLines, mouseX - 10, mouseY + 25);
-
-    }
-
-    protected void actionPerformed(GuiButton button) {
-        float valueChanged = 1f;
-        if (GuiScreen.isCtrlKeyDown()) valueChanged = 5f;
-        if (GuiScreen.isShiftKeyDown()) valueChanged = 10f;
-
-        if (button == minusButton) {
-            setNumber(getNumber() - valueChanged);
-        }
-        if (button == plusButton) {
-            setNumber(getNumber() + valueChanged);
-        }
-    }
-
-    public void update() {
-        textField.updateCursorCounter();
-    }
-
-    protected 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) {
-            textField.textboxKeyTyped(typedChar, keyCode);
-//        }
-    }
-
-    //Scroll inside textfield to change number
-//    public void handleMouseInput(int mouseX, int mouseY) {
-//        boolean insideTextField = mouseX >= x + buttonWidth && mouseX < x + width - buttonWidth && mouseY >= y && mouseY < y + height;
-//
-//        if (insideTextField)
-//        {
-//            int valueChanged = 0;
-//            if (Mouse.getEventDWheel() > 0)
-//                valueChanged = 1;
-//            if (Mouse.getEventDWheel() < 0)
-//                valueChanged = -1;
-//
-//            if (valueChanged != 0)
-//                setNumber(getNumber() + valueChanged);
-//        }
-//    }
-}

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

@@ -1,435 +0,0 @@
-package nl.requios.effortlessbuilding.gui;
-
-import net.minecraft.client.Minecraft;
-import net.minecraft.client.gui.FontRenderer;
-import net.minecraft.client.gui.GuiButton;
-import net.minecraft.client.gui.GuiListExtended;
-import net.minecraft.client.gui.GuiScreen;
-import net.minecraft.client.renderer.BufferBuilder;
-import net.minecraft.client.renderer.GlStateManager;
-import net.minecraft.client.renderer.Tessellator;
-import net.minecraft.client.renderer.vertex.DefaultVertexFormats;
-import net.minecraft.util.math.MathHelper;
-import net.minecraftforge.fml.relauncher.Side;
-import net.minecraftforge.fml.relauncher.SideOnly;
-import org.lwjgl.input.Mouse;
-
-import java.io.IOException;
-import java.util.ArrayList;
-import java.util.List;
-
-@SideOnly(Side.CLIENT)
-public class GuiScrollPane extends GuiListExtended {
-
-    public GuiScreen parent;
-    public FontRenderer fontRenderer;
-    public List<IScrollEntry> listEntries;
-
-    public GuiScrollPane(GuiScreen parent, FontRenderer fontRenderer, int top, int bottom) {
-        super(parent.mc, parent.width, parent.height, top, bottom, 100);
-        this.parent = parent;
-        this.fontRenderer = fontRenderer;
-        this.setShowSelectionBox(false);
-        listEntries = new ArrayList<>();
-    }
-
-    @Override
-    public IGuiListEntry getListEntry(int index) {
-        return listEntries.get(index);
-    }
-
-    @Override
-    protected int getSize() {
-        return listEntries.size();
-    }
-
-    @Override
-    protected int getScrollBarX() {
-        //return width / 2 + 140 + 10;
-        return width - 15;
-    }
-
-    @Override
-    public int getListWidth() {
-        return 280;
-    }
-
-    //Removed background
-    @Override
-    public void drawScreen(int mouseXIn, int mouseYIn, float partialTicks)
-    {
-        if (this.visible)
-        {
-            this.mouseX = mouseXIn;
-            this.mouseY = mouseYIn;
-            int scrollBarLeft = this.getScrollBarX();
-            int scrollBarRight = scrollBarLeft + 6;
-            this.bindAmountScrolled();
-            GlStateManager.disableLighting();
-            GlStateManager.disableFog();
-
-            Tessellator tessellator = Tessellator.getInstance();
-            BufferBuilder bufferbuilder = tessellator.getBuffer();
-            int insideLeft = this.left + this.width / 2 - this.getListWidth() / 2 + 2;
-            int insideTop = this.top + 4 - (int)this.amountScrolled;
-
-            if (this.hasListHeader)
-            {
-                this.drawListHeader(insideLeft, insideTop, tessellator);
-            }
-
-            //All entries
-            this.drawSelectionBox(insideLeft, insideTop, mouseXIn, mouseYIn, partialTicks);
-            GlStateManager.disableDepth();
-            //Dirt overlays on top and bottom
-//            this.overlayBackground(0, this.top, 255, 255);
-//            this.overlayBackground(this.bottom, this.height, 255, 255);
-            GlStateManager.enableBlend();
-            GlStateManager.tryBlendFuncSeparate(GlStateManager.SourceFactor.SRC_ALPHA, GlStateManager.DestFactor.ONE_MINUS_SRC_ALPHA, GlStateManager.SourceFactor.ZERO, GlStateManager.DestFactor.ONE);
-            GlStateManager.disableAlpha();
-            GlStateManager.shadeModel(7425);
-            GlStateManager.disableTexture2D();
-//            //top fade
-//            bufferbuilder.begin(7, DefaultVertexFormats.POSITION_TEX_COLOR);
-//            bufferbuilder.pos((double)this.left, (double)(this.top + 5), 0.0D).tex(0.0D, 1.0D).color(100, 100, 100, 0).endVertex();
-//            bufferbuilder.pos((double)this.right, (double)(this.top + 5), 0.0D).tex(1.0D, 1.0D).color(100, 100, 100, 0).endVertex();
-//            bufferbuilder.pos((double)this.right, (double)this.top, 0.0D).tex(1.0D, 0.0D).color(100, 100, 100, 100).endVertex();
-//            bufferbuilder.pos((double)this.left, (double)this.top, 0.0D).tex(0.0D, 0.0D).color(100, 100, 100, 100).endVertex();
-//            tessellator.draw();
-//            //top line
-//            bufferbuilder.begin(7, DefaultVertexFormats.POSITION_TEX_COLOR);
-//            bufferbuilder.pos((double)this.left, (double)this.top, 0.0D).tex(0.0D, 1.0D).color(20, 20, 20, 255).endVertex();
-//            bufferbuilder.pos((double)this.right, (double)this.top, 0.0D).tex(1.0D, 1.0D).color(20, 20, 20, 255).endVertex();
-//            bufferbuilder.pos((double)this.right, (double)(this.top - 1), 0.0D).tex(1.0D, 0.0D).color(20, 20, 20, 255).endVertex();
-//            bufferbuilder.pos((double)this.left, (double)(this.top - 1), 0.0D).tex(0.0D, 0.0D).color(20, 20, 20, 255).endVertex();
-//            tessellator.draw();
-//            //bottom fade
-//            bufferbuilder.begin(7, DefaultVertexFormats.POSITION_TEX_COLOR);
-//            bufferbuilder.pos((double)this.left, (double)this.bottom, 0.0D).tex(0.0D, 1.0D).color(10, 10, 10, 100).endVertex();
-//            bufferbuilder.pos((double)this.right, (double)this.bottom, 0.0D).tex(1.0D, 1.0D).color(10, 10, 10, 100).endVertex();
-//            bufferbuilder.pos((double)this.right, (double)(this.bottom - 5), 0.0D).tex(1.0D, 0.0D).color(10, 10, 10, 0).endVertex();
-//            bufferbuilder.pos((double)this.left, (double)(this.bottom - 5), 0.0D).tex(0.0D, 0.0D).color(10, 10, 10, 0).endVertex();
-//            tessellator.draw();
-//            //bottom line
-//            bufferbuilder.begin(7, DefaultVertexFormats.POSITION_TEX_COLOR);
-//            bufferbuilder.pos((double)this.left, (double)(this.bottom + 1), 0.0D).tex(0.0D, 1.0D).color(20, 20, 20, 255).endVertex();
-//            bufferbuilder.pos((double)this.right, (double)(this.bottom + 1), 0.0D).tex(1.0D, 1.0D).color(20, 20, 20, 255).endVertex();
-//            bufferbuilder.pos((double)this.right, (double)this.bottom, 0.0D).tex(1.0D, 0.0D).color(20, 20, 20, 255).endVertex();
-//            bufferbuilder.pos((double)this.left, (double)this.bottom, 0.0D).tex(0.0D, 0.0D).color(20, 20, 20, 255).endVertex();
-//            tessellator.draw();
-
-            //Draw scrollbar
-            int maxScroll = this.getMaxScroll();
-            if (maxScroll > 0)
-            {
-                int k1 = (this.bottom - this.top) * (this.bottom - this.top) / this.getContentHeight();
-                k1 = MathHelper.clamp(k1, 32, this.bottom - this.top - 8);
-                int l1 = (int)this.amountScrolled * (this.bottom - this.top - k1) / maxScroll + this.top;
-
-                if (l1 < this.top)
-                {
-                    l1 = this.top;
-                }
-
-                bufferbuilder.begin(7, DefaultVertexFormats.POSITION_TEX_COLOR);
-                bufferbuilder.pos((double)scrollBarLeft, (double)this.bottom, 0.0D).tex(0.0D, 1.0D).color(0, 0, 0, 255).endVertex();
-                bufferbuilder.pos((double)scrollBarRight, (double)this.bottom, 0.0D).tex(1.0D, 1.0D).color(0, 0, 0, 255).endVertex();
-                bufferbuilder.pos((double)scrollBarRight, (double)this.top, 0.0D).tex(1.0D, 0.0D).color(0, 0, 0, 255).endVertex();
-                bufferbuilder.pos((double)scrollBarLeft, (double)this.top, 0.0D).tex(0.0D, 0.0D).color(0, 0, 0, 255).endVertex();
-                tessellator.draw();
-                bufferbuilder.begin(7, DefaultVertexFormats.POSITION_TEX_COLOR);
-                bufferbuilder.pos((double)scrollBarLeft, (double)(l1 + k1), 0.0D).tex(0.0D, 1.0D).color(128, 128, 128, 255).endVertex();
-                bufferbuilder.pos((double)scrollBarRight, (double)(l1 + k1), 0.0D).tex(1.0D, 1.0D).color(128, 128, 128, 255).endVertex();
-                bufferbuilder.pos((double)scrollBarRight, (double)l1, 0.0D).tex(1.0D, 0.0D).color(128, 128, 128, 255).endVertex();
-                bufferbuilder.pos((double)scrollBarLeft, (double)l1, 0.0D).tex(0.0D, 0.0D).color(128, 128, 128, 255).endVertex();
-                tessellator.draw();
-                bufferbuilder.begin(7, DefaultVertexFormats.POSITION_TEX_COLOR);
-                bufferbuilder.pos((double)scrollBarLeft, (double)(l1 + k1 - 1), 0.0D).tex(0.0D, 1.0D).color(192, 192, 192, 255).endVertex();
-                bufferbuilder.pos((double)(scrollBarRight - 1), (double)(l1 + k1 - 1), 0.0D).tex(1.0D, 1.0D).color(192, 192, 192, 255).endVertex();
-                bufferbuilder.pos((double)(scrollBarRight - 1), (double)l1, 0.0D).tex(1.0D, 0.0D).color(192, 192, 192, 255).endVertex();
-                bufferbuilder.pos((double)scrollBarLeft, (double)l1, 0.0D).tex(0.0D, 0.0D).color(192, 192, 192, 255).endVertex();
-                tessellator.draw();
-            }
-
-            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 getContentHeight() {
-        //Add every entry height
-        int height = this.headerPadding;
-        for (IScrollEntry entry : listEntries) {
-            height += entry.getHeight();
-        }
-        return height;
-    }
-
-    public int getContentHeight(int count) {
-        //Add all count entry heights
-        int height = this.headerPadding;
-        for (int i = 0; i < count; i++) {
-            IScrollEntry entry = listEntries.get(i);
-            height += entry.getHeight();
-        }
-        return height;
-    }
-
-    @Override
-    public int getSlotIndexFromScreenCoords(int posX, int posY) {
-        int left = this.left + (this.width - this.getListWidth()) / 2;
-        int right = this.left + (this.width + this.getListWidth()) / 2;
-        int relativeMouseY = posY - this.top - this.headerPadding + (int)this.amountScrolled - 4; //click height in content dimensions
-        //int slotIndex = relativeMouseY / this.slotHeight;
-
-        //Iterate over every entry until relativeMouseY falls within its height
-        for (int i = 0; i < listEntries.size(); i++) {
-            IScrollEntry entry = listEntries.get(i);
-            if (relativeMouseY <= entry.getHeight())
-                return posX < this.getScrollBarX() && posX >= left && posX <= right && i >= 0 &&
-                       relativeMouseY >= 0 && i < this.getSize() ? i : -1;
-            relativeMouseY -= entry.getHeight();
-        }
-        return -1;
-    }
-
-    @Override
-    public boolean mouseClicked(int mouseX, int mouseY, int mouseEvent)
-    {
-        if (this.isMouseYWithinSlotBounds(mouseY))
-        {
-            int i = this.getSlotIndexFromScreenCoords(mouseX, mouseY);
-
-            if (i >= 0)
-            {
-                int j = this.left + this.width / 2 - this.getListWidth() / 2 + 2;
-                int k = this.top + 4 - this.getAmountScrolled() + getContentHeight(i) + this.headerPadding;
-                int relativeX = mouseX - j;
-                int relativeY = mouseY - k;
-
-                if (this.getListEntry(i).mousePressed(i, mouseX, mouseY, mouseEvent, relativeX, relativeY))
-                {
-                    this.setEnabled(false);
-                    return true;
-                }
-            }
-        }
-
-        return false;
-    }
-
-    @Override
-    public boolean mouseReleased(int x, int y, int mouseEvent)
-    {
-        for (int i = 0; i < this.getSize(); ++i)
-        {
-            int j = this.left + this.width / 2 - this.getListWidth() / 2 + 2;
-            int k = this.top + 4 - this.getAmountScrolled() + getContentHeight(i) + this.headerPadding;
-            int relativeX = x - j;
-            int relativeY = y - k;
-            this.getListEntry(i).mouseReleased(i, x, y, mouseEvent, relativeX, relativeY);
-        }
-
-        this.setEnabled(true);
-        return false;
-    }
-
-    @Override
-    public void handleMouseInput() {
-        if (this.isMouseYWithinSlotBounds(this.mouseY)) {
-            if (Mouse.getEventButton() == 0 && Mouse.getEventButtonState() && this.mouseY >= this.top &&
-                this.mouseY <= this.bottom) {
-                int i = this.left + (this.width - this.getListWidth()) / 2;
-                int j = this.left + (this.width + this.getListWidth()) / 2;
-                int relativeMouseY = this.mouseY - this.top - this.headerPadding + (int) this.amountScrolled -
-                                     4; //click height in content dimensions
-                int slotIndex = getSlotIndexFromScreenCoords(this.mouseX, this.mouseY);
-
-                if (slotIndex > -1) {
-                    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.top + (int) this.amountScrolled - 4);
-                }
-            }
-
-            if (Mouse.isButtonDown(0) && this.getEnabled()) {
-                if (this.initialClickY == -1) {
-                    boolean flag1 = true;
-
-                    if (this.mouseY >= this.top && this.mouseY <= this.bottom) {
-                        int i2 = this.left + (this.width - this.getListWidth()) / 2;
-                        int j2 = this.left + (this.width + this.getListWidth()) / 2;
-                        int relativeMouseY = this.mouseY - this.top - this.headerPadding + (int) this.amountScrolled -
-                                             4; //click height in content dimensions
-                        int slotIndex = getSlotIndexFromScreenCoords(this.mouseX, this.mouseY);
-
-                        if (slotIndex > -1) {
-                            boolean flag = slotIndex == this.selectedElement &&
-                                           Minecraft.getSystemTime() - this.lastClicked < 250L;
-                            this.elementClicked(slotIndex, flag, this.mouseX, this.mouseY);
-                            this.selectedElement = slotIndex;
-                            this.lastClicked = Minecraft.getSystemTime();
-                        } else if (this.mouseX >= i2 && this.mouseX <= j2 && relativeMouseY < 0) {
-                            this.clickedHeader(this.mouseX - i2,
-                                    this.mouseY - this.top + (int) this.amountScrolled - 4);
-                            flag1 = false;
-                        }
-
-                        int i3 = this.getScrollBarX();
-                        int j1 = i3 + 6;
-
-                        if (this.mouseX >= i3 && this.mouseX <= j1) {
-                            this.scrollMultiplier = -1.0F;
-                            int maxScroll = this.getMaxScroll();
-
-                            if (maxScroll < 1) {
-                                maxScroll = 1;
-                            }
-
-                            int l1 = (int) ((float) ((this.bottom - this.top) * (this.bottom - this.top)) /
-                                            (float) this.getContentHeight());
-                            l1 = MathHelper.clamp(l1, 32, this.bottom - this.top - 8);
-                            this.scrollMultiplier /= (float) (this.bottom - this.top - l1) / (float) maxScroll;
-                        } else {
-                            this.scrollMultiplier = 1.0F;
-                        }
-
-                        if (flag1) {
-                            this.initialClickY = this.mouseY;
-                        } else {
-                            this.initialClickY = -2;
-                        }
-                    } else {
-                        this.initialClickY = -2;
-                    }
-                } else if (this.initialClickY >= 0) {
-                    this.amountScrolled -= (float) (this.mouseY - this.initialClickY) * this.scrollMultiplier;
-                    this.initialClickY = this.mouseY;
-                }
-            } else {
-                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 drawSelectionBox(int insideLeft, int insideTop, int mouseXIn, int mouseYIn, float partialTicks)
-    {
-        int size = this.getSize();
-        Tessellator tessellator = Tessellator.getInstance();
-        BufferBuilder bufferbuilder = tessellator.getBuffer();
-
-        //Find y to start with
-        int y = this.headerPadding + insideTop;
-        int contentHeight = getContentHeight();
-        int insideHeight = this.bottom - this.top - 4;
-
-        if (contentHeight < insideHeight) {
-            //it fits, so we can center it vertically
-            y += (insideHeight - contentHeight) / 2;
-        }
-
-        //Draw all entries
-        for (int i = 0; i < size; ++i)
-        {
-            int entryHeight = listEntries.get(i).getHeight();
-            int entryHeight2 = entryHeight - 4;
-
-            if (y > this.bottom || y + entryHeight2 < this.top)
-            {
-                this.updateItemPos(i, insideLeft, y, partialTicks);
-            }
-
-            if (this.showSelectionBox && this.isSelected(i))
-            {
-                int i1 = this.left + this.width / 2 - this.getListWidth() / 2;
-                int j1 = this.left + this.width / 2 + this.getListWidth() / 2;
-                GlStateManager.color(1.0F, 1.0F, 1.0F, 1.0F);
-                GlStateManager.disableTexture2D();
-                bufferbuilder.begin(7, DefaultVertexFormats.POSITION_TEX_COLOR);
-                bufferbuilder.pos((double)i1, (double)(y + entryHeight2 + 2), 0.0D).tex(0.0D, 1.0D).color(128, 128, 128, 255).endVertex();
-                bufferbuilder.pos((double)j1, (double)(y + entryHeight2 + 2), 0.0D).tex(1.0D, 1.0D).color(128, 128, 128, 255).endVertex();
-                bufferbuilder.pos((double)j1, (double)(y - 2), 0.0D).tex(1.0D, 0.0D).color(128, 128, 128, 255).endVertex();
-                bufferbuilder.pos((double)i1, (double)(y - 2), 0.0D).tex(0.0D, 0.0D).color(128, 128, 128, 255).endVertex();
-                bufferbuilder.pos((double)(i1 + 1), (double)(y + entryHeight2 + 1), 0.0D).tex(0.0D, 1.0D).color(0, 0, 0, 255).endVertex();
-                bufferbuilder.pos((double)(j1 - 1), (double)(y + entryHeight2 + 1), 0.0D).tex(1.0D, 1.0D).color(0, 0, 0, 255).endVertex();
-                bufferbuilder.pos((double)(j1 - 1), (double)(y - 1), 0.0D).tex(1.0D, 0.0D).color(0, 0, 0, 255).endVertex();
-                bufferbuilder.pos((double)(i1 + 1), (double)(y - 1), 0.0D).tex(0.0D, 0.0D).color(0, 0, 0, 255).endVertex();
-                tessellator.draw();
-                GlStateManager.enableTexture2D();
-            }
-
-            this.drawSlot(i, insideLeft, y, entryHeight2, mouseXIn, mouseYIn, partialTicks);
-            y += entryHeight;
-        }
-    }
-
-    //PASSTHROUGHS
-    public int initGui(int id, List<GuiButton> buttonList) {
-        for (IScrollEntry entry : this.listEntries) {
-            id = entry.initGui(id, buttonList);
-        }
-        registerScrollButtons(id++, id++);
-        return id;
-    }
-
-    public void updateScreen() {
-        for (IScrollEntry entry : this.listEntries)
-            entry.updateScreen();
-    }
-
-    public void drawTooltip(GuiScreen guiScreen, int mouseX, int mouseY) {
-        for (IScrollEntry entry : this.listEntries)
-            entry.drawTooltip(guiScreen, mouseX, mouseY);
-    }
-
-    public void keyTyped(char eventChar, int eventKey) throws IOException {
-        for (IScrollEntry entry : this.listEntries)
-            entry.keyTyped(eventChar, eventKey);
-    }
-
-    public void actionPerformed(GuiButton button) {
-        for (IScrollEntry entry : this.listEntries)
-            entry.actionPerformed(button);
-    }
-
-    public void onGuiClosed() {
-        for (IScrollEntry entry : this.listEntries)
-            entry.onGuiClosed();
-    }
-
-    public interface IScrollEntry extends GuiListExtended.IGuiListEntry {
-        int initGui(int id, List<GuiButton> buttonList);
-
-        void updateScreen();
-
-        void drawTooltip(GuiScreen guiScreen, int mouseX, int mouseY);
-
-        void keyTyped(char eventChar, int eventKey) throws IOException;
-
-        void actionPerformed(GuiButton button);
-
-        void onGuiClosed();
-
-        int getHeight();
-    }
-}

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

@@ -1,295 +0,0 @@
-package nl.requios.effortlessbuilding.gui;
-
-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.fml.client.config.GuiCheckBox;
-import nl.requios.effortlessbuilding.BuildSettingsManager;
-import nl.requios.effortlessbuilding.EffortlessBuilding;
-import nl.requios.effortlessbuilding.Mirror;
-import nl.requios.effortlessbuilding.helper.ReachHelper;
-
-import java.io.IOException;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.List;
-
-public class MirrorSettingsGui extends GuiCollapsibleScrollEntry {
-
-    protected static final ResourceLocation BUILDING_ICONS = new ResourceLocation(EffortlessBuilding.MODID, "textures/gui/building_icons.png");
-
-    protected List<GuiButton> mirrorButtonList = new ArrayList<>();
-    protected List<GuiIconButton> mirrorIconButtonList = new ArrayList<>();
-    protected List<GuiNumberField> mirrorNumberFieldList = new ArrayList<>();
-
-    private GuiNumberField textMirrorPosX, textMirrorPosY, textMirrorPosZ, textMirrorRadius;
-    private GuiCheckBox buttonMirrorEnabled, buttonMirrorX, buttonMirrorY, buttonMirrorZ;
-    private GuiIconButton buttonCurrentPosition, buttonToggleOdd, buttonDrawPlanes, buttonDrawLines;
-    private boolean drawPlanes, drawLines, toggleOdd;
-
-    public MirrorSettingsGui(GuiScrollPane scrollPane) {
-        super(scrollPane);
-    }
-
-    @Override
-    public int initGui(int id, List<GuiButton> buttonList) {
-        id = super.initGui(id, buttonList);
-
-        int y = top - 2;
-        buttonMirrorEnabled = new GuiCheckBox(id++, left - 15 + 8, y, "", false);
-        buttonList.add(buttonMirrorEnabled);
-
-        y = top + 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(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(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 GuiCheckBox(id++, left + 60, y, " X", true);
-        mirrorButtonList.add(buttonMirrorX);
-
-        buttonMirrorY = new GuiCheckBox(id++, left + 100, y, " Y", false);
-        mirrorButtonList.add(buttonMirrorY);
-
-        buttonMirrorZ = new GuiCheckBox(id++, left + 140, y, " Z", false);
-        mirrorButtonList.add(buttonMirrorZ);
-
-        y = top + 47;
-        textMirrorRadius = new GuiNumberField(id++, id++, id++, fontRenderer, buttonList, left + 218, y, 62, 18);
-        textMirrorRadius.setNumber(50);
-        //TODO change to diameter (remove /2)
-        textMirrorRadius.setTooltip(Arrays.asList("How far the mirror reaches in any direction.",
-                TextFormatting.GRAY + "Max: " + TextFormatting.GOLD + ReachHelper.getMaxReach(mc.player) / 2,
-                TextFormatting.GRAY + "Upgradeable in survival with reach upgrades."));
-        mirrorNumberFieldList.add(textMirrorRadius);
-
-        y = top + 72;
-        buttonCurrentPosition = new GuiIconButton(id++, left + 5, y, 0, 0, BUILDING_ICONS);
-        buttonCurrentPosition.setTooltip("Set mirror position to current player position");
-        mirrorIconButtonList.add(buttonCurrentPosition);
-
-        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(id++, left + 65, y, 0, 40, BUILDING_ICONS);
-        buttonDrawLines.setTooltip("Show lines");
-        mirrorIconButtonList.add(buttonDrawLines);
-
-        buttonDrawPlanes = new GuiIconButton(id++, left + 95, y, 0, 60, BUILDING_ICONS);
-        buttonDrawPlanes.setTooltip("Show area");
-        mirrorIconButtonList.add(buttonDrawPlanes);
-
-        BuildSettingsManager.BuildSettings buildSettings = BuildSettingsManager.getBuildSettings(mc.player);
-        if (buildSettings != null) {
-            Mirror.MirrorSettings m = buildSettings.getMirrorSettings();
-            buttonMirrorEnabled.setIsChecked(m.enabled);
-            textMirrorPosX.setNumber(m.position.x);
-            textMirrorPosY.setNumber(m.position.y);
-            textMirrorPosZ.setNumber(m.position.z);
-            buttonMirrorX.setIsChecked(m.mirrorX);
-            buttonMirrorY.setIsChecked(m.mirrorY);
-            buttonMirrorZ.setIsChecked(m.mirrorZ);
-            textMirrorRadius.setNumber(m.radius);
-            drawLines = m.drawLines;
-            drawPlanes = m.drawPlanes;
-            buttonDrawLines.setUseAlternateIcon(drawLines);
-            buttonDrawPlanes.setUseAlternateIcon(drawPlanes);
-            buttonDrawLines.setTooltip(drawLines ? "Hide lines" : "Show lines");
-            buttonDrawPlanes.setTooltip(drawPlanes ? "Hide area" : "Show area");
-            if (textMirrorPosX.getNumber() == Math.floor(textMirrorPosX.getNumber())) {
-                toggleOdd = false;
-                buttonToggleOdd.setTooltip(Arrays.asList("Set mirror position to middle of block", "for odd numbered builds"));
-            } else {
-                toggleOdd = true;
-                buttonToggleOdd.setTooltip(Arrays.asList("Set mirror position to corner of block", "for even numbered builds"));
-            }
-            buttonToggleOdd.setUseAlternateIcon(toggleOdd);
-        }
-
-        buttonList.addAll(mirrorButtonList);
-        buttonList.addAll(mirrorIconButtonList);
-
-        setCollapsed(!buttonMirrorEnabled.isChecked());
-
-        return id;
-    }
-
-    @Override
-    public void updateScreen() {
-        super.updateScreen();
-        mirrorNumberFieldList.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;
-
-        buttonMirrorEnabled.drawButton(this.mc, mouseX, mouseY, partialTicks);
-        if (buttonMirrorEnabled.isChecked()) {
-            buttonMirrorEnabled.y = yy;
-            fontRenderer.drawString("Mirror enabled", left + offset, yy + 2, 0xFFFFFF, true);
-
-            yy = y + 18;
-            fontRenderer.drawString("Position", left + offset, yy + 5, 0xFFFFFF, true);
-            fontRenderer.drawString("X", left + 40 + offset, yy + 5, 0xFFFFFF, true);
-            textMirrorPosX.y = yy;
-            fontRenderer.drawString("Y", left + 120 + offset, yy + 5, 0xFFFFFF, true);
-            textMirrorPosY.y = yy;
-            fontRenderer.drawString("Z", left + 200 + offset, yy + 5, 0xFFFFFF, true);
-            textMirrorPosZ.y = yy;
-
-            yy = y + 50;
-            fontRenderer.drawString("Direction", left + offset, yy + 2, 0xFFFFFF, true);
-            buttonMirrorX.y = yy;
-            buttonMirrorY.y = yy;
-            buttonMirrorZ.y = yy;
-            fontRenderer.drawString("Radius", left + 176 + offset, yy + 2, 0xFFFFFF, true);
-            textMirrorRadius.y = yy - 3;
-
-            yy = y + 72;
-            buttonCurrentPosition.y = yy;
-            buttonToggleOdd.y = yy;
-            buttonDrawLines.y = yy;
-            buttonDrawPlanes.y = yy;
-
-            mirrorButtonList.forEach(button -> button.drawButton(this.mc, mouseX, mouseY, partialTicks));
-            mirrorIconButtonList.forEach(button -> button.drawButton(this.mc, mouseX, mouseY, partialTicks));
-            mirrorNumberFieldList.forEach(numberField -> numberField.drawNumberField(this.mc, mouseX, mouseY, partialTicks));
-        } else {
-            buttonMirrorEnabled.y = yy;
-            fontRenderer.drawString("Mirror disabled", left + offset, yy + 2, 0x999999, true);
-        }
-
-    }
-
-    public void drawTooltip(GuiScreen guiScreen, int mouseX, int mouseY) {
-        //Draw tooltips last
-        if (buttonMirrorEnabled.isChecked())
-        {
-            mirrorIconButtonList.forEach(iconButton -> iconButton.drawTooltip(scrollPane.parent, mouseX, mouseY));
-            mirrorNumberFieldList.forEach(numberField -> numberField.drawTooltip(scrollPane.parent, mouseX, mouseY));
-        }
-    }
-
-    @Override
-    public void updatePosition(int slotIndex, int x, int y, float partialTicks) {
-        super.updatePosition(slotIndex, x, y, partialTicks);
-    }
-
-    @Override
-    public void keyTyped(char typedChar, int keyCode) throws IOException {
-        super.keyTyped(typedChar, keyCode);
-        for (GuiNumberField numberField : mirrorNumberFieldList) {
-            numberField.keyTyped(typedChar, keyCode);
-        }
-    }
-
-    @Override
-    public boolean mousePressed(int slotIndex, int mouseX, int mouseY, int mouseEvent, int relativeX, int relativeY) {
-        super.mousePressed(slotIndex, mouseX, mouseY, mouseEvent, relativeX, relativeY);
-        mirrorNumberFieldList.forEach(numberField -> numberField.mouseClicked(mouseX, mouseY, mouseEvent));
-
-        boolean insideMirrorEnabledLabel = mouseX >= left && mouseX < right && relativeY >= -2 && relativeY < 12;
-
-        if (insideMirrorEnabledLabel) {
-            buttonMirrorEnabled.setIsChecked(!buttonMirrorEnabled.isChecked());
-            buttonMirrorEnabled.playPressSound(this.mc.getSoundHandler());
-            actionPerformed(buttonMirrorEnabled);
-        }
-
-        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();
-
-        Vec3d mirrorPos = new Vec3d(0, 64, 0);
-        try {
-            mirrorPos = new Vec3d(textMirrorPosX.getNumber(), textMirrorPosY.getNumber(), textMirrorPosZ.getNumber());
-        } catch (NumberFormatException | NullPointerException ex) {
-            EffortlessBuilding.log(mc.player, "Mirror position not a valid number.");
-        }
-
-        boolean mirrorX = buttonMirrorX.isChecked();
-        boolean mirrorY = buttonMirrorY.isChecked();
-        boolean mirrorZ = buttonMirrorZ.isChecked();
-
-        int mirrorRadius = 50;
-        try {
-            mirrorRadius = (int) textMirrorRadius.getNumber();
-        } catch (NumberFormatException | NullPointerException ex) {
-            EffortlessBuilding.log(mc.player, "Mirror radius not a valid number.");
-        }
-
-        return new Mirror.MirrorSettings(mirrorEnabled, mirrorPos, mirrorX, mirrorY, mirrorZ, mirrorRadius, drawLines, drawPlanes);
-    }
-
-    @Override
-    protected String getName() {
-        return "Mirror";
-    }
-
-    @Override
-    protected int getExpandedHeight() {
-        return 100;
-    }
-}

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

@@ -1,302 +0,0 @@
-package nl.requios.effortlessbuilding.gui;
-
-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.fml.client.config.GuiCheckBox;
-import nl.requios.effortlessbuilding.BuildSettingsManager;
-import nl.requios.effortlessbuilding.EffortlessBuilding;
-import nl.requios.effortlessbuilding.RadialMirror;
-import nl.requios.effortlessbuilding.helper.ReachHelper;
-
-import java.io.IOException;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.List;
-
-public class RadialMirrorSettingsGui extends GuiCollapsibleScrollEntry {
-
-    protected static final ResourceLocation BUILDING_ICONS = new ResourceLocation(EffortlessBuilding.MODID, "textures/gui/building_icons.png");
-
-    protected List<GuiButton> radialMirrorButtonList = new ArrayList<>();
-    protected List<GuiIconButton> radialMirrorIconButtonList = new ArrayList<>();
-    protected List<GuiNumberField> radialMirrorNumberFieldList = new ArrayList<>();
-
-    private GuiNumberField textRadialMirrorPosX, textRadialMirrorPosY, textRadialMirrorPosZ, textRadialMirrorSlices, textRadialMirrorRadius;
-    private GuiCheckBox buttonRadialMirrorEnabled, buttonRadialMirrorAlternate;
-    private GuiIconButton buttonCurrentPosition, buttonToggleOdd, buttonDrawPlanes, buttonDrawLines;
-    private boolean drawPlanes, drawLines, toggleOdd;
-
-    public RadialMirrorSettingsGui(GuiScrollPane scrollPane) {
-        super(scrollPane);
-    }
-
-    @Override
-    public int initGui(int id, List<GuiButton> buttonList) {
-        id = super.initGui(id, buttonList);
-
-        int y = top - 2;
-        buttonRadialMirrorEnabled = new GuiCheckBox(id++, left - 15 + 8, y, "", false);
-        buttonList.add(buttonRadialMirrorEnabled);
-
-        y = top + 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(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(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(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(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.",
-                TextFormatting.GRAY + "Max: " + TextFormatting.GOLD + ReachHelper.getMaxReach(mc.player) / 2,
-                TextFormatting.GRAY + "Upgradeable in survival with reach upgrades."));
-        radialMirrorNumberFieldList.add(textRadialMirrorRadius);
-
-
-        y = top + 72;
-        buttonCurrentPosition = new GuiIconButton(id++, left + 5, y, 0, 0, BUILDING_ICONS);
-        buttonCurrentPosition.setTooltip("Set radial mirror position to current player position");
-        radialMirrorIconButtonList.add(buttonCurrentPosition);
-
-        buttonToggleOdd = new GuiIconButton(id++, left + 35, y, 0, 20, BUILDING_ICONS);
-        buttonToggleOdd.setTooltip(Arrays.asList("Set radial mirror position to middle of block", "for odd numbered builds"));
-        radialMirrorIconButtonList.add(buttonToggleOdd);
-
-        buttonDrawLines = new GuiIconButton(id++, left + 65, y, 0, 40, BUILDING_ICONS);
-        buttonDrawLines.setTooltip("Show lines");
-        radialMirrorIconButtonList.add(buttonDrawLines);
-
-        buttonDrawPlanes = new GuiIconButton(id++, left + 95, y, 0, 60, BUILDING_ICONS);
-        buttonDrawPlanes.setTooltip("Show area");
-        radialMirrorIconButtonList.add(buttonDrawPlanes);
-
-        y = top + 76;
-        buttonRadialMirrorAlternate = new GuiCheckBox(id++, left + 140, y, " Alternate", false);
-        radialMirrorButtonList.add(buttonRadialMirrorAlternate);
-
-        BuildSettingsManager.BuildSettings buildSettings = BuildSettingsManager.getBuildSettings(mc.player);
-        if (buildSettings != null) {
-            RadialMirror.RadialMirrorSettings r = buildSettings.getRadialMirrorSettings();
-            buttonRadialMirrorEnabled.setIsChecked(r.enabled);
-            textRadialMirrorPosX.setNumber(r.position.x);
-            textRadialMirrorPosY.setNumber(r.position.y);
-            textRadialMirrorPosZ.setNumber(r.position.z);
-            textRadialMirrorSlices.setNumber(r.slices);
-            buttonRadialMirrorAlternate.setIsChecked(r.alternate);
-            textRadialMirrorRadius.setNumber(r.radius);
-            drawLines = r.drawLines;
-            drawPlanes = r.drawPlanes;
-            buttonDrawLines.setUseAlternateIcon(drawLines);
-            buttonDrawPlanes.setUseAlternateIcon(drawPlanes);
-            buttonDrawLines.setTooltip(drawLines ? "Hide lines" : "Show lines");
-            buttonDrawPlanes.setTooltip(drawPlanes ? "Hide area" : "Show area");
-            if (textRadialMirrorPosX.getNumber() == Math.floor(textRadialMirrorPosX.getNumber())) {
-                toggleOdd = false;
-                buttonToggleOdd.setTooltip(Arrays.asList("Set radial mirror position to middle of block", "for odd numbered builds"));
-            } else {
-                toggleOdd = true;
-                buttonToggleOdd.setTooltip(Arrays.asList("Set radial mirror position to corner of block", "for even numbered builds"));
-            }
-            buttonToggleOdd.setUseAlternateIcon(toggleOdd);
-        }
-
-        buttonList.addAll(radialMirrorButtonList);
-        buttonList.addAll(radialMirrorIconButtonList);
-
-        setCollapsed(!buttonRadialMirrorEnabled.isChecked());
-
-        return id;
-    }
-
-    @Override
-    public void updateScreen() {
-        super.updateScreen();
-        radialMirrorNumberFieldList.forEach(GuiNumberField::update);
-    }
-
-    @Override
-    public void drawEntry(int slotIndex, int x, int y, int listWidth, int slotHeight, int mouseX, int mouseY,
-                          boolean isSelected, float partialTicks) {
-        super.drawEntry(slotIndex, x, y, listWidth, slotHeight, mouseX, mouseY, isSelected, partialTicks);
-
-        int yy = y;
-        int offset = 8;
-
-        buttonRadialMirrorEnabled.drawButton(this.mc, mouseX, mouseY, partialTicks);
-        if (buttonRadialMirrorEnabled.isChecked()) {
-            buttonRadialMirrorEnabled.y = yy;
-            fontRenderer.drawString("Radial mirror enabled", left + offset, yy + 2, 0xFFFFFF, true);
-
-            yy = y + 18;
-            fontRenderer.drawString("Position", left + offset, yy + 5, 0xFFFFFF, true);
-            fontRenderer.drawString("X", left + 40 + offset, yy + 5, 0xFFFFFF, true);
-            textRadialMirrorPosX.y = yy;
-            fontRenderer.drawString("Y", left + 120 + offset, yy + 5, 0xFFFFFF, true);
-            textRadialMirrorPosY.y = yy;
-            fontRenderer.drawString("Z", left + 200 + offset, yy + 5, 0xFFFFFF, true);
-            textRadialMirrorPosZ.y = yy;
-
-            yy = y + 50;
-            fontRenderer.drawString("Slices", left + offset, yy + 2, 0xFFFFFF, true);
-            textRadialMirrorSlices.y = yy - 3;
-            fontRenderer.drawString("Radius", left + 176 + offset, yy + 2, 0xFFFFFF, true);
-            textRadialMirrorRadius.y = yy - 3;
-
-            yy = y + 72;
-            buttonCurrentPosition.y = yy;
-            buttonToggleOdd.y = yy;
-            buttonDrawLines.y = yy;
-            buttonDrawPlanes.y = yy;
-
-            yy = y + 76;
-            buttonRadialMirrorAlternate.y = yy;
-
-            radialMirrorButtonList.forEach(button -> button.drawButton(this.mc, mouseX, mouseY, partialTicks));
-            radialMirrorIconButtonList.forEach(button -> button.drawButton(this.mc, mouseX, mouseY, partialTicks));
-            radialMirrorNumberFieldList
-                    .forEach(numberField -> numberField.drawNumberField(this.mc, mouseX, mouseY, partialTicks));
-        } else {
-            buttonRadialMirrorEnabled.y = yy;
-            fontRenderer.drawString("Radial mirror disabled", left + offset, yy + 2, 0x999999, true);
-        }
-
-    }
-
-    public void drawTooltip(GuiScreen guiScreen, int mouseX, int mouseY) {
-        //Draw tooltips last
-        if (buttonRadialMirrorEnabled.isChecked())
-        {
-            radialMirrorIconButtonList.forEach(iconButton -> iconButton.drawTooltip(scrollPane.parent, mouseX, mouseY));
-            radialMirrorNumberFieldList.forEach(numberField -> numberField.drawTooltip(scrollPane.parent, mouseX, mouseY));
-        }
-    }
-
-    @Override
-    public void updatePosition(int slotIndex, int x, int y, float partialTicks) {
-        super.updatePosition(slotIndex, x, y, partialTicks);
-    }
-
-    @Override
-    public void keyTyped(char typedChar, int keyCode) throws IOException {
-        super.keyTyped(typedChar, keyCode);
-        for (GuiNumberField numberField : radialMirrorNumberFieldList) {
-            numberField.keyTyped(typedChar, keyCode);
-        }
-    }
-
-    @Override
-    public boolean mousePressed(int slotIndex, int mouseX, int mouseY, int mouseEvent, int relativeX, int relativeY) {
-        super.mousePressed(slotIndex, mouseX, mouseY, mouseEvent, relativeX, relativeY);
-        radialMirrorNumberFieldList.forEach(numberField -> numberField.mouseClicked(mouseX, mouseY, mouseEvent));
-
-        boolean insideRadialMirrorEnabledLabel = mouseX >= left && mouseX < right && relativeY >= -2 && relativeY < 12;
-
-        if (insideRadialMirrorEnabledLabel) {
-            buttonRadialMirrorEnabled.setIsChecked(!buttonRadialMirrorEnabled.isChecked());
-            buttonRadialMirrorEnabled.playPressSound(this.mc.getSoundHandler());
-            actionPerformed(buttonRadialMirrorEnabled);
-        }
-
-        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();
-
-        Vec3d radialMirrorPos = new Vec3d(0, 64, 0);
-        try {
-            radialMirrorPos = new Vec3d(textRadialMirrorPosX.getNumber(), textRadialMirrorPosY.getNumber(), textRadialMirrorPosZ
-                    .getNumber());
-        } catch (NumberFormatException | NullPointerException ex) {
-            EffortlessBuilding.log(mc.player, "Radial mirror position not a valid number.");
-        }
-
-        int radialMirrorSlices = 4;
-        try {
-            radialMirrorSlices = (int) textRadialMirrorSlices.getNumber();
-        } catch (NumberFormatException | NullPointerException ex) {
-            EffortlessBuilding.log(mc.player, "Radial mirror slices not a valid number.");
-        }
-
-        boolean radialMirrorAlternate = buttonRadialMirrorAlternate.isChecked();
-
-        int radialMirrorRadius = 50;
-        try {
-            radialMirrorRadius = (int) textRadialMirrorRadius.getNumber();
-        } catch (NumberFormatException | NullPointerException ex) {
-            EffortlessBuilding.log(mc.player, "Mirror radius not a valid number.");
-        }
-
-        return new RadialMirror.RadialMirrorSettings(radialMirrorEnabled, radialMirrorPos, radialMirrorSlices, radialMirrorAlternate, radialMirrorRadius, drawLines, drawPlanes);
-    }
-
-    @Override
-    protected String getName() {
-        return "Radial mirror";
-    }
-
-    @Override
-    protected int getExpandedHeight() {
-        return 100;
-    }
-}

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

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

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

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

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

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

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

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

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

@@ -1,132 +0,0 @@
-package nl.requios.effortlessbuilding.gui;
-
-import net.minecraft.client.gui.GuiButton;
-import net.minecraft.client.gui.GuiScreen;
-import nl.requios.effortlessbuilding.*;
-import nl.requios.effortlessbuilding.network.BuildSettingsMessage;
-import nl.requios.effortlessbuilding.proxy.ClientProxy;
-
-import java.io.IOException;
-
-public class SettingsGui extends GuiScreen {
-
-    private GuiScrollPane scrollPane;
-    private GuiButton buttonClose;
-
-    private MirrorSettingsGui mirrorSettingsGui;
-    private ArraySettingsGui arraySettingsGui;
-    private RadialMirrorSettingsGui radialMirrorSettingsGui;
-
-    @Override
-    //Create buttons and labels and add them to buttonList/labelList
-    public void initGui() {
-        int id = 0;
-
-        scrollPane = new GuiScrollPane(this, fontRenderer, 8, height - 30);
-
-        mirrorSettingsGui = new MirrorSettingsGui(scrollPane);
-        scrollPane.listEntries.add(mirrorSettingsGui);
-
-        arraySettingsGui = new ArraySettingsGui(scrollPane);
-        scrollPane.listEntries.add(arraySettingsGui);
-
-        radialMirrorSettingsGui = new RadialMirrorSettingsGui(scrollPane);
-        scrollPane.listEntries.add(radialMirrorSettingsGui);
-
-        id = scrollPane.initGui(id, buttonList);
-
-        //Close button
-        int y = height - 26;
-        buttonClose = new GuiButton(id++, width / 2 - 100, y, "Close");
-        buttonList.add(buttonClose);
-
-    }
-
-    @Override
-    //Process general logic, i.e. hide buttons
-    public void updateScreen() {
-        scrollPane.updateScreen();
-    }
-
-    @Override
-    //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 drawScreen(int mouseX, int mouseY, float partialTicks) {
-        this.drawDefaultBackground();
-
-        scrollPane.drawScreen(mouseX, mouseY, partialTicks);
-
-        buttonClose.drawButton(this.mc, mouseX, mouseY, partialTicks);
-
-        scrollPane.drawTooltip(this, mouseX, mouseY);
-    }
-
-    @Override
-    protected void keyTyped(char typedChar, int keyCode) throws IOException {
-        super.keyTyped(typedChar, keyCode);
-        scrollPane.keyTyped(typedChar, keyCode);
-        if (keyCode == ClientProxy.keyBindings[0].getKeyCode()) {
-            mc.player.closeScreen();
-        }
-    }
-
-    @Override
-    protected void mouseClicked(int mouseX, int mouseY, int mouseButton) throws IOException {
-        super.mouseClicked(mouseX, mouseY, mouseButton);
-        scrollPane.mouseClicked(mouseX, mouseY, mouseButton);
-    }
-
-    @Override
-    protected void mouseReleased(int mouseX, int mouseY, int state) {
-        if (state != 0 || !scrollPane.mouseReleased(mouseX, mouseY, state))
-        {
-            super.mouseReleased(mouseX, mouseY, state);
-        }
-    }
-
-    @Override
-    public void handleMouseInput() throws IOException {
-        super.handleMouseInput();
-        scrollPane.handleMouseInput();
-
-        //Scrolling numbers
-//        int mouseX = Mouse.getEventX() * this.width / this.mc.displayWidth;
-//        int mouseY = this.height - Mouse.getEventY() * this.height / this.mc.displayHeight - 1;
-//        numberFieldList.forEach(numberField -> numberField.handleMouseInput(mouseX, mouseY));
-    }
-
-    @Override
-    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
-        Mirror.MirrorSettings m = mirrorSettingsGui.getMirrorSettings();
-        Array.ArraySettings a = arraySettingsGui.getArraySettings();
-        RadialMirror.RadialMirrorSettings r = radialMirrorSettingsGui.getRadialMirrorSettings();
-
-        BuildSettingsManager.BuildSettings buildSettings = BuildSettingsManager.getBuildSettings(mc.player);
-        if (buildSettings == null) buildSettings = new BuildSettingsManager.BuildSettings();
-        buildSettings.setMirrorSettings(m);
-        buildSettings.setArraySettings(a);
-        buildSettings.setRadialMirrorSettings(r);
-
-        //Sanitize
-        String error = BuildSettingsManager.sanitize(buildSettings, mc.player);
-        if (!error.isEmpty()) EffortlessBuilding.log(mc.player, error);
-
-        BuildSettingsManager.setBuildSettings(mc.player, buildSettings);
-
-        //Send to server
-        EffortlessBuilding.packetHandler.sendToServer(new BuildSettingsMessage(buildSettings));
-    }
-
-}

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

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

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

@@ -0,0 +1,518 @@
+package nl.requios.effortlessbuilding.gui.buildmode;
+
+import com.mojang.blaze3d.vertex.*;
+import com.mojang.blaze3d.systems.RenderSystem;
+import com.mojang.math.Vector4f;
+import net.minecraft.MethodsReturnNonnullByDefault;
+import net.minecraft.client.Minecraft;
+import net.minecraft.client.gui.screens.Screen;
+import net.minecraft.client.player.LocalPlayer;
+import net.minecraft.client.renderer.GameRenderer;
+import net.minecraft.client.resources.language.I18n;
+import net.minecraft.client.KeyMapping;
+import net.minecraft.client.resources.sounds.SimpleSoundInstance;
+import net.minecraft.core.Direction;
+import net.minecraft.ChatFormatting;
+import net.minecraft.network.chat.Component;
+import net.minecraft.resources.ResourceLocation;
+import net.minecraft.sounds.SoundEvents;
+import net.minecraft.sounds.SoundSource;
+import net.minecraft.util.RandomSource;
+import nl.requios.effortlessbuilding.EffortlessBuilding;
+import nl.requios.effortlessbuilding.buildmode.ModeOptions;
+import nl.requios.effortlessbuilding.buildmode.ModeSettingsManager;
+import nl.requios.effortlessbuilding.network.ModeActionMessage;
+import nl.requios.effortlessbuilding.network.ModeSettingsMessage;
+import nl.requios.effortlessbuilding.network.PacketHandler;
+import nl.requios.effortlessbuilding.proxy.ClientProxy;
+import org.apache.commons.lang3.text.WordUtils;
+import org.lwjgl.opengl.GL11;
+
+import javax.annotation.ParametersAreNonnullByDefault;
+import java.util.ArrayList;
+
+import static nl.requios.effortlessbuilding.buildmode.ModeOptions.*;
+
+import nl.requios.effortlessbuilding.buildmode.BuildModes.BuildModeEnum;
+import nl.requios.effortlessbuilding.buildmode.ModeOptions.ActionEnum;
+import nl.requios.effortlessbuilding.buildmode.ModeOptions.OptionEnum;
+
+/**
+ * Initially from Chisels and Bits by AlgorithmX2
+ * https://github.com/AlgorithmX2/Chisels-and-Bits/blob/1.12/src/main/java/mod/chiselsandbits/client/gui/ChiselsAndBitsMenu.java
+ */
+
+@ParametersAreNonnullByDefault
+@MethodsReturnNonnullByDefault
+public class RadialMenu extends Screen {
+
+	private final Vector4f radialButtonColor = new Vector4f(0f, 0f, 0f, .5f);
+	private final Vector4f sideButtonColor = new Vector4f(.5f, .5f, .5f, .5f);
+	private final Vector4f highlightColor = new Vector4f(.6f, .8f, 1f, .6f);
+	private final Vector4f selectedColor = new Vector4f(0f, .5f, 1f, .5f);
+	private final Vector4f highlightSelectedColor = new Vector4f(0.2f, .7f, 1f, .7f);
+
+	private final int whiteTextColor = 0xffffffff;
+	private final int watermarkTextColor = 0x88888888;
+	private final int descriptionTextColor = 0xdd888888;
+	private final int optionTextColor = 0xeeeeeeff;
+
+	private final double ringInnerEdge = 40;
+	private final double ringOuterEdge = 80;
+	private final double categoryLineOuterEdge = 42;
+	private final double textDistance = 90;
+	private final double buttonDistance = 120;
+	private final float fadeSpeed = 0.3f;
+	private final int descriptionHeight = 100;
+
+	public static final RadialMenu instance = new RadialMenu();
+	public BuildModeEnum switchTo = null;
+	public ActionEnum doAction = null;
+	public boolean performedActionUsingMouse;
+
+	private float visibility;
+
+	public RadialMenu() {
+		super(Component.translatable("effortlessbuilding.screen.radial_menu"));
+	}
+
+	public boolean isVisible() {
+		return Minecraft.getInstance().screen instanceof RadialMenu;
+	}
+
+	@Override
+	protected void init() {
+		super.init();
+		performedActionUsingMouse = false;
+		visibility = 0f;
+	}
+
+	@Override
+	public void tick() {
+		super.tick();
+
+		if (!ClientProxy.isKeybindDown(2)) {
+			onClose();
+		}
+	}
+
+	@Override
+	public void render(PoseStack ms, final int mouseX, final int mouseY, final float partialTicks) {
+		BuildModeEnum currentBuildMode = ModeSettingsManager.getModeSettings(minecraft.player).getBuildMode();
+
+		ms.pushPose();
+		ms.translate(0, 0, 200);
+
+		visibility += fadeSpeed * partialTicks;
+		if (visibility > 1f) visibility = 1f;
+
+		final int startColor = (int) (visibility * 98) << 24;
+		final int endColor = (int) (visibility * 128) << 24;
+
+		fillGradient(ms, 0, 0, width, height, startColor, endColor);
+
+		RenderSystem.disableTexture();
+		RenderSystem.enableBlend();
+		RenderSystem.blendFuncSeparate(GL11.GL_SRC_ALPHA, GL11.GL_ONE_MINUS_SRC_ALPHA, 1, 0);
+		final Tesselator tessellator = Tesselator.getInstance();
+		final BufferBuilder buffer = tessellator.getBuilder();
+
+		buffer.begin(VertexFormat.Mode.QUADS, DefaultVertexFormat.POSITION_COLOR);
+
+		final double middleX = width / 2.0;
+		final double middleY = height / 2.0;
+
+		//Fix for high def (retina) displays: use custom mouse coordinates
+		//Borrowed from GameRenderer::updateCameraAndRender
+		int mouseXX = (int) (minecraft.mouseHandler.xpos() * (double) minecraft.getWindow().getGuiScaledWidth() / (double) minecraft.getWindow().getScreenWidth());
+		int mouseYY = (int) (minecraft.mouseHandler.ypos() * (double) minecraft.getWindow().getGuiScaledHeight() / (double) minecraft.getWindow().getScreenHeight());
+
+		final double mouseXCenter = mouseXX - middleX;
+		final double mouseYCenter = mouseYY - middleY;
+		double mouseRadians = Math.atan2(mouseYCenter, mouseXCenter);
+
+		final double quarterCircle = Math.PI / 2.0;
+
+		if (mouseRadians < -quarterCircle) {
+			mouseRadians = mouseRadians + Math.PI * 2;
+		}
+
+		final ArrayList<MenuRegion> modes = new ArrayList<MenuRegion>();
+		final ArrayList<MenuButton> buttons = new ArrayList<MenuButton>();
+
+		//Add build modes
+		for (final BuildModeEnum mode : BuildModeEnum.values()) {
+			modes.add(new MenuRegion(mode));
+		}
+
+		//Add actions
+		buttons.add(new MenuButton(ActionEnum.UNDO.name, ActionEnum.UNDO, -buttonDistance - 26, -13, Direction.UP));
+		buttons.add(new MenuButton(ActionEnum.REDO.name, ActionEnum.REDO, -buttonDistance, -13, Direction.UP));
+//		buttons.add(new MenuButton(ActionEnum.OPEN_PLAYER_SETTINGS.name, ActionEnum.OPEN_PLAYER_SETTINGS, -buttonDistance - 26 - 13, 13, Direction.DOWN));
+		buttons.add(new MenuButton(ActionEnum.OPEN_MODIFIER_SETTINGS.name, ActionEnum.OPEN_MODIFIER_SETTINGS, -buttonDistance - 26, 13, Direction.DOWN));
+		buttons.add(new MenuButton(ActionEnum.REPLACE.name, ActionEnum.REPLACE, -buttonDistance, 13, Direction.DOWN));
+
+		//Add buildmode dependent options
+		OptionEnum[] options = currentBuildMode.options;
+		for (int i = 0; i < options.length; i++) {
+			for (int j = 0; j < options[i].actions.length; j++) {
+				ActionEnum action = options[i].actions[j];
+				buttons.add(new MenuButton(action.name, action, buttonDistance + j * 26, -13 + i * 39, Direction.DOWN));
+			}
+		}
+
+		switchTo = null;
+		doAction = null;
+
+		//Draw buildmode backgrounds
+		drawRadialButtonBackgrounds(currentBuildMode, buffer, middleX, middleY, mouseXCenter, mouseYCenter, mouseRadians, ringInnerEdge, ringOuterEdge, quarterCircle, modes);
+
+		//Draw action backgrounds
+		drawSideButtonBackgrounds(buffer, middleX, middleY, mouseXCenter, mouseYCenter, buttons);
+
+		tessellator.end();
+		RenderSystem.disableBlend();
+		RenderSystem.enableTexture();
+
+		drawIcons(ms, tessellator, buffer, middleX, middleY, ringInnerEdge, ringOuterEdge, modes, buttons);
+
+		drawTexts(ms, currentBuildMode, middleX, middleY, textDistance, buttonDistance, modes, buttons, options);
+
+		ms.popPose();
+	}
+
+	private void drawRadialButtonBackgrounds(BuildModeEnum currentBuildMode, BufferBuilder buffer, double middleX, double middleY, double mouseXCenter, double mouseYCenter, double mouseRadians, double ringInnerEdge, double ringOuterEdge, double quarterCircle, ArrayList<MenuRegion> modes) {
+		if (!modes.isEmpty()) {
+			final int totalModes = Math.max(3, modes.size());
+			final double fragment = Math.PI * 0.005; //gap between buttons in radians at inner edge
+			final double fragment2 = Math.PI * 0.0025; //gap between buttons in radians at outer edge
+			final double radiansPerObject = 2.0 * Math.PI / totalModes;
+
+			for (int i = 0; i < modes.size(); i++) {
+				MenuRegion menuRegion = modes.get(i);
+				final double beginRadians = i * radiansPerObject - quarterCircle;
+				final double endRadians = (i + 1) * radiansPerObject - quarterCircle;
+
+				menuRegion.x1 = Math.cos(beginRadians);
+				menuRegion.x2 = Math.cos(endRadians);
+				menuRegion.y1 = Math.sin(beginRadians);
+				menuRegion.y2 = Math.sin(endRadians);
+
+				final double x1m1 = Math.cos(beginRadians + fragment) * ringInnerEdge;
+				final double x2m1 = Math.cos(endRadians - fragment) * ringInnerEdge;
+				final double y1m1 = Math.sin(beginRadians + fragment) * ringInnerEdge;
+				final double y2m1 = Math.sin(endRadians - fragment) * ringInnerEdge;
+
+				final double x1m2 = Math.cos(beginRadians + fragment2) * ringOuterEdge;
+				final double x2m2 = Math.cos(endRadians - fragment2) * ringOuterEdge;
+				final double y1m2 = Math.sin(beginRadians + fragment2) * ringOuterEdge;
+				final double y2m2 = Math.sin(endRadians - fragment2) * ringOuterEdge;
+
+				final boolean isSelected = currentBuildMode.ordinal() == i;
+				final boolean isMouseInQuad = inTriangle(x1m1, y1m1, x2m2, y2m2, x2m1, y2m1, mouseXCenter, mouseYCenter)
+											  || inTriangle(x1m1, y1m1, x1m2, y1m2, x2m2, y2m2, mouseXCenter, mouseYCenter);
+				final boolean isHighlighted = beginRadians <= mouseRadians && mouseRadians <= endRadians && isMouseInQuad;
+
+				Vector4f color = radialButtonColor;
+				if (isSelected) color = selectedColor;
+				if (isHighlighted) color = highlightColor;
+				if (isSelected && isHighlighted) color = highlightSelectedColor;
+
+				if (isHighlighted) {
+					menuRegion.highlighted = true;
+					switchTo = menuRegion.mode;
+				}
+
+				buffer.vertex(middleX + x1m1, middleY + y1m1, getBlitOffset()).color(color.x(), color.y(), color.z(), color.w()).endVertex();
+				buffer.vertex(middleX + x2m1, middleY + y2m1, getBlitOffset()).color(color.x(), color.y(), color.z(), color.w()).endVertex();
+				buffer.vertex(middleX + x2m2, middleY + y2m2, getBlitOffset()).color(color.x(), color.y(), color.z(), color.w()).endVertex();
+				buffer.vertex(middleX + x1m2, middleY + y1m2, getBlitOffset()).color(color.x(), color.y(), color.z(), color.w()).endVertex();
+
+				//Category line
+				color = menuRegion.mode.category.color;
+
+				final double x1m3 = Math.cos(beginRadians + fragment) * categoryLineOuterEdge;
+				final double x2m3 = Math.cos(endRadians - fragment) * categoryLineOuterEdge;
+				final double y1m3 = Math.sin(beginRadians + fragment) * categoryLineOuterEdge;
+				final double y2m3 = Math.sin(endRadians - fragment) * categoryLineOuterEdge;
+
+				buffer.vertex(middleX + x1m1, middleY + y1m1, getBlitOffset()).color(color.x(), color.y(), color.z(), color.w()).endVertex();
+				buffer.vertex(middleX + x2m1, middleY + y2m1, getBlitOffset()).color(color.x(), color.y(), color.z(), color.w()).endVertex();
+				buffer.vertex(middleX + x2m3, middleY + y2m3, getBlitOffset()).color(color.x(), color.y(), color.z(), color.w()).endVertex();
+				buffer.vertex(middleX + x1m3, middleY + y1m3, getBlitOffset()).color(color.x(), color.y(), color.z(), color.w()).endVertex();
+			}
+		}
+	}
+
+	private void drawSideButtonBackgrounds(BufferBuilder buffer, double middleX, double middleY, double mouseXCenter, double mouseYCenter, ArrayList<MenuButton> buttons) {
+		for (final MenuButton btn : buttons) {
+
+			final boolean isSelected =
+					btn.action == getBuildSpeed() ||
+					btn.action == getFill() ||
+					btn.action == getCubeFill() ||
+					btn.action == getRaisedEdge() ||
+					btn.action == getLineThickness() ||
+					btn.action == getCircleStart();
+
+			final boolean isHighlighted = btn.x1 <= mouseXCenter && btn.x2 >= mouseXCenter && btn.y1 <= mouseYCenter && btn.y2 >= mouseYCenter;
+
+			Vector4f color = sideButtonColor;
+			if (isSelected) color = selectedColor;
+			if (isHighlighted) color = highlightColor;
+			if (isSelected && isHighlighted) color = highlightSelectedColor;
+
+			if (isHighlighted) {
+				btn.highlighted = true;
+				doAction = btn.action;
+			}
+
+			buffer.vertex(middleX + btn.x1, middleY + btn.y1, getBlitOffset()).color(color.x(), color.y(), color.z(), color.w()).endVertex();
+			buffer.vertex(middleX + btn.x1, middleY + btn.y2, getBlitOffset()).color(color.x(), color.y(), color.z(), color.w()).endVertex();
+			buffer.vertex(middleX + btn.x2, middleY + btn.y2, getBlitOffset()).color(color.x(), color.y(), color.z(), color.w()).endVertex();
+			buffer.vertex(middleX + btn.x2, middleY + btn.y1, getBlitOffset()).color(color.x(), color.y(), color.z(), color.w()).endVertex();
+		}
+	}
+
+	private void drawIcons(PoseStack ms, Tesselator tessellator, BufferBuilder buffer, double middleX, double middleY, double ringInnerEdge, double ringOuterEdge, ArrayList<MenuRegion> modes, ArrayList<MenuButton> buttons) {
+		ms.pushPose();
+		RenderSystem.enableTexture();
+		RenderSystem.setShader(GameRenderer::getPositionColorTexShader);
+		RenderSystem.setShaderColor(1f, 1f, 1f, 1f);
+
+		//Draw buildmode icons
+		for (final MenuRegion menuRegion : modes) {
+
+			final double x = (menuRegion.x1 + menuRegion.x2) * 0.5 * (ringOuterEdge * 0.55 + 0.45 * ringInnerEdge);
+			final double y = (menuRegion.y1 + menuRegion.y2) * 0.5 * (ringOuterEdge * 0.55 + 0.45 * ringInnerEdge);
+
+			RenderSystem.setShaderTexture(0, new ResourceLocation(EffortlessBuilding.MODID, "textures/icons/" + menuRegion.mode.name().toLowerCase() + ".png"));
+			blit(ms, (int) (middleX + x - 8), (int) (middleY + y - 8), 16, 16, 0, 0, 18, 18, 18, 18);
+		}
+
+		//Draw action icons
+		for (final MenuButton button : buttons) {
+
+			final double x = (button.x1 + button.x2) / 2 + 0.01;
+			final double y = (button.y1 + button.y2) / 2 + 0.01;
+
+			RenderSystem.setShaderTexture(0, new ResourceLocation(EffortlessBuilding.MODID, "textures/icons/" + button.action.name().toLowerCase() + ".png"));
+			blit(ms, (int) (middleX + x - 8), (int) (middleY + y - 8), 16, 16, 0, 0, 18, 18, 18, 18);
+		}
+
+		ms.popPose();
+	}
+
+	private void drawTexts(PoseStack ms, BuildModeEnum currentBuildMode, double middleX, double middleY, double textDistance, double buttonDistance, ArrayList<MenuRegion> modes, ArrayList<MenuButton> buttons, OptionEnum[] options) {
+		//font.drawStringWithShadow("Actions", (int) (middleX - buttonDistance - 13) - font.getStringWidth("Actions") * 0.5f, (int) middleY - 38, 0xffffffff);
+
+		//Draw option strings
+		for (int i = 0; i < currentBuildMode.options.length; i++) {
+			OptionEnum option = options[i];
+			font.drawShadow(ms, I18n.get(option.name), (int) (middleX + buttonDistance - 9), (int) middleY - 37 + i * 39, optionTextColor);
+		}
+
+		String credits = "Effortless Building";
+		font.drawShadow(ms, credits, width - font.width(credits) - 4, height - 10, watermarkTextColor);
+
+		//Draw buildmode text
+		for (final MenuRegion menuRegion : modes) {
+
+			if (menuRegion.highlighted) {
+				final double x = (menuRegion.x1 + menuRegion.x2) * 0.5;
+				final double y = (menuRegion.y1 + menuRegion.y2) * 0.5;
+
+				int fixed_x = (int) (x * textDistance);
+				int fixed_y = (int) (y * textDistance) - font.lineHeight / 2;
+				String text = I18n.get(menuRegion.mode.getNameKey());
+
+				if (x <= -0.2) {
+					fixed_x -= font.width(text);
+				} else if (-0.2 <= x && x <= 0.2) {
+					fixed_x -= font.width(text) / 2;
+				}
+
+				font.drawShadow(ms, text, (int) middleX + fixed_x, (int) middleY + fixed_y, whiteTextColor);
+
+				//Draw description
+				text = I18n.get(menuRegion.mode.getDescriptionKey());
+				font.drawShadow(ms, text, (int) middleX - font.width(text) / 2f, (int) middleY + descriptionHeight, descriptionTextColor);
+			}
+		}
+
+		//Draw action text
+		for (final MenuButton button : buttons) {
+			if (button.highlighted) {
+				String text = ChatFormatting.AQUA + button.name;
+
+				//Add keybind in brackets
+				String keybind = findKeybind(button, currentBuildMode);
+				String keybindFormatted = "";
+				if (!keybind.isEmpty())
+					keybindFormatted = ChatFormatting.GRAY + "(" + WordUtils.capitalizeFully(keybind) + ")";
+
+				if (button.textSide == Direction.WEST) {
+
+					font.draw(ms, text, (int) (middleX + button.x1 - 8) - font.width(text),
+							(int) (middleY + button.y1 + 6), whiteTextColor);
+
+				} else if (button.textSide == Direction.EAST) {
+
+					font.draw(ms, text, (int) (middleX + button.x2 + 8),
+							(int) (middleY + button.y1 + 6), whiteTextColor);
+
+				} else if (button.textSide == Direction.UP || button.textSide == Direction.NORTH) {
+
+					font.draw(ms, keybindFormatted, (int) (middleX + (button.x1 + button.x2) * 0.5 - font.width(keybindFormatted) * 0.5),
+							(int) (middleY + button.y1 - 26), whiteTextColor);
+
+					font.draw(ms, text, (int) (middleX + (button.x1 + button.x2) * 0.5 - font.width(text) * 0.5),
+							(int) (middleY + button.y1 - 14), whiteTextColor);
+
+				} else if (button.textSide == Direction.DOWN || button.textSide == Direction.SOUTH) {
+
+					font.draw(ms, text, (int) (middleX + (button.x1 + button.x2) * 0.5 - font.width(text) * 0.5),
+							(int) (middleY + button.y1 + 26), whiteTextColor);
+
+					font.draw(ms, keybindFormatted, (int) (middleX + (button.x1 + button.x2) * 0.5 - font.width(keybindFormatted) * 0.5),
+							(int) (middleY + button.y1 + 38), whiteTextColor);
+
+				}
+
+			}
+		}
+	}
+
+	private String findKeybind(MenuButton button, BuildModeEnum currentBuildMode){
+		String result = "";
+		int keybindingIndex = -1;
+		if (button.action == ActionEnum.UNDO) keybindingIndex = 3;
+		if (button.action == ActionEnum.REDO) keybindingIndex = 4;
+		if (button.action == ActionEnum.REPLACE) keybindingIndex = 1;
+		if (button.action == ActionEnum.OPEN_MODIFIER_SETTINGS) keybindingIndex = 0;
+
+		if (keybindingIndex != -1) {
+			KeyMapping keyMap = ClientProxy.keyBindings[keybindingIndex];
+
+			if (!keyMap.getKeyModifier().name().equals("none")) {
+				result = keyMap.getKeyModifier().name() + " ";
+			}
+			result += I18n.get(keyMap.getKey().getName());
+		}
+
+		if (currentBuildMode.options.length > 0) {
+			//Add (ctrl) to first two actions of first option
+			if (button.action == currentBuildMode.options[0].actions[0]
+				|| button.action == currentBuildMode.options[0].actions[1]) {
+				result = I18n.get(ClientProxy.keyBindings[5].getKey().getName());
+				if (result.equals("Left Control")) result = "Ctrl";
+			}
+		}
+		return result;
+	}
+
+	private boolean inTriangle(final double x1, final double y1, final double x2, final double y2,
+							   final double x3, final double y3, final double x, final double y) {
+		final double ab = (x1 - x) * (y2 - y) - (x2 - x) * (y1 - y);
+		final double bc = (x2 - x) * (y3 - y) - (x3 - x) * (y2 - y);
+		final double ca = (x3 - x) * (y1 - y) - (x1 - x) * (y3 - y);
+		return sign(ab) == sign(bc) && sign(bc) == sign(ca);
+	}
+
+	private int sign(final double n) {
+		return n > 0 ? 1 : -1;
+	}
+
+	@Override
+	public boolean isPauseScreen() {
+		return false;
+	}
+
+	@Override
+	public boolean mouseClicked(double mouseX, double mouseY, int mouseButton) {
+		performAction(true);
+
+		return super.mouseClicked(mouseX, mouseY, mouseButton);
+	}
+
+	@Override
+	public void onClose() {
+		super.onClose();
+		//After onClose so it can open another screen
+		if (!performedActionUsingMouse) performAction(false);
+	}
+
+	private void performAction(boolean fromMouseClick) {
+		LocalPlayer player = Minecraft.getInstance().player;
+
+		ModeSettingsManager.ModeSettings modeSettings = ModeSettingsManager.getModeSettings(player);
+
+		if (switchTo != null) {
+			playRadialMenuSound();
+
+			modeSettings.setBuildMode(switchTo);
+			ModeSettingsManager.setModeSettings(player, modeSettings);
+			PacketHandler.INSTANCE.sendToServer(new ModeSettingsMessage(modeSettings));
+
+			EffortlessBuilding.log(player, I18n.get(modeSettings.getBuildMode().getNameKey()), true);
+
+			if (fromMouseClick) performedActionUsingMouse = true;
+		}
+
+		//Perform button action
+		ModeOptions.ActionEnum action = doAction;
+		if (action != null) {
+			playRadialMenuSound();
+
+			ModeOptions.performAction(player, action);
+			PacketHandler.INSTANCE.sendToServer(new ModeActionMessage(action));
+
+			if (fromMouseClick) performedActionUsingMouse = true;
+		}
+	}
+
+	public static void playRadialMenuSound() {
+		final float volume = 0.1f;
+		if (volume >= 0.0001f) {
+			SimpleSoundInstance sound = new SimpleSoundInstance(SoundEvents.UI_BUTTON_CLICK, SoundSource.MASTER, volume, 1.0f, RandomSource.create(), Minecraft.getInstance().player.blockPosition());
+			Minecraft.getInstance().getSoundManager().play(sound);
+		}
+	}
+
+	private static class MenuButton {
+
+		public final ActionEnum action;
+		public double x1, x2;
+		public double y1, y2;
+		public boolean highlighted;
+		public String name;
+		public Direction textSide;
+
+		public MenuButton(final String name, final ActionEnum action, final double x, final double y,
+						  final Direction textSide) {
+			this.name = I18n.get(name);
+			this.action = action;
+			x1 = x - 10;
+			x2 = x + 10;
+			y1 = y - 10;
+			y2 = y + 10;
+			this.textSide = textSide;
+		}
+
+	}
+
+	static class MenuRegion {
+
+		public final BuildModeEnum mode;
+		public double x1, x2;
+		public double y1, y2;
+		public boolean highlighted;
+
+		public MenuRegion(final BuildModeEnum mode) {
+			this.mode = mode;
+		}
+
+	}
+
+}
+

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

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

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

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

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

@@ -0,0 +1,155 @@
+package nl.requios.effortlessbuilding.gui.buildmodifier;
+
+import com.mojang.blaze3d.vertex.PoseStack;
+import net.minecraft.client.Minecraft;
+import net.minecraft.client.gui.screens.Screen;
+import net.minecraft.client.gui.components.Button;
+import net.minecraft.network.chat.Component;
+import net.minecraftforge.api.distmarker.Dist;
+import net.minecraftforge.api.distmarker.OnlyIn;
+import nl.requios.effortlessbuilding.EffortlessBuilding;
+import nl.requios.effortlessbuilding.buildmodifier.Array;
+import nl.requios.effortlessbuilding.buildmodifier.Mirror;
+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 {
+
+	private GuiScrollPane scrollPane;
+	private Button buttonClose;
+
+	private MirrorSettingsGui mirrorSettingsGui;
+	private ArraySettingsGui arraySettingsGui;
+	private RadialMirrorSettingsGui radialMirrorSettingsGui;
+
+	public ModifierSettingsGui() {
+		super(Component.translatable("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);
+
+		mirrorSettingsGui = new MirrorSettingsGui(scrollPane);
+		scrollPane.AddListEntry(mirrorSettingsGui);
+
+		arraySettingsGui = new ArraySettingsGui(scrollPane);
+		scrollPane.AddListEntry(arraySettingsGui);
+
+		radialMirrorSettingsGui = new RadialMirrorSettingsGui(scrollPane);
+		scrollPane.AddListEntry(radialMirrorSettingsGui);
+
+		scrollPane.init(renderables);
+
+		//Close button
+		int y = height - 26;
+		buttonClose = new Button(width / 2 - 100, y, 200, 20, Component.literal("Close"), (button) -> {
+			Minecraft.getInstance().player.closeContainer();
+		});
+		addRenderableOnly(buttonClose);
+	}
+
+	@Override
+	//Process general logic, i.e. hide buttons
+	public void tick() {
+		scrollPane.updateScreen();
+
+		handleMouseInput();
+	}
+
+	@Override
+	//Set colors using GL11, use the fontObj field to display text
+	//Use drawTexturedModalRect() to transfers areas of a texture resource to the screen
+	public void render(PoseStack ms, int mouseX, int mouseY, float partialTicks) {
+		this.renderBackground(ms);
+
+		scrollPane.render(ms, mouseX, mouseY, partialTicks);
+
+		buttonClose.render(ms, mouseX, mouseY, partialTicks);
+
+		scrollPane.drawTooltip(ms, this, mouseX, mouseY);
+	}
+
+
+	@Override
+	public boolean charTyped(char typedChar, int keyCode) {
+		super.charTyped(typedChar, keyCode);
+		scrollPane.charTyped(typedChar, keyCode);
+		return false;
+	}
+
+	@Override
+	public boolean keyPressed(int keyCode, int p_96553_, int p_96554_) {
+		if (keyCode == ClientProxy.keyBindings[0].getKey().getValue()) {
+			minecraft.player.closeContainer();
+			return true;
+		}
+
+		return super.keyPressed(keyCode, p_96553_, p_96554_);
+	}
+
+	@Override
+	public boolean mouseClicked(double mouseX, double mouseY, int mouseButton) {
+		super.mouseClicked(mouseX, mouseY, mouseButton);
+		renderables.forEach(renderable -> {
+			if (renderable instanceof Button) {
+				Button button = (Button) renderable;
+				button.mouseClicked(mouseX, mouseY, mouseButton);
+			}
+		});
+		return scrollPane.mouseClicked(mouseX, mouseY, mouseButton);
+	}
+
+	@Override
+	public boolean mouseReleased(double mouseX, double mouseY, int state) {
+		if (state != 0 || !scrollPane.mouseReleased(mouseX, mouseY, state)) {
+			return super.mouseReleased(mouseX, mouseY, state);
+		}
+		return false;
+	}
+
+	public void handleMouseInput() {
+		//super.handleMouseInput();
+		scrollPane.handleMouseInput();
+
+		//Scrolling numbers
+//        int mouseX = Mouse.getEventX() * this.width / this.mc.displayWidth;
+//        int mouseY = this.height - Mouse.getEventY() * this.height / this.mc.displayHeight - 1;
+//        numberFieldList.forEach(numberField -> numberField.handleMouseInput(mouseX, mouseY));
+	}
+
+	@Override
+	public void removed() {
+		scrollPane.onGuiClosed();
+
+		//save everything
+		Mirror.MirrorSettings m = mirrorSettingsGui.getMirrorSettings();
+		Array.ArraySettings a = arraySettingsGui.getArraySettings();
+		RadialMirror.RadialMirrorSettings r = radialMirrorSettingsGui.getRadialMirrorSettings();
+
+		ModifierSettingsManager.ModifierSettings modifierSettings = ModifierSettingsManager.getModifierSettings(minecraft.player);
+		if (modifierSettings == null) modifierSettings = new ModifierSettingsManager.ModifierSettings();
+		modifierSettings.setMirrorSettings(m);
+		modifierSettings.setArraySettings(a);
+		modifierSettings.setRadialMirrorSettings(r);
+
+		//Sanitize
+		String error = ModifierSettingsManager.sanitize(modifierSettings, minecraft.player);
+		if (!error.isEmpty()) EffortlessBuilding.log(minecraft.player, error);
+
+		ModifierSettingsManager.setModifierSettings(minecraft.player, modifierSettings);
+
+		//Send to server
+		PacketHandler.INSTANCE.sendToServer(new ModifierSettingsMessage(modifierSettings));
+
+		Minecraft.getInstance().mouseHandler.grabMouse();
+	}
+
+}

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

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

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

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

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

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

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

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

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

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

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

@@ -0,0 +1,466 @@
+package nl.requios.effortlessbuilding.gui.elements;
+
+import com.mojang.blaze3d.vertex.*;
+import com.mojang.blaze3d.platform.GlStateManager;
+import com.mojang.blaze3d.systems.RenderSystem;
+import net.minecraft.MethodsReturnNonnullByDefault;
+import net.minecraft.client.Minecraft;
+import net.minecraft.client.gui.Font;
+import net.minecraft.client.gui.components.Widget;
+import net.minecraft.client.gui.components.events.GuiEventListener;
+import net.minecraft.client.gui.screens.Screen;
+import net.minecraft.client.gui.components.AbstractWidget;
+import net.minecraft.util.Mth;
+import net.minecraftforge.api.distmarker.Dist;
+import net.minecraftforge.api.distmarker.OnlyIn;
+import net.minecraftforge.common.MinecraftForge;
+
+import javax.annotation.ParametersAreNonnullByDefault;
+import java.util.ArrayList;
+import java.util.List;
+
+@OnlyIn(Dist.CLIENT)
+@MethodsReturnNonnullByDefault
+@ParametersAreNonnullByDefault
+public class GuiScrollPane extends SlotGui {
+
+	public Screen parent;
+	public Font font;
+	private final List<IScrollEntry> listEntries;
+	private float scrollMultiplier = 1f;
+
+	private int mouseX;
+	private int mouseY;
+
+	public GuiScrollPane(Screen parent, Font font, int top, int bottom) {
+		super(Minecraft.getInstance(), parent.width, parent.height, top, bottom, 100);
+		this.parent = parent;
+		this.font = font;
+		this.renderSelection = 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() {
+		return listEntries.size();
+	}
+
+	@Override
+	protected boolean isSelectedItem(int slotIndex) {
+		return false;
+	}
+
+	@Override
+	protected int getScrollbarPosition() {
+		//return width / 2 + 140 + 10;
+		return width - 15;
+	}
+
+	@Override
+	public int getRowWidth() {
+		return 280;
+	}
+
+	//Removed background
+	@Override
+	public void render(PoseStack ms, int mouseXIn, int mouseYIn, float partialTicks) {
+		if (this.visible) {
+			this.mouseX = mouseXIn;
+			this.mouseY = mouseYIn;
+			this.renderBackground();
+			int scrollbarLeft = this.getScrollbarPosition();
+			int scrollbarRight = scrollbarLeft + 6;
+			this.capYPosition();
+
+			Tesselator tessellator = Tesselator.getInstance();
+			BufferBuilder bufferbuilder = tessellator.getBuilder();
+
+			int insideLeft = this.x0 + this.width / 2 - this.getRowWidth() / 2 + 2;
+			int insideTop = this.y0 + 4 - (int) this.yo;
+			if (this.renderHeader) {
+				this.renderHeader(insideLeft, insideTop, tessellator);
+			}
+
+			//All entries
+			this.renderList(ms, insideLeft, insideTop, mouseXIn, mouseYIn, partialTicks);
+			RenderSystem.disableDepthTest();
+
+			//Dirt overlays on top and bottom
+//            this.renderHoleBackground(0, this.y0, 255, 255);
+//            this.renderHoleBackground(this.y1, this.height, 255, 255);
+
+			RenderSystem.enableBlend();
+			RenderSystem.blendFuncSeparate(GlStateManager.SourceFactor.SRC_ALPHA, GlStateManager.DestFactor.ONE_MINUS_SRC_ALPHA, GlStateManager.SourceFactor.ZERO, GlStateManager.DestFactor.ONE);
+			RenderSystem.disableTexture();
+
+			//top
+//            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();
+//            tessellator.draw();
+
+			//bottom
+//            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();
+//            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 = Mth.clamp(k1, 32, this.y1 - this.y0 - 8);
+				int l1 = (int) this.yo * (this.y1 - this.y0 - k1) / maxScroll + this.y0;
+				if (l1 < this.y0) {
+					l1 = this.y0;
+				}
+
+				bufferbuilder.begin(VertexFormat.Mode.QUADS, DefaultVertexFormat.POSITION_TEX_COLOR);
+				bufferbuilder.vertex(scrollbarLeft, this.y1, 0.0F).uv(0.0F, 1.0F).color(0, 0, 0, 255).endVertex();
+				bufferbuilder.vertex(scrollbarRight, this.y1, 0.0F).uv(1.0F, 1.0F).color(0, 0, 0, 255).endVertex();
+				bufferbuilder.vertex(scrollbarRight, this.y0, 0.0F).uv(1.0F, 0.0F).color(0, 0, 0, 255).endVertex();
+				bufferbuilder.vertex(scrollbarLeft, this.y0, 0.0F).uv(0.0F, 0.0F).color(0, 0, 0, 255).endVertex();
+				tessellator.end();
+				bufferbuilder.begin(VertexFormat.Mode.QUADS, DefaultVertexFormat.POSITION_TEX_COLOR);
+				bufferbuilder.vertex(scrollbarLeft, l1 + k1, 0.0F).uv(0.0F, 1.0F).color(128, 128, 128, 255).endVertex();
+				bufferbuilder.vertex(scrollbarRight, l1 + k1, 0.0F).uv(1.0F, 1.0F).color(128, 128, 128, 255).endVertex();
+				bufferbuilder.vertex(scrollbarRight, l1, 0.0F).uv(1.0F, 0.0F).color(128, 128, 128, 255).endVertex();
+				bufferbuilder.vertex(scrollbarLeft, l1, 0.0F).uv(0.0F, 0.0F).color(128, 128, 128, 255).endVertex();
+				tessellator.end();
+				bufferbuilder.begin(VertexFormat.Mode.QUADS, DefaultVertexFormat.POSITION_TEX_COLOR);
+				bufferbuilder.vertex(scrollbarLeft, l1 + k1 - 1, 0.0F).uv(0.0F, 1.0F).color(192, 192, 192, 255).endVertex();
+				bufferbuilder.vertex(scrollbarRight - 1, l1 + k1 - 1, 0.0F).uv(1.0F, 1.0F).color(192, 192, 192, 255).endVertex();
+				bufferbuilder.vertex(scrollbarRight - 1, l1, 0.0F).uv(1.0F, 0.0F).color(192, 192, 192, 255).endVertex();
+				bufferbuilder.vertex(scrollbarLeft, l1, 0.0F).uv(0.0F, 0.0F).color(192, 192, 192, 255).endVertex();
+				tessellator.end();
+			}
+
+			//this.renderDecorations(mouseXIn, mouseYIn);
+			RenderSystem.enableTexture();
+			RenderSystem.disableBlend();
+		}
+	}
+
+	//SLOTHEIGHT MODIFICATIONS
+	//SlotHeight is still relied on for determining how much to scroll
+	@Override
+	protected int getMaxPosition() {
+		//Add every entry height
+		int height = this.headerHeight;
+		for (IScrollEntry entry : listEntries) {
+			height += entry.getHeight();
+		}
+		return height;
+	}
+
+	@Override
+	protected void renderBackground() {
+
+	}
+
+	@Override
+	protected void renderItem(PoseStack ms, int slotIndex, int xPos, int yPos, int heightIn, int mouseXIn, int mouseYIn, float partialTicks) {
+		this.getListEntry(slotIndex).drawEntry(ms, slotIndex, xPos, yPos, this.getRowWidth(), heightIn, mouseXIn, mouseYIn,
+			this.getSlotIndexFromScreenCoords(mouseXIn, mouseYIn) == slotIndex, partialTicks);
+	}
+
+	public int getMaxPosition(int count) {
+		//Add all count entry heights
+		int height = this.headerHeight;
+		for (int i = 0; i < count; i++) {
+			IScrollEntry entry = listEntries.get(i);
+			height += entry.getHeight();
+		}
+		return height;
+	}
+
+	public int getSlotIndexFromScreenCoords(double posX, double posY) {
+		int left = this.x0 + (this.width - this.getRowWidth()) / 2;
+		int right = this.x0 + (this.width + this.getRowWidth()) / 2;
+		double relativeMouseY = getRelativeMouseY(mouseY, 0);
+
+		//Iterate over every entry until relativeMouseY falls within its height
+		for (int i = 0; i < listEntries.size(); i++) {
+			IScrollEntry entry = listEntries.get(i);
+			if (relativeMouseY <= entry.getHeight())
+				return posX < this.getScrollbarPosition() && posX >= left && posX <= right && i >= 0 &&
+					relativeMouseY >= 0 && i < this.getItemCount() ? i : -1;
+			relativeMouseY -= entry.getHeight();
+		}
+		return -1;
+	}
+
+	@Override
+	public List<? extends GuiEventListener> children() {
+		return null;
+	}
+
+	@Override
+	public boolean mouseClicked(double mouseX, double mouseY, int button) {
+		int selectedSlot = this.getSlotIndexFromScreenCoords(mouseX, mouseY);
+		double relativeX = getRelativeMouseX(mouseX);
+
+		//Always pass through mouseclicked, to be able to unfocus textfields
+		for (int i = 0; i < this.listEntries.size(); i++) {
+			double relativeY = getRelativeMouseY(mouseY, i);
+			this.getListEntry(i).mousePressed(selectedSlot, (int) mouseX, (int) mouseY, button, (int) relativeX, (int) relativeY);
+		}
+
+
+//        if (this.isMouseYWithinSlotBounds(mouseY))
+//        {
+//            int i = this.getSlotIndexFromScreenCoords(mouseX, mouseY);
+//
+//            if (i >= 0)
+//            {
+//                int relativeX = getRelativeMouseX(mouseX);
+//                int relativeY = getRelativeMouseY(mouseY, i);
+//
+//                if (this.getListEntry(i).mousePressed(i, mouseX, mouseY, mouseEvent, relativeX, relativeY))
+//                {
+//                    this.setEnabled(false);
+//                    return true;
+//                }
+//            }
+//        }
+
+		return false;
+	}
+
+	@Override
+	public boolean mouseReleased(double mouseX, double mouseY, int button) {
+		for (int i = 0; i < this.getItemCount(); ++i) {
+			double relativeX = getRelativeMouseX(mouseX);
+			double relativeY = getRelativeMouseY(mouseY, i);
+			this.getListEntry(i).mouseReleased(i, (int) mouseX, (int) mouseY, button, (int) relativeX, (int) relativeY);
+		}
+
+		this.visible = true;
+		return false;
+	}
+
+	public void handleMouseInput() {
+		if (this.isMouseInList(this.mouseX, this.mouseY)) {
+			if (minecraft.mouseHandler.isLeftPressed() && this.mouseY >= this.y0 &&
+				this.mouseY <= this.y1) {
+				int i = this.x0 + (this.width - this.getRowWidth()) / 2;
+				int j = this.x0 + (this.width + this.getRowWidth()) / 2;
+				int slotIndex = getSlotIndexFromScreenCoords(this.mouseX, this.mouseY);
+				double relativeMouseY = getRelativeMouseY(mouseY, slotIndex);
+
+				if (slotIndex > -1) {
+					this.mouseClicked(this.mouseX, this.mouseY, 0);
+				} else if (this.mouseX >= i && this.mouseX <= j && relativeMouseY < 0) {
+					this.clickedHeader(this.mouseX - i, this.mouseY - this.y0 + (int) this.yo - 4);
+				}
+			}
+
+			if (minecraft.mouseHandler.isLeftPressed() && this.isVisible()) {
+				if (this.yDrag == -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;
+						int slotIndex = getSlotIndexFromScreenCoords(this.mouseX, this.mouseY);
+						double relativeMouseY = getRelativeMouseY(mouseY, slotIndex);
+
+						if (slotIndex > -1) {
+							this.mouseClicked(slotIndex, this.mouseX, this.mouseY);
+						} else if (this.mouseX >= i2 && this.mouseX <= j2 && relativeMouseY < 0) {
+							this.clickedHeader(this.mouseX - i2,
+								this.mouseY - this.y0 + (int) this.yo - 4);
+							flag1 = false;
+						}
+
+						int i3 = this.getScrollbarPosition();
+						int j1 = i3 + 6;
+
+						if (this.mouseX >= i3 && this.mouseX <= j1) {
+							this.scrollMultiplier = -1.0F;
+							int maxScroll = this.getMaxScroll();
+
+							if (maxScroll < 1) {
+								maxScroll = 1;
+							}
+
+							int l1 = (int) ((float) ((this.y1 - this.y0) * (this.y1 - this.y0)) /
+								(float) this.getMaxPosition());
+							l1 = Mth.clamp(l1, 32, this.y1 - this.y0 - 8);
+							this.scrollMultiplier /= (float) (this.y1 - this.y0 - l1) / (float) maxScroll;
+						} else {
+							this.scrollMultiplier = 1.0F;
+						}
+
+						if (flag1) {
+							this.yDrag = this.mouseY;
+						} else {
+							this.yDrag = -2;
+						}
+					} else {
+						this.yDrag = -2;
+					}
+				} else if (this.yDrag >= 0) {
+					this.yo -= (float) (this.mouseY - this.yDrag) * this.scrollMultiplier;
+					this.yDrag = this.mouseY;
+				}
+			} else {
+				this.yDrag = -1;
+			}
+
+		}
+	}
+
+	//Draw in center if it fits
+	@Override
+	protected void renderList(PoseStack ms, int insideLeft, int insideTop, int mouseXIn, int mouseYIn, float partialTicks) {
+		int itemCount = this.getItemCount();
+		Tesselator tessellator = Tesselator.getInstance();
+		BufferBuilder bufferbuilder = tessellator.getBuilder();
+
+		//Find y to start with
+		int y = this.headerHeight + insideTop;
+		int contentHeight = getMaxPosition();
+		int insideHeight = this.y1 - this.y0 - 4;
+
+		if (contentHeight < insideHeight) {
+			//it fits, so we can center it vertically
+			y += (insideHeight - contentHeight) / 2;
+		}
+
+		//Draw all entries
+		for (int i = 0; i < itemCount; ++i) {
+			int entryHeight = listEntries.get(i).getHeight();
+			int entryHeight2 = entryHeight - 4;
+
+			if (y > this.y1 || y + entryHeight2 < this.y0) {
+				this.updateItemPosition(i, insideLeft, y, partialTicks);
+			}
+
+			if (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.setShaderColor(f, f, f, 1.0F);
+				bufferbuilder.begin(VertexFormat.Mode.QUADS, DefaultVertexFormat.POSITION);
+				bufferbuilder.vertex(i1, y + entryHeight2 + 2, 0.0D).endVertex();
+				bufferbuilder.vertex(j1, y + entryHeight2 + 2, 0.0D).endVertex();
+				bufferbuilder.vertex(j1, y - 2, 0.0D).endVertex();
+				bufferbuilder.vertex(i1, y - 2, 0.0D).endVertex();
+				tessellator.end();
+				RenderSystem.setShaderColor(0.0F, 0.0F, 0.0F, 1.0F);
+				bufferbuilder.begin(VertexFormat.Mode.QUADS, DefaultVertexFormat.POSITION);
+				bufferbuilder.vertex(i1 + 1, y + entryHeight2 + 1, 0.0D).endVertex();
+				bufferbuilder.vertex(j1 - 1, y + entryHeight2 + 1, 0.0D).endVertex();
+				bufferbuilder.vertex(j1 - 1, y - 1, 0.0D).endVertex();
+				bufferbuilder.vertex(i1 + 1, y - 1, 0.0D).endVertex();
+				tessellator.end();
+				RenderSystem.enableTexture();
+			}
+
+			this.renderItem(ms, i, insideLeft, y, entryHeight2, mouseXIn, mouseYIn, partialTicks);
+			y += entryHeight;
+		}
+	}
+
+	private double getRelativeMouseX(double mouseX) {
+		int j = this.x0 + this.width / 2 - this.getRowWidth() / 2 + 2;
+		return mouseX - j;
+	}
+
+	private double getRelativeMouseY(double mouseY, int contentIndex) {
+		int k = this.y0 + 4 - this.getScroll() + getMaxPosition(contentIndex) + this.headerHeight;
+		double relativeMouseY = mouseY - k;
+
+		//Content might be centered, adjust relative mouse y accordingly
+		int contentHeight = getMaxPosition();
+		int insideHeight = this.y1 - this.y0 - 4;
+
+		if (contentHeight < insideHeight) {
+			//it fits, so we can center it vertically
+			relativeMouseY -= (insideHeight - contentHeight) / 2f;
+		}
+		return relativeMouseY;
+	}
+
+	//PASSTHROUGHS
+	public void init(List<Widget> renderables) {
+		for (IScrollEntry entry : this.listEntries) {
+			entry.init(renderables);
+		}
+	}
+
+	public void updateScreen() {
+		for (IScrollEntry entry : this.listEntries)
+			entry.updateScreen();
+	}
+
+	public void drawTooltip(PoseStack ms, Screen guiScreen, int mouseX, int mouseY) {
+		for (IScrollEntry entry : this.listEntries)
+			entry.drawTooltip(ms, guiScreen, mouseX, mouseY);
+	}
+
+	@Override
+	public boolean charTyped(char eventChar, int eventKey) {
+		for (IScrollEntry entry : this.listEntries)
+			entry.charTyped(eventChar, eventKey);
+		return false;
+	}
+
+	public void onGuiClosed() {
+		for (IScrollEntry entry : this.listEntries)
+			entry.onGuiClosed();
+	}
+
+	//Make protected values available
+	public int getWidth() {
+		return width;
+	}
+
+	public int getHeight() {
+		return height;
+	}
+
+	public interface IScrollEntry {
+		void init(List<Widget> renderables);
+
+		void updateScreen();
+
+		void drawTooltip(PoseStack ms, Screen guiScreen, int mouseX, int mouseY);
+
+		boolean charTyped(char eventChar, int eventKey);
+
+		void onGuiClosed();
+
+		int getHeight();
+
+		void updatePosition(int slotIndex, int x, int y, float partialTicks);
+
+		void drawEntry(PoseStack ms, int slotIndex, int x, int y, int listWidth, int slotHeight, int mouseX, int mouseY, boolean isSelected, float partialTicks);
+
+		/**
+		 * Called when the mouse is clicked within this entry. Returning true means that something within this entry was
+		 * clicked and the list should not be dragged.
+		 */
+		boolean mousePressed(int slotIndex, int mouseX, int mouseY, int mouseEvent, int relativeX, int relativeY);
+
+		/**
+		 * Fired when the mouse button is released. Arguments: index, x, y, mouseEvent, relativeX, relativeY
+		 */
+		void mouseReleased(int slotIndex, int x, int y, int mouseEvent, int relativeX, int relativeY);
+	}
+}

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

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

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

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

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

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

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

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

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

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

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

@@ -1,435 +0,0 @@
-package nl.requios.effortlessbuilding.helper;
-
-import net.minecraft.block.Block;
-import net.minecraft.block.state.IBlockState;
-import net.minecraft.client.Minecraft;
-import net.minecraft.client.renderer.*;
-import net.minecraft.client.renderer.texture.TextureMap;
-import net.minecraft.client.renderer.vertex.DefaultVertexFormats;
-import net.minecraft.entity.Entity;
-import net.minecraft.entity.player.EntityPlayer;
-import net.minecraft.item.ItemBlock;
-import net.minecraft.item.ItemStack;
-import net.minecraft.util.EnumFacing;
-import net.minecraft.util.SoundCategory;
-import net.minecraft.util.SoundEvent;
-import net.minecraft.util.math.*;
-import net.minecraft.world.IWorldEventListener;
-import net.minecraft.world.World;
-import net.minecraftforge.client.event.RenderWorldLastEvent;
-import net.minecraftforge.fml.common.Mod;
-import net.minecraftforge.fml.common.eventhandler.SubscribeEvent;
-import net.minecraftforge.fml.relauncher.Side;
-import nl.requios.effortlessbuilding.*;
-import nl.requios.effortlessbuilding.item.ItemRandomizerBag;
-import nl.requios.effortlessbuilding.proxy.ClientProxy;
-import org.lwjgl.opengl.GL11;
-import org.lwjgl.opengl.GL14;
-import org.lwjgl.util.Color;
-
-import javax.annotation.Nullable;
-import java.util.ArrayList;
-import java.util.List;
-
-@Mod.EventBusSubscriber(Side.CLIENT)
-public class RenderHelper implements IWorldEventListener {
-
-    private static final Color colorX = new Color(255, 72, 52);
-    private static final Color colorY = new Color(67, 204, 51);
-    private static final Color colorZ = new Color(52, 247, 255);
-    private static final Color colorRadial = new Color(52, 247, 255);
-    private static final int lineAlpha = 200;
-    private static final int planeAlpha = 75;
-    private static final Vec3d epsilon = new Vec3d(0.001, 0.001, 0.001); //prevents z-fighting
-
-    private static List<BlockPos> previousCoordinates;
-
-    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);
-    }
-
-    private 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);
-    }
-
-    private static void endLines() {
-        GL11.glPopAttrib();
-    }
-
-    private 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);
-        GlStateManager.enableBlend();
-        GlStateManager.blendFunc(GL11.GL_CONSTANT_ALPHA, GL11.GL_ONE_MINUS_CONSTANT_ALPHA);
-        GL14.glBlendColor(1F, 1F, 1F, 0.8f);
-    }
-
-    private static void endBlockPreviews() {
-        GlStateManager.blendFunc(GL11.GL_SRC_ALPHA, GL11.GL_ONE_MINUS_SRC_ALPHA);
-        GlStateManager.disableBlend();
-        GL11.glPopAttrib();
-    }
-
-    private static void end() {
-        GL11.glDepthMask(true);
-        GL11.glPopMatrix();
-    }
-
-    private static void renderBlockPreview(BlockRendererDispatcher dispatcher, BlockPos blockPos, IBlockState blockState) {
-        GlStateManager.pushMatrix();
-        GlStateManager.translate(blockPos.getX(), blockPos.getY(), blockPos.getZ());
-        GlStateManager.rotate(-90.0F, 0.0F, 1.0F, 0.0F);
-        GlStateManager.translate(-0.005f, -0.005f, 0.005f);
-        GlStateManager.scale(1.01f, 1.01f, 1.01f);
-        dispatcher.renderBlockBrightness(blockState, 0.85f);
-        GlStateManager.popMatrix();
-    }
-
-    public static void renderBlockOutline(BlockPos pos) {
-        renderBlockOutline(pos, pos);
-    }
-
-    //Renders outline. Pos1 has to be minimal x,y,z and pos2 maximal x,y,z
-    public static void renderBlockOutline(BlockPos pos1, BlockPos pos2) {
-        GL11.glLineWidth(2);
-
-        AxisAlignedBB aabb = new AxisAlignedBB(pos1, pos2.add(1, 1, 1)).grow(0.0020000000949949026);
-
-        RenderGlobal.drawSelectionBoundingBox(aabb, 0f, 0f, 0f, 0.4f);
-    }
-
-    @SubscribeEvent
-    public static void onRender(RenderWorldLastEvent event) {
-        EntityPlayer player = Minecraft.getMinecraft().player;
-        BuildSettingsManager.BuildSettings buildSettings = BuildSettingsManager.getBuildSettings(player);
-
-        begin(event.getPartialTicks());
-
-        beginLines();
-        //Mirror lines and areas
-        Mirror.MirrorSettings m = buildSettings.getMirrorSettings();
-        if (m != null && m.enabled && (m.mirrorX || m.mirrorY || m.mirrorZ))
-        {
-            Vec3d pos = m.position.add(epsilon);
-            int radius = m.radius;
-
-            if (m.mirrorX)
-            {
-                Vec3d posA = new Vec3d(pos.x, pos.y - radius, pos.z - radius);
-                Vec3d posB = new Vec3d(pos.x, pos.y + radius, pos.z + radius);
-
-                drawMirrorPlane(posA, posB, colorX, m.drawLines, m.drawPlanes, true);
-            }
-            if (m.mirrorY)
-            {
-                Vec3d posA = new Vec3d(pos.x - radius, pos.y, pos.z - radius);
-                Vec3d posB = new Vec3d(pos.x + radius, pos.y, pos.z + radius);
-
-                drawMirrorPlaneY(posA, posB, colorY, m.drawLines, m.drawPlanes);
-            }
-            if (m.mirrorZ)
-            {
-                Vec3d posA = new Vec3d(pos.x - radius, pos.y - radius, pos.z);
-                Vec3d posB = new Vec3d(pos.x + radius, pos.y + radius, pos.z);
-
-                drawMirrorPlane(posA, posB, colorZ, m.drawLines, m.drawPlanes, true);
-            }
-
-            //Draw axis coordinated colors if two or more axes are enabled
-            //(If only one is enabled the lines are that planes color)
-            if (m.drawLines && ((m.mirrorX && m.mirrorY) || (m.mirrorX && m.mirrorZ) || (m.mirrorY && m.mirrorZ)))
-            {
-                drawMirrorLines(m);
-            }
-        }
-
-        //Radial mirror lines and areas
-        RadialMirror.RadialMirrorSettings r = buildSettings.getRadialMirrorSettings();
-        if (r != null && r.enabled)
-        {
-            Vec3d pos = r.position.add(epsilon);
-            int radius = r.radius;
-
-            float angle = 2f * ((float) Math.PI) / r.slices;
-            Vec3d relStartVec = new Vec3d(radius, 0, 0);
-            if (r.slices%4 == 2) relStartVec = relStartVec.rotateYaw(angle / 2f);
-
-            for (int i = 0; i < r.slices; i++) {
-                Vec3d relNewVec = relStartVec.rotateYaw(angle * i);
-                Vec3d newVec = pos.add(relNewVec);
-
-                Vec3d posA = new Vec3d(pos.x, pos.y - radius, pos.z);
-                Vec3d posB = new Vec3d(newVec.x, pos.y + radius, newVec.z);
-                drawMirrorPlane(posA, posB, colorRadial, r.drawLines, r.drawPlanes, false);
-            }
-        }
-        endLines();
-
-        //Render block previews
-        RayTraceResult lookingAt = ClientProxy.getLookingAt(player);
-        //Checking for null is necessary! Even in vanilla when looking down ladders it is occasionally null (instead of Type MISS)
-        if (lookingAt != null && lookingAt.typeOfHit == RayTraceResult.Type.BLOCK)
-        {
-            beginBlockPreviews();
-            BlockRendererDispatcher dispatcher = Minecraft.getMinecraft().getBlockRendererDispatcher();
-            BlockPos startPos = lookingAt.getBlockPos();
-
-            //Check if tool (or none) in hand
-            ItemStack mainhand = player.getHeldItemMainhand();
-            boolean toolInHand = !(!mainhand.isEmpty() && (mainhand.getItem() instanceof ItemBlock || mainhand.getItem() instanceof ItemRandomizerBag));
-            boolean replaceable =
-                    player.world.getBlockState(startPos).getBlock().isReplaceable(player.world, startPos);
-            if (!buildSettings.doQuickReplace() && !toolInHand && !replaceable) {
-                startPos = startPos.offset(lookingAt.sideHit);
-            }
-
-            //Get under tall grass and other replaceable blocks
-            if (buildSettings.doQuickReplace() && !toolInHand && replaceable) {
-                startPos = startPos.down();
-            }
-
-            if (BuildModifiers.isEnabled(buildSettings, startPos) || BuildConfig.visuals.alwaysShowBlockPreview) {
-                //get coordinates
-                List<BlockPos> newCoordinates = BuildModifiers.findCoordinates(player, startPos);
-
-                //check if they are different from previous
-                if (!BuildModifiers.compareCoordinates(previousCoordinates, newCoordinates)) {
-                    previousCoordinates = newCoordinates;
-                    //if so, renew randomness of randomizer bag
-                    ItemRandomizerBag.renewRandomness();
-                }
-
-                Vec3d hitVec = lookingAt.hitVec;
-                hitVec = new Vec3d(Math.abs(hitVec.x - ((int) hitVec.x)), Math.abs(hitVec.y - ((int) hitVec.y)),
-                        Math.abs(hitVec.z - ((int) hitVec.z)));
-                List<ItemStack> itemStacks = new ArrayList<>();
-                List<IBlockState> blockStates = BuildModifiers.findBlockStates(player, startPos, hitVec, lookingAt.sideHit, itemStacks);
-
-                //check if valid blockstates
-                if (blockStates.size() != 0 && newCoordinates.size() == blockStates.size()) {
-                    for (int i = newCoordinates.size() - 1; i >= 0; i--) {
-                        BlockPos blockPos = newCoordinates.get(i);
-                        IBlockState blockState = blockStates.get(i);
-                        ItemStack itemstack = itemStacks.get(i);
-                        //Check if can place
-                        if (!itemstack.isEmpty() && SurvivalHelper.canPlayerEdit(player, player.world, blockPos, itemstack) &&
-                            SurvivalHelper.mayPlace(player.world, Block.getBlockFromItem(itemstack.getItem()), blockState, blockPos, true, EnumFacing.UP, player) &&
-                            SurvivalHelper.canReplace(player.world, player, blockPos)) {
-                            renderBlockPreview(dispatcher, blockPos, blockState);
-                        }
-                    }
-                }
-            }
-            endBlockPreviews();
-
-            beginLines();
-            //Draw outlines if tool in hand
-            //Find proper raytrace: either normal range or increased range depending on canBreakFar
-            RayTraceResult objectMouseOver = Minecraft.getMinecraft().objectMouseOver;
-            RayTraceResult breakingRaytrace = ReachHelper.canBreakFar(player) ? lookingAt : objectMouseOver;
-            if (toolInHand && breakingRaytrace != null && breakingRaytrace.typeOfHit == RayTraceResult.Type.BLOCK) {
-                List<BlockPos> breakCoordinates = BuildModifiers.findCoordinates(player, breakingRaytrace.getBlockPos());
-
-                //Only render first outline if further than normal reach
-                boolean excludeFirst = objectMouseOver != null && objectMouseOver.typeOfHit == RayTraceResult.Type.BLOCK;
-                for (int i = excludeFirst ? 1 : 0; i < breakCoordinates.size(); i++) {
-                    BlockPos coordinate = breakCoordinates.get(i);
-
-                    IBlockState blockState = player.world.getBlockState(coordinate);
-                    if (!blockState.getBlock().isAir(blockState, player.world, coordinate)) {
-                        if (SurvivalHelper.canBreak(player.world, player, coordinate) || i == 0) {
-                            renderBlockOutline(coordinate);
-                        }
-                    }
-                }
-            }
-            endLines();
-        }
-
-        end();
-    }
-
-
-    //----Mirror----
-
-    public static void drawMirrorPlane(Vec3d posA, Vec3d posB, Color c, boolean drawLines, boolean drawPlanes, boolean drawVerticalLines) {
-
-        GL11.glColor4d(c.getRed(), c.getGreen(), c.getBlue(), planeAlpha);
-        Tessellator tessellator = Tessellator.getInstance();
-        BufferBuilder bufferBuilder = tessellator.getBuffer();
-
-        if (drawPlanes) {
-            bufferBuilder.begin(GL11.GL_TRIANGLE_STRIP, DefaultVertexFormats.POSITION_COLOR);
-
-            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();
-
-            tessellator.draw();
-        }
-
-        if (drawLines) {
-            Vec3d middle = posA.add(posB).scale(0.5);
-            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) {
-                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();
-            }
-
-            tessellator.draw();
-        }
-    }
-
-    public static void drawMirrorPlaneY(Vec3d posA, Vec3d posB, Color c, boolean drawLines, boolean drawPlanes) {
-
-        GL11.glColor4d(c.getRed(), c.getGreen(), c.getBlue(), c.getAlpha());
-        Tessellator tessellator = Tessellator.getInstance();
-        BufferBuilder bufferBuilder = tessellator.getBuffer();
-
-        if (drawPlanes) {
-            bufferBuilder.begin(GL11.GL_TRIANGLE_STRIP, DefaultVertexFormats.POSITION_COLOR);
-
-            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();
-
-            tessellator.draw();
-        }
-
-        if (drawLines) {
-            Vec3d middle = posA.add(posB).scale(0.5);
-            bufferBuilder.begin(GL11.GL_LINES, DefaultVertexFormats.POSITION_COLOR);
-
-            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();
-        }
-    }
-
-    public static void drawMirrorLines(Mirror.MirrorSettings m) {
-
-        Vec3d pos = m.position.add(epsilon);
-
-        GL11.glColor4d(100, 100, 100, 255);
-        GL11.glLineWidth(2);
-        Tessellator tessellator = Tessellator.getInstance();
-        BufferBuilder bufferBuilder = tessellator.getBuffer();
-
-        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();
-    }
-
-    //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) {
-
-    }
-
-    //Sends breaking progress for all coordinates to renderglobal, so all blocks get visually broken
-    @Override
-    public void sendBlockBreakProgress(int breakerId, BlockPos pos, int progress) {
-        Minecraft mc = Minecraft.getMinecraft();
-
-        BuildSettingsManager.BuildSettings buildSettings = BuildSettingsManager.getBuildSettings(mc.player);
-        if (!BuildModifiers.isEnabled(buildSettings, 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/helper/SurvivalHelper.java

@@ -1,219 +1,317 @@
 package nl.requios.effortlessbuilding.helper;
 
-import net.minecraft.block.Block;
+import net.minecraft.advancements.CriteriaTriggers;
-import net.minecraft.block.BlockLiquid;
+import net.minecraft.core.BlockPos;
-import net.minecraft.block.SoundType;
+import net.minecraft.core.Direction;
-import net.minecraft.block.material.Material;
+import net.minecraft.core.Registry;
-import net.minecraft.block.state.IBlockState;
+import net.minecraft.server.level.ServerPlayer;
-import net.minecraft.enchantment.EnchantmentHelper;
+import net.minecraft.sounds.SoundSource;
-import net.minecraft.entity.Entity;
+import net.minecraft.tags.BlockTags;
-import net.minecraft.entity.player.EntityPlayer;
+import net.minecraft.world.InteractionHand;
-import net.minecraft.init.Blocks;
+import net.minecraft.world.entity.Entity;
-import net.minecraft.init.Enchantments;
+import net.minecraft.world.entity.player.Player;
-import net.minecraft.item.Item;
+import net.minecraft.world.item.BlockItem;
-import net.minecraft.item.ItemBlock;
+import net.minecraft.world.item.ItemStack;
-import net.minecraft.item.ItemStack;
+import net.minecraft.world.level.Level;
-import net.minecraft.util.EnumFacing;
+import net.minecraft.world.level.block.Block;
-import net.minecraft.util.SoundCategory;
+import net.minecraft.world.level.block.Blocks;
-import net.minecraft.util.math.AxisAlignedBB;
+import net.minecraft.world.level.block.SlabBlock;
-import net.minecraft.util.math.BlockPos;
+import net.minecraft.world.level.block.SoundType;
-import net.minecraft.world.IBlockAccess;
+import net.minecraft.world.level.block.state.BlockState;
-import net.minecraft.world.World;
+import net.minecraft.world.level.block.state.pattern.BlockInWorld;
-import net.minecraftforge.items.IItemHandler;
+import net.minecraft.world.level.material.Material;
-import net.minecraftforge.items.ItemHandlerHelper;
+import net.minecraft.world.phys.Vec3;
-import nl.requios.effortlessbuilding.BuildSettingsManager;
+import net.minecraft.world.phys.shapes.VoxelShape;
-import nl.requios.effortlessbuilding.EffortlessBuilding;
+import net.minecraftforge.event.ForgeEventFactory;
-import nl.requios.effortlessbuilding.item.ItemRandomizerBag;
+import nl.requios.effortlessbuilding.BuildConfig;
+import nl.requios.effortlessbuilding.buildmodifier.ModifierSettingsManager;
+import nl.requios.effortlessbuilding.compatibility.CompatHelper;
 
-import javax.annotation.Nonnull;
 import javax.annotation.Nullable;
-import java.util.List;
 
 public class SurvivalHelper {
 
 	//Used for all placing of blocks in this mod.
 	//Checks if area is loaded, if player has the right permissions, if existing block can be replaced (drops it if so) and consumes an item from the stack.
 	//Based on ItemBlock#onItemUse
-    public static boolean placeBlock(World world, EntityPlayer player, BlockPos pos, IBlockState blockState, ItemStack itemstack, EnumFacing facing, boolean skipCollisionCheck, boolean playSound) {
+	public static boolean placeBlock(Level world, Player player, BlockPos pos, BlockState blockState,
-        if (!world.isBlockLoaded(pos, true)) return false;
+									 ItemStack origstack, Direction facing, Vec3 hitVec, boolean skipPlaceCheck,
+									 boolean skipCollisionCheck, boolean playSound) {
+		if (!world.isLoaded(pos)) return false;
+		ItemStack itemstack = origstack;
 
-        //Randomizer bag synergy
+		if (blockState.isAir() || itemstack.isEmpty()) {
-        //Find itemstack that belongs to the blockstate
+			dropBlock(world, player, pos);
-        if (itemstack.getItem() == EffortlessBuilding.ITEM_RANDOMIZER_BAG) {
+			world.removeBlock(pos, false);
-            IItemHandler bagInventory = ItemRandomizerBag.getBagInventory(itemstack);
+			return true;
-            itemstack = ItemRandomizerBag.findStack(bagInventory, Item.getItemFromBlock(blockState.getBlock()));
 		}
 
-        //Check if itemstack is correct
+		//Randomizer bag, other proxy item synergy
-        if (!(itemstack.getItem() instanceof ItemBlock) || Block.getBlockFromItem(itemstack.getItem()) != blockState.getBlock()) {
+		//Preliminary compatibility code for other items that hold blocks
-            EffortlessBuilding.log(player, "Cannot (re)place block", true);
+		if (CompatHelper.isItemBlockProxy(itemstack))
-            EffortlessBuilding.log("SurvivalHelper#placeBlock: itemstack " + itemstack.toString() + " does not match blockstate " + blockState.toString());
+			itemstack = CompatHelper.getItemBlockByState(itemstack, blockState);
+
+		if (!(itemstack.getItem() instanceof BlockItem))
 			return false;
-        }
+		Block block = ((BlockItem) itemstack.getItem()).getBlock();
 
-        Block block = ((ItemBlock) itemstack.getItem()).getBlock();
 
-        if (!itemstack.isEmpty() && canPlayerEdit(player, world, pos, itemstack) &&
+		//More manual with ItemBlock#placeBlockAt
-            mayPlace(world, block, blockState, pos, skipCollisionCheck, facing.getOpposite(), player) &&
+		if (skipPlaceCheck || canPlace(world, player, pos, blockState, itemstack, skipCollisionCheck, facing.getOpposite())) {
-            canReplace(world, player, pos))
-        {
 			//Drop existing block
-            //TODO check if can replace
 			dropBlock(world, player, pos);
 
-            //From ItemBlock#placeBlockAt
+			//TryPlace sets block with offset and reduces itemstack count in creative, so we copy only parts of it
-            if (!world.setBlockState(pos, blockState, 11)) return false;
+//            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);
-            IBlockState state = world.getBlockState(pos);
+			if (!world.setBlock(pos, blockState, 3)) return false;
-            if (state.getBlock() == block)
+			BlockItem.updateCustomBlockEntityTag(world, player, pos, itemstack); //Actually BlockItem::onBlockPlaced but that is protected
-            {
+			block.setPlacedBy(world, pos, blockState, player, itemstack);
-                ((ItemBlock) itemstack.getItem()).setTileEntityNBT(world, player, pos, itemstack);
+			if (player instanceof ServerPlayer) {
-                block.onBlockPlacedBy(world, pos, state, player, itemstack);
+				CriteriaTriggers.PLACED_BLOCK.trigger((ServerPlayer) player, pos, itemstack);
-
-//                if (player instanceof EntityPlayerMP)
-//                    CriteriaTriggers.PLACED_BLOCK.trigger((EntityPlayerMP)player, pos, itemstack);
 			}
 
+			BlockState afterState = world.getBlockState(pos);
+
 			if (playSound) {
-                SoundType soundtype = state.getBlock().getSoundType(state, world, pos, player);
+				SoundType soundtype = afterState.getBlock().getSoundType(afterState, world, pos, player);
-                world.playSound(null, pos, soundtype.getPlaceSound(), SoundCategory.BLOCKS, (soundtype.getVolume() + 1.0F) / 2.0F, soundtype.getPitch() * 0.8F);
+				world.playSound(null, pos, soundtype.getPlaceSound(), SoundSource.BLOCKS, (soundtype.getVolume() + 1.0F) / 2.0F, soundtype.getPitch() * 0.8F);
 			}
 
-            if (!player.isCreative() && Block.getBlockFromItem(itemstack.getItem()) == block) {
+			if (!player.isCreative() && Block.byItem(itemstack.getItem()) == block) {
 				itemstack.shrink(1);
 			}
 
 			return true;
 		}
 		return false;
+
+		//Using ItemBlock#onItemUse
+//        EnumActionResult result;
+//        PlayerInteractEvent.RightClickBlock event = ForgeHooks.onRightClickBlock(player, EnumHand.MAIN_HAND, pos, facing, net.minecraftforge.common.ForgeHooks.rayTraceEyeHitVec(player, ReachHelper.getPlacementReach(player)));
+//        if (player.isCreative())
+//        {
+//            int i = itemstack.getMetadata();
+//            int j = itemstack.getCount();
+//            if (event.getUseItem() != net.minecraftforge.fml.common.eventhandler.Event.Result.DENY) {
+//                EnumActionResult enumactionresult = itemstack.getItem().onItemUse(player, world, pos, EnumHand.MAIN_HAND, facing, (float) hitVec.x, (float) hitVec.y, (float) hitVec.z);
+//                itemstack.setItemDamage(i);
+//                itemstack.setCount(j);
+//                return enumactionresult == EnumActionResult.SUCCESS;
+//            } else return false;
+//        }
+//        else
+//        {
+//            ItemStack copyForUse = itemstack.copy();
+//            if (event.getUseItem() != net.minecraftforge.fml.common.eventhandler.Event.Result.DENY)
+//                result = itemstack.getItem().onItemUse(player, world, pos, EnumHand.MAIN_HAND, facing, (float) hitVec.x, (float) hitVec.y, (float) hitVec.z);
+//            if (itemstack.isEmpty()) net.minecraftforge.event.ForgeEventFactory.onPlayerDestroyItem(player, copyForUse, EnumHand.MAIN_HAND);
+//            return false;
+//        }
+
 	}
 
 	//Used for all breaking of blocks in this mod.
 	//Checks if area is loaded, if appropriate tool is used in survival mode, and drops the block directly into the players inventory
-    public static boolean breakBlock(World world, EntityPlayer player, BlockPos pos) {
+	public static boolean breakBlock(Level world, Player player, BlockPos pos, boolean skipChecks) {
-        if (!world.isBlockLoaded(pos, false)) return false;
+		if (!world.isLoaded(pos) && !world.isEmptyBlock(pos)) return false;
 
 		//Check if can break
-        if (canBreak(world, player, pos))
+		if (skipChecks || canBreak(world, player, pos)) {
-        {
+//            player.addStat(StatList.getBlockStats(world.getNewBlockState(pos).getBlock()));
+//            player.addExhaustion(0.005F);
+
 			//Drop existing block
 			dropBlock(world, player, pos);
 
 			//Damage tool
-            player.getHeldItemMainhand().onBlockDestroyed(world, world.getBlockState(pos), pos, player);
+			player.getMainHandItem().mineBlock(world, world.getBlockState(pos), pos, player);
 
-            world.setBlockToAir(pos);
+			world.removeBlock(pos, false);
 			return true;
 		}
 		return false;
 	}
 
-    //Can break using held tool? (or in creative)
-    public static boolean canBreak(World world, EntityPlayer player, BlockPos pos) {
-        IBlockState blockState = world.getBlockState(pos);
-        if (blockState.getBlock() instanceof BlockLiquid) return false;
-
-        if (player.isCreative()) return true;
-
-        return canHarvestBlock(blockState.getBlock(), player, world, pos);
-    }
-
-    //From ForgeHooks#canHarvestBlock
-    public static boolean canHarvestBlock(@Nonnull Block block, @Nonnull EntityPlayer player, @Nonnull IBlockAccess world, @Nonnull BlockPos pos)
-    {
-        IBlockState state = world.getBlockState(pos);
-        state = state.getBlock().getActualState(state, world, pos);
-        if (state.getMaterial().isToolNotRequired())
-        {
-            return true;
-        }
-
-        ItemStack stack = player.getHeldItemMainhand();
-        String tool = block.getHarvestTool(state);
-        if (stack.isEmpty() || tool == null)
-        {
-            return player.canHarvestBlock(state);
-        }
-
-        if (stack.getItemDamage() >= stack.getMaxDamage()) return false;
-
-        int toolLevel = stack.getItem().getHarvestLevel(stack, tool, player, state);
-        if (toolLevel < 0)
-        {
-            return player.canHarvestBlock(state);
-        }
-
-        return toolLevel >= block.getHarvestLevel(state);
-    }
-
-    //Can be harvested with hand? (or in creative)
-    public static boolean canReplace(World world, EntityPlayer player, BlockPos pos){
-        if (player.isCreative()) return true;
-
-        IBlockState state = world.getBlockState(pos);
-        state = state.getBlock().getActualState(state, world, pos);
-        if (state.getMaterial().isToolNotRequired()) return true;
-
-        return false;
-    }
-
 	//Gives items directly to player
-    public static void dropBlock(World world, EntityPlayer player, BlockPos pos){
+	public static void dropBlock(Level world, Player player, BlockPos pos) {
 		if (player.isCreative()) return;
 
-        IBlockState blockState = world.getBlockState(pos);
+		BlockState blockState = world.getBlockState(pos);
+		Block block = blockState.getBlock();
 
-        int fortune = EnchantmentHelper.getEnchantmentLevel(Enchantments.FORTUNE, player.getHeldItemMainhand());
+		block.playerDestroy(world, player, pos, blockState, world.getBlockEntity(pos), player.getMainHandItem());
-        List<ItemStack> drops = blockState.getBlock().getDrops(world, pos, blockState, fortune);
+
-        for (ItemStack drop : drops)
+		//TODO drop items in inventory instead of world
-        {
+
-            ItemHandlerHelper.giveItemToPlayer(player, drop);
+//        List<ItemStack> drops = new ArrayList<>();
-        }
+//
+//        //From Block#harvestBlock
+//        int silktouch = EnchantmentHelper.getEnchantmentLevel(Enchantments.SILK_TOUCH, player.getHeldItemMainhand());
+//        if (block.canSilkHarvest(world, pos, blockState, player) && silktouch > 0) {
+//
+//            //From Block#getSilkTouchDrop (protected)
+//            Item item = Item.getItemFromBlock(block);
+//            int i = 0;
+//
+//            if (item.getHasSubtypes())
+//            {
+//                i = block.getMetaFromState(blockState);
+//            }
+//
+//            drops.add(new ItemStack(item, 1, i));
+//
+//            net.minecraftforge.event.ForgeEventFactory.fireBlockHarvesting(drops, world, pos, blockState, 0, 1.0f, true, player);
+//        }
+//
+//        int fortune = EnchantmentHelper.getEnchantmentLevel(Enchantments.FORTUNE, player.getHeldItemMainhand());
+//        drops.addAll(block.getDrops(world, pos, blockState, fortune));
+//        for (ItemStack drop : drops)
+//        {
+//            ItemHandlerHelper.giveItemToPlayer(player, drop);
+//        }
 	}
 
-    //From EntityPlayer#canPlayerEdit
+	/**
-    public static boolean canPlayerEdit(EntityPlayer player, World world, BlockPos pos, ItemStack stack)
+	 * Check if player can place a block.
-    {
+	 * Turn randomizer bag into itemstack inside before.
-        if (player.capabilities.allowEdit)
+	 *
-        {
+	 * @param world
-            //True in creative and survival mode
+	 * @param player
+	 * @param pos
+	 * @param newBlockState      the blockstate that is going to be placed
+	 * @param itemStack          the itemstack used for placing
+	 * @param skipCollisionCheck skips collision check with entities
+	 * @param sidePlacedOn
+	 * @return Whether the player may place the block at pos with itemstack
+	 */
+	public static boolean canPlace(Level world, Player player, BlockPos pos, BlockState newBlockState, ItemStack itemStack, boolean skipCollisionCheck, Direction sidePlacedOn) {
+
+		//Check if itemstack is correct
+		if (!(itemStack.getItem() instanceof BlockItem) || Block.byItem(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();
+
+		return !itemStack.isEmpty() && canPlayerEdit(player, world, pos, itemStack) &&
+			mayPlace(world, block, newBlockState, pos, skipCollisionCheck, sidePlacedOn, player) &&
+			canReplace(world, player, pos);
+	}
+
+	//Can be harvested with hand? (or in creative)
+	private static boolean canReplace(Level world, Player player, BlockPos pos) {
+		if (player.isCreative()) return true;
+
+		BlockState state = world.getBlockState(pos);
+
+		int miningLevel = BuildConfig.survivalBalancers.quickReplaceMiningLevel.get();
+		switch (miningLevel) {
+			case -1:
+				return !state.requiresCorrectToolForDrops();
+			case 0:
+				return !state.is(BlockTags.NEEDS_STONE_TOOL) &&
+					   !state.is(BlockTags.NEEDS_IRON_TOOL) &&
+					   !state.is(BlockTags.NEEDS_DIAMOND_TOOL);
+			case 1:
+				return !state.is(BlockTags.NEEDS_IRON_TOOL) &&
+					   !state.is(BlockTags.NEEDS_DIAMOND_TOOL);
+			case 2:
+				return !state.is(BlockTags.NEEDS_DIAMOND_TOOL);
+			case 3:
+			case 4:
 				return true;
 		}
-        else
+
-        {
+		return false;
+	}
+
+	//From Player#mayUseItemAt
+	private static boolean canPlayerEdit(Player player, Level world, BlockPos pos, ItemStack stack) {
+		if (!world.mayInteract(player, pos)) return false;
+
+		if (player.getAbilities().mayBuild) {
+			//True in creative and survival mode
+			return true;
+		} else {
 			//Adventure mode
-            Block block = world.getBlockState(pos).getBlock();
+			BlockInWorld blockinworld = new BlockInWorld(world, pos, false);
-            return stack.canPlaceOn(block) || stack.canEditBlocks();
+			return stack.hasAdventureModePlaceTagForBlock(world.registryAccess().registryOrThrow(Registry.BLOCK_REGISTRY), blockinworld);
 		}
 	}
 
 	//From World#mayPlace
-    public static boolean mayPlace(World world, Block blockIn, IBlockState newBlockState, BlockPos pos, boolean skipCollisionCheck, EnumFacing sidePlacedOn, @Nullable Entity placer)
+	private static boolean mayPlace(Level world, Block blockIn, BlockState newBlockState, BlockPos pos, boolean skipCollisionCheck, Direction sidePlacedOn, @Nullable Entity placer) {
-    {
+		BlockState iblockstate1 = world.getBlockState(pos);
-        IBlockState iblockstate1 = world.getBlockState(pos);
+		VoxelShape voxelShape = skipCollisionCheck ? null : blockIn.defaultBlockState().getCollisionShape(world, pos);
-        AxisAlignedBB axisalignedbb = skipCollisionCheck ? null : blockIn.getDefaultState().getCollisionBoundingBox(world, pos);
 
-        if (axisalignedbb != Block.NULL_AABB && !world.checkNoEntityCollision(axisalignedbb.offset(pos), placer))
+		if (voxelShape != null && !world.isUnobstructed(placer, voxelShape)) {
-        {
 			return false;
 		}
 
+		//Check if double slab
+		if (placer != null && doesBecomeDoubleSlab(((Player) placer), pos, sidePlacedOn)) {
+			return true;
+		}
+
 		//Check if same block
 		//Necessary otherwise extra items will be dropped
 		if (iblockstate1 == newBlockState) {
 			return false;
 		}
 
-        if (iblockstate1.getMaterial() == Material.CIRCUITS && blockIn == Blocks.ANVIL)
+		//TODO 1.14 check what Material.CIRCUITS has become
-        {
+		if (iblockstate1.getMaterial() == Material.BUILDABLE_GLASS && blockIn == Blocks.ANVIL) {
 			return true;
 		}
 
 		//Check quickreplace
-        if (placer instanceof EntityPlayer && BuildSettingsManager.getBuildSettings(((EntityPlayer) placer)).doQuickReplace()) {
+		if (placer instanceof Player && ModifierSettingsManager.getModifierSettings(((Player) placer)).doQuickReplace()) {
 			return true;
 		}
 
-        return iblockstate1.getBlock().isReplaceable(world, pos) && blockIn.canPlaceBlockOnSide(world, pos, sidePlacedOn);
+		//TODO 1.13 replaceable
+		return iblockstate1.getMaterial().isReplaceable() /*&& canPlaceBlockOnSide(world, pos, sidePlacedOn)*/;
+	}
+
+
+	//Can break using held tool? (or in creative)
+	public static boolean canBreak(Level world, Player player, BlockPos pos) {
+		BlockState blockState = world.getBlockState(pos);
+		if (!world.getFluidState(pos).isEmpty()) return false;
+
+		if (player.isCreative()) return true;
+
+		return ForgeEventFactory.doPlayerHarvestCheck(player, blockState, true);
+	}
+
+	public static boolean doesBecomeDoubleSlab(Player player, BlockPos pos, Direction facing) {
+		BlockState placedBlockState = player.level.getBlockState(pos);
+
+		ItemStack itemstack = player.getItemInHand(InteractionHand.MAIN_HAND);
+		if (CompatHelper.isItemBlockProxy(itemstack))
+			itemstack = CompatHelper.getItemBlockFromStack(itemstack);
+
+		if (itemstack.isEmpty() || !(itemstack.getItem() instanceof BlockItem) || !(((BlockItem) itemstack.getItem()).getBlock() instanceof SlabBlock))
+			return false;
+		SlabBlock heldSlab = (SlabBlock) ((BlockItem) itemstack.getItem()).getBlock();
+
+		if (placedBlockState.getBlock() == heldSlab) {
+			//TODO 1.13
+//            IProperty<?> variantProperty = heldSlab.getVariantProperty();
+//            Comparable<?> placedVariant = placedBlockState.getValue(variantProperty);
+//            BlockSlab.EnumBlockHalf placedHalf = placedBlockState.getValue(BlockSlab.HALF);
+//
+//            Comparable<?> heldVariant = heldSlab.getTypeForItem(itemstack);
+//
+//            if ((facing == EnumFacing.UP && placedHalf == BlockSlab.EnumBlockHalf.BOTTOM || facing == EnumFacing.DOWN && placedHalf == BlockSlab.EnumBlockHalf.TOP) && placedVariant == heldVariant)
+//            {
+//                return true;
+//            }
+		}
+		return false;
 	}
 }

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

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

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

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

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

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

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

@@ -1,196 +0,0 @@
-package nl.requios.effortlessbuilding.item;
-
-import net.minecraft.block.Block;
-import net.minecraft.block.state.IBlockState;
-import net.minecraft.client.util.ITooltipFlag;
-import net.minecraft.creativetab.CreativeTabs;
-import net.minecraft.entity.player.EntityPlayer;
-import net.minecraft.item.Item;
-import net.minecraft.item.ItemStack;
-import net.minecraft.nbt.NBTTagCompound;
-import net.minecraft.util.ActionResult;
-import net.minecraft.util.EnumActionResult;
-import net.minecraft.util.EnumFacing;
-import net.minecraft.util.EnumHand;
-import net.minecraft.util.math.BlockPos;
-import net.minecraft.util.text.TextFormatting;
-import net.minecraft.world.World;
-import net.minecraftforge.common.capabilities.ICapabilityProvider;
-import net.minecraftforge.items.CapabilityItemHandler;
-import net.minecraftforge.items.IItemHandler;
-import nl.requios.effortlessbuilding.EffortlessBuilding;
-import nl.requios.effortlessbuilding.capability.ItemHandlerCapabilityProvider;
-import nl.requios.effortlessbuilding.helper.SurvivalHelper;
-
-import javax.annotation.Nullable;
-import java.util.ArrayList;
-import java.util.Calendar;
-import java.util.List;
-import java.util.Random;
-
-public class ItemRandomizerBag extends Item {
-    public static final int INV_SIZE = 5;
-
-    private static long currentSeed = 1337;
-    private static Random rand = new Random(currentSeed);
-
-    public ItemRandomizerBag() {
-        this.setRegistryName(EffortlessBuilding.MODID, "randomizer_bag");
-        this.setUnlocalizedName(this.getRegistryName().toString());
-
-        this.maxStackSize = 1;
-        this.setCreativeTab(CreativeTabs.TOOLS);
-    }
-
-    @Override
-    public EnumActionResult onItemUse(EntityPlayer player, World world, BlockPos pos, EnumHand hand, EnumFacing facing, float hitX, float hitY, float hitZ) {
-
-        if (player.isSneaking()) {
-            if (world.isRemote) return EnumActionResult.SUCCESS;
-            //Open inventory
-            player.openGui(EffortlessBuilding.instance, EffortlessBuilding.RANDOMIZER_BAG_GUI, world, 0, 0, 0);
-        } else {
-            if (world.isRemote) return EnumActionResult.SUCCESS;
-            //Use item
-            //Get bag inventory
-            ItemStack bag = player.getHeldItem(hand);
-            IItemHandler bagInventory = getBagInventory(bag);
-            if (bagInventory == null)
-                return EnumActionResult.FAIL;
-
-            ItemStack toPlace = pickRandomStack(bagInventory);
-            if (toPlace.isEmpty()) return EnumActionResult.FAIL;
-
-            //Previously: use onItemUse to place block (no synergy)
-            //bag.setItemDamage(toPlace.getMetadata());
-            //toPlace.onItemUse(player, world, pos, hand, facing, hitX, hitY, hitZ);
-
-            if (!world.getBlockState(pos).getBlock().isReplaceable(world, pos)) {
-                pos = pos.offset(facing);
-            }
-
-            IBlockState blockState = Block.getBlockFromItem(toPlace.getItem()).getStateForPlacement(world, pos, facing,
-                    hitX, hitY, hitZ, toPlace.getMetadata(), player, hand);
-
-            SurvivalHelper.placeBlock(world, player, pos, blockState, toPlace, facing, false, true);
-
-            //Synergy
-            //Works without calling
-//            BlockSnapshot blockSnapshot = new BlockSnapshot(player.world, pos, blockState);
-//            BlockEvent.PlaceEvent placeEvent = new BlockEvent.PlaceEvent(blockSnapshot, blockState, player, hand);
-//            Mirror.onBlockPlaced(placeEvent);
-//            Array.onBlockPlaced(placeEvent);
-        }
-        return EnumActionResult.SUCCESS;
-    }
-
-    @Override
-    public ActionResult<ItemStack> onItemRightClick(World world, EntityPlayer player, EnumHand hand) {
-        ItemStack bag = player.getHeldItem(hand);
-
-        if (player.isSneaking()) {
-            if (world.isRemote) return new ActionResult<>(EnumActionResult.SUCCESS, bag);
-            //Open inventory
-            player.openGui(EffortlessBuilding.instance, EffortlessBuilding.RANDOMIZER_BAG_GUI, world, 0, 0, 0);
-        } else {
-            //Use item
-            //Get bag inventory
-            IItemHandler bagInventory = getBagInventory(bag);
-            if (bagInventory == null)
-                return new ActionResult<>(EnumActionResult.FAIL, bag);
-
-            ItemStack toUse = pickRandomStack(bagInventory);
-            if (toUse.isEmpty()) return new ActionResult<>(EnumActionResult.FAIL, bag);
-
-            return toUse.useItemRightClick(world, player, hand);
-        }
-        return new ActionResult<>(EnumActionResult.PASS, bag);
-    }
-
-    /**
-     * Get the inventory of a randomizer bag by checking the capability.
-     *
-     * @param bag
-     * @return
-     */
-    public static IItemHandler getBagInventory(ItemStack bag) {
-        if (!bag.hasCapability(CapabilityItemHandler.ITEM_HANDLER_CAPABILITY, null)) return null;
-        return bag.getCapability(CapabilityItemHandler.ITEM_HANDLER_CAPABILITY, null);
-    }
-
-    /**
-     * Pick a random slot from the bag. Empty slots will never get chosen.
-     *
-     * @param bagInventory
-     * @return
-     */
-    public static ItemStack pickRandomStack(IItemHandler bagInventory) {
-        //Find how many stacks are non-empty, and save them in a list
-        int nonempty = 0;
-        List<ItemStack> nonEmptyStacks = new ArrayList<>(INV_SIZE);
-        List<Integer> originalSlots = new ArrayList<>(INV_SIZE);
-        for (int i = 0; i < bagInventory.getSlots(); i++) {
-            ItemStack stack = bagInventory.getStackInSlot(i);
-            if (!stack.isEmpty()) {
-                nonempty++;
-                nonEmptyStacks.add(stack);
-                originalSlots.add(i);
-            }
-        }
-
-        if (nonEmptyStacks.size() != originalSlots.size())
-            throw new Error("NonEmptyStacks and OriginalSlots not same size");
-
-        if (nonempty == 0) return ItemStack.EMPTY;
-
-        //Pick random slot
-        int randomSlot = rand.nextInt(nonempty);
-        if (randomSlot < 0 || randomSlot > bagInventory.getSlots()) return ItemStack.EMPTY;
-
-        int originalSlot = originalSlots.get(randomSlot);
-        if (originalSlot < 0 || originalSlot > bagInventory.getSlots()) return ItemStack.EMPTY;
-
-        return bagInventory.getStackInSlot(originalSlot);
-    }
-
-    public static ItemStack findStack(IItemHandler bagInventory, Item item) {
-        for (int i = 0; i < bagInventory.getSlots(); i++) {
-            ItemStack stack = bagInventory.getStackInSlot(i);
-            if (!stack.isEmpty() && stack.getItem() == item) {
-                return stack;
-            }
-        }
-        return ItemStack.EMPTY;
-    }
-
-    @Override
-    public int getMaxItemUseDuration(ItemStack stack) {
-        return 1;
-    }
-
-    @Nullable
-    @Override
-    public ICapabilityProvider initCapabilities(ItemStack stack, @Nullable NBTTagCompound nbt) {
-        return new ItemHandlerCapabilityProvider();
-    }
-
-    @Override
-    public void addInformation(ItemStack stack, @Nullable World world, List<String> tooltip, ITooltipFlag flag) {
-        tooltip.add(TextFormatting.BLUE + "Rightclick" + TextFormatting.GRAY + " to place a random block");
-        tooltip.add(TextFormatting.BLUE + "Sneak + rightclick" + TextFormatting.GRAY + " to open inventory");
-    }
-
-    @Override
-    public String getUnlocalizedName() {
-        return super.getUnlocalizedName();
-    }
-
-    public static void resetRandomness() {
-        rand.setSeed(currentSeed);
-    }
-
-    public static void renewRandomness() {
-        currentSeed = Calendar.getInstance().getTimeInMillis();
-        rand.setSeed(currentSeed);
-    }
-}

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

@@ -0,0 +1,101 @@
+package nl.requios.effortlessbuilding.network;
+
+import net.minecraft.world.level.block.Block;
+import net.minecraft.world.level.block.state.BlockState;
+import net.minecraft.world.entity.player.Player;
+import net.minecraft.network.FriendlyByteBuf;
+import net.minecraft.core.BlockPos;
+import net.minecraft.world.phys.Vec3;
+import net.minecraftforge.api.distmarker.Dist;
+import net.minecraftforge.api.distmarker.OnlyIn;
+import net.minecraftforge.fml.DistExecutor;
+import net.minecraftforge.fml.LogicalSide;
+import net.minecraftforge.network.NetworkEvent;
+import nl.requios.effortlessbuilding.EffortlessBuilding;
+import nl.requios.effortlessbuilding.buildmodifier.BlockSet;
+import nl.requios.effortlessbuilding.buildmodifier.UndoRedo;
+import nl.requios.effortlessbuilding.render.BlockPreviewRenderer;
+
+import java.util.ArrayList;
+import java.util.function.Supplier;
+
+/***
+ * Sends a message to the client asking to add a block to the undo stack.
+ */
+public class AddUndoMessage {
+	private final BlockPos coordinate;
+	private final BlockState previousBlockState;
+	private final BlockState newBlockState;
+
+	public AddUndoMessage() {
+		coordinate = BlockPos.ZERO;
+		previousBlockState = null;
+		newBlockState = null;
+	}
+
+	public AddUndoMessage(BlockPos coordinate, BlockState previousBlockState, BlockState newBlockState) {
+		this.coordinate = coordinate;
+		this.previousBlockState = previousBlockState;
+		this.newBlockState = newBlockState;
+	}
+
+	public static void encode(AddUndoMessage message, FriendlyByteBuf buf) {
+		buf.writeInt(message.coordinate.getX());
+		buf.writeInt(message.coordinate.getY());
+		buf.writeInt(message.coordinate.getZ());
+		buf.writeInt(Block.getId(message.previousBlockState));
+		buf.writeInt(Block.getId(message.newBlockState));
+	}
+
+	public static AddUndoMessage decode(FriendlyByteBuf buf) {
+		BlockPos coordinate = new BlockPos(buf.readInt(), buf.readInt(), buf.readInt());
+		BlockState previousBlockState = Block.stateById(buf.readInt());
+		BlockState newBlockState = Block.stateById(buf.readInt());
+		return new AddUndoMessage(coordinate, previousBlockState, newBlockState);
+	}
+
+	public BlockPos getCoordinate() {
+		return coordinate;
+	}
+
+	public BlockState getPreviousBlockState() {
+		return previousBlockState;
+	}
+
+	public BlockState getNewBlockState() {
+		return newBlockState;
+	}
+
+	public static class Handler {
+		public static void handle(AddUndoMessage message, Supplier<NetworkEvent.Context> ctx) {
+			ctx.get().enqueueWork(() -> {
+				if (ctx.get().getDirection().getReceptionSide() == LogicalSide.CLIENT) {
+					//Received clientside
+					DistExecutor.unsafeRunWhenOn(Dist.CLIENT, () -> () -> ClientHandler.handle(message, ctx));
+				}
+			});
+			ctx.get().setPacketHandled(true);
+		}
+	}
+
+	@OnlyIn(Dist.CLIENT)
+	public static class ClientHandler {
+		public static void handle(AddUndoMessage message, Supplier<NetworkEvent.Context> ctx) {
+			Player 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 Vec3(0, 0, 0),
+					message.getCoordinate(), message.getCoordinate()));
+		}
+	}
+}

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

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