Fixed not being able to load when the newest version of Create is installed.

Updated logo, pack version

build.gradle

@@ -1,85 +1,68 @@
-plugins {
+buildscript {
-    id 'eclipse'
+    repositories {
-    id 'maven-publish'
+        maven { url = 'https://maven.minecraftforge.net' }
-    id 'net.minecraftforge.gradle' version '5.1.+'
+        mavenCentral()
+        jcenter()
+        maven { url = 'https://repo.spongepowered.org/repository/maven-public' }
+        maven { url = 'https://maven.parchmentmc.org' }
+    }
+    dependencies {
+        classpath "net.minecraftforge.gradle:ForgeGradle:${forgegradle_version}"
+        classpath "org.spongepowered:mixingradle:${mixingradle_version}"
+        classpath "org.parchmentmc:librarian:${librarian_version}"
+    }
 }
 
-version = '1.19-2.40'
+plugins {
-group = 'nl.requios.effortlessbuilding'
+    id 'com.matthewprenger.cursegradle' version "${cursegradle_version}"
-archivesBaseName = 'effortlessbuilding'
+}
+apply plugin: 'net.minecraftforge.gradle'
+apply plugin: 'org.parchmentmc.librarian.forgegradle'
+apply plugin: 'eclipse'
+apply plugin: 'maven-publish'
+apply plugin: 'org.spongepowered.mixin'
+
+jarJar.enable()
+
+boolean flywheelInWorkspace = findProject(':Flywheel') != null
+
+ext.buildNumber = System.getenv('BUILD_NUMBER')
+
+version = mod_version
+group = 'nl.requios.effortlessbuilding'
+archivesBaseName = "effortlessbuilding-${artifact_minecraft_version}"
 
-// Mojang ships Java 17 to end users in 1.18+, so your mod should target Java 17.
 java.toolchain.languageVersion = JavaLanguageVersion.of(17)
 
-println "Java: ${System.getProperty 'java.version'}, JVM: ${System.getProperty 'java.vm.version'} (${System.getProperty 'java.vendor'}), Arch: ${System.getProperty 'os.arch'}"
+println('Java: ' + System.getProperty('java.version') + ' JVM: ' + System.getProperty('java.vm.version') + ' (' + System.getProperty('java.vendor') + ') Arch: ' + System.getProperty('os.arch'))
-minecraft {
+
-    // The mappings can be changed at any time, and must be in the following format.
+minecraft {
-    // snapshot_YYYYMMDD   Snapshot are built nightly.
+    mappings channel: 'parchment', version: "${parchment_version}-${minecraft_version}"
-    // stable_#            Stables are built at the discretion of the MCP team.
+    accessTransformer = file('src/main/resources/META-INF/accesstransformer.cfg')
-    // Use non-default mappings at your own risk. they may not always work.
-    // Simply re-run your setup task after changing the mappings to update your workspace.
-    mappings channel: 'official', version: '1.19.2'
-    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')
-
+            arg '-mixin.config=flywheel.mixins.json'
-            // Recommended logging data for a userdev environment (SCAN,REGISTRIES,REGISTRYDUMP)
+            //jvmArgs '-XX:+UnlockCommercialFeatures' // uncomment for profiling
-            property 'forge.logging.markers', 'REGISTRIES'
+            property 'forge.logging.console.level', 'info'
-
-            // Recommended logging level for the console
-            property 'forge.logging.console.level', 'debug'
-
-            // Comma-separated list of namespaces to load gametests from. Empty = all namespaces.
-            property 'forge.enabledGameTestNamespaces', 'effortlessbuilding'
-
-            // Flywheel
-            property 'mixin.env.remapRefMap', 'true'
-            property 'mixin.env.refMapRemappingFile', "${projectDir}/build/createSrgToMcp/output.srg"
 
             mods {
                 effortlessbuilding {
                     source sourceSets.main
                 }
+
+                if (flywheelInWorkspace) {
+                    flywheel {
+                        source project(":Flywheel").sourceSets.main
+                    }
+                }
             }
         }
 
         server {
-            workingDirectory project.file('run')
+            workingDirectory project.file('run/server')
-
+            property 'forge.logging.console.level', 'info'
-            property 'forge.logging.markers', 'REGISTRIES'
-
-            property 'forge.logging.console.level', 'debug'
-
-            property 'forge.enabledGameTestNamespaces', 'effortlessbuilding'
-
-            // Flywheel
-            property 'mixin.env.remapRefMap', 'true'
-            property 'mixin.env.refMapRemappingFile', "${projectDir}/build/createSrgToMcp/output.srg"
-
-            mods {
-                effortlessbuilding {
-                    source sourceSets.main
-                }
-            }
-        }
-		
-        // This run config launches GameTestServer and runs all registered gametests, then exits.
-        // By default, the server will crash when no gametests are provided.
-        // The gametest system is also enabled by default for other run configs under the /test command.
-        gameTestServer {
-            workingDirectory project.file('run')
-
-            property 'forge.logging.markers', 'REGISTRIES'
-
-            property 'forge.logging.console.level', 'debug'
-
-            property 'forge.enabledGameTestNamespaces', 'effortlessbuilding'
-
             mods {
                 effortlessbuilding {
                     source sourceSets.main
@@ -89,73 +72,90 @@ minecraft {
 
         data {
             workingDirectory project.file('run')
-
+            property 'forge.logging.markers', 'REGISTRIES,REGISTRYDUMP'
-            property 'forge.logging.markers', 'REGISTRIES'
-
             property 'forge.logging.console.level', 'debug'
-
+            args '--mod', 'effortlessbuilding', '--all', '--output', file('src/generated/resources/'), '--existing', file('src/main/resources')
-            // 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
                 }
+
+                if (flywheelInWorkspace) {
+                    flywheel {
+                        source project(":Flywheel").sourceSets.main
+                    }
+                }
             }
         }
     }
 }
 
-// Include resources generated by data generators.
-sourceSets.main.resources { srcDir 'src/generated/resources' }
-
 repositories {
-    // Put repositories for dependencies here
-    // ForgeGradle automatically adds the Forge maven and Maven Central for you
-
-    // If you have mod jar dependencies in ./libs, you can declare them as a repository like so:
-    // flatDir {
-    //     dir 'libs'
-    // }
-
-    //Flywheel
     maven {
-        name "tterrag maven"
+        // location of the maven for Registrate and Flywheel
-        url "https://maven.tterrag.com/"
+        name = 'tterrag maven'
+        url = 'https://maven.tterrag.com'
+    }
+
+    maven {
+        url = 'https://www.cursemaven.com'
+        content {
+            includeGroup "curse.maven"
+        }
+    }
+    maven {
+        name = "Modrinth"
+        url = "https://api.modrinth.com/maven"
+        content {
+            includeGroup "maven.modrinth"
+        }
+    }
+
+    mavenLocal()
+    flatDir {
+        dirs 'libs'
     }
 }
 
 dependencies {
-    // Specify the version of Minecraft to use. If this is any group other than 'net.minecraft', it is assumed
+    minecraft "net.minecraftforge:forge:${minecraft_version}-${forge_version}"
-    // that the dep is a ForgeGradle 'patcher' dependency, and its patches will be applied.
-    // The userdev artifact is a special name and will get all sorts of transformations applied to it.
-    minecraft 'net.minecraftforge:forge:1.19.2-43.1.47'
 
-    // Real mod deobf dependency examples - these get remapped to your current mappings
+    jarJar("com.jozufozu.flywheel:flywheel-forge-${flywheel_minecraft_version}:${flywheel_version}") {
-    // compileOnly fg.deobf("mezz.jei:jei-${mc_version}:${jei_version}:api") // Adds JEI API as a compile dependency
+        jarJar.ranged(it, '[0.6.9,0.7)')
-    // 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
 
-    // Examples using mod jars from ./libs
+    if (flywheelInWorkspace) {
-    // implementation fg.deobf("blank:coolmod-${mc_version}:${coolmod_version}")
+        implementation project(':Flywheel')
+    } else {
+        implementation fg.deobf("com.jozufozu.flywheel:flywheel-forge-${flywheel_minecraft_version}:${flywheel_version}")
+    }
 
-    // For more info...
+    // Prevent Mixin annotation processor from getting into IntelliJ's annotation processor settings
-    // http://www.gradle.org/docs/current/userguide/artifact_dependencies_tutorial.html
+    // This allows 'Settings > Build, Execution, and Deployment > Build Tools > Gradle > Build and run using' set to IntelliJ to work correctly
-    // http://www.gradle.org/docs/current/userguide/dependency_management.html
+    if (!Boolean.getBoolean('idea.sync.active')) {
-
+        annotationProcessor "org.spongepowered:mixin:${mixin_version}:processor"
-    //Flywheel
+    }
-    //Versions: https://maven.tterrag.com/com/jozufozu/flywheel/flywheel-forge-1.19.2/
+}
-    implementation fg.deobf("com.jozufozu.flywheel:flywheel-forge-1.19.2:0.6.8-13")
+
+sourceSets.main.resources {
+    srcDir 'src/generated/resources'
+    exclude '.cache/'
+}
+tasks.withType(JavaCompile).configureEach {
+    options.encoding = 'UTF-8' // Use the UTF-8 charset for Java compilation
+}
+
+compileJava {
+    options.compilerArgs = ['-Xdiags:verbose']
 }
 
-// Example for how to get properties into the manifest for reading by the runtime..
 jar {
     manifest {
         attributes([
             "Specification-Title": "effortlessbuilding",
             "Specification-Vendor": "requios",
-            "Specification-Version": "1", // We are version 1 of ourselves
+            "Specification-Version": "1",
-            "Implementation-Title": project.name,
+            "Implementation-Title": project.jar.baseName,
             "Implementation-Version": project.jar.archiveVersion,
             "Implementation-Vendor" :"requios",
             "Implementation-Timestamp": new Date().format("yyyy-MM-dd'T'HH:mm:ssZ")
@@ -163,25 +163,39 @@ jar {
     }
 }
 
-// Example configuration to allow publishing using the maven-publish plugin
+task jarJarRelease {
-// This is the preferred method to reobfuscate your jar file
+    group = 'jarjar'
+    doLast {
+        tasks.jarJar {
+            classifier = ''
+        }
+    }
+    finalizedBy tasks.jarJar
+}
+
+java {
+    withSourcesJar()
+    withJavadocJar()
+}
+
 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
+tasks.jarJar.finalizedBy('reobfJarJar')
-// publish.dependsOn('reobfJar')
 
 publishing {
     publications {
         mavenJava(MavenPublication) {
-            artifact jar
+            artifactId = archivesBaseName
+
+            from components.java
+            fg.component(it)
+            jarJar.component(it)
         }
     }
+
     repositories {
-        maven {
+        if (project.hasProperty('mavendir')) {
-            url "file://${project.projectDir}/mcmodsrepo"
+            maven { url mavendir }
         }
     }
 }
 
-tasks.withType(JavaCompile).configureEach {
-    options.encoding = 'UTF-8' // Use the UTF-8 charset for Java compilation
-}

gradle.properties

@@ -2,3 +2,19 @@
 # This is required to provide enough memory for the Minecraft decompilation process.
 org.gradle.jvmargs=-Xmx3G
 org.gradle.daemon=false
+
+mod_version = 3.5
+artifact_minecraft_version = 1.19.2
+
+minecraft_version = 1.19.2
+forge_version = 43.1.47
+
+forgegradle_version = 5.1.53
+mixingradle_version = 0.7-SNAPSHOT
+mixin_version = 0.8.5
+librarian_version = 1.+
+cursegradle_version = 1.4.0
+parchment_version = 2022.11.27
+
+flywheel_minecraft_version = 1.19.2
+flywheel_version = 0.6.10-20

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

@@ -0,0 +1,69 @@
+package nl.requios.effortlessbuilding;
+
+import com.mojang.blaze3d.systems.RenderSystem;
+import com.mojang.blaze3d.vertex.PoseStack;
+import net.minecraft.client.gui.GuiComponent;
+import net.minecraft.resources.ResourceLocation;
+import net.minecraftforge.api.distmarker.Dist;
+import net.minecraftforge.api.distmarker.OnlyIn;
+import nl.requios.effortlessbuilding.create.foundation.gui.UIRenderHelper;
+import nl.requios.effortlessbuilding.create.foundation.gui.element.ScreenElement;
+import nl.requios.effortlessbuilding.create.foundation.utility.Color;
+
+public enum AllGuiTextures implements ScreenElement {
+    ARRAY_ENTRY("modifiers", 226, 64),
+    MIRROR_ENTRY("modifiers", 0, 64, 226, 64),
+    RADIAL_MIRROR_ENTRY("modifiers", 0, 128, 226, 64),
+    ENABLE_BUTTON_BACKGROUND("modifiers", 234, 0, 9, 9),
+    CHECKMARK("modifiers", 243, 0, 10, 9),
+    ARROW_UP("modifiers", 234, 9, 9, 9),
+    ARROW_DOWN("modifiers", 243, 9, 9, 9),
+    TRASH("modifiers", 234, 18, 9, 9),
+    ;
+    public final ResourceLocation location;
+    public int width, height;
+    public int startX, startY;
+    private AllGuiTextures(String location, int width, int height) {
+        this(location, 0, 0, width, height);
+    }
+    
+    private AllGuiTextures(int startX, int startY) {
+        this("icons", startX * 16, startY * 16, 16, 16);
+    }
+    
+    private AllGuiTextures(String location, int startX, int startY, int width, int height) {
+        this(EffortlessBuilding.MODID, location, startX, startY, width, height);
+    }
+    
+    private AllGuiTextures(String namespace, String location, int startX, int startY, int width, int height) {
+        this.location = new ResourceLocation(namespace, "textures/gui/" + location + ".png");
+        this.width = width;
+        this.height = height;
+        this.startX = startX;
+        this.startY = startY;
+    }
+    
+    @OnlyIn(Dist.CLIENT)
+    public void bind() {
+        RenderSystem.setShaderTexture(0, location);
+    }
+    
+    @OnlyIn(Dist.CLIENT)
+    @Override
+    public void render(PoseStack ms, int x, int y) {
+        bind();
+        GuiComponent.blit(ms, x, y, 0, startX, startY, width, height, 256, 256);
+    }
+    
+    @OnlyIn(Dist.CLIENT)
+    public void render(PoseStack ms, int x, int y, GuiComponent component) {
+        bind();
+        component.blit(ms, x, y, startX, startY, width, height);
+    }
+    
+    @OnlyIn(Dist.CLIENT)
+    public void render(PoseStack ms, int x, int y, Color c) {
+        bind();
+        UIRenderHelper.drawColoredTexture(ms, c, x, y, startX, startY, width, height);
+    }
+}

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

@@ -0,0 +1,158 @@
+package nl.requios.effortlessbuilding;
+
+import com.mojang.blaze3d.systems.RenderSystem;
+import com.mojang.blaze3d.vertex.PoseStack;
+import com.mojang.blaze3d.vertex.VertexConsumer;
+import com.mojang.math.Matrix4f;
+import net.minecraft.client.gui.GuiComponent;
+import net.minecraft.client.renderer.LightTexture;
+import net.minecraft.client.renderer.MultiBufferSource;
+import net.minecraft.client.renderer.RenderType;
+import net.minecraft.resources.ResourceLocation;
+import net.minecraft.world.phys.Vec3;
+import net.minecraftforge.api.distmarker.Dist;
+import net.minecraftforge.api.distmarker.OnlyIn;
+import nl.requios.effortlessbuilding.create.Create;
+import nl.requios.effortlessbuilding.create.foundation.gui.element.DelegatedStencilElement;
+import nl.requios.effortlessbuilding.create.foundation.gui.element.ScreenElement;
+import nl.requios.effortlessbuilding.create.foundation.utility.Color;
+
+public class AllIcons implements ScreenElement {
+    
+    public static final ResourceLocation ICON_ATLAS = Create.asResource("textures/gui/icons.png");
+    public static final int ICON_ATLAS_SIZE = 256;
+    private static int x = 0, y = -1;
+    private int iconX;
+    private int iconY;
+    
+    public static final AllIcons
+    I_SETTINGS = newRow(),
+    I_UNDO = next(),
+    I_REDO = next(),
+    I_REPLACE = next(),
+    I_REPLACE_AIR = next(),
+    I_REPLACE_BLOCKS_AND_AIR = next(),
+    I_REPLACE_BLOCKS = next(),
+    I_REPLACE_OFFHAND_FILTERED = next(),
+    I_PROTECT_TILE_ENTITIES = next();
+
+    
+    public static final AllIcons
+    I_DISABLE = newRow(),
+    I_SINGLE = next(),
+    I_LINE = next(),
+    I_WALL = next(),
+    I_FLOOR = next(),
+    I_CUBE = next(),
+    I_DIAGONAL_LINE = next(),
+    I_DIAGONAL_WALL = next(),
+    I_SLOPED_FLOOR = next(),
+    I_CIRCLE = next(),
+    I_CYLINDER = next(),
+    I_SPHERE = next(),
+    I_PYRAMID = next(),
+    I_CONE = next(),
+    I_DOME = next();
+    
+    public static final AllIcons
+    I_NORMAL_SPEED = newRow(),
+    I_FAST_SPEED = next(),
+    I_FILLED = next(),
+    I_HOLLOW = next(),
+    I_CUBE_FILLED = next(),
+    I_CUBE_HOLLOW = next(),
+    I_CUBE_SKELETON = next(),
+    I_SHORT_EDGE = next(),
+    I_LONG_EDGE = next(),
+    I_CIRCLE_START_CORNER = next(),
+    I_CIRCLE_START_CENTER = next(),
+    I_THICKNESS_1 = next(),
+    I_THICKNESS_3 = next(),
+    I_THICKNESS_5 = next();
+    
+    public static final AllIcons
+    I_PLAYER = newRow(),
+    I_BLOCK_CENTER = next(),
+    I_BLOCK_CORNER = next(),
+    I_HIDE_LINES = next(),
+    I_SHOW_LINES = next(),
+    I_HIDE_AREAS = next(),
+    I_SHOW_AREAS = next(),
+    I_X_OFF = next(),
+    I_X_ON = next(),
+    I_Y_OFF = next(),
+    I_Y_ON = next(),
+    I_Z_OFF = next(),
+    I_Z_ON = next(),
+    I_ALTERNATE_OFF = next(),
+    I_ALTERNATE_ON = next();
+    
+    
+    public AllIcons(int x, int y) {
+        iconX = x * 16;
+        iconY = y * 16;
+    }
+    
+    private static AllIcons next() {
+        return new AllIcons(++x, y);
+    }
+    
+    private static AllIcons newRow() {
+        return new AllIcons(x = 0, ++y);
+    }
+    
+    @OnlyIn(Dist.CLIENT)
+    public void bind() {
+        RenderSystem.setShaderTexture(0, ICON_ATLAS);
+    }
+    
+    @OnlyIn(Dist.CLIENT)
+    @Override
+    public void render(PoseStack matrixStack, int x, int y) {
+        bind();
+        GuiComponent.blit(matrixStack, x, y, 0, iconX, iconY, 16, 16, 256, 256);
+    }
+    
+    @OnlyIn(Dist.CLIENT)
+    public void render(PoseStack matrixStack, int x, int y, GuiComponent component) {
+        bind();
+        component.blit(matrixStack, x, y, iconX, iconY, 16, 16);
+    }
+    
+    @OnlyIn(Dist.CLIENT)
+    public void render(PoseStack ms, MultiBufferSource buffer, int color) {
+        VertexConsumer builder = buffer.getBuffer(RenderType.textSeeThrough(ICON_ATLAS));
+        Matrix4f matrix = ms.last().pose();
+        Color rgb = new Color(color);
+        int light = LightTexture.FULL_BRIGHT;
+        
+        Vec3 vec1 = new Vec3(0, 0, 0);
+        Vec3 vec2 = new Vec3(0, 1, 0);
+        Vec3 vec3 = new Vec3(1, 1, 0);
+        Vec3 vec4 = new Vec3(1, 0, 0);
+        
+        float u1 = iconX * 1f / ICON_ATLAS_SIZE;
+        float u2 = (iconX + 16) * 1f / ICON_ATLAS_SIZE;
+        float v1 = iconY * 1f / ICON_ATLAS_SIZE;
+        float v2 = (iconY + 16) * 1f / ICON_ATLAS_SIZE;
+        
+        vertex(builder, matrix, vec1, rgb, u1, v1, light);
+        vertex(builder, matrix, vec2, rgb, u1, v2, light);
+        vertex(builder, matrix, vec3, rgb, u2, v2, light);
+        vertex(builder, matrix, vec4, rgb, u2, v1, light);
+    }
+    
+    @OnlyIn(Dist.CLIENT)
+    private void vertex(VertexConsumer builder, Matrix4f matrix, Vec3 vec, Color rgb, float u, float v, int light) {
+        builder.vertex(matrix, (float) vec.x, (float) vec.y, (float) vec.z)
+            .color(rgb.getRed(), rgb.getGreen(), rgb.getBlue(), 255)
+            .uv(u, v)
+            .uv2(light)
+            .endVertex();
+    }
+    
+    @OnlyIn(Dist.CLIENT)
+    public DelegatedStencilElement asStencil() {
+        return new DelegatedStencilElement().withStencilRenderer((ms, w, h, alpha) -> this.render(ms, 0, 0)).withBounds(16, 16);
+    }
+}

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

@@ -2,33 +2,46 @@ package nl.requios.effortlessbuilding;
 
 import net.minecraftforge.common.ForgeConfigSpec;
 
+import static net.minecraftforge.common.ForgeConfigSpec.*;
+
 public class ClientConfig {
 
-	private static final ForgeConfigSpec.Builder builder = new ForgeConfigSpec.Builder();
+	private static final Builder builder = new Builder();
 	public static final Visuals visuals = new Visuals(builder);
 	public static final ForgeConfigSpec spec = builder.build();
 
 	public static class Visuals {
-		public final ForgeConfigSpec.ConfigValue<Boolean> showBlockPreviews;
+		public final BooleanValue showBlockPreviews;
-		public final ForgeConfigSpec.ConfigValue<Boolean> alwaysShowBlockPreview;
+		public final BooleanValue onlyShowBlockPreviewsWhenBuilding;
-		public final ForgeConfigSpec.ConfigValue<Integer> maxBlockPreviews;
+		public final IntValue maxBlockPreviews;
+		public final IntValue appearAnimationLength;
+		public final IntValue breakAnimationLength;
 
-		public Visuals(ForgeConfigSpec.Builder builder) {
+		public Visuals(Builder builder) {
 			builder.push("Visuals");
 
 			showBlockPreviews = builder
 					.comment("Show previews of the blocks while placing them")
-					.define("useShaders", true);
+					.define("showBlockPreviews", true);
 
-			alwaysShowBlockPreview = builder
+			onlyShowBlockPreviewsWhenBuilding = builder
-				.comment("Show a block preview if you have a block in hand even in the 'Disabled' build mode")
+				.comment("Show block previews only when actively using a build mode")
-				.define("alwaysShowBlockPreview", false);
+				.define("onlyShowBlockPreviewsWhenBuilding", true);
 
 			maxBlockPreviews = builder
 				.comment("Don't show block previews when placing more than this many blocks. " +
 						 "The outline will always be rendered.")
-				.define("shaderTreshold", 500);
+				.defineInRange("maxBlockPreviews", 400, 0, 5000);
 
+			appearAnimationLength = builder
+					.comment("How long it takes for a block to appear when placed in ticks.",
+							"Set to 0 to disable animation.")
+					.defineInRange("appearAnimationLength", 5, 0, 100);
+
+			breakAnimationLength = builder
+					.comment("How long the break animation is in ticks.",
+							"Set to 0 to disable animation.")
+					.defineInRange("breakAnimationLength", 10, 0, 100);
 
 			builder.pop();
 		}

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

@@ -1,58 +1,32 @@
 package nl.requios.effortlessbuilding;
 
 import com.mojang.blaze3d.platform.InputConstants;
-import com.mojang.blaze3d.vertex.DefaultVertexFormat;
-import net.minecraft.ChatFormatting;
 import net.minecraft.client.KeyMapping;
 import net.minecraft.client.Minecraft;
 import net.minecraft.client.gui.screens.Screen;
 import net.minecraft.client.player.LocalPlayer;
-import net.minecraft.client.renderer.ShaderInstance;
-import net.minecraft.core.BlockPos;
-import net.minecraft.resources.ResourceLocation;
-import net.minecraft.sounds.SoundSource;
-import net.minecraft.world.InteractionHand;
 import net.minecraft.world.entity.player.Player;
-import net.minecraft.world.item.BlockItem;
-import net.minecraft.world.item.ItemStack;
-import net.minecraft.world.level.ClipContext;
-import net.minecraft.world.level.Level;
-import net.minecraft.world.level.block.SoundType;
-import net.minecraft.world.level.block.state.BlockState;
-import net.minecraft.world.phys.BlockHitResult;
-import net.minecraft.world.phys.HitResult;
-import net.minecraft.world.phys.Vec3;
 import net.minecraftforge.api.distmarker.Dist;
 import net.minecraftforge.client.event.InputEvent;
 import net.minecraftforge.client.event.RegisterKeyMappingsEvent;
-import net.minecraftforge.client.event.RegisterShadersEvent;
 import net.minecraftforge.client.event.ScreenEvent;
 import net.minecraftforge.client.settings.KeyConflictContext;
 import net.minecraftforge.client.settings.KeyModifier;
 import net.minecraftforge.event.TickEvent;
 import net.minecraftforge.eventbus.api.SubscribeEvent;
 import net.minecraftforge.fml.common.Mod.EventBusSubscriber;
-import nl.requios.effortlessbuilding.buildmode.BuildModes;
+import nl.requios.effortlessbuilding.buildmode.BuildModeEnum;
 import nl.requios.effortlessbuilding.buildmode.ModeOptions;
-import nl.requios.effortlessbuilding.buildmode.ModeSettingsManager;
-import nl.requios.effortlessbuilding.buildmodifier.ModifierSettingsManager;
-import nl.requios.effortlessbuilding.compatibility.CompatHelper;
 import nl.requios.effortlessbuilding.gui.buildmode.PlayerSettingsGui;
 import nl.requios.effortlessbuilding.gui.buildmode.RadialMenu;
-import nl.requios.effortlessbuilding.gui.buildmodifier.ModifierSettingsGui;
+import nl.requios.effortlessbuilding.gui.buildmodifier.ModifiersScreen;
-import nl.requios.effortlessbuilding.helper.ReachHelper;
+import nl.requios.effortlessbuilding.systems.PowerLevel;
-import nl.requios.effortlessbuilding.network.*;
-import nl.requios.effortlessbuilding.render.BuildRenderTypes;
 import org.lwjgl.glfw.GLFW;
 
-import java.io.IOException;
-
 @EventBusSubscriber(Dist.CLIENT)
 public class ClientEvents {
 
     public static KeyMapping[] keyBindings;
-    public static HitResult previousLookAt;
-    public static HitResult currentLookAt;
     public static int ticksInGame = 0;
     private static int placeCooldown = 0;
     private static int breakCooldown = 0;
@@ -63,60 +37,42 @@ public class ClientEvents {
 
         @SubscribeEvent
         public static void registerKeyMappings(RegisterKeyMappingsEvent event) {
-            EffortlessBuilding.log("Registering KeyMappings!");
 
-            // register key bindings
             keyBindings = new KeyMapping[6];
 
-            // instantiate the key bindings
+            keyBindings[0] = new KeyMapping("key.effortlessbuilding.mode.desc", KeyConflictContext.IN_GAME, InputConstants.getKey(GLFW.GLFW_KEY_LEFT_ALT, 0), "key.effortlessbuilding.category");
-            keyBindings[0] = new KeyMapping("key.effortlessbuilding.hud.desc", KeyConflictContext.IN_GAME, InputConstants.getKey(GLFW.GLFW_KEY_KP_ADD, 0), "key.effortlessbuilding.category");
+            keyBindings[1] = new KeyMapping("key.effortlessbuilding.hud.desc", KeyConflictContext.IN_GAME, InputConstants.getKey(GLFW.GLFW_KEY_KP_ADD, 0), "key.effortlessbuilding.category");
-            keyBindings[1] = new KeyMapping("key.effortlessbuilding.replace.desc", KeyConflictContext.IN_GAME, InputConstants.getKey(GLFW.GLFW_KEY_KP_SUBTRACT, 0), "key.effortlessbuilding.category");
+            keyBindings[2] = new KeyMapping("key.effortlessbuilding.undo.desc", KeyConflictContext.IN_GAME, KeyModifier.CONTROL, InputConstants.getKey(GLFW.GLFW_KEY_Z, 0), "key.effortlessbuilding.category");
-            keyBindings[2] = new KeyMapping("key.effortlessbuilding.mode.desc", KeyConflictContext.IN_GAME, InputConstants.getKey(GLFW.GLFW_KEY_LEFT_ALT, 0), "key.effortlessbuilding.category");
+            keyBindings[3] = new KeyMapping("key.effortlessbuilding.redo.desc", KeyConflictContext.IN_GAME, KeyModifier.CONTROL, InputConstants.getKey(GLFW.GLFW_KEY_Y, 0), "key.effortlessbuilding.category");
-            keyBindings[3] = new KeyMapping("key.effortlessbuilding.undo.desc", KeyConflictContext.IN_GAME, KeyModifier.CONTROL, InputConstants.getKey(GLFW.GLFW_KEY_Z, 0), "key.effortlessbuilding.category");
+            keyBindings[4] = new KeyMapping("key.effortlessbuilding.previous_build_mode.desc", KeyConflictContext.IN_GAME, InputConstants.UNKNOWN, "key.effortlessbuilding.category");
-            keyBindings[4] = new KeyMapping("key.effortlessbuilding.redo.desc", KeyConflictContext.IN_GAME, KeyModifier.CONTROL, InputConstants.getKey(GLFW.GLFW_KEY_Y, 0), "key.effortlessbuilding.category");
+            keyBindings[5] = new KeyMapping("key.effortlessbuilding.disable_build_mode_toggle.desc", KeyConflictContext.IN_GAME, InputConstants.UNKNOWN, "key.effortlessbuilding.category");
-            keyBindings[5] = new KeyMapping("key.effortlessbuilding.altplacement.desc", KeyConflictContext.IN_GAME, InputConstants.getKey(GLFW.GLFW_KEY_LEFT_CONTROL, 0), "key.effortlessbuilding.category");
 
             for (KeyMapping keyBinding : keyBindings) {
                 event.register(keyBinding);
             }
         }
 
-        @SubscribeEvent
+//        @SubscribeEvent
-        public static void registerShaders(RegisterShadersEvent event) throws IOException {
+//        public static void registerShaders(RegisterShadersEvent event) throws IOException {
-            event.registerShader(new ShaderInstance(event.getResourceManager(),
+//            event.registerShader(new ShaderInstance(event.getResourceManager(),
-                            new ResourceLocation(EffortlessBuilding.MODID, "dissolve"),
+//                            new ResourceLocation(EffortlessBuilding.MODID, "dissolve"),
-                            DefaultVertexFormat.BLOCK),
+//                            DefaultVertexFormat.BLOCK),
-                    shaderInstance -> BuildRenderTypes.dissolveShaderInstance = shaderInstance);
+//                    shaderInstance -> BuildRenderTypes.dissolveShaderInstance = shaderInstance);
-        }
+//        }
     }
 
     @SubscribeEvent
     public static void onClientTick(TickEvent.ClientTickEvent event) {
+        if (!isGameActive()) return;
+
         if (event.phase == TickEvent.Phase.START) {
+
+            EffortlessBuildingClient.BUILDER_CHAIN.onTick();
+
             onMouseInput();
 
-            //Update previousLookAt
+            EffortlessBuildingClient.BLOCK_PREVIEWS.onTick();
-            HitResult objectMouseOver = Minecraft.getInstance().hitResult;
-            //Checking for null is necessary! Even in vanilla when looking down ladders it is occasionally null (instead of Type MISS)
-            if (objectMouseOver == null) return;
 
-            if (currentLookAt == null) {
-                currentLookAt = objectMouseOver;
-                previousLookAt = objectMouseOver;
-                return;
-            }
-
-            if (objectMouseOver.getType() == HitResult.Type.BLOCK) {
-                if (currentLookAt.getType() != HitResult.Type.BLOCK) {
-                    currentLookAt = objectMouseOver;
-                    previousLookAt = objectMouseOver;
-                } else {
-                    if (((BlockHitResult) currentLookAt).getBlockPos() != ((BlockHitResult) objectMouseOver).getBlockPos()) {
-                        previousLookAt = currentLookAt;
-                        currentLookAt = objectMouseOver;
-                    }
-                }
-            }
         } else if (event.phase == TickEvent.Phase.END) {
             Screen gui = Minecraft.getInstance().screen;
             if (gui == null || !gui.isPauseScreen()) {
@@ -130,52 +86,21 @@ public class ClientEvents {
         Minecraft mc = Minecraft.getInstance();
         LocalPlayer player = mc.player;
         if (player == null) return;
-        BuildModes.BuildModeEnum buildMode = ModeSettingsManager.getModeSettings(player).getBuildMode();
+        BuildModeEnum buildMode = EffortlessBuildingClient.BUILD_MODES.getBuildMode();
 
         if (mc.screen != null ||
-            buildMode == BuildModes.BuildModeEnum.DISABLED ||
             RadialMenu.instance.isVisible()) {
             return;
         }
 
         if (mc.options.keyUse.isDown()) {
 
-            //KeyBinding.setKeyBindState(mc.gameSettings.keyBindUseItem.getKeyCode(), false);
-
             if (placeCooldown <= 0) {
                 placeCooldown = 4;
 
-                ItemStack currentItemStack = player.getItemInHand(InteractionHand.MAIN_HAND);
+                EffortlessBuildingClient.BUILDER_CHAIN.onRightClick();
-                if (currentItemStack.getItem() instanceof BlockItem ||
-                    (CompatHelper.isItemBlockProxy(currentItemStack) && !player.isShiftKeyDown())) {
 
-                    ItemStack itemStack = CompatHelper.getItemBlockFromStack(currentItemStack);
+            } else if (buildMode == BuildModeEnum.SINGLE) {
-
-                    //find position in distance
-                    HitResult lookingAt = getLookingAt(player);
-                    if (lookingAt != null && lookingAt.getType() == HitResult.Type.BLOCK) {
-                        BlockHitResult blockLookingAt = (BlockHitResult) lookingAt;
-
-                        BuildModes.onBlockPlacedMessage(player, new BlockPlacedMessage(blockLookingAt, true));
-                        PacketHandler.INSTANCE.sendToServer(new BlockPlacedMessage(blockLookingAt, true));
-
-                        //play sound if further than normal
-                        if ((blockLookingAt.getLocation().subtract(player.getEyePosition(1f))).lengthSqr() > 25f &&
-                            itemStack.getItem() instanceof BlockItem) {
-
-                            BlockState state = ((BlockItem) itemStack.getItem()).getBlock().defaultBlockState();
-                            BlockPos blockPos = blockLookingAt.getBlockPos();
-                            SoundType soundType = state.getBlock().getSoundType(state, player.level, blockPos, player);
-                            player.level.playSound(player, player.blockPosition(), soundType.getPlaceSound(), SoundSource.BLOCKS,
-                                    0.4f, soundType.getPitch());
-                            player.swing(InteractionHand.MAIN_HAND);
-                        }
-                    } else {
-                        BuildModes.onBlockPlacedMessage(player, new BlockPlacedMessage());
-                        PacketHandler.INSTANCE.sendToServer(new BlockPlacedMessage());
-                    }
-                }
-            } else if (buildMode == BuildModes.BuildModeEnum.SINGLE) {
                 placeCooldown--;
                 if (ModeOptions.getBuildSpeed() == ModeOptions.ActionEnum.FAST_SPEED) placeCooldown = 0;
             }
@@ -189,34 +114,13 @@ public class ClientEvents {
             if (breakCooldown <= 0) {
                 breakCooldown = 4;
 
-                HitResult lookingAt = getLookingAt(player);
+                EffortlessBuildingClient.BUILDER_CHAIN.onLeftClick();
-                if (lookingAt != null && lookingAt.getType() == HitResult.Type.BLOCK) {
-                    BlockHitResult blockLookingAt = (BlockHitResult) lookingAt;
 
-                    BuildModes.onBlockBrokenMessage(player, new BlockBrokenMessage(blockLookingAt));
+            } else if (buildMode == BuildModeEnum.SINGLE) {
-                    PacketHandler.INSTANCE.sendToServer(new BlockBrokenMessage(blockLookingAt));
-
-                    //play sound if further than normal
-                    if ((blockLookingAt.getLocation().subtract(player.getEyePosition(1f))).lengthSqr() > 25f) {
-
-                        BlockPos blockPos = blockLookingAt.getBlockPos();
-                        BlockState state = player.level.getBlockState(blockPos);
-                        SoundType soundtype = state.getBlock().getSoundType(state, player.level, blockPos, player);
-                        player.level.playSound(player, player.blockPosition(), soundtype.getBreakSound(), SoundSource.BLOCKS,
-                                0.4f, soundtype.getPitch());
-                        player.swing(InteractionHand.MAIN_HAND);
-                    }
-                } else {
-                    BuildModes.onBlockBrokenMessage(player, new BlockBrokenMessage());
-                    PacketHandler.INSTANCE.sendToServer(new BlockBrokenMessage());
-                }
-            } else if (buildMode == BuildModes.BuildModeEnum.SINGLE) {
                 breakCooldown--;
                 if (ModeOptions.getBuildSpeed() == ModeOptions.ActionEnum.FAST_SPEED) breakCooldown = 0;
             }
 
-            //EffortlessBuilding.packetHandler.sendToServer(new CancelModeMessage());
-
         } else {
             breakCooldown = 0;
         }
@@ -228,24 +132,9 @@ public class ClientEvents {
         if (player == null)
             return;
 
-        //Remember to send packet to server if necessary
-        //Show Modifier Settings GUI
-        if (keyBindings[0].consumeClick()) {
-            openModifierSettings();
-        }
-
-        //QuickReplace toggle
-        if (keyBindings[1].consumeClick()) {
-            ModifierSettingsManager.ModifierSettings modifierSettings = ModifierSettingsManager.getModifierSettings(player);
-            modifierSettings.setQuickReplace(!modifierSettings.doQuickReplace());
-            EffortlessBuilding.log(player, "Set " + ChatFormatting.GOLD + "Quick Replace " + ChatFormatting.RESET + (
-                    modifierSettings.doQuickReplace() ? "on" : "off"));
-            PacketHandler.INSTANCE.sendToServer(new ModifierSettingsMessage(modifierSettings));
-        }
-
         //Radial menu
-        if (keyBindings[2].isDown()) {
+        if (keyBindings[0].isDown()) {
-            if (ReachHelper.getMaxReach(player) > 0) {
+            if (!EffortlessBuildingClient.POWER_LEVEL.isDisabled(player)) {
                 if (!RadialMenu.instance.isVisible()) {
                     Minecraft.getInstance().setScreen(RadialMenu.instance);
                 }
@@ -254,39 +143,31 @@ public class ClientEvents {
             }
         }
 
+        //Show Modifier Settings GUI
+        if (keyBindings[1].consumeClick()) {
+            openModifierSettings();
+        }
+
         //Undo (Ctrl+Z)
-        if (keyBindings[3].consumeClick()) {
+        if (keyBindings[2].consumeClick()) {
-            ModeOptions.ActionEnum action = ModeOptions.ActionEnum.UNDO;
+            ModeOptions.performAction(player, ModeOptions.ActionEnum.UNDO);
-            ModeOptions.performAction(player, action);
-            PacketHandler.INSTANCE.sendToServer(new ModeActionMessage(action));
         }
 
         //Redo (Ctrl+Y)
+        if (keyBindings[3].consumeClick()) {
+            ModeOptions.performAction(player, ModeOptions.ActionEnum.REDO);
+        }
+
+        //Previous build mode
         if (keyBindings[4].consumeClick()) {
-            ModeOptions.ActionEnum action = ModeOptions.ActionEnum.REDO;
+            ModeOptions.performAction(player, ModeOptions.ActionEnum.PREVIOUS_BUILD_MODE);
-            ModeOptions.performAction(player, action);
-            PacketHandler.INSTANCE.sendToServer(new ModeActionMessage(action));
         }
 
-        //Change placement mode
+        //Disable build mode toggle
         if (keyBindings[5].consumeClick()) {
-            //Toggle between first two actions of the first option of the current build mode
+            ModeOptions.performAction(player, ModeOptions.ActionEnum.DISABLE_BUILD_MODE_TOGGLE);
-            BuildModes.BuildModeEnum currentBuildMode = ModeSettingsManager.getModeSettings(player).getBuildMode();
-            if (currentBuildMode.options.length > 0) {
-                ModeOptions.OptionEnum option = currentBuildMode.options[0];
-                if (option.actions.length >= 2) {
-                    if (ModeOptions.getOptionSetting(option) == option.actions[0]) {
-                        ModeOptions.performAction(player, option.actions[1]);
-                        PacketHandler.INSTANCE.sendToServer(new ModeActionMessage(option.actions[1]));
-                    } else {
-                        ModeOptions.performAction(player, option.actions[0]);
-                        PacketHandler.INSTANCE.sendToServer(new ModeActionMessage(option.actions[0]));
         }
     }
-            }
-        }
-
-    }
 
     public static void openModifierSettings() {
         Minecraft mc = Minecraft.getInstance();
@@ -294,10 +175,10 @@ public class ClientEvents {
         if (player == null) return;
 
         //Disabled if max reach is 0, might be set in the config that way.
-        if (ReachHelper.getMaxReach(player) == 0) {
+        if (EffortlessBuildingClient.POWER_LEVEL.isDisabled(player)) {
-            EffortlessBuilding.log(player, "Build modifiers are disabled until your reach has increased. Increase your reach with craftable reach upgrades.");
+            EffortlessBuilding.log(player, "Build modifiers are disabled until your power level has increased. Increase your power level by consuming certain items.");
         } else {
-            mc.setScreen(new ModifierSettingsGui());
+            mc.setScreen(new ModifiersScreen());
         }
     }
 
@@ -310,28 +191,18 @@ public class ClientEvents {
     public static void onGuiOpen(ScreenEvent event) {
         Player player = Minecraft.getInstance().player;
         if (player != null) {
-            BuildModes.initializeMode(player);
+            EffortlessBuildingClient.BUILDER_CHAIN.cancel();
         }
     }
 
     public static boolean isKeybindDown(int keybindIndex) {
         return InputConstants.isKeyDown(
                 Minecraft.getInstance().getWindow().getWindow(),
-                keyBindings[2].getKey().getValue());
+                keyBindings[keybindIndex].getKey().getValue());
     }
 
-    public static HitResult getLookingAt(Player player) {
+    public static boolean isGameActive() {
-        Level world = player.level;
+        return !(Minecraft.getInstance().level == null || Minecraft.getInstance().player == null);
-
-        //base distance off of player ability (config)
-        float raytraceRange = ReachHelper.getPlacementReach(player);
-
-        Vec3 look = player.getLookAngle();
-        Vec3 start = new Vec3(player.getX(), player.getY() + player.getEyeHeight(), player.getZ());
-        Vec3 end = new Vec3(player.getX() + look.x * raytraceRange, player.getY() + player.getEyeHeight() + look.y * raytraceRange, player.getZ() + look.z * raytraceRange);
-//        return player.rayTrace(raytraceRange, 1f, RayTraceFluidMode.NEVER);
-        //TODO 1.14 check if correct
-        return world.clip(new ClipContext(start, end, ClipContext.Block.COLLIDER, ClipContext.Fluid.NONE, player));
     }
 
 }

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

@@ -1,101 +1,143 @@
 package nl.requios.effortlessbuilding;
 
 import net.minecraftforge.common.ForgeConfigSpec;
-import nl.requios.effortlessbuilding.create.foundation.render.SuperByteBufferCache;
+
+import static net.minecraftforge.common.ForgeConfigSpec.*;
 
 public class CommonConfig {
 
-	private static final ForgeConfigSpec.Builder builder = new ForgeConfigSpec.Builder();
+	private static final Builder builder = new Builder();
 	public static final Reach reach = new Reach(builder);
-	public static final SurvivalBalancers survivalBalancers = new SurvivalBalancers(builder);
+	public static final MaxBlocksPlacedAtOnce maxBlocksPlacedAtOnce = new MaxBlocksPlacedAtOnce(builder);
-	public static final Visuals visuals = new Visuals(builder);
+	public static final MaxBlocksPerAxis maxBlocksPerAxis = new MaxBlocksPerAxis(builder);
+	public static final MaxMirrorRadius maxMirrorRadius = new MaxMirrorRadius(builder);
 	public static final ForgeConfigSpec spec = builder.build();
 
 	public static class Reach {
-		public final ForgeConfigSpec.ConfigValue<Boolean> enableReachUpgrades;
+		public final IntValue creative;
-		public final ForgeConfigSpec.ConfigValue<Integer> maxReachCreative;
+		public final IntValue level0;
-		public final ForgeConfigSpec.ConfigValue<Integer> maxReachLevel0;
+		public final IntValue level1;
-		public final ForgeConfigSpec.ConfigValue<Integer> maxReachLevel1;
+		public final IntValue level2;
-		public final ForgeConfigSpec.ConfigValue<Integer> maxReachLevel2;
+		public final IntValue level3;
-		public final ForgeConfigSpec.ConfigValue<Integer> maxReachLevel3;
 
-		public Reach(ForgeConfigSpec.Builder builder) {
+		public Reach(Builder builder) {
 			builder.push("Reach");
-			enableReachUpgrades = builder
-				.comment("Reach: how far away the player can place blocks using mirror/array etc.",
-					"Enable the crafting of reach upgrades to increase reach.",
-					"If disabled, reach is set to level 3 for survival players.")
-				.define("enableReachUpgrades", true);
 
-			maxReachCreative = builder
+			creative = builder
-				.comment("Maximum reach in creative",
+				.comment("How far away the player can place and break blocks.")
-					"Keep in mind that chunks need to be loaded to be able to place blocks inside.")
+				.defineInRange("reachCreative", 200, 0, 1000);
-				.define("maxReachCreative", 200);
 
-			maxReachLevel0 = builder
+			level0 = builder
 				.comment("Maximum reach in survival without upgrades",
-					"Reach upgrades are craftable consumables that permanently increase reach.",
+					"Consume Power Level upgrades to permanently increase this.")
-					"Set to 0 to disable Effortless Building until the player has consumed a reach upgrade.")
+				.defineInRange("reachLevel0", 0, 0, 1000);
-				.define("maxReachLevel0", 20);
 
-			maxReachLevel1 = builder
+			level1 = builder
-				.comment("Maximum reach in survival with one upgrade")
+				.defineInRange("reachLevel1", 8, 0, 1000);
-				.define("maxReachLevel1", 50);
 
-			maxReachLevel2 = builder
+			level2 = builder
-				.comment("Maximum reach in survival with two upgrades")
+				.defineInRange("reachLevel2", 16, 0, 1000);
-				.define("maxReachLevel2", 100);
 
-			maxReachLevel3 = builder
+			level3 = builder
-				.comment("Maximum reach in survival with three upgrades")
+				.defineInRange("reachLevel3", 32, 0, 1000);
-				.define("maxReachLevel3", 200);
 
 			builder.pop();
 		}
 	}
 
-	public static class SurvivalBalancers {
+	public static class MaxBlocksPlacedAtOnce {
-		public final ForgeConfigSpec.ConfigValue<Integer> quickReplaceMiningLevel;
+		public final IntValue creative;
-		public final ForgeConfigSpec.ConfigValue<Integer> undoStackSize;
+		public final IntValue level0;
+		public final IntValue level1;
+		public final IntValue level2;
+		public final IntValue level3;
 
-		public SurvivalBalancers(ForgeConfigSpec.Builder builder) {
+		public MaxBlocksPlacedAtOnce(Builder builder) {
-			builder.push("SurvivalBalancers");
+			builder.push("MaxBlocksPlacedAtOnce");
 
-			quickReplaceMiningLevel = builder
+			creative = builder
-				.comment("Determines what blocks can be replaced in survival.",
+				.comment("How many blocks can be placed in one click.")
-					"-1: only blocks that can be harvested by hand (default)",
+				.defineInRange("maxBlocksPlacedAtOnceCreative", 10000, 0, 100000);
-					"0: blocks that can be harvested with wooden or gold tools",
-					"1: blocks that can be harvested with stone tools",
-					"2: blocks that can be harvested with iron tools",
-					"3: blocks that can be harvested with diamond tools",
-					"4: blocks that can be harvested with netherite tools")
-				.defineInRange("quickReplaceMiningLevel", -1, -1, 3);
 
-			undoStackSize = builder
+			level0 = builder
-				.comment("How many placements are remembered for the undo functionality.")
+				.comment("In survival without upgrades",
-				.worldRestart()
+						"Consume Power Level upgrades to permanently increase this.",
-				.define("undoStackSize", 10);
+						"Set to 0 to disable Effortless Building until the player has increased their Building Power Level.")
+				.defineInRange("maxBlocksPlacedAtOnceLevel0", 128, 0, 100000);
+
+			level1 = builder
+				.defineInRange("maxBlocksPlacedAtOnceLevel1", 192, 0, 100000);
+
+			level2 = builder
+				.defineInRange("maxBlocksPlacedAtOnceLevel2", 320, 0, 100000);
+
+			level3 = builder
+				.defineInRange("maxBlocksPlacedAtOnceLevel3", 640, 0, 100000);
 
 			builder.pop();
 		}
 	}
 
-	public static class Visuals {
+	public static class MaxBlocksPerAxis {
-		public final ForgeConfigSpec.ConfigValue<Integer> appearAnimationLength;
+		public final IntValue creative;
-		public final ForgeConfigSpec.ConfigValue<Integer> breakAnimationLength;
+		public final IntValue level0;
+		public final IntValue level1;
+		public final IntValue level2;
+		public final IntValue level3;
 
-        public Visuals(ForgeConfigSpec.Builder builder) {
+		public MaxBlocksPerAxis(Builder builder) {
-			builder.push("Visuals");
+			builder.push("MaxBlocksPerAxis");
 
-			appearAnimationLength = builder
+			creative = builder
-				.comment("How long it takes for a block to appear when placed in ticks.",
+				.comment("How many blocks can be placed at once per axis when using build modes (e.g. walls).",
-					"Set to 0 to disable animation.")
+						"Also affects the array modifier.")
-				.define("appearAnimationLength", 5);
+				.defineInRange("maxBlocksPerAxisCreative", 1000, 0, 1000);
 
-			breakAnimationLength = builder
+			level0 = builder
-				.comment("How long the break animation is in ticks.",
+				.comment("In survival without upgrades",
-					"Set to 0 to disable animation.")
+						"Consume Power Level upgrades to permanently increase this.")
-				.define("breakAnimationLength", 10);
+				.defineInRange("maxBlocksPerAxisLevel0", 8, 0, 1000);
+
+			level1 = builder
+				.defineInRange("maxBlocksPerAxisLevel1", 12, 0, 1000);
+
+			level2 = builder
+				.defineInRange("maxBlocksPerAxisLevel2", 16, 0, 1000);
+
+			level3 = builder
+				.defineInRange("maxBlocksPerAxisLevel3", 20, 0, 1000);
+
+			builder.pop();
+		}
+	}
+
+	public static class MaxMirrorRadius {
+		public final IntValue creative;
+		public final IntValue level0;
+		public final IntValue level1;
+		public final IntValue level2;
+		public final IntValue level3;
+
+		public MaxMirrorRadius(Builder builder) {
+			builder.push("MaxMirrorRadius");
+
+			creative = builder
+				.comment("The maximum (radial) mirror radius.")
+				.defineInRange("maxMirrorRadiusCreative", 200, 0, 1000);
+
+			level0 = builder
+				.comment("Maximum reach in survival without upgrades",
+						"Consume Power Level upgrades upgrades to permanently increase this.")
+				.defineInRange("maxMirrorRadiusLevel0", 16, 0, 1000);
+
+			level1 = builder
+				.defineInRange("maxMirrorRadiusLevel1", 32, 0, 1000);
+
+			level2 = builder
+				.defineInRange("maxMirrorRadiusLevel2", 48, 0, 1000);
+
+			level3 = builder
+				.defineInRange("maxMirrorRadiusLevel3", 64, 0, 1000);
 
 			builder.pop();
 		}

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

@@ -1,34 +1,24 @@
 package nl.requios.effortlessbuilding;
 
+import net.minecraft.server.level.ServerPlayer;
 import net.minecraft.world.InteractionHand;
+import net.minecraft.world.entity.player.Player;
 import net.minecraft.world.item.BlockItem;
 import net.minecraft.world.item.ItemStack;
-import net.minecraft.world.level.block.Blocks;
-import net.minecraft.world.entity.Entity;
-import net.minecraft.world.entity.player.Player;
-import net.minecraft.server.level.ServerPlayer;
-import net.minecraft.resources.ResourceLocation;
-import net.minecraftforge.common.capabilities.RegisterCapabilitiesEvent;
 import net.minecraftforge.common.util.FakePlayer;
-import net.minecraftforge.event.AttachCapabilitiesEvent;
+import net.minecraftforge.event.RegisterCommandsEvent;
 import net.minecraftforge.event.TickEvent;
 import net.minecraftforge.event.entity.player.PlayerEvent;
 import net.minecraftforge.event.level.BlockEvent;
 import net.minecraftforge.eventbus.api.SubscribeEvent;
+import net.minecraftforge.fml.LogicalSide;
 import net.minecraftforge.fml.common.Mod.EventBusSubscriber;
 import net.minecraftforge.network.PacketDistributor;
-import nl.requios.effortlessbuilding.buildmode.BuildModes;
-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.compatibility.CompatHelper;
-import nl.requios.effortlessbuilding.helper.ReachHelper;
+import nl.requios.effortlessbuilding.network.ModifierSettingsPacket;
-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 nl.requios.effortlessbuilding.systems.ServerBuildState;
+import nl.requios.effortlessbuilding.utilities.PowerLevelCommand;
 
 @EventBusSubscriber
 public class CommonEvents {
@@ -37,160 +27,113 @@ public class CommonEvents {
 	@EventBusSubscriber(bus = EventBusSubscriber.Bus.MOD)
 	public static class ModBusEvents {
 
-		@SubscribeEvent
+
-		public void registerCapabilities(RegisterCapabilitiesEvent event){
-			event.register(ModifierCapabilityManager.IModifierCapability.class);
-			event.register(ModeCapabilityManager.IModeCapability.class);
-		}
 	}
 
 	@SubscribeEvent
-	public static void attachCapabilities(AttachCapabilitiesEvent<Entity> event) {
+	public static void registerCommands(RegisterCommandsEvent event) {
-		if (event.getObject() instanceof FakePlayer) return;
+		PowerLevelCommand.register(event.getDispatcher());
-		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 static void onTick(TickEvent.LevelTickEvent event) {
 		if (event.phase != TickEvent.Phase.START) return;
+		if (event.side == LogicalSide.CLIENT) return;
 
-		EffortlessBuilding.DELAYED_BLOCK_PLACER.tick();
+		EffortlessBuilding.SERVER_BLOCK_PLACER.tick();
 	}
 
+	//Cancel event if necessary. Nothing more, rest is handled on mouseclick
 	@SubscribeEvent
 	public static void onBlockPlaced(BlockEvent.EntityPlaceEvent event) {
-		if (event.getLevel().isClientSide()) return;
+		if (event.getLevel().isClientSide()) return; //Never called clientside anyway, but just to be sure
-
+		if (!(event.getEntity() instanceof Player player)) return;
-		if (!(event.getEntity() instanceof Player)) return;
-
 		if (event.getEntity() instanceof FakePlayer) return;
 
-		//Cancel event if necessary
+		//Don't cancel event if our custom logic is breaking blocks
-		ServerPlayer player = ((ServerPlayer) event.getEntity());
+		if (EffortlessBuilding.SERVER_BLOCK_PLACER.isPlacingOrBreakingBlocks()) return;
-		BuildModes.BuildModeEnum buildMode = ModeSettingsManager.getModeSettings(player).getBuildMode();
-		ModifierSettingsManager.ModifierSettings modifierSettings = ModifierSettingsManager.getModifierSettings(player);
 
-		if (buildMode != BuildModes.BuildModeEnum.DISABLED) {
+		if (!ServerBuildState.isLikeVanilla(player)) {
 
 			//Only cancel if itemblock in hand
 			//Fixed issue with e.g. Create Wrench shift-rightclick disassembling being cancelled.
-			ItemStack currentItemStack = player.getItemInHand(InteractionHand.MAIN_HAND);
+			if (isPlayerHoldingBlock(player)) {
-			if (currentItemStack.getItem() instanceof BlockItem ||
-				(CompatHelper.isItemBlockProxy(currentItemStack) && !player.isShiftKeyDown())) {
 				event.setCanceled(true);
+				//TODO Notify client to not decrease itemstack
+			}
+		}
 	}
 
-		} else if (modifierSettings.doQuickReplace()) {
+	//Cancel event if necessary. Nothing more, rest is handled on mouseclick
-			//Cancel event and send message if QuickReplace
-			event.setCanceled(true);
-			PacketHandler.INSTANCE.send(PacketDistributor.PLAYER.with(() -> player), new RequestLookAtMessage(true));
-			PacketHandler.INSTANCE.send(PacketDistributor.PLAYER.with(() -> player), new AddUndoMessage(event.getPos(), event.getBlockSnapshot().getReplacedBlock(), event.getState()));
-		} else {
-			//NORMAL mode, let vanilla handle block placing
-			//But modifiers should still work
-
-			//Send message to client, which sends message back with raytrace info
-			PacketHandler.INSTANCE.send(PacketDistributor.PLAYER.with(() -> player), new RequestLookAtMessage(false));
-			PacketHandler.INSTANCE.send(PacketDistributor.PLAYER.with(() -> player), new AddUndoMessage(event.getPos(), event.getBlockSnapshot().getReplacedBlock(), event.getState()));
-		}
-
-//        Stat<ResourceLocation> blocksPlacedStat = StatList.CUSTOM.get(new ResourceLocation(EffortlessBuilding.MODID, "blocks_placed"));
-//        player.getStats().increment(player, blocksPlacedStat, 1);
-//
-//        System.out.println(player.getStats().getValue(blocksPlacedStat));
-	}
-
 	@SubscribeEvent
 	public static void onBlockBroken(BlockEvent.BreakEvent event) {
 		if (event.getLevel().isClientSide()) return;
+		Player player = event.getPlayer();
+		if (player instanceof FakePlayer) return;
 
-		if (event.getPlayer() instanceof FakePlayer) return;
+		//Don't cancel event if our custom logic is breaking blocks
+		if (EffortlessBuilding.SERVER_BLOCK_PLACER.isPlacingOrBreakingBlocks()) return;
 
-		//Cancel event if necessary
+		if (!ServerBuildState.isLikeVanilla(player) && EffortlessBuilding.SERVER_POWER_LEVEL.canBreakFar(player)) {
-		//If cant break far then dont cancel event ever
-		BuildModes.BuildModeEnum buildMode = ModeSettingsManager.getModeSettings(event.getPlayer()).getBuildMode();
-		if (buildMode != BuildModes.BuildModeEnum.DISABLED && 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
+	private static boolean isPlayerHoldingBlock(Player player) {
-			if (event.getPlayer() instanceof ServerPlayer && event.getState() != null && event.getPos() != null) {
+		ItemStack currentItemStack = player.getItemInHand(InteractionHand.MAIN_HAND);
-				PacketDistributor.PacketTarget packetTarget = PacketDistributor.PLAYER.with(() -> (ServerPlayer) event.getPlayer());
+		return currentItemStack.getItem() instanceof BlockItem ||
-				if (packetTarget != null)
+				(CompatHelper.isItemBlockProxy(currentItemStack) && !player.isShiftKeyDown());
-					PacketHandler.INSTANCE.send(packetTarget, new AddUndoMessage(event.getPos(), event.getState(), Blocks.AIR.defaultBlockState()));
-			}
-		}
 	}
 
 	@SubscribeEvent
 	public static void onPlayerLoggedIn(PlayerEvent.PlayerLoggedInEvent event) {
 		if (event.getEntity() instanceof FakePlayer) return;
 		Player player = event.getEntity();
-		ModifierSettingsManager.handleNewPlayer(player);
+		if (player.getCommandSenderWorld().isClientSide) return;
-		ModeSettingsManager.handleNewPlayer(player);
+
+		ServerBuildState.handleNewPlayer(player);
+
+		PacketHandler.INSTANCE.send(PacketDistributor.PLAYER.with(() -> (ServerPlayer) player), new ModifierSettingsPacket(player));
+		EffortlessBuilding.SERVER_POWER_LEVEL.sendToClient(player);
 	}
 
 	@SubscribeEvent
 	public static void onPlayerLoggedOut(PlayerEvent.PlayerLoggedOutEvent event) {
 		if (event.getEntity() instanceof FakePlayer) return;
 		Player player = event.getEntity();
-		if (player.getCommandSenderWorld().isClientSide) return;
+		if (player.getCommandSenderWorld().isClientSide) {
+			EffortlessBuilding.log("PlayerLoggedOutEvent triggers on client side");
+			return;
+		}
 
-		UndoRedo.clear(player);
+		EffortlessBuilding.UNDO_REDO.clear(player);
-		PacketHandler.INSTANCE.send(PacketDistributor.PLAYER.with(() -> (ServerPlayer) player), new ClearUndoMessage());
 	}
 
 	@SubscribeEvent
 	public static void onPlayerRespawn(PlayerEvent.PlayerRespawnEvent event) {
 		if (event.getEntity() instanceof FakePlayer) return;
 		Player player = event.getEntity();
-		ModifierSettingsManager.handleNewPlayer(player);
+		if (player.getCommandSenderWorld().isClientSide) {
-		ModeSettingsManager.handleNewPlayer(player);
+			EffortlessBuilding.log("PlayerRespawnEvent triggers on client side");
+			return;
+		}
+
+		//TODO check if this is needed
+		ServerBuildState.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;
+		if (player.getCommandSenderWorld().isClientSide) {
-
+			EffortlessBuilding.log("PlayerChangedDimensionEvent triggers on client side");
-		//Set build mode to normal
+			return;
-		ModeSettingsManager.ModeSettings modeSettings = ModeSettingsManager.getModeSettings(player);
-		modeSettings.setBuildMode(BuildModes.BuildModeEnum.DISABLED);
-		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
+		//Undo redo has no dimension data, so clear it
-	public static void onPlayerClone(PlayerEvent.Clone event) {
+		EffortlessBuilding.UNDO_REDO.clear(player);
-		if (event.getEntity() instanceof FakePlayer) return;
-		//Attach capabilities on death, otherwise crash
-		Player oldPlayer = event.getOriginal();
-		oldPlayer.revive();
 
-		Player newPlayer = event.getEntity();
+		//TODO disable build mode and modifiers?
-		ModifierSettingsManager.setModifierSettings(newPlayer, ModifierSettingsManager.getModifierSettings(oldPlayer));
-		ModeSettingsManager.setModeSettings(newPlayer, ModeSettingsManager.getModeSettings(oldPlayer));
 	}
-
-
 }

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

@@ -1,5 +1,6 @@
 package nl.requios.effortlessbuilding;
 
+import com.mojang.serialization.Codec;
 import net.minecraft.network.chat.Component;
 import net.minecraft.world.entity.player.Player;
 import net.minecraft.world.inventory.AbstractContainerMenu;
@@ -7,6 +8,7 @@ import net.minecraft.world.inventory.MenuType;
 import net.minecraft.world.item.Item;
 import net.minecraftforge.api.distmarker.Dist;
 import net.minecraftforge.common.MinecraftForge;
+import net.minecraftforge.common.loot.IGlobalLootModifier;
 import net.minecraftforge.eventbus.api.IEventBus;
 import net.minecraftforge.fml.DistExecutor;
 import net.minecraftforge.fml.ModLoadingContext;
@@ -22,12 +24,15 @@ import nl.requios.effortlessbuilding.compatibility.CompatHelper;
 import nl.requios.effortlessbuilding.gui.DiamondRandomizerBagContainer;
 import nl.requios.effortlessbuilding.gui.GoldenRandomizerBagContainer;
 import nl.requios.effortlessbuilding.gui.RandomizerBagContainer;
-import nl.requios.effortlessbuilding.helper.DelayedBlockPlacer;
 import nl.requios.effortlessbuilding.item.*;
 import nl.requios.effortlessbuilding.network.PacketHandler;
 import nl.requios.effortlessbuilding.proxy.ClientProxy;
 import nl.requios.effortlessbuilding.proxy.IProxy;
 import nl.requios.effortlessbuilding.proxy.ServerProxy;
+import nl.requios.effortlessbuilding.systems.ItemUsageTracker;
+import nl.requios.effortlessbuilding.systems.ServerBlockPlacer;
+import nl.requios.effortlessbuilding.systems.ServerPowerLevel;
+import nl.requios.effortlessbuilding.systems.UndoRedo;
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
 
@@ -38,13 +43,17 @@ public class EffortlessBuilding {
 	public static final Logger logger = LogManager.getLogger();
 
 	public static EffortlessBuilding instance;
-	public static IProxy proxy = DistExecutor.safeRunForDist(() -> ClientProxy::new, () -> ServerProxy::new);
+	public static IProxy proxy = DistExecutor.unsafeRunForDist(() -> ClientProxy::new, () -> ServerProxy::new);
 
-	public static final DelayedBlockPlacer DELAYED_BLOCK_PLACER = new DelayedBlockPlacer();
+	public static final ServerBlockPlacer SERVER_BLOCK_PLACER = new ServerBlockPlacer();
+	public static final UndoRedo UNDO_REDO = new UndoRedo();
+	public static final ItemUsageTracker ITEM_USAGE_TRACKER = new ItemUsageTracker();
+	public static final ServerPowerLevel SERVER_POWER_LEVEL = new ServerPowerLevel();
 
 	//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);
+	public static final DeferredRegister<Codec<? extends IGlobalLootModifier>> LOOT_MODIFIERS = DeferredRegister.create(ForgeRegistries.Keys.GLOBAL_LOOT_MODIFIER_SERIALIZERS, EffortlessBuilding.MODID);
 
 	public static final RegistryObject<Item> RANDOMIZER_BAG_ITEM = ITEMS.register("randomizer_bag", RandomizerBagItem::new);
 	public static final RegistryObject<Item> GOLDEN_RANDOMIZER_BAG_ITEM = ITEMS.register("golden_randomizer_bag", GoldenRandomizerBagItem::new);
@@ -52,11 +61,15 @@ public class EffortlessBuilding {
 	public static final RegistryObject<Item> REACH_UPGRADE_1_ITEM = ITEMS.register("reach_upgrade1", ReachUpgrade1Item::new);
 	public static final RegistryObject<Item> REACH_UPGRADE_2_ITEM = ITEMS.register("reach_upgrade2", ReachUpgrade2Item::new);
 	public static final RegistryObject<Item> REACH_UPGRADE_3_ITEM = ITEMS.register("reach_upgrade3", ReachUpgrade3Item::new);
+	public static final RegistryObject<Item> MUSCLES_ITEM = ITEMS.register("muscles", PowerLevelItem::new);
+	public static final RegistryObject<Item> ELASTIC_HAND_ITEM = ITEMS.register("elastic_hand", PowerLevelItem::new);
+	public static final RegistryObject<Item> BUILDING_TECHNIQUES_BOOK_ITEM = ITEMS.register("building_techniques_book", PowerLevelItem::new);
 
 	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 EffortlessBuilding() {
 		instance = this;
 
@@ -71,9 +84,13 @@ public class EffortlessBuilding {
 		ITEMS.register(FMLJavaModLoadingContext.get().getModEventBus());
 		CONTAINERS.register(FMLJavaModLoadingContext.get().getModEventBus());
 
+		var singleItemLootModifier = SingleItemLootModifier.CODEC; //load this class to register the loot modifier
+		LOOT_MODIFIERS.register(FMLJavaModLoadingContext.get().getModEventBus());
+
 		//Register config
 		ModLoadingContext.get().registerConfig(ModConfig.Type.COMMON, CommonConfig.spec);
 		ModLoadingContext.get().registerConfig(ModConfig.Type.CLIENT, ClientConfig.spec);
+		ModLoadingContext.get().registerConfig(ModConfig.Type.SERVER, ServerConfig.spec);
 	}
 
 	public static void setup(final FMLCommonSetupEvent event) {
@@ -104,4 +121,8 @@ public class EffortlessBuilding {
 		proxy.logTranslate(player, prefix, translationKey, suffix, actionBar);
 	}
 
+	public static void logError(String msg) {
+		logger.error(msg);
+	}
+
 }

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

@@ -3,12 +3,25 @@ package nl.requios.effortlessbuilding;
 import net.minecraft.client.gui.screens.MenuScreens;
 import net.minecraftforge.eventbus.api.IEventBus;
 import net.minecraftforge.fml.event.lifecycle.FMLClientSetupEvent;
+import nl.requios.effortlessbuilding.buildmode.BuildModes;
+import nl.requios.effortlessbuilding.buildmodifier.BuildModifiers;
 import nl.requios.effortlessbuilding.gui.DiamondRandomizerBagScreen;
 import nl.requios.effortlessbuilding.gui.GoldenRandomizerBagScreen;
 import nl.requios.effortlessbuilding.gui.RandomizerBagScreen;
+import nl.requios.effortlessbuilding.render.BlockPreviews;
+import nl.requios.effortlessbuilding.systems.*;
 
 public class EffortlessBuildingClient {
 
+    public static final BuilderChain BUILDER_CHAIN = new BuilderChain();
+    public static final BuildModes BUILD_MODES = new BuildModes();
+    public static final BuildModifiers BUILD_MODIFIERS = new BuildModifiers();
+    public static final BuildSettings BUILD_SETTINGS = new BuildSettings();
+    public static final BlockPreviews BLOCK_PREVIEWS = new BlockPreviews();
+    public static final BuilderFilter BUILDER_FILTER = new BuilderFilter();
+    public static final ItemUsageTracker ITEM_USAGE_TRACKER = new ItemUsageTracker();
+    public static final PowerLevel POWER_LEVEL = new PowerLevel();
+
     public static void onConstructorClient(IEventBus modEventBus, IEventBus forgeEventBus) {
         modEventBus.addListener(EffortlessBuildingClient::clientSetup);
     }

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

@@ -0,0 +1,59 @@
+package nl.requios.effortlessbuilding;
+
+import net.minecraftforge.common.ForgeConfigSpec;
+
+import java.util.Arrays;
+import java.util.List;
+
+import static net.minecraftforge.common.ForgeConfigSpec.*;
+
+public class ServerConfig {
+    private static final Builder builder = new Builder();
+    public static final ServerConfig.Validation validation = new ServerConfig.Validation(builder);
+    public static final ServerConfig.Memory memory = new ServerConfig.Memory(builder);
+    public static final ForgeConfigSpec spec = builder.build();
+
+    public static class Validation {
+        public final BooleanValue allowInSurvival;
+        public final BooleanValue useWhitelist;
+        public final ConfigValue<List<? extends String>> whitelist;
+        public final IntValue maxBlocksPlacedAtOnce;
+
+        public Validation(Builder builder) {
+            builder.push("Validation");
+
+            allowInSurvival = builder
+                    .comment("Allow use of the mod for players that are in survival mode. Otherwise, only creative mode players can use the mod.")
+                    .define("allowInSurvival", true);
+
+            useWhitelist = builder
+                    .comment("Use a whitelist to determine which players can use the mod. If false, all players can use the mod.")
+                    .define("useWhitelist", false);
+
+            whitelist = builder
+                    .comment("List of player names that can use the mod.")
+                    .defineList("whitelist", Arrays.asList("Player1", "Player2"), o -> true);
+
+            maxBlocksPlacedAtOnce = builder
+                    .comment("Maximum number of blocks that can be placed at once. This is a last check. If you want the player to receive visual feedback instead of an error message, change values in the common config.")
+                    .defineInRange("maxBlocksPlacedAtOnce", 10000, 1, 100000);
+
+            builder.pop();
+        }
+    }
+
+    public static class Memory {
+        public final IntValue undoStackSize;
+
+        public Memory(Builder builder) {
+            builder.push("Memory");
+
+            undoStackSize = builder
+                    .comment("How many sets of blocks are remembered for the undo functionality, per player.")
+                    .worldRestart()
+                    .defineInRange("undoStackSize", 50, 10, 200);
+
+            builder.pop();
+        }
+    }
+}

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

@@ -1,39 +1,19 @@
 package nl.requios.effortlessbuilding.buildmode;
 
-import net.minecraft.world.entity.player.Player;
+import nl.requios.effortlessbuilding.utilities.BlockSet;
-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 int clicks;
-	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) {
+	public void initialize() {
-		rightClickClientTable.put(player.getUUID(), 0);
+		clicks = 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) {
+	public boolean onClick(BlockSet blocks) {
-		return sideHitTable.get(player.getUUID());
+		clicks++;
-	}
+		return false;
-
-	@Override
-	public Vec3 getHitVec(Player player) {
-		return hitVecTable.get(player.getUUID());
 	}
 }

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

@@ -0,0 +1,16 @@
+package nl.requios.effortlessbuilding.buildmode;
+
+import com.mojang.math.Vector4f;
+
+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/BuildModeEnum.java

@@ -0,0 +1,45 @@
+package nl.requios.effortlessbuilding.buildmode;
+
+import nl.requios.effortlessbuilding.AllIcons;
+import nl.requios.effortlessbuilding.buildmode.buildmodes.*;
+
+public enum BuildModeEnum {
+    DISABLED("normal", new Disabled(), BuildModeCategoryEnum.BASIC, AllIcons.I_DISABLE),
+    SINGLE("normal_plus", new Single(), BuildModeCategoryEnum.BASIC, AllIcons.I_SINGLE, ModeOptions.OptionEnum.BUILD_SPEED),
+    LINE("line", new Line(), BuildModeCategoryEnum.BASIC, AllIcons.I_LINE /*, OptionEnum.THICKNESS*/),
+    WALL("wall", new Wall(), BuildModeCategoryEnum.BASIC, AllIcons.I_WALL, ModeOptions.OptionEnum.FILL),
+    FLOOR("floor", new Floor(), BuildModeCategoryEnum.BASIC, AllIcons.I_FLOOR, ModeOptions.OptionEnum.FILL),
+    CUBE("cube", new Cube(), BuildModeCategoryEnum.BASIC, AllIcons.I_CUBE, ModeOptions.OptionEnum.CUBE_FILL),
+    DIAGONAL_LINE("diagonal_line", new DiagonalLine(), BuildModeCategoryEnum.DIAGONAL, AllIcons.I_DIAGONAL_LINE /*, OptionEnum.THICKNESS*/),
+    DIAGONAL_WALL("diagonal_wall", new DiagonalWall(), BuildModeCategoryEnum.DIAGONAL, AllIcons.I_DIAGONAL_WALL /*, OptionEnum.FILL*/),
+    SLOPE_FLOOR("slope_floor", new SlopeFloor(), BuildModeCategoryEnum.DIAGONAL, AllIcons.I_SLOPED_FLOOR, ModeOptions.OptionEnum.RAISED_EDGE),
+    CIRCLE("circle", new Circle(), BuildModeCategoryEnum.CIRCULAR, AllIcons.I_CIRCLE, ModeOptions.OptionEnum.CIRCLE_START, ModeOptions.OptionEnum.FILL),
+    CYLINDER("cylinder", new Cylinder(), BuildModeCategoryEnum.CIRCULAR, AllIcons.I_CYLINDER, ModeOptions.OptionEnum.CIRCLE_START, ModeOptions.OptionEnum.FILL),
+    SPHERE("sphere", new Sphere(), BuildModeCategoryEnum.CIRCULAR, AllIcons.I_SPHERE, ModeOptions.OptionEnum.CIRCLE_START, ModeOptions.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 AllIcons icon;
+    public final ModeOptions.OptionEnum[] options;
+
+    BuildModeEnum(String name, IBuildMode instance, BuildModeCategoryEnum category, AllIcons icon, ModeOptions.OptionEnum... options) {
+        this.name = name;
+        this.instance = instance;
+        this.category = category;
+        this.icon = icon;
+        this.options = options;
+    }
+
+    public String getNameKey() {
+        return "effortlessbuilding.mode." + name;
+    }
+
+    public String getDescriptionKey() {
+        return "effortlessbuilding.modedescription." + name;
+    }
+
+}

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

@@ -1,180 +1,57 @@
 package nl.requios.effortlessbuilding.buildmode;
 
-import com.mojang.math.Vector4f;
+import net.minecraft.client.Minecraft;
+import net.minecraft.client.resources.language.I18n;
 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 net.minecraftforge.api.distmarker.Dist;
+import net.minecraftforge.api.distmarker.OnlyIn;
 import nl.requios.effortlessbuilding.EffortlessBuilding;
-import nl.requios.effortlessbuilding.buildmode.buildmodes.*;
+import nl.requios.effortlessbuilding.network.IsUsingBuildModePacket;
-import nl.requios.effortlessbuilding.buildmodifier.BuildModifiers;
+import nl.requios.effortlessbuilding.network.PacketHandler;
-import nl.requios.effortlessbuilding.buildmodifier.ModifierSettingsManager;
+import nl.requios.effortlessbuilding.utilities.BlockSet;
-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;
 
+@OnlyIn(Dist.CLIENT)
 public class BuildModes {
+	private BuildModeEnum buildMode = BuildModeEnum.DISABLED;
+	private BuildModeEnum previousBuildMode = BuildModeEnum.DISABLED;
+	private BuildModeEnum beforeDisabledBuildMode = BuildModeEnum.SINGLE;
 
-	//Static variables are shared between client and server in singleplayer
+	public void findCoordinates(BlockSet blocks, Player player) {
-	//We need them separate
+		buildMode.instance.findCoordinates(blocks);
-	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);
+	public BuildModeEnum getBuildMode() {
-		ModeSettingsManager.ModeSettings modeSettings = ModeSettingsManager.getModeSettings(player);
+		return buildMode;
-		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
-			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
+	public void setBuildMode(BuildModeEnum buildMode) {
-			if (modifierSettings.doQuickReplace() && replaceable) {
+		this.buildMode = buildMode;
-				startPos = startPos.below();
+
+		PacketHandler.INSTANCE.sendToServer(new IsUsingBuildModePacket(this.buildMode != BuildModeEnum.DISABLED));
+
+		EffortlessBuilding.log(Minecraft.getInstance().player, I18n.get(buildMode.getNameKey()), true);
 	}
 
-			//Check if player reach does not exceed startpos
+	public void activatePreviousBuildMode() {
-			int maxReach = ReachHelper.getMaxReach(player);
+		var temp = buildMode;
-			if (buildMode != BuildModeEnum.DISABLED && player.blockPosition().distSqr(startPos) > maxReach * maxReach) {
+		setBuildMode(previousBuildMode);
-				EffortlessBuilding.log(player, "Placement exceeds your reach.");
+		previousBuildMode = temp;
-				return;
+	}
+
+	public void activateDisableBuildModeToggle(){
+		if (buildMode == BuildModeEnum.DISABLED) {
+			setBuildMode(beforeDisabledBuildMode);
+		} else {
+			beforeDisabledBuildMode = buildMode;
+			setBuildMode(BuildModeEnum.DISABLED);
 		}
 	}
 
-		//Even when no starting block is found, call buildmode instance
+	public void onCancel() {
-		//We might want to place things in the air
+		getBuildMode().instance.initialize();
-		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
@@ -242,54 +119,4 @@ public class BuildModes {
 			!intersects;
 	}
 
-	public enum BuildModeEnum {
-		DISABLED("normal", new Disabled(), BuildModeCategoryEnum.BASIC),
-		SINGLE("normal_plus", new Single(), 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

@@ -1,25 +1,14 @@
 package nl.requios.effortlessbuilding.buildmode;
 
-import net.minecraft.world.entity.player.Player;
+import nl.requios.effortlessbuilding.utilities.BlockSet;
-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
+	//Reset values here, start over
-	void initialize(Player player);
+	void initialize();
 
-	//Fired when a block would be placed
+	//Returns if we should place blocks now
-	//Return a list of coordinates where you want to place blocks
+	boolean onClick(BlockSet blocks);
-	List<BlockPos> onRightClick(Player player, BlockPos blockPos, Direction sideHit, Vec3 hitVec, boolean skipRaytrace);
 
-	//Fired continuously for visualization purposes
+	void findCoordinates(BlockSet blocks);
-	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

@@ -1,13 +1,18 @@
 package nl.requios.effortlessbuilding.buildmode;
 
 import net.minecraft.world.entity.player.Player;
-import net.minecraft.ChatFormatting;
+import net.minecraftforge.api.distmarker.Dist;
+import net.minecraftforge.api.distmarker.OnlyIn;
+import nl.requios.effortlessbuilding.AllIcons;
 import nl.requios.effortlessbuilding.ClientEvents;
 import nl.requios.effortlessbuilding.EffortlessBuilding;
-import nl.requios.effortlessbuilding.buildmodifier.ModifierSettingsManager;
+import nl.requios.effortlessbuilding.EffortlessBuildingClient;
-import nl.requios.effortlessbuilding.buildmodifier.UndoRedo;
+import nl.requios.effortlessbuilding.network.PacketHandler;
-import nl.requios.effortlessbuilding.proxy.ClientProxy;
+import nl.requios.effortlessbuilding.network.PerformRedoPacket;
+import nl.requios.effortlessbuilding.network.PerformUndoPacket;
+import nl.requios.effortlessbuilding.systems.BuildSettings;
 
+@OnlyIn(Dist.CLIENT)
 public class ModeOptions {
 
 	private static ActionEnum buildSpeed = ActionEnum.NORMAL_SPEED;
@@ -60,116 +65,106 @@ public class ModeOptions {
 		return circleStart;
 	}
 
-	//Called on both client and server
 	public static void performAction(Player player, ActionEnum action) {
 		if (action == null) return;
 
 		switch (action) {
-			case UNDO:
+			case UNDO -> PacketHandler.INSTANCE.sendToServer(new PerformUndoPacket());
-				UndoRedo.undo(player);
+			case REDO -> PacketHandler.INSTANCE.sendToServer(new PerformRedoPacket());
-				break;
+			case OPEN_MODIFIER_SETTINGS -> ClientEvents.openModifierSettings();
-			case REDO:
+			case OPEN_PLAYER_SETTINGS -> ClientEvents.openPlayerSettings();
-				UndoRedo.redo(player);
+			case PREVIOUS_BUILD_MODE -> EffortlessBuildingClient.BUILD_MODES.activatePreviousBuildMode();
-				break;
+			case DISABLE_BUILD_MODE_TOGGLE -> EffortlessBuildingClient.BUILD_MODES.activateDisableBuildModeToggle();
-			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)
-					ClientEvents.openModifierSettings();
-				break;
-			case OPEN_PLAYER_SETTINGS:
-				if (player.level.isClientSide)
-					ClientEvents.openPlayerSettings();
-				break;
 
-			case NORMAL_SPEED:
+			case REPLACE_ONLY_AIR -> EffortlessBuildingClient.BUILD_SETTINGS.setReplaceMode(BuildSettings.ReplaceMode.ONLY_AIR);
-				buildSpeed = ActionEnum.NORMAL_SPEED;
+			case REPLACE_BLOCKS_AND_AIR -> EffortlessBuildingClient.BUILD_SETTINGS.setReplaceMode(BuildSettings.ReplaceMode.BLOCKS_AND_AIR);
-				break;
+			case REPLACE_ONLY_BLOCKS -> EffortlessBuildingClient.BUILD_SETTINGS.setReplaceMode(BuildSettings.ReplaceMode.ONLY_BLOCKS);
-			case FAST_SPEED:
+			case REPLACE_FILTERED_BY_OFFHAND -> EffortlessBuildingClient.BUILD_SETTINGS.setReplaceMode(BuildSettings.ReplaceMode.FILTERED_BY_OFFHAND);
-				buildSpeed = ActionEnum.FAST_SPEED;
+			case TOGGLE_PROTECT_TILE_ENTITIES -> EffortlessBuildingClient.BUILD_SETTINGS.toggleProtectTileEntities();
-				break;
+
-			case FULL:
+			case NORMAL_SPEED -> buildSpeed = ActionEnum.NORMAL_SPEED;
-				fill = ActionEnum.FULL;
+			case FAST_SPEED -> buildSpeed = ActionEnum.FAST_SPEED;
-				break;
+
-			case HOLLOW:
+			case FULL -> fill = ActionEnum.FULL;
-				fill = ActionEnum.HOLLOW;
+			case HOLLOW -> fill = ActionEnum.HOLLOW;
-				break;
+
-			case CUBE_FULL:
+			case CUBE_FULL -> cubeFill = ActionEnum.CUBE_FULL;
-				cubeFill = ActionEnum.CUBE_FULL;
+			case CUBE_HOLLOW -> cubeFill = ActionEnum.CUBE_HOLLOW;
-				break;
+			case CUBE_SKELETON -> cubeFill = ActionEnum.CUBE_SKELETON;
-			case CUBE_HOLLOW:
+
-				cubeFill = ActionEnum.CUBE_HOLLOW;
+			case SHORT_EDGE -> raisedEdge = ActionEnum.SHORT_EDGE;
-				break;
+			case LONG_EDGE -> raisedEdge = ActionEnum.LONG_EDGE;
-			case CUBE_SKELETON:
+
-				cubeFill = ActionEnum.CUBE_SKELETON;
+			case THICKNESS_1 -> lineThickness = ActionEnum.THICKNESS_1;
-				break;
+			case THICKNESS_3 -> lineThickness = ActionEnum.THICKNESS_3;
-			case SHORT_EDGE:
+			case THICKNESS_5 -> lineThickness = ActionEnum.THICKNESS_5;
-				raisedEdge = ActionEnum.SHORT_EDGE;
+
-				break;
+			case CIRCLE_START_CENTER -> circleStart = ActionEnum.CIRCLE_START_CENTER;
-			case LONG_EDGE:
+			case CIRCLE_START_CORNER -> circleStart = ActionEnum.CIRCLE_START_CORNER;
-				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) {
+			action != ActionEnum.OPEN_PLAYER_SETTINGS &&
+			action != ActionEnum.PREVIOUS_BUILD_MODE &&
+			action != ActionEnum.DISABLE_BUILD_MODE_TOGGLE) {
 
-			EffortlessBuilding.logTranslate(player, "", action.name, "", true);
+			EffortlessBuilding.logTranslate(player, "", action.getNameKey(), "", true);
 		}
 	}
 
 	public enum ActionEnum {
-		UNDO("effortlessbuilding.action.undo"),
+		UNDO("undo", AllIcons.I_UNDO),
-		REDO("effortlessbuilding.action.redo"),
+		REDO("redo", AllIcons.I_REDO),
-		REPLACE("effortlessbuilding.action.replace"),
+		OPEN_MODIFIER_SETTINGS("open_modifier_settings", AllIcons.I_SETTINGS),
-		OPEN_MODIFIER_SETTINGS("effortlessbuilding.action.open_modifier_settings"),
+		OPEN_PLAYER_SETTINGS("open_player_settings", AllIcons.I_SETTINGS),
-		OPEN_PLAYER_SETTINGS("effortlessbuilding.action.open_player_settings"),
+		PREVIOUS_BUILD_MODE("previous_build_mode", AllIcons.I_SINGLE),
+		DISABLE_BUILD_MODE_TOGGLE("disable_build_mode_toggle", AllIcons.I_DISABLE),
 
-		NORMAL_SPEED("effortlessbuilding.action.normal_speed"),
+		REPLACE_ONLY_AIR("replace_only_air", AllIcons.I_REPLACE_AIR),
-		FAST_SPEED("effortlessbuilding.action.fast_speed"),
+		REPLACE_BLOCKS_AND_AIR("replace_blocks_and_air", AllIcons.I_REPLACE_BLOCKS_AND_AIR),
+		REPLACE_ONLY_BLOCKS("replace_only_blocks", AllIcons.I_REPLACE_BLOCKS),
+		REPLACE_FILTERED_BY_OFFHAND("replace_filtered_by_offhand", AllIcons.I_REPLACE_OFFHAND_FILTERED),
+		TOGGLE_PROTECT_TILE_ENTITIES("toggle_protect_tile_entities", AllIcons.I_PROTECT_TILE_ENTITIES),
 
-		FULL("effortlessbuilding.action.full"),
+		NORMAL_SPEED("normal_speed", AllIcons.I_NORMAL_SPEED),
-		HOLLOW("effortlessbuilding.action.hollow"),
+		FAST_SPEED("fast_speed", AllIcons.I_FAST_SPEED),
 
-		CUBE_FULL("effortlessbuilding.action.full"),
+		FULL("full", AllIcons.I_FILLED),
-		CUBE_HOLLOW("effortlessbuilding.action.hollow"),
+		HOLLOW("hollow", AllIcons.I_HOLLOW),
-		CUBE_SKELETON("effortlessbuilding.action.skeleton"),
 
-		SHORT_EDGE("effortlessbuilding.action.short_edge"),
+		CUBE_FULL("full", AllIcons.I_CUBE_FILLED),
-		LONG_EDGE("effortlessbuilding.action.long_edge"),
+		CUBE_HOLLOW("hollow", AllIcons.I_CUBE_HOLLOW),
+		CUBE_SKELETON("skeleton", AllIcons.I_CUBE_SKELETON),
 
-		THICKNESS_1("effortlessbuilding.action.thickness_1"),
+		SHORT_EDGE("short_edge", AllIcons.I_SHORT_EDGE),
-		THICKNESS_3("effortlessbuilding.action.thickness_3"),
+		LONG_EDGE("long_edge", AllIcons.I_LONG_EDGE),
-		THICKNESS_5("effortlessbuilding.action.thickness_5"),
 
-		CIRCLE_START_CORNER("effortlessbuilding.action.start_corner"),
+		THICKNESS_1("thickness_1", AllIcons.I_THICKNESS_1),
-		CIRCLE_START_CENTER("effortlessbuilding.action.start_center");
+		THICKNESS_3("thickness_3", AllIcons.I_THICKNESS_3),
+		THICKNESS_5("thickness_5", AllIcons.I_THICKNESS_5),
+
+		CIRCLE_START_CORNER("start_corner", AllIcons.I_CIRCLE_START_CORNER),
+		CIRCLE_START_CENTER("start_center", AllIcons.I_CIRCLE_START_CENTER);
 
 		public String name;
+		public AllIcons icon;
 
-		ActionEnum(String name) {
+		ActionEnum(String name, AllIcons icon) {
 			this.name = name;
+			this.icon = icon;
+		}
+		
+		public String getName() {
+			return name;
+		}
+		
+		public String getNameKey() {
+			return "effortlessbuilding.action." + name;
+		}
+		
+		public String getDescriptionKey() {
+			return "effortlessbuilding.action." + name + ".description";
 		}
 	}
 

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

@@ -1,97 +0,0 @@
-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.DISABLED;
-
-		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

@@ -1,17 +1,129 @@
 package nl.requios.effortlessbuilding.buildmode;
 
-import net.minecraft.world.entity.player.Player;
+import net.minecraft.client.Minecraft;
-import net.minecraft.core.Direction;
 import net.minecraft.core.BlockPos;
+import net.minecraft.world.entity.player.Player;
 import net.minecraft.world.phys.Vec3;
-import nl.requios.effortlessbuilding.helper.ReachHelper;
+import nl.requios.effortlessbuilding.EffortlessBuildingClient;
+import nl.requios.effortlessbuilding.utilities.BlockEntry;
+import nl.requios.effortlessbuilding.utilities.BlockSet;
 
-import java.util.*;
+import java.util.ArrayList;
+import java.util.List;
 
 public abstract class ThreeClicksBuildMode extends BaseBuildMode {
-	protected Dictionary<UUID, BlockPos> secondPosTable = new Hashtable<>();
+	protected BlockEntry firstBlockEntry;
+	protected BlockEntry secondBlockEntry;
 
 	//Finds height after floor has been chosen in buildmodes with 3 clicks
+	@Override
+	public void initialize() {
+		super.initialize();
+		firstBlockEntry = null;
+		secondBlockEntry = null;
+	}
+
+	@Override
+	public boolean onClick(BlockSet blocks) {
+		super.onClick(blocks);
+
+		if (clicks == 1) {
+			//First click, remember starting position
+			firstBlockEntry = EffortlessBuildingClient.BUILDER_CHAIN.getStartPos();
+
+			//If clicking in air, reset and try again
+			if (firstBlockEntry == null) clicks = 0;
+
+		} else if (clicks == 2) {
+			//Second click, find second position
+
+			if (blocks.size() == 0) {
+				clicks = 0;
+				return false;
+			}
+
+			var player = Minecraft.getInstance().player;
+			var secondPos = findSecondPos(player, firstBlockEntry.blockPos, true);
+			secondBlockEntry = new BlockEntry(secondPos);
+		} else {
+			//Third click, place blocks
+			clicks = 0;
+			return true;
+		}
+		return false;
+	}
+
+	@Override
+	public void findCoordinates(BlockSet blocks) {
+		if (clicks == 0) return;
+
+		if (clicks == 1) {
+			var player = Minecraft.getInstance().player;
+			var firstPos = firstBlockEntry.blockPos;
+			var secondPos = findSecondPos(player, firstBlockEntry.blockPos, true);
+			if (secondPos == null) return;
+
+			//Limit amount of blocks we can place per row
+			int axisLimit = EffortlessBuildingClient.POWER_LEVEL.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;
+
+			blocks.clear();
+			for (BlockPos pos : getIntermediateBlocks(player, x1, y1, z1, x2, y2, z2)) {
+				if (blocks.containsKey(pos)) continue;
+				blocks.add(new BlockEntry(pos));
+			}
+			blocks.firstPos = firstPos;
+			blocks.lastPos = secondPos;
+		} else {
+			var player = Minecraft.getInstance().player;
+			BlockPos firstPos = firstBlockEntry.blockPos;
+			BlockPos secondPos = secondBlockEntry.blockPos;
+			BlockPos thirdPos = findThirdPos(player, firstPos, secondPos, true);
+			if (thirdPos == null) return;
+
+			//Limit amount of blocks you can place per row
+			int axisLimit = EffortlessBuildingClient.POWER_LEVEL.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;
+
+			blocks.clear();
+			for (BlockPos pos : getFinalBlocks(player, x1, y1, z1, x2, y2, z2, x3, y3, z3)) {
+				if (blocks.containsKey(pos)) continue;
+				blocks.add(new BlockEntry(pos));
+			}
+			blocks.firstPos = firstPos;
+			blocks.lastPos = thirdPos;
+		}
+	}
+
 	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());
@@ -27,7 +139,7 @@ public abstract class ThreeClicksBuildMode extends BaseBuildMode {
 		criteriaList.add(new HeightCriteria(zBound, secondPos, start));
 
 		//Remove invalid criteria
-		int reach = ReachHelper.getPlacementReach(player) * 4; //4 times as much as normal placement reach
+		int reach = EffortlessBuildingClient.POWER_LEVEL.getBuildModeReach(player);
 		criteriaList.removeIf(criteria -> !criteria.isValid(start, look, reach, player, skipRaytrace));
 
 		//If none are valid, return empty list of blocks
@@ -55,124 +167,10 @@ public abstract class ThreeClicksBuildMode extends BaseBuildMode {
 		return new BlockPos(selected.lineBound);
 	}
 
-	@Override
+//	protected abstract BlockEntry findSecondPos(List<BlockEntry> blocks);
-	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
+//	@Deprecated
 	protected abstract BlockPos findSecondPos(Player player, BlockPos firstPos, boolean skipRaytrace);
 
 	//Finds the place of the third block pos

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

@@ -1,64 +1,55 @@
 package nl.requios.effortlessbuilding.buildmode;
 
-import net.minecraft.world.entity.player.Player;
+import net.minecraft.client.Minecraft;
-import net.minecraft.core.Direction;
 import net.minecraft.core.BlockPos;
-import net.minecraft.world.phys.Vec3;
+import net.minecraft.world.entity.player.Player;
-import nl.requios.effortlessbuilding.helper.ReachHelper;
+import nl.requios.effortlessbuilding.EffortlessBuildingClient;
+import nl.requios.effortlessbuilding.utilities.BlockEntry;
+import nl.requios.effortlessbuilding.utilities.BlockSet;
+import nl.requios.effortlessbuilding.systems.PowerLevel;
 
-import java.util.ArrayList;
-import java.util.Dictionary;
 import java.util.List;
-import java.util.UUID;
 
 public abstract class TwoClicksBuildMode extends BaseBuildMode {
 
+	protected BlockEntry firstBlockEntry;
+
 	@Override
-	public List<BlockPos> onRightClick(Player player, BlockPos blockPos, Direction sideHit, Vec3 hitVec, boolean skipRaytrace) {
+	public void initialize() {
-		List<BlockPos> list = new ArrayList<>();
+		super.initialize();
-
+		firstBlockEntry = null;
-		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;
 	}
 
+	@Override
+	public boolean onClick(BlockSet blocks) {
+		super.onClick(blocks);
+
+		if (clicks == 1) {
 			//First click, remember starting position
-			firstPosTable.put(player.getUUID(), blockPos);
+			firstBlockEntry = EffortlessBuildingClient.BUILDER_CHAIN.getStartPos();
-			sideHitTable.put(player.getUUID(), sideHit);
+
-			hitVecTable.put(player.getUUID(), hitVec);
+			//If clicking in air, reset and try again
-			//Keep list empty, dont place any blocks yet
+			if (firstBlockEntry == null) clicks = 0;
+
 		} else {
 			//Second click, place blocks
-			list = findCoordinates(player, blockPos, skipRaytrace);
+			clicks = 0;
-			rightClickTable.put(player.getUUID(), 0);
+			return true;
 		}
-
+		return false;
-		return list;
 	}
 
 	@Override
-	public List<BlockPos> findCoordinates(Player player, BlockPos blockPos, boolean skipRaytrace) {
+	public void findCoordinates(BlockSet blocks) {
-		List<BlockPos> list = new ArrayList<>();
+		if (clicks == 0) return;
-		Dictionary<UUID, Integer> rightClickTable = player.level.isClientSide ? rightClickClientTable : rightClickServerTable;
-		int rightClickNr = rightClickTable.get(player.getUUID());
-		BlockPos firstPos = firstPosTable.get(player.getUUID());
 
-		if (rightClickNr == 0) {
+		var player = Minecraft.getInstance().player;
-			if (blockPos != null)
+		var firstPos = firstBlockEntry.blockPos;
-				list.add(blockPos);
+		var secondPos = findSecondPos(player, firstBlockEntry.blockPos, true);
-		} else {
+		if (secondPos == null) return;
-			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 axisLimit = EffortlessBuildingClient.POWER_LEVEL.getMaxBlocksPerAxis(player);
 
 		int x1 = firstPos.getX(), x2 = secondPos.getX();
 		int y1 = firstPos.getY(), y2 = secondPos.getY();
@@ -72,10 +63,13 @@ public abstract class TwoClicksBuildMode extends BaseBuildMode {
 		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));
+		blocks.clear();
+		for (BlockPos pos : getAllBlocks(player, x1, y1, z1, x2, y2, z2)) {
+			if (blocks.containsKey(pos)) continue;
+			blocks.add(new BlockEntry(pos));
 		}
-
+		blocks.firstPos = firstPos;
-		return list;
+		blocks.lastPos = secondPos;
 	}
 
 	//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)

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

@@ -1,41 +1,22 @@
 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 nl.requios.effortlessbuilding.utilities.BlockSet;
-import java.util.ArrayList;
-import java.util.List;
 
 public class Disabled implements IBuildMode {
+
 	@Override
-	public void initialize(Player player) {
+	public void initialize() {
 
 	}
 
 	@Override
-	public List<BlockPos> onRightClick(Player player, BlockPos blockPos, Direction sideHit, Vec3 hitVec, boolean skipRaytrace) {
+	public boolean onClick(BlockSet blocks) {
-		List<BlockPos> list = new ArrayList<>();
+		return true;
-		if (blockPos != null) list.add(blockPos);
-		return list;
 	}
 
 	@Override
-	public List<BlockPos> findCoordinates(Player player, BlockPos blockPos, boolean skipRaytrace) {
+	public void findCoordinates(BlockSet blocks) {
-		List<BlockPos> list = new ArrayList<>();
+		//Do nothing
-		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/Floor.java

@@ -3,10 +3,11 @@ 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.EffortlessBuildingClient;
 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 nl.requios.effortlessbuilding.systems.PowerLevel;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -24,7 +25,7 @@ public class Floor extends TwoClicksBuildMode {
 		criteriaList.add(new Criteria(yBound, start));
 
 		//Remove invalid criteria
-		int reach = ReachHelper.getPlacementReach(player) * 4; //4 times as much as normal placement reach
+		int reach = EffortlessBuildingClient.POWER_LEVEL.getBuildModeReach(player);
 		criteriaList.removeIf(criteria -> !criteria.isValid(start, look, reach, player, skipRaytrace));
 
 		//If none are valid, return empty list of blocks

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

@@ -3,9 +3,10 @@ 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.EffortlessBuildingClient;
 import nl.requios.effortlessbuilding.buildmode.BuildModes;
 import nl.requios.effortlessbuilding.buildmode.TwoClicksBuildMode;
-import nl.requios.effortlessbuilding.helper.ReachHelper;
+import nl.requios.effortlessbuilding.systems.PowerLevel;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -31,7 +32,7 @@ public class Line extends TwoClicksBuildMode {
 		criteriaList.add(new Criteria(zBound, firstPos, start));
 
 		//Remove invalid criteria
-		int reach = ReachHelper.getPlacementReach(player) * 4; //4 times as much as normal placement reach
+		int reach = EffortlessBuildingClient.POWER_LEVEL.getBuildModeReach(player);
 		criteriaList.removeIf(criteria -> !criteria.isValid(start, look, reach, player, skipRaytrace));
 
 		//If none are valid, return empty list of blocks

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

@@ -2,11 +2,8 @@ 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 {

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

@@ -1,41 +1,22 @@
 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 nl.requios.effortlessbuilding.utilities.BlockSet;
-import java.util.ArrayList;
-import java.util.List;
 
 public class Single implements IBuildMode {
+
 	@Override
-	public void initialize(Player player) {
+	public void initialize() {
 
 	}
 
 	@Override
-	public List<BlockPos> onRightClick(Player player, BlockPos blockPos, Direction sideHit, Vec3 hitVec, boolean skipRaytrace) {
+	public boolean onClick(BlockSet blocks) {
-		List<BlockPos> list = new ArrayList<>();
+		return true;
-		if (blockPos != null) list.add(blockPos);
-		return list;
 	}
 
 	@Override
-	public List<BlockPos> findCoordinates(Player player, BlockPos blockPos, boolean skipRaytrace) {
+	public void findCoordinates(BlockSet blocks) {
-		List<BlockPos> list = new ArrayList<>();
+		//Do nothing
-		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/SlopeFloor.java

@@ -2,9 +2,10 @@ package nl.requios.effortlessbuilding.buildmode.buildmodes;
 
 import net.minecraft.world.entity.player.Player;
 import net.minecraft.core.BlockPos;
+import nl.requios.effortlessbuilding.EffortlessBuildingClient;
 import nl.requios.effortlessbuilding.buildmode.ModeOptions;
 import nl.requios.effortlessbuilding.buildmode.ThreeClicksBuildMode;
-import nl.requios.effortlessbuilding.helper.ReachHelper;
+import nl.requios.effortlessbuilding.systems.PowerLevel;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -15,7 +16,7 @@ public class SlopeFloor extends ThreeClicksBuildMode {
 	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);
+		int axisLimit = EffortlessBuildingClient.POWER_LEVEL.getMaxBlocksPerAxis(player);
 
 		//Determine whether to use x or z axis to slope up
 		boolean onXAxis = true;

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

@@ -3,10 +3,11 @@ 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.EffortlessBuildingClient;
 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 nl.requios.effortlessbuilding.systems.PowerLevel;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -28,7 +29,7 @@ public class Wall extends TwoClicksBuildMode {
 		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
+		int reach = EffortlessBuildingClient.POWER_LEVEL.getBuildModeReach(player);
 		criteriaList.removeIf(criteria -> !criteria.isValid(start, look, reach, player, skipRaytrace));
 
 		//If none are valid, return empty list of blocks

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

@@ -1,5 +1,8 @@
 package nl.requios.effortlessbuilding.buildmodifier;
 
+import net.minecraft.nbt.CompoundTag;
+import net.minecraft.nbt.NbtUtils;
+import net.minecraft.nbt.Tag;
 import net.minecraft.world.level.block.state.BlockState;
 import net.minecraft.world.entity.player.Player;
 import net.minecraft.world.item.ItemStack;
@@ -10,84 +13,38 @@ import net.minecraft.world.phys.Vec3;
 import net.minecraft.core.Vec3i;
 import net.minecraftforge.items.IItemHandler;
 import nl.requios.effortlessbuilding.item.AbstractRandomizerBagItem;
+import nl.requios.effortlessbuilding.utilities.BlockEntry;
+import nl.requios.effortlessbuilding.utilities.BlockSet;
 
 import java.util.ArrayList;
 import java.util.List;
 
-public class Array {
+public class Array extends BaseModifier {
 
-	public static List<BlockPos> findCoordinates(Player player, BlockPos startPos) {
+	public Vec3i offset = BlockPos.ZERO;
-		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() {
+	@Override
+	public void findCoordinates(BlockSet blocks, Player player) {
+		if (!enabled || offset.getX() == 0 && offset.getY() == 0 && offset.getZ() == 0) return;
+
+		var originalBlocks = new BlockSet(blocks);
+		for (BlockEntry blockEntry : originalBlocks) {
+			var pos = blockEntry.blockPos;
+			for (int i = 0; i < count; i++) {
+				pos = pos.offset(offset);
+				if (blocks.containsKey(pos)) continue;
+
+				var newBlockEntry = new BlockEntry(pos);
+				newBlockEntry.copyRotationSettingsFrom(blockEntry);
+				blocks.add(newBlockEntry);
+			}
+		}
 	}
 
-		public ArraySettings(boolean enabled, BlockPos offset, int count) {
+	@Override
-			this.enabled = enabled;
+	public void onPowerLevelChanged(int powerLevel) {
-			this.offset = offset;
+
-			this.count = count;
 	}
 
 	public int getReach() {
@@ -99,6 +56,20 @@ public class Array {
 
 		return largestOffset * count;
 	}
+
+	@Override
+	public CompoundTag serializeNBT() {
+		var compound = super.serializeNBT();
+		compound.putIntArray("offset", new int[]{offset.getX(), offset.getY(), offset.getZ()});
+		compound.putInt("count", count);
+		return compound;
 	}
 
+	@Override
+	public void deserializeNBT(CompoundTag compound) {
+		super.deserializeNBT(compound);
+		int[] offsetArray = compound.getIntArray("offset");
+		offset = new Vec3i(offsetArray[0], offsetArray[1], offsetArray[2]);
+		count = compound.getInt("count");
+	}
 }

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

@@ -0,0 +1,25 @@
+package nl.requios.effortlessbuilding.buildmodifier;
+
+import net.minecraft.nbt.CompoundTag;
+import net.minecraft.nbt.Tag;
+import net.minecraft.world.entity.player.Player;
+import nl.requios.effortlessbuilding.utilities.BlockSet;
+
+public abstract class BaseModifier {
+    public boolean enabled = true;
+
+    public abstract void findCoordinates(BlockSet blocks, Player player);
+
+    public abstract void onPowerLevelChanged(int powerLevel);
+
+    public CompoundTag serializeNBT() {
+        CompoundTag compound = new CompoundTag();
+        compound.putString("type", this.getClass().getSimpleName());
+        compound.putBoolean("enabled", enabled);
+        return compound;
+    }
+
+    public void deserializeNBT(CompoundTag compound) {
+        enabled = compound.getBoolean("enabled");
+    }
+}

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

@@ -1,232 +1,160 @@
 package nl.requios.effortlessbuilding.buildmodifier;
 
-import net.minecraft.world.level.block.Block;
+import net.minecraft.nbt.CompoundTag;
-import net.minecraft.world.level.block.state.BlockState;
+import net.minecraft.nbt.Tag;
-import net.minecraft.world.level.block.Blocks;
 import net.minecraft.world.entity.player.Player;
-import net.minecraft.world.item.BlockItem;
+import net.minecraftforge.api.distmarker.Dist;
-import net.minecraft.world.item.context.BlockPlaceContext;
+import net.minecraftforge.api.distmarker.OnlyIn;
-import net.minecraft.world.item.ItemStack;
+import nl.requios.effortlessbuilding.create.foundation.utility.NBTHelper;
-import net.minecraft.world.item.context.UseOnContext;
+import nl.requios.effortlessbuilding.network.ModifierSettingsPacket;
-import net.minecraft.core.Direction;
+import nl.requios.effortlessbuilding.network.PacketHandler;
-import net.minecraft.world.InteractionHand;
+import nl.requios.effortlessbuilding.utilities.BlockSet;
-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.CommonConfig;
-import nl.requios.effortlessbuilding.EffortlessBuilding;
-import nl.requios.effortlessbuilding.compatibility.CompatHelper;
-import nl.requios.effortlessbuilding.helper.DelayedBlockPlacer;
-import nl.requios.effortlessbuilding.helper.SurvivalHelper;
-import nl.requios.effortlessbuilding.item.AbstractRandomizerBagItem;
-import nl.requios.effortlessbuilding.render.BlockPreviews;
 
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.List;
 
+@OnlyIn(Dist.CLIENT)
 public class BuildModifiers {
+	private List<BaseModifier> modifierSettingsList = new ArrayList<>();
 
-	//Called from BuildModes
+	public List<BaseModifier> getModifierSettingsList() {
-	public static void onBlockPlaced(Player player, List<BlockPos> startCoordinates, Direction sideHit, Vec3 hitVec, boolean placeStartPos) {
+		return Collections.unmodifiableList(modifierSettingsList);
-		Level world = player.level;
+	}
-		AbstractRandomizerBagItem.renewRandomness();
 
-		//Format hitvec to 0.x
+	public void addModifierSettings(BaseModifier modifierSettings) {
-		hitVec = new Vec3(Math.abs(hitVec.x - ((int) hitVec.x)), Math.abs(hitVec.y - ((int) hitVec.y)), Math.abs(hitVec.z - ((int) hitVec.z)));
+		modifierSettingsList.add(modifierSettings);
+	}
 
-		//find coordinates and blockstates
+	public void removeModifierSettings(BaseModifier modifierSettings) {
-		List<BlockPos> coordinates = findCoordinates(player, startCoordinates);
+		modifierSettingsList.remove(modifierSettings);
-		List<ItemStack> itemStacks = new ArrayList<>();
+	}
-		List<BlockState> blockStates = findBlockStates(player, startCoordinates, hitVec, sideHit, itemStacks);
 
-		//check if valid blockstates
+	public void removeModifierSettings(int index) {
-		if (blockStates.size() == 0 || coordinates.size() != blockStates.size()) return;
+		modifierSettingsList.remove(index);
+	}
 
-		if (world.isClientSide) {
+	public void moveUp(BaseModifier modifierSettings) {
+		int index = modifierSettingsList.indexOf(modifierSettings);
+		if (index == 0) return;
 
-			BlockPreviews.onBlocksPlaced();
+		Collections.swap(modifierSettingsList, index, index - 1);
+	}
 
-		} else {
+	public void moveDown(BaseModifier modifierSettings) {
+		int index = modifierSettingsList.indexOf(modifierSettings);
+		if (index == modifierSettingsList.size() - 1) return;
 
-			int delay = CommonConfig.visuals.appearAnimationLength.get() * 3 - 3; //DelayedBlockPlacer is called 3 times per tick?
+		Collections.swap(modifierSettingsList, index, index + 1);
+	}
 
-			//place blocks after delay
+	public void setFirst(BaseModifier modifierSettings) {
-			EffortlessBuilding.DELAYED_BLOCK_PLACER.placeBlocksDelayed(new DelayedBlockPlacer.Entry(world, player, coordinates,
+		int index = modifierSettingsList.indexOf(modifierSettings);
-					blockStates, itemStacks, hitVec, placeStartPos, delay));
+		if (index == 0) return;
+
+		modifierSettingsList.remove(index);
+		modifierSettingsList.add(0, modifierSettings);
+	}
+
+	public void setLast(BaseModifier modifierSettings) {
+		int index = modifierSettingsList.indexOf(modifierSettings);
+		if (index == modifierSettingsList.size() - 1) return;
+
+		modifierSettingsList.remove(index);
+		modifierSettingsList.add(modifierSettings);
+	}
+
+	public void clearAllModifierSettings() {
+		modifierSettingsList.clear();
+	}
+
+	public void findCoordinates(BlockSet blocks, Player player) {
+		for (BaseModifier modifierSettings : modifierSettingsList) {
+			modifierSettings.findCoordinates(blocks, player);
 		}
 	}
 
-	public static void onBlockBroken(Player player, List<BlockPos> startCoordinates, boolean breakStartPos) {
+	public void onPowerLevelChanged(int powerLevel) {
-		Level world = player.level;
+		for (BaseModifier modifierSettings : modifierSettingsList) {
-
+			modifierSettings.onPowerLevelChanged(powerLevel);
-		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) {
-			BlockPreviews.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
+	public CompoundTag serializeNBT() {
-		//(Block isn't broken yet by the time it gets here, and broken after this)
+		var compoundTag = new CompoundTag();
-		if (!breakStartPos) newBlockStates.set(0, Blocks.AIR.defaultBlockState());
+		compoundTag.put("modifierSettingsList", NBTHelper.writeCompoundList(modifierSettingsList, BaseModifier::serializeNBT));
-
+		return compoundTag;
-		//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) {
+	public void deserializeNBT(CompoundTag compoundTag) {
-		List<BlockPos> coordinates = new ArrayList<>();
+		var listTag = compoundTag.getList("modifierSettingsList", Tag.TAG_COMPOUND);
-		//Add current blocks being placed too
+		modifierSettingsList = NBTHelper.readCompoundList(listTag, tag -> {
-		coordinates.addAll(posList);
+			var modifier = createModifier(tag.getString("type"));
+			modifier.deserializeNBT(tag);
+			return modifier;
+		});
+	}
 
-		//Find mirror/array/radial mirror coordinates for each blockpos
+	public void save() {
-		for (BlockPos blockPos : posList) {
+		PacketHandler.INSTANCE.sendToServer(new ModifierSettingsPacket(serializeNBT()));
-			List<BlockPos> arrayCoordinates = Array.findCoordinates(player, blockPos);
+
-			coordinates.addAll(arrayCoordinates);
+		//Save locally as well?
-			coordinates.addAll(Mirror.findCoordinates(player, blockPos));
+//		var listTag = NBTHelper.writeCompoundList(modifierSettingsList, BaseModifier::serializeNBT);
-			coordinates.addAll(RadialMirror.findCoordinates(player, blockPos));
+//		player.getPersistentData().put(DATA_KEY, listTag);
-			//get mirror for each array coordinate
+	}
-			for (BlockPos coordinate : arrayCoordinates) {
+
-				coordinates.addAll(Mirror.findCoordinates(player, coordinate));
+	private BaseModifier createModifier(String type) {
-				coordinates.addAll(RadialMirror.findCoordinates(player, coordinate));
+		switch (type) {
+			case "Mirror": return new Mirror();
+			case "Array": return new Array();
+			case "RadialMirror": return new RadialMirror();
+			default: throw new IllegalArgumentException("Unknown modifier type: " + type);
 		}
 	}
 
-		return coordinates;
+//	public static String sanitize(ModifierSettingsManager.ModifierSettings modifierSettings, Player player) {
-	}
+//		int maxReach = ReachHelper.getMaxReach(player);
-
+//		String error = "";
-	public static List<BlockPos> findCoordinates(Player player, BlockPos blockPos) {
+//
-		return findCoordinates(player, new ArrayList<>(Collections.singletonList(blockPos)));
+//		//Mirror settings
-	}
+//		Mirror.MirrorSettings m = modifierSettings.getMirrorSettings();
-
+//		if (m.radius < 1) {
-	public static List<BlockState> findBlockStates(Player player, List<BlockPos> posList, Vec3 hitVec, Direction facing, List<ItemStack> itemStacks) {
+//			m.radius = 1;
-		List<BlockState> blockStates = new ArrayList<>();
+//			error += "Mirror size has to be at least 1. This has been corrected. ";
-		itemStacks.clear();
+//		}
-
+//		if (m.getReach() > maxReach) {
-		//Get itemstack
+//			m.radius = maxReach / 2;
-		ItemStack itemStack = player.getItemInHand(InteractionHand.MAIN_HAND);
+//			error += "Mirror exceeds your maximum reach of " + (maxReach / 2) + ". Radius has been set to " + (maxReach / 2) + ". ";
-		if (itemStack.isEmpty() || !CompatHelper.isItemBlockProxy(itemStack)) {
+//		}
-			itemStack = player.getItemInHand(InteractionHand.OFF_HAND);
+//
-		}
+//		//Array settings
-		if (itemStack.isEmpty() || !CompatHelper.isItemBlockProxy(itemStack)) {
+//		Array.ArraySettings a = modifierSettings.getArraySettings();
-			return blockStates;
+//		if (a.count < 0) {
-		}
+//			a.count = 0;
-
+//			error += "Array count may not be negative. It has been reset to 0.";
-		//Get ItemBlock stack
+//		}
-		ItemStack itemBlock = ItemStack.EMPTY;
+//
-		if (itemStack.getItem() instanceof BlockItem) itemBlock = itemStack;
+//		if (a.getReach() > maxReach) {
-		else itemBlock = CompatHelper.getItemBlockFromStack(itemStack);
+//			a.count = 0;
-		AbstractRandomizerBagItem.resetRandomness();
+//			error += "Array exceeds your maximum reach of " + maxReach + ". Array count has been reset to 0. ";
-
+//		}
-		//Add blocks in posList first
+//
-		for (BlockPos blockPos : posList) {
+//		//Radial mirror settings
-			if (!(itemStack.getItem() instanceof BlockItem)) itemBlock = CompatHelper.getItemBlockFromStack(itemStack);
+//		RadialMirror.RadialMirrorSettings r = modifierSettings.getRadialMirrorSettings();
-			BlockState blockState = getBlockStateFromItem(itemBlock, player, blockPos, facing, hitVec, InteractionHand.MAIN_HAND);
+//		if (r.slices < 2) {
-			if (blockState == null) continue;
+//			r.slices = 2;
-
+//			error += "Radial mirror needs to have at least 2 slices. Slices has been set to 2.";
-			blockStates.add(blockState);
+//		}
-			itemStacks.add(itemBlock);
+//
-		}
+//		if (r.radius < 1) {
-
+//			r.radius = 1;
-		for (BlockPos blockPos : posList) {
+//			error += "Radial mirror radius has to be at least 1. This has been corrected. ";
-			BlockState blockState = getBlockStateFromItem(itemBlock, player, blockPos, facing, hitVec, InteractionHand.MAIN_HAND);
+//		}
-			if (blockState == null) continue;
+//		if (r.getReach() > maxReach) {
-
+//			r.radius = maxReach / 2;
-			List<BlockState> arrayBlockStates = Array.findBlockStates(player, blockPos, blockState, itemStack, itemStacks);
+//			error += "Radial mirror exceeds your maximum reach of " + (maxReach / 2) + ". Radius has been set to " + (maxReach / 2) + ". ";
-			blockStates.addAll(arrayBlockStates);
+//		}
-			blockStates.addAll(Mirror.findBlockStates(player, blockPos, blockState, itemStack, itemStacks));
+//
-			blockStates.addAll(RadialMirror.findBlockStates(player, blockPos, blockState, itemStack, itemStacks));
+//		return error;
-			//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) {
-		//startPos can be null
-		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

@@ -1,234 +1,153 @@
 package nl.requios.effortlessbuilding.buildmodifier;
 
+import net.minecraft.client.Minecraft;
+import net.minecraft.nbt.CompoundTag;
+import net.minecraft.nbt.NbtUtils;
+import net.minecraft.nbt.Tag;
 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 nl.requios.effortlessbuilding.EffortlessBuildingClient;
-import java.util.List;
+import nl.requios.effortlessbuilding.utilities.BlockEntry;
+import nl.requios.effortlessbuilding.utilities.BlockSet;
 
-import net.minecraft.world.level.block.DirectionalBlock;
+public class Mirror extends BaseModifier {
-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 boolean mirrorX = true;
+	public boolean mirrorY = false;
+	public boolean mirrorZ = false;
 	public int radius = 10;
-		public boolean drawLines = true, drawPlanes = true;
+	public boolean drawLines = true;
+	public boolean drawPlanes = true;
 	
-		public MirrorSettings() {
+	public Mirror() {
+		super();
+		var player = Minecraft.getInstance().player;
+		if (player != null)
+			position = Vec3.atLowerCornerOf(Minecraft.getInstance().player.blockPosition());
 	}
 	
-		public MirrorSettings(boolean mirrorEnabled, Vec3 position, boolean mirrorX, boolean mirrorY, boolean mirrorZ, int radius, boolean drawLines, boolean drawPlanes) {
+	@Override
-			this.enabled = mirrorEnabled;
+	public void findCoordinates(BlockSet blocks, Player player) {
-			this.position = position;
+		if (!(enabled && (mirrorX || mirrorY || mirrorZ))) return;
-			this.mirrorX = mirrorX;
+
-			this.mirrorY = mirrorY;
+		var originalBlocks = new BlockSet(blocks);
-			this.mirrorZ = mirrorZ;
+		for (BlockEntry blockEntry : originalBlocks) {
-			this.radius = radius;
+			if (!isWithinRange(blockEntry.blockPos)) continue;
-			this.drawLines = drawLines;
+
-			this.drawPlanes = drawPlanes;
+			if (mirrorX) performMirrorX(blocks, blockEntry);
+			if (mirrorY) performMirrorY(blocks, blockEntry);
+			if (mirrorZ) performMirrorZ(blocks, blockEntry);
+		}
+	}
+
+	@Override
+	public void onPowerLevelChanged(int powerLevel) {
+		radius = EffortlessBuildingClient.POWER_LEVEL.getMaxMirrorRadius(Minecraft.getInstance().player);
+	}
+
+	private void performMirrorX(BlockSet blocks, BlockEntry blockEntry) {
+		//find mirror position
+		double x = position.x + (position.x - blockEntry.blockPos.getX() - 0.5);
+		BlockPos newBlockPos = new BlockPos(x, blockEntry.blockPos.getY(), blockEntry.blockPos.getZ());
+
+		if (blocks.containsKey(newBlockPos)) return;
+
+		var newBlockEntry = new BlockEntry(newBlockPos);
+		newBlockEntry.copyRotationSettingsFrom(blockEntry);
+		newBlockEntry.mirrorX = !newBlockEntry.mirrorX;
+		blocks.add(newBlockEntry);
+
+		if (mirrorY) performMirrorY(blocks, newBlockEntry);
+		if (mirrorZ) performMirrorZ(blocks, newBlockEntry);
+	}
+
+	private void performMirrorY(BlockSet blocks, BlockEntry blockEntry) {
+		//find mirror position
+		double y = position.y + (position.y - blockEntry.blockPos.getY() - 0.5);
+		BlockPos newBlockPos = new BlockPos(blockEntry.blockPos.getX(), y, blockEntry.blockPos.getZ());
+
+		if (blocks.containsKey(newBlockPos)) return;
+
+		var newBlockEntry = new BlockEntry(newBlockPos);
+		newBlockEntry.copyRotationSettingsFrom(blockEntry);
+		newBlockEntry.mirrorY = !newBlockEntry.mirrorY;
+		blocks.add(newBlockEntry);
+
+		if (mirrorZ) performMirrorZ(blocks, newBlockEntry);
+	}
+
+	private void performMirrorZ(BlockSet blocks, BlockEntry blockEntry) {
+		//find mirror position
+		double z = position.z + (position.z - blockEntry.blockPos.getZ() - 0.5);
+		BlockPos newBlockPos = new BlockPos(blockEntry.blockPos.getX(), blockEntry.blockPos.getY(), z);
+
+		if (blocks.containsKey(newBlockPos)) return;
+
+		var newBlockEntry = new BlockEntry(newBlockPos);
+		newBlockEntry.copyRotationSettingsFrom(blockEntry);
+		newBlockEntry.mirrorZ = !newBlockEntry.mirrorZ;
+		blocks.add(newBlockEntry);
+	}
+
+	public boolean isWithinRange(BlockPos blockPos) {
+		return !(blockPos.getX() + 0.5 < position.x - radius) && !(blockPos.getX() + 0.5 > position.x + radius) &&
+			!(blockPos.getY() + 0.5 < position.y - radius) && !(blockPos.getY() + 0.5 > position.y + radius) &&
+			!(blockPos.getZ() + 0.5 < position.z - radius) && !(blockPos.getZ() + 0.5 > position.z + radius);
 	}
 	
 	public int getReach() {
 		return radius * 2; //Change ModifierSettings#setReachUpgrade too
 	}
+	
+	public void toggleMirrorAxis(int index) {
+		switch (index) {
+			case 0 -> mirrorX = !mirrorX;
+			case 1 -> mirrorY = !mirrorY;
+			case 2 -> mirrorZ = !mirrorZ;
+		}
+	}
+	
+	public boolean getMirrorAxis(int index) {
+		switch (index) {
+			case 0 -> {
+				return mirrorX;
+			}
+			case 1 -> {
+				return mirrorY;
+			}
+			case 2 -> {
+				return mirrorZ;
+			}
+		}
+		return false;
+	}
+
+	@Override
+	public CompoundTag serializeNBT() {
+		var compound = super.serializeNBT();
+		compound.putDouble("positionX", position.x);
+		compound.putDouble("positionY", position.y);
+		compound.putDouble("positionZ", position.z);
+		compound.putBoolean("mirrorX", mirrorX);
+		compound.putBoolean("mirrorY", mirrorY);
+		compound.putBoolean("mirrorZ", mirrorZ);
+		compound.putInt("radius", radius);
+		compound.putBoolean("drawLines", drawLines);
+		compound.putBoolean("drawPlanes", drawPlanes);
+		return compound;
+	}
+
+	@Override
+	public void deserializeNBT(CompoundTag compound) {
+		super.deserializeNBT(compound);
+		position = new Vec3(compound.getDouble("positionX"), compound.getDouble("positionY"), compound.getDouble("positionZ"));
+		mirrorX = compound.getBoolean("mirrorX");
+		mirrorY = compound.getBoolean("mirrorY");
+		mirrorZ = compound.getBoolean("mirrorZ");
+		radius = compound.getInt("radius");
+		drawLines = compound.getBoolean("drawLines");
+		drawPlanes = compound.getBoolean("drawPlanes");
 	}
 }

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

@@ -1,215 +0,0 @@
-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.CommonConfig;
-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 = CommonConfig.reach.maxReachLevel0.get();
-					break;
-				case 1:
-					reach = CommonConfig.reach.maxReachLevel1.get();
-					break;
-				case 2:
-					reach = CommonConfig.reach.maxReachLevel2.get();
-					break;
-				case 3:
-					reach = CommonConfig.reach.maxReachLevel3.get();
-					break;
-			}
-
-			if (this.mirrorSettings != null)
-				this.mirrorSettings.radius = reach / 2;
-			if (this.radialMirrorSettings != null)
-				this.radialMirrorSettings.radius = reach / 2;
-		}
-	}
-}
-

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

@@ -1,5 +1,7 @@
 package nl.requios.effortlessbuilding.buildmodifier;
 
+import net.minecraft.client.Minecraft;
+import net.minecraft.nbt.CompoundTag;
 import net.minecraft.world.level.block.state.BlockState;
 import net.minecraft.world.entity.player.Player;
 import net.minecraft.world.item.ItemStack;
@@ -11,108 +13,107 @@ 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.EffortlessBuildingClient;
 import nl.requios.effortlessbuilding.item.AbstractRandomizerBagItem;
+import nl.requios.effortlessbuilding.utilities.BlockEntry;
+import nl.requios.effortlessbuilding.utilities.BlockSet;
 
 import java.util.ArrayList;
 import java.util.List;
 
-public class RadialMirror {
+public class RadialMirror extends BaseModifier {
 
-	public static List<BlockPos> findCoordinates(Player player, BlockPos startPos) {
+	public Vec3 position = new Vec3(0.5, 64.5, 0.5);
-		List<BlockPos> coordinates = new ArrayList<>();
+	public int slices = 4;
+	public boolean alternate = false;
+	public int radius = 20;
+	public boolean drawLines = true;
+	public boolean drawPlanes = false;
 
-		//find radial mirror settings for the player
+	public RadialMirror() {
-		RadialMirrorSettings r = ModifierSettingsManager.getModifierSettings(player).getRadialMirrorSettings();
+		super();
-		if (!isEnabled(r, startPos)) return coordinates;
+		var player = Minecraft.getInstance().player;
+		if (player != null)
+			position = Vec3.atLowerCornerOf(Minecraft.getInstance().player.blockPosition());
+	}
+
+	@Override
+	public void findCoordinates(BlockSet blocks, Player player) {
+		if (!enabled) return;
+
+		var originalBlocks = new BlockSet(blocks);
+		for (BlockEntry blockEntry : originalBlocks) {
+			if (!isWithinRange(blockEntry.blockPos)) continue;
+
+			performRadialMirror(blocks, blockEntry);
+		}
+	}
+
+	@Override
+	public void onPowerLevelChanged(int powerLevel) {
+		radius = EffortlessBuildingClient.POWER_LEVEL.getMaxMirrorRadius(Minecraft.getInstance().player);
+	}
+
+	public void performRadialMirror(BlockSet blocks, BlockEntry blockEntry) {
 
 		//get angle between slices
-		double sliceAngle = 2 * Math.PI / r.slices;
+		double sliceAngle = 2 * Math.PI / slices;
 
-		Vec3 startVec = new Vec3(startPos.getX() + 0.5f, startPos.getY() + 0.5f, startPos.getZ() + 0.5f);
+		//Get start vector relative to mirror center
-		Vec3 relStartVec = startVec.subtract(r.position);
+		Vec3 relStartVec = Vec3.atCenterOf(blockEntry.blockPos).subtract(position);
 
-		double startAngleToCenter = Mth.atan2(relStartVec.x, relStartVec.z);
+		double startAngleToCenter = Mth.atan2(relStartVec.x, relStartVec.z); //between -PI and PI
+		//TODO change to Abs if alternative?
 		if (startAngleToCenter < 0) startAngleToCenter += Math.PI;
 		double startAngleInSlice = startAngleToCenter % sliceAngle;
 
-		for (int i = 1; i < r.slices; i++) {
+		for (int i = 1; i < slices; i++) {
 			double curAngle = sliceAngle * i;
 
 			//alternate mirroring of slices
-			if (r.alternate && i % 2 == 1) {
+			boolean doAlternate = alternate && i % 2 == 1;
+			if (doAlternate) {
 				curAngle = curAngle - startAngleInSlice + (sliceAngle - startAngleInSlice);
 			}
 
 			Vec3 relNewVec = relStartVec.yRot((float) curAngle);
-			BlockPos newBlockPos = new BlockPos(r.position.add(relNewVec));
+			BlockPos newBlockPos = new BlockPos(position.add(relNewVec));
-			if (!coordinates.contains(newBlockPos) && !newBlockPos.equals(startPos)) coordinates.add(newBlockPos);
+
+			if (blocks.containsKey(newBlockPos)) continue;
+
+			BlockEntry newBlockEntry = new BlockEntry(newBlockPos);
+			newBlockEntry.copyRotationSettingsFrom(blockEntry);
+
+			//rotate block
+			double angleToCenter = Mth.atan2(relNewVec.x, relNewVec.z); //between -PI and PI
+			rotateBlockEntry(newBlockEntry, angleToCenter, doAlternate);
+			
+			blocks.add(newBlockEntry);
+		}
 	}
 
-		return coordinates;
+	private void rotateBlockEntry(BlockEntry blockEntry, double angleToCenter, boolean alternate) {
+
+		if (angleToCenter < -0.751 * Math.PI || angleToCenter > 0.749 * Math.PI) {
+			blockEntry.rotation = blockEntry.rotation.getRotated(Rotation.CLOCKWISE_180);
+			if (alternate) {
+//				blockEntry.mirrorX = !blockEntry.mirrorX;
 			}
-
+		} else if (angleToCenter < -0.251 * Math.PI) {
-	public static List<BlockState> findBlockStates(Player player, BlockPos startPos, BlockState blockState, ItemStack itemStack, List<ItemStack> itemStacks) {
+			blockEntry.rotation = blockEntry.rotation.getRotated(Rotation.CLOCKWISE_90);
-		List<BlockState> blockStates = new ArrayList<>();
+			if (alternate) {
-		List<BlockPos> coordinates = new ArrayList<>(); //to keep track of duplicates
+//				blockEntry.mirrorZ = !blockEntry.mirrorZ;
-
-		//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);
 			}
-
+		} else if (angleToCenter > 0.249 * Math.PI) {
-		BlockState newBlockState;
+			blockEntry.rotation = blockEntry.rotation.getRotated(Rotation.COUNTERCLOCKWISE_90);
-		for (int i = 1; i < r.slices; i++) {
+			if (alternate) {
-			newBlockState = blockState;
+//				blockEntry.mirrorZ = !blockEntry.mirrorZ;
-			double curAngle = sliceAngle * i;
-
-			//alternate mirroring of slices
-			if (r.alternate && i % 2 == 1) {
-				curAngle = curAngle - startAngleInSlice + (sliceAngle - startAngleInSlice);
 			}
-
+		} else {
-			Vec3 relNewVec = relStartVec.yRot((float) curAngle);
+			if (alternate) {
-			BlockPos newBlockPos = new BlockPos(r.position.add(relNewVec));
+//				blockEntry.mirrorX = !blockEntry.mirrorX;
-			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) {
@@ -158,37 +159,36 @@ public class RadialMirror {
 		return newBlockState;
 	}
 
-	public static boolean isEnabled(RadialMirrorSettings r, BlockPos startPos) {
+	public boolean isWithinRange(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(position).lengthSqr() < radius * radius);
-
-		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;
 	}
+
+	@Override
+	public CompoundTag serializeNBT() {
+		var compound = super.serializeNBT();
+		compound.putDouble("positionX", position.x);
+		compound.putDouble("positionY", position.y);
+		compound.putDouble("positionZ", position.z);
+		compound.putInt("slices", slices);
+		compound.putBoolean("alternate", alternate);
+		compound.putInt("radius", radius);
+		compound.putBoolean("drawLines", drawLines);
+		compound.putBoolean("drawPlanes", drawPlanes);
+		return compound;
 	}
 
+	@Override
+	public void deserializeNBT(CompoundTag nbt) {
+		super.deserializeNBT(nbt);
+		position = new Vec3(nbt.getDouble("positionX"), nbt.getDouble("positionY"), nbt.getDouble("positionZ"));
+		slices = nbt.getInt("slices");
+		alternate = nbt.getBoolean("alternate");
+		radius = nbt.getInt("radius");
+		drawLines = nbt.getBoolean("drawLines");
+		drawPlanes = nbt.getBoolean("drawPlanes");
+	}
 }

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

@@ -1,239 +0,0 @@
-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.CommonConfig;
-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.BlockPreviews;
-
-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[CommonConfig.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[CommonConfig.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) {
-			BlockPreviews.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 = previousBlockStates.get(i);
-				if (itemStack.getItem() instanceof BlockItem) {
-					previousBlockState = ((BlockItem) itemStack.getItem()).getBlock().defaultBlockState();
-				}
-
-				if (player.level.isLoaded(coordinate)) {
-					//check itemstack empty
-					if (itemStack.isEmpty() && !player.isCreative()) {
-						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) {
-			BlockPreviews.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 = newBlockStates.get(i);
-				if (itemStack.getItem() instanceof BlockItem) {
-					newBlockState = ((BlockItem) itemStack.getItem()).getBlock().defaultBlockState();
-				}
-
-				if (player.level.isLoaded(coordinate)) {
-					//check itemstack empty
-					if (itemStack.isEmpty() && !player.isCreative()) {
-						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/ModeCapabilityManager.java

@@ -1,108 +0,0 @@
-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.DISABLED);
-			instance.setModeData(modeSettings);
-		}
-
-	}
-}

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

@@ -1,186 +0,0 @@
-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/compatibility/CompatHelper.java

@@ -1,10 +1,14 @@
 package nl.requios.effortlessbuilding.compatibility;
 
+import net.minecraft.world.level.block.Block;
+import net.minecraft.world.level.block.Blocks;
 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 net.minecraftforge.items.ItemHandlerHelper;
+import nl.requios.effortlessbuilding.create.foundation.item.ItemHelper;
 import nl.requios.effortlessbuilding.item.AbstractRandomizerBagItem;
 
 public class CompatHelper {
@@ -13,12 +17,16 @@ public class CompatHelper {
 
 	}
 
+	public static boolean isItemBlockProxy(ItemStack stack) {
+		return isItemBlockProxy(stack, true);
+	}
+
 	// 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) {
+	public static boolean isItemBlockProxy(ItemStack stack, boolean seeBlockItemsAsProxies) {
 		Item item = stack.getItem();
 		if (item instanceof BlockItem)
-			return true;
+			return seeBlockItemsAsProxies;
 		return item instanceof AbstractRandomizerBagItem;
 	}
 
@@ -60,4 +68,21 @@ public class CompatHelper {
 		return ItemStack.EMPTY;
 	}
 
+	public static boolean containsBlock(ItemStack stack, Block block) {
+		if (stack == null || stack.isEmpty() || !isItemBlockProxy(stack)) {
+			return block == null || block == Blocks.AIR;
+		}
+
+		if (stack.getItem() instanceof BlockItem) {
+			return ((BlockItem) stack.getItem()).getBlock() == block;
+		}
+
+		if (stack.getItem() instanceof AbstractRandomizerBagItem randomizerBagItem) {
+			IItemHandler bagInventory = randomizerBagItem.getBagInventory(stack);
+			ItemStack firstMatch = ItemHelper.findFirstMatch(bagInventory, s -> s.getItem() instanceof BlockItem);
+			return firstMatch != null && !firstMatch.isEmpty();
+		}
+		return false;
+	}
+
 }

src/main/java/nl/requios/effortlessbuilding/create/AllKeys.java

@@ -0,0 +1,39 @@
+package nl.requios.effortlessbuilding.create;
+
+import com.mojang.blaze3d.platform.InputConstants;
+import net.minecraft.client.KeyMapping;
+import net.minecraft.client.Minecraft;
+import net.minecraft.client.gui.screens.Screen;
+import net.minecraftforge.api.distmarker.Dist;
+import net.minecraftforge.client.event.RegisterKeyMappingsEvent;
+import net.minecraftforge.eventbus.api.SubscribeEvent;
+import net.minecraftforge.fml.common.Mod.EventBusSubscriber;
+import org.lwjgl.glfw.GLFW;
+
+public class AllKeys {
+
+	public static boolean isKeyDown(int key) {
+		return InputConstants.isKeyDown(Minecraft.getInstance()
+			.getWindow()
+			.getWindow(), key);
+	}
+
+	public static boolean isMouseButtonDown(int button) {
+		return GLFW.glfwGetMouseButton(Minecraft.getInstance()
+			.getWindow()
+			.getWindow(), button) == 1;
+	}
+
+	public static boolean ctrlDown() {
+		return Screen.hasControlDown();
+	}
+
+	public static boolean shiftDown() {
+		return Screen.hasShiftDown();
+	}
+
+	public static boolean altDown() {
+		return Screen.hasAltDown();
+	}
+
+}

src/main/java/nl/requios/effortlessbuilding/create/events/ClientEvents.java

@@ -10,6 +10,7 @@ import net.minecraft.world.phys.Vec3;
 import net.minecraftforge.api.distmarker.Dist;
 import net.minecraftforge.client.event.RenderLevelLastEvent;
 import net.minecraftforge.client.event.ViewportEvent;
+import net.minecraftforge.event.TickEvent;
 import net.minecraftforge.event.TickEvent.ClientTickEvent;
 import net.minecraftforge.event.level.LevelEvent;
 import net.minecraftforge.eventbus.api.SubscribeEvent;
@@ -29,10 +30,8 @@ public class ClientEvents {
 
 	@SubscribeEvent
 	public static void onTick(ClientTickEvent event) {
-		if (!isGameActive())
+		if (!isGameActive() || event.phase != TickEvent.Phase.END) return;
-			return;
 
-		Level world = Minecraft.getInstance().level;
 		AnimationTickHolder.tick();
 
 		CreateClient.GHOST_BLOCKS.tickGhosts();

src/main/java/nl/requios/effortlessbuilding/create/foundation/gui/AbstractSimiScreen.java

@@ -0,0 +1,175 @@
+package nl.requios.effortlessbuilding.create.foundation.gui;
+
+import com.mojang.blaze3d.platform.InputConstants;
+import com.mojang.blaze3d.vertex.PoseStack;
+import nl.requios.effortlessbuilding.create.foundation.gui.widget.AbstractSimiWidget;
+import nl.requios.effortlessbuilding.create.foundation.utility.Components;
+import net.minecraft.client.gui.components.AbstractWidget;
+import net.minecraft.client.gui.components.Widget;
+import net.minecraft.client.gui.components.events.GuiEventListener;
+import net.minecraft.client.gui.narration.NarratableEntry;
+import net.minecraft.client.gui.screens.Screen;
+import net.minecraft.network.chat.Component;
+import net.minecraftforge.api.distmarker.Dist;
+import net.minecraftforge.api.distmarker.OnlyIn;
+import nl.requios.effortlessbuilding.gui.buildmodifier.ModifiersScreenList;
+
+import java.util.Collection;
+import java.util.List;
+
+@OnlyIn(Dist.CLIENT)
+public abstract class AbstractSimiScreen extends Screen {
+
+	protected int windowWidth, windowHeight;
+	protected int windowXOffset, windowYOffset;
+	protected int guiLeft, guiTop;
+
+	protected AbstractSimiScreen(Component title) {
+		super(title);
+	}
+
+	protected AbstractSimiScreen() {
+		this(Components.immutableEmpty());
+	}
+
+	/**
+	 * This method must be called before {@code super.init()}!
+	 */
+	protected void setWindowSize(int width, int height) {
+		windowWidth = width;
+		windowHeight = height;
+	}
+
+	/**
+	 * This method must be called before {@code super.init()}!
+	 */
+	protected void setWindowOffset(int xOffset, int yOffset) {
+		windowXOffset = xOffset;
+		windowYOffset = yOffset;
+	}
+
+	@Override
+	protected void init() {
+		guiLeft = (width - windowWidth) / 2;
+		guiTop = (height - windowHeight) / 2;
+		guiLeft += windowXOffset;
+		guiTop += windowYOffset;
+	}
+
+	@Override
+	public void tick() {
+		for (GuiEventListener listener : children()) {
+			if (listener instanceof TickableGuiEventListener tickable) {
+				tickable.tick();
+			}
+		}
+	}
+
+	@Override
+	public boolean isPauseScreen() {
+		return false;
+	}
+
+	@SuppressWarnings("unchecked")
+	protected <W extends GuiEventListener & Widget & NarratableEntry> void addRenderableWidgets(W... widgets) {
+		for (W widget : widgets) {
+			addRenderableWidget(widget);
+		}
+	}
+
+	protected <W extends GuiEventListener & Widget & NarratableEntry> void addRenderableWidgets(Collection<W> widgets) {
+		for (W widget : widgets) {
+			addRenderableWidget(widget);
+		}
+	}
+
+	protected void removeWidgets(GuiEventListener... widgets) {
+		for (GuiEventListener widget : widgets) {
+			removeWidget(widget);
+		}
+	}
+
+	protected void removeWidgets(Collection<? extends GuiEventListener> widgets) {
+		for (GuiEventListener widget : widgets) {
+			removeWidget(widget);
+		}
+	}
+
+	@Override
+	public void render(PoseStack ms, int mouseX, int mouseY, float partialTicks) {
+		partialTicks = minecraft.getFrameTime();
+
+		ms.pushPose();
+
+		prepareFrame();
+
+		renderWindowBackground(ms, mouseX, mouseY, partialTicks);
+		renderWindow(ms, mouseX, mouseY, partialTicks);
+		super.render(ms, mouseX, mouseY, partialTicks);
+		renderWindowForeground(ms, mouseX, mouseY, partialTicks);
+
+		endFrame();
+
+		ms.popPose();
+	}
+
+	@Override
+	public boolean keyPressed(int keyCode, int scanCode, int modifiers) {
+		boolean keyPressed = super.keyPressed(keyCode, scanCode, modifiers);
+		if (keyPressed || getFocused() != null)
+			return keyPressed;
+
+		InputConstants.Key mouseKey = InputConstants.getKey(keyCode, scanCode);
+		if (this.minecraft.options.keyInventory.isActiveAndMatches(mouseKey)) {
+			this.onClose();
+			return true;
+		}
+
+		return false;
+	}
+
+	protected void prepareFrame() {}
+
+	protected void renderWindowBackground(PoseStack ms, int mouseX, int mouseY, float partialTicks) {
+		renderBackground(ms);
+	}
+
+	protected abstract void renderWindow(PoseStack ms, int mouseX, int mouseY, float partialTicks);
+
+	protected void renderWindowForeground(PoseStack ms, int mouseX, int mouseY, float partialTicks) {
+		for (Widget widget : renderables) {
+			if (widget instanceof AbstractSimiWidget simiWidget && simiWidget.isHoveredOrFocused()
+				&& simiWidget.visible) {
+				List<Component> tooltip = simiWidget.getToolTip();
+				if (tooltip.isEmpty())
+					continue;
+				int ttx = simiWidget.lockedTooltipX == -1 ? mouseX : simiWidget.lockedTooltipX + simiWidget.x;
+				int tty = simiWidget.lockedTooltipY == -1 ? mouseY : simiWidget.lockedTooltipY + simiWidget.y;
+				renderComponentTooltip(ms, tooltip, ttx, tty);
+			}
+			
+			//Added
+			if (widget instanceof ModifiersScreenList list) {
+				list.renderWindowForeground(ms, mouseX, mouseY, partialTicks);
+			}
+		}
+		
+	}
+
+	protected void endFrame() {}
+
+	@Deprecated
+	protected void debugWindowArea(PoseStack matrixStack) {
+		fill(matrixStack, guiLeft + windowWidth, guiTop + windowHeight, guiLeft, guiTop, 0xD3D3D3D3);
+	}
+
+	@Override
+	public GuiEventListener getFocused() {
+		GuiEventListener focused = super.getFocused();
+		if (focused instanceof AbstractWidget && !((AbstractWidget) focused).isFocused())
+			focused = null;
+		setFocused(focused);
+		return focused;
+	}
+
+}

src/main/java/nl/requios/effortlessbuilding/create/foundation/gui/AllGuiTextures.java

@@ -0,0 +1,95 @@
+package nl.requios.effortlessbuilding.create.foundation.gui;
+
+import com.mojang.blaze3d.systems.RenderSystem;
+import com.mojang.blaze3d.vertex.PoseStack;
+import nl.requios.effortlessbuilding.create.Create;
+import nl.requios.effortlessbuilding.create.foundation.gui.element.ScreenElement;
+import nl.requios.effortlessbuilding.create.foundation.utility.Color;
+import net.minecraft.client.gui.GuiComponent;
+import net.minecraft.resources.ResourceLocation;
+import net.minecraftforge.api.distmarker.Dist;
+import net.minecraftforge.api.distmarker.OnlyIn;
+
+public enum AllGuiTextures implements ScreenElement {
+
+	// Widgets
+	BUTTON("widgets", 18, 18),
+	BUTTON_HOVER("widgets", 18, 0, 18, 18),
+	BUTTON_DOWN("widgets", 36, 0, 18, 18),
+	INDICATOR("widgets", 0, 18, 18, 6),
+	INDICATOR_WHITE("widgets", 18, 18, 18, 6),
+	INDICATOR_GREEN("widgets", 36, 18, 18, 6),
+	INDICATOR_YELLOW("widgets", 54, 18, 18, 6),
+	INDICATOR_RED("widgets", 72, 18, 18, 6),
+
+	HOTSLOT_ARROW("widgets", 24, 51, 20, 12),
+	HOTSLOT("widgets", 0, 68, 22, 22),
+	HOTSLOT_ACTIVE("widgets", 0, 46, 22, 22),
+	HOTSLOT_SUPER_ACTIVE("widgets", 27, 67, 24, 24),
+
+	SPEECH_TOOLTIP_BACKGROUND("widgets", 0, 24, 8, 8),
+	SPEECH_TOOLTIP_COLOR("widgets", 8, 24, 8, 8),
+	
+	TRAIN_HUD_SPEED_BG("widgets", 0, 190, 182, 5),
+	TRAIN_HUD_SPEED("widgets", 0, 185, 182, 5),
+	TRAIN_HUD_THROTTLE("widgets", 0, 195, 182, 5),
+	TRAIN_HUD_THROTTLE_POINTER("widgets", 0, 209, 6, 9),
+	TRAIN_HUD_FRAME("widgets", 0, 200, 186, 7),
+	TRAIN_HUD_DIRECTION("widgets", 77, 165, 28, 20),
+	TRAIN_PROMPT_L("widgets", 8, 209, 3, 16),
+	TRAIN_PROMPT_R("widgets", 11, 209, 3, 16),
+	TRAIN_PROMPT("widgets", 0, 230, 256, 16),
+
+	;
+
+	public static final int FONT_COLOR = 0x575F7A;
+
+	public final ResourceLocation location;
+	public int width, height;
+	public int startX, startY;
+
+	private AllGuiTextures(String location, int width, int height) {
+		this(location, 0, 0, width, height);
+	}
+
+	private AllGuiTextures(int startX, int startY) {
+		this("icons", startX * 16, startY * 16, 16, 16);
+	}
+
+	private AllGuiTextures(String location, int startX, int startY, int width, int height) {
+		this(Create.ID, location, startX, startY, width, height);
+	}
+
+	private AllGuiTextures(String namespace, String location, int startX, int startY, int width, int height) {
+		this.location = new ResourceLocation(namespace, "textures/gui/" + location + ".png");
+		this.width = width;
+		this.height = height;
+		this.startX = startX;
+		this.startY = startY;
+	}
+
+	@OnlyIn(Dist.CLIENT)
+	public void bind() {
+		RenderSystem.setShaderTexture(0, location);
+	}
+
+	@OnlyIn(Dist.CLIENT)
+	@Override
+	public void render(PoseStack ms, int x, int y) {
+		bind();
+		GuiComponent.blit(ms, x, y, 0, startX, startY, width, height, 256, 256);
+	}
+
+	@OnlyIn(Dist.CLIENT)
+	public void render(PoseStack ms, int x, int y, GuiComponent component) {
+		bind();
+		component.blit(ms, x, y, startX, startY, width, height);
+	}
+
+	@OnlyIn(Dist.CLIENT)
+	public void render(PoseStack ms, int x, int y, Color c) {
+		bind();
+		UIRenderHelper.drawColoredTexture(ms, c, x, y, startX, startY, width, height);
+	}
+
+}

src/main/java/nl/requios/effortlessbuilding/create/foundation/gui/AllIcons.java

@@ -0,0 +1,224 @@
+package nl.requios.effortlessbuilding.create.foundation.gui;
+
+import com.mojang.blaze3d.systems.RenderSystem;
+import com.mojang.blaze3d.vertex.PoseStack;
+import com.mojang.blaze3d.vertex.VertexConsumer;
+import com.mojang.math.Matrix4f;
+import nl.requios.effortlessbuilding.create.Create;
+import nl.requios.effortlessbuilding.create.foundation.gui.element.DelegatedStencilElement;
+import nl.requios.effortlessbuilding.create.foundation.gui.element.ScreenElement;
+import nl.requios.effortlessbuilding.create.foundation.utility.Color;
+import net.minecraft.client.gui.GuiComponent;
+import net.minecraft.client.renderer.LightTexture;
+import net.minecraft.client.renderer.MultiBufferSource;
+import net.minecraft.client.renderer.RenderType;
+import net.minecraft.resources.ResourceLocation;
+import net.minecraft.world.phys.Vec3;
+import net.minecraftforge.api.distmarker.Dist;
+import net.minecraftforge.api.distmarker.OnlyIn;
+
+public class AllIcons implements ScreenElement {
+
+	public static final ResourceLocation ICON_ATLAS = Create.asResource("textures/gui/create_icons.png");
+	public static final int ICON_ATLAS_SIZE = 256;
+
+	private static int x = 0, y = -1;
+	private int iconX;
+	private int iconY;
+
+	public static final AllIcons
+		I_ADD = newRow(),
+		I_TRASH = next(),
+		I_3x3 = next(),
+		I_TARGET = next(),
+		I_PRIORITY_VERY_LOW = next(),
+		I_PRIORITY_LOW = next(),
+		I_PRIORITY_HIGH = next(),
+		I_PRIORITY_VERY_HIGH = next(),
+		I_BLACKLIST = next(),
+		I_WHITELIST = next(),
+		I_WHITELIST_OR = next(),
+		I_WHITELIST_AND = next(),
+		I_WHITELIST_NOT = next(),
+		I_RESPECT_NBT = next(),
+		I_IGNORE_NBT = next();
+
+	public static final AllIcons
+		I_CONFIRM = newRow(),
+		I_NONE = next(),
+		I_OPEN_FOLDER = next(),
+		I_REFRESH = next(),
+		I_ACTIVE = next(),
+		I_PASSIVE = next(),
+		I_ROTATE_PLACE = next(),
+		I_ROTATE_PLACE_RETURNED = next(),
+		I_ROTATE_NEVER_PLACE = next(),
+		I_MOVE_PLACE = next(),
+		I_MOVE_PLACE_RETURNED = next(),
+		I_MOVE_NEVER_PLACE = next(),
+		I_CART_ROTATE = next(),
+		I_CART_ROTATE_PAUSED = next(),
+		I_CART_ROTATE_LOCKED = next();
+
+	public static final AllIcons
+		I_DONT_REPLACE = newRow(),
+		I_REPLACE_SOLID = next(),
+		I_REPLACE_ANY = next(),
+		I_REPLACE_EMPTY = next(),
+		I_CENTERED = next(),
+		I_ATTACHED = next(),
+		I_INSERTED = next(),
+		I_FILL = next(),
+		I_PLACE = next(),
+		I_REPLACE = next(),
+		I_CLEAR = next(),
+		I_OVERLAY = next(),
+		I_FLATTEN = next(),
+		I_LMB = next(),
+		I_SCROLL = next(),
+		I_RMB = next();
+
+	public static final AllIcons
+		I_TOOL_DEPLOY = newRow(),
+		I_SKIP_MISSING = next(),
+		I_SKIP_TILES = next(),
+		I_DICE = next(),
+		I_TUNNEL_SPLIT = next(),
+		I_TUNNEL_FORCED_SPLIT = next(),
+		I_TUNNEL_ROUND_ROBIN = next(),
+		I_TUNNEL_FORCED_ROUND_ROBIN = next(),
+		I_TUNNEL_PREFER_NEAREST = next(),
+		I_TUNNEL_RANDOMIZE = next(),
+		I_TUNNEL_SYNCHRONIZE = next(),
+		I_TOOLBOX = next(),
+		I_VIEW_SCHEDULE = next(),
+
+		I_TOOL_MOVE_XZ = newRow(),
+		I_TOOL_MOVE_Y = next(),
+		I_TOOL_ROTATE = next(),
+		I_TOOL_MIRROR = next(),
+		I_ARM_ROUND_ROBIN = next(),
+		I_ARM_FORCED_ROUND_ROBIN = next(),
+		I_ARM_PREFER_FIRST = next(),
+
+		I_ADD_INVERTED_ATTRIBUTE = next(),
+		I_FLIP = next(),
+
+		I_PLAY = newRow(),
+		I_PAUSE = next(),
+		I_STOP = next(),
+		I_PLACEMENT_SETTINGS = next(),
+		I_ROTATE_CCW = next(),
+		I_HOUR_HAND_FIRST = next(),
+		I_MINUTE_HAND_FIRST = next(),
+		I_HOUR_HAND_FIRST_24 = next(),
+
+		I_PATTERN_SOLID = newRow(),
+		I_PATTERN_CHECKERED = next(),
+		I_PATTERN_CHECKERED_INVERSED = next(),
+		I_PATTERN_CHANCE_25 = next(),
+
+		I_PATTERN_CHANCE_50 = newRow(),
+		I_PATTERN_CHANCE_75 = next(),
+		I_FOLLOW_DIAGONAL = next(),
+		I_FOLLOW_MATERIAL = next(),
+
+		I_SCHEMATIC = newRow(),
+		I_SEQ_REPEAT = next(),
+
+		I_MTD_LEFT = newRow(),
+		I_MTD_CLOSE = next(),
+		I_MTD_RIGHT = next(),
+		I_MTD_SCAN = next(),
+		I_MTD_REPLAY = next(),
+		I_MTD_USER_MODE = next(),
+		I_MTD_SLOW_MODE = next(),
+
+		I_CONFIG_UNLOCKED = newRow(),
+		I_CONFIG_LOCKED = next(),
+		I_CONFIG_DISCARD = next(),
+		I_CONFIG_SAVE = next(),
+		I_CONFIG_RESET = next(),
+		I_CONFIG_BACK = next(),
+		I_CONFIG_PREV = next(),
+		I_CONFIG_NEXT = next(),
+		I_DISABLE = next(),
+		I_CONFIG_OPEN = next(),
+
+		I_FX_SURFACE_OFF = newRow(),
+		I_FX_SURFACE_ON = next(),
+		I_FX_FIELD_OFF = next(),
+		I_FX_FIELD_ON = next(),
+		I_FX_BLEND = next(),
+		I_FX_BLEND_OFF = next();
+	;
+
+	public AllIcons(int x, int y) {
+		iconX = x * 16;
+		iconY = y * 16;
+	}
+
+	private static AllIcons next() {
+		return new AllIcons(++x, y);
+	}
+
+	private static AllIcons newRow() {
+		return new AllIcons(x = 0, ++y);
+	}
+
+	@OnlyIn(Dist.CLIENT)
+	public void bind() {
+		RenderSystem.setShaderTexture(0, ICON_ATLAS);
+	}
+
+	@OnlyIn(Dist.CLIENT)
+	@Override
+	public void render(PoseStack matrixStack, int x, int y) {
+		bind();
+		GuiComponent.blit(matrixStack, x, y, 0, iconX, iconY, 16, 16, 256, 256);
+	}
+
+	@OnlyIn(Dist.CLIENT)
+	public void render(PoseStack matrixStack, int x, int y, GuiComponent component) {
+		bind();
+		component.blit(matrixStack, x, y, iconX, iconY, 16, 16);
+	}
+
+	@OnlyIn(Dist.CLIENT)
+	public void render(PoseStack ms, MultiBufferSource buffer, int color) {
+		VertexConsumer builder = buffer.getBuffer(RenderType.textSeeThrough(ICON_ATLAS));
+		Matrix4f matrix = ms.last().pose();
+		Color rgb = new Color(color);
+		int light = LightTexture.FULL_BRIGHT;
+
+		Vec3 vec1 = new Vec3(0, 0, 0);
+		Vec3 vec2 = new Vec3(0, 1, 0);
+		Vec3 vec3 = new Vec3(1, 1, 0);
+		Vec3 vec4 = new Vec3(1, 0, 0);
+
+		float u1 = iconX * 1f / ICON_ATLAS_SIZE;
+		float u2 = (iconX + 16) * 1f / ICON_ATLAS_SIZE;
+		float v1 = iconY * 1f / ICON_ATLAS_SIZE;
+		float v2 = (iconY + 16) * 1f / ICON_ATLAS_SIZE;
+
+		vertex(builder, matrix, vec1, rgb, u1, v1, light);
+		vertex(builder, matrix, vec2, rgb, u1, v2, light);
+		vertex(builder, matrix, vec3, rgb, u2, v2, light);
+		vertex(builder, matrix, vec4, rgb, u2, v1, light);
+	}
+
+	@OnlyIn(Dist.CLIENT)
+	private void vertex(VertexConsumer builder, Matrix4f matrix, Vec3 vec, Color rgb, float u, float v, int light) {
+		builder.vertex(matrix, (float) vec.x, (float) vec.y, (float) vec.z)
+			.color(rgb.getRed(), rgb.getGreen(), rgb.getBlue(), 255)
+			.uv(u, v)
+			.uv2(light)
+			.endVertex();
+	}
+
+	@OnlyIn(Dist.CLIENT)
+	public DelegatedStencilElement asStencil() {
+		return new DelegatedStencilElement().withStencilRenderer((ms, w, h, alpha) -> this.render(ms, 0, 0)).withBounds(16, 16);
+	}
+
+}

src/main/java/nl/requios/effortlessbuilding/create/foundation/gui/ConfirmationScreen.java

@@ -0,0 +1,227 @@
+package nl.requios.effortlessbuilding.create.foundation.gui;
+
+import com.mojang.blaze3d.systems.RenderSystem;
+import com.mojang.blaze3d.vertex.PoseStack;
+import nl.requios.effortlessbuilding.create.foundation.gui.element.BoxElement;
+import nl.requios.effortlessbuilding.create.foundation.gui.element.TextStencilElement;
+import nl.requios.effortlessbuilding.create.foundation.gui.widget.BoxWidget;
+import net.minecraft.client.Minecraft;
+import net.minecraft.client.gui.screens.Screen;
+import net.minecraft.network.chat.FormattedText;
+import net.minecraft.network.chat.Style;
+import org.lwjgl.opengl.GL30;
+
+import javax.annotation.Nonnull;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.function.Consumer;
+
+public class ConfirmationScreen extends AbstractSimiScreen {
+
+	private Screen source;
+	private Consumer<Response> action = _success -> {
+	};
+	private List<FormattedText> text = new ArrayList<>();
+	private boolean centered = false;
+	private int x;
+	private int y;
+	private int textWidth;
+	private int textHeight;
+	private boolean tristate;
+
+	private BoxWidget confirm;
+	private BoxWidget confirmDontSave;
+	private BoxWidget cancel;
+	private BoxElement textBackground;
+
+	public enum Response {
+		Confirm, ConfirmDontSave, Cancel
+	}
+
+	/*
+	 * Removes text lines from the back of the list
+	 * */
+	public ConfirmationScreen removeTextLines(int amount) {
+		if (amount > text.size())
+			return clearText();
+
+		text.subList(text.size() - amount, text.size()).clear();
+		return this;
+	}
+
+	public ConfirmationScreen clearText() {
+		this.text.clear();
+		return this;
+	}
+
+	public ConfirmationScreen addText(FormattedText text) {
+		this.text.add(text);
+		return this;
+	}
+
+	public ConfirmationScreen withText(FormattedText text) {
+		return clearText().addText(text);
+	}
+
+	public ConfirmationScreen at(int x, int y) {
+		this.x = Math.max(x, 0);
+		this.y = Math.max(y, 0);
+		this.centered = false;
+		return this;
+	}
+
+	public ConfirmationScreen centered() {
+		this.centered = true;
+		return this;
+	}
+
+	public ConfirmationScreen withAction(Consumer<Boolean> action) {
+		this.action = r -> action.accept(r == Response.Confirm);
+		return this;
+	}
+
+	public ConfirmationScreen withThreeActions(Consumer<Response> action) {
+		this.action = action;
+		this.tristate = true;
+		return this;
+	}
+
+	public void open(@Nonnull Screen source) {
+		this.source = source;
+		Minecraft client = source.getMinecraft();
+		this.init(client, client.getWindow().getGuiScaledWidth(), client.getWindow().getGuiScaledHeight());
+		this.minecraft.screen = this;
+	}
+
+	@Override
+	public void tick() {
+		super.tick();
+		source.tick();
+	}
+
+	@Override
+	protected void init() {
+		super.init();
+
+		ArrayList<FormattedText> copy = new ArrayList<>(text);
+		text.clear();
+		copy.forEach(t -> text.addAll(font.getSplitter().splitLines(t, 300, Style.EMPTY)));
+
+		textHeight = text.size() * (font.lineHeight + 1) + 4;
+		textWidth = 300;
+
+		if (centered) {
+			x = width/2 - textWidth/2 - 2;
+			y = height/2 - textHeight/2 - 16;
+		} else {
+			x = Math.max(0, x - textWidth / 2);
+			y = Math.max(0, y -= textHeight);
+		}
+
+		if (x + textWidth > width) {
+			x = width - textWidth;
+		}
+
+		if (y + textHeight + 30 > height) {
+			y = height - textHeight - 30;
+		}
+
+		int buttonX = x + textWidth / 2 - 6 - (int) (70 * (tristate ? 1.5f : 1));
+
+		TextStencilElement confirmText =
+				new TextStencilElement(font, tristate ? "Save" : "Confirm").centered(true, true);
+		confirm = new BoxWidget(buttonX, y + textHeight + 6, 70, 16).withCallback(() -> accept(Response.Confirm));
+		confirm.showingElement(confirmText.withElementRenderer(BoxWidget.gradientFactory.apply(confirm)));
+		addRenderableWidget(confirm);
+
+		buttonX += 12 + 70;
+
+		if (tristate) {
+			TextStencilElement confirmDontSaveText =
+					new TextStencilElement(font, "Don't Save").centered(true, true);
+			confirmDontSave =
+					new BoxWidget(buttonX, y + textHeight + 6, 70, 16).withCallback(() -> accept(Response.ConfirmDontSave));
+			confirmDontSave.showingElement(
+					confirmDontSaveText.withElementRenderer(BoxWidget.gradientFactory.apply(confirmDontSave)));
+			addRenderableWidget(confirmDontSave);
+			buttonX += 12 + 70;
+		}
+
+		TextStencilElement cancelText = new TextStencilElement(font, "Cancel").centered(true, true);
+		cancel = new BoxWidget(buttonX, y + textHeight + 6, 70, 16)
+				.withCallback(() -> accept(Response.Cancel));
+		cancel.showingElement(cancelText.withElementRenderer(BoxWidget.gradientFactory.apply(cancel)));
+		addRenderableWidget(cancel);
+
+		textBackground = new BoxElement()
+				.gradientBorder(Theme.p(Theme.Key.BUTTON_DISABLE))
+				.withBounds(width + 10, textHeight + 35)
+				.at(-5, y - 5);
+
+		if (text.size() == 1)
+			x = (width - font.width(text.get(0))) / 2;
+	}
+
+	@Override
+	public void onClose() {
+		accept(Response.Cancel);
+	}
+
+	private void accept(Response success) {
+		minecraft.screen = source;
+		action.accept(success);
+	}
+
+	@Override
+	protected void renderWindow(PoseStack ms, int mouseX, int mouseY, float partialTicks) {
+		textBackground.render(ms);
+		int offset = font.lineHeight + 1;
+		int lineY = y - offset;
+
+		ms.pushPose();
+		ms.translate(0, 0, 200);
+
+		for (FormattedText line : text) {
+			lineY += offset;
+			if (line == null)
+				continue;
+			font.draw(ms, line.getString(), x, lineY, 0xeaeaea);
+		}
+
+		ms.popPose();
+	}
+
+	@Override
+	protected void renderWindowBackground(PoseStack ms, int mouseX, int mouseY, float partialTicks) {
+		endFrame();
+
+		source.render(ms, 0, 0, 10); // zero mouse coords to prevent further tooltips
+
+		prepareFrame();
+
+		this.fillGradient(ms, 0, 0, this.width, this.height, 0x70101010, 0x80101010);
+	}
+
+
+	@Override
+	protected void prepareFrame() {
+		UIRenderHelper.swapAndBlitColor(minecraft.getMainRenderTarget(), UIRenderHelper.framebuffer);
+		RenderSystem.clear(GL30.GL_STENCIL_BUFFER_BIT | GL30.GL_DEPTH_BUFFER_BIT, Minecraft.ON_OSX);
+	}
+
+	@Override
+	protected void endFrame() {
+		UIRenderHelper.swapAndBlitColor(UIRenderHelper.framebuffer, minecraft.getMainRenderTarget());
+	}
+
+	@Override
+	public void resize(@Nonnull Minecraft client, int width, int height) {
+		super.resize(client, width, height);
+		source.resize(client, width, height);
+	}
+
+	@Override
+	public boolean isPauseScreen() {
+		return true;
+	}
+}

src/main/java/nl/requios/effortlessbuilding/create/foundation/gui/CustomLightingSettings.java

@@ -0,0 +1,81 @@
+package nl.requios.effortlessbuilding.create.foundation.gui;
+
+import com.mojang.blaze3d.systems.RenderSystem;
+import com.mojang.math.Matrix4f;
+import com.mojang.math.Vector3f;
+
+public class CustomLightingSettings implements ILightingSettings {
+
+	private Vector3f light1;
+	private Vector3f light2;
+	private Matrix4f lightMatrix;
+
+	protected CustomLightingSettings(float yRot, float xRot) {
+		init(yRot, xRot, 0, 0, false);
+	}
+
+	protected CustomLightingSettings(float yRot1, float xRot1, float yRot2, float xRot2) {
+		init(yRot1, xRot1, yRot2, xRot2, true);
+	}
+
+	protected void init(float yRot1, float xRot1, float yRot2, float xRot2, boolean doubleLight) {
+		light1 = Vector3f.ZP.copy();
+		light1.transform(Vector3f.YP.rotationDegrees(yRot1));
+		light1.transform(Vector3f.XN.rotationDegrees(xRot1));
+
+		if (doubleLight) {
+			light2 = Vector3f.ZP.copy();
+			light2.transform(Vector3f.YP.rotationDegrees(yRot2));
+			light2.transform(Vector3f.XN.rotationDegrees(xRot2));
+		} else {
+			light2 = Vector3f.ZERO;
+		}
+
+		lightMatrix = new Matrix4f();
+		lightMatrix.setIdentity();
+	}
+
+	@Override
+	public void applyLighting() {
+		RenderSystem.setupLevelDiffuseLighting(light1, light2, lightMatrix);
+	}
+
+	public static Builder builder() {
+		return new Builder();
+	}
+
+	public static class Builder {
+
+		private float yRot1, xRot1;
+		private float yRot2, xRot2;
+		private boolean doubleLight;
+
+		public Builder firstLightRotation(float yRot, float xRot) {
+			yRot1 = yRot;
+			xRot1 = xRot;
+			return this;
+		}
+
+		public Builder secondLightRotation(float yRot, float xRot) {
+			yRot2 = yRot;
+			xRot2 = xRot;
+			doubleLight = true;
+			return this;
+		}
+
+		public Builder doubleLight() {
+			doubleLight = true;
+			return this;
+		}
+
+		public CustomLightingSettings build() {
+			if (doubleLight) {
+				return new CustomLightingSettings(yRot1, xRot1, yRot2, xRot2);
+			} else {
+				return new CustomLightingSettings(yRot1, xRot1);
+			}
+		}
+
+	}
+
+}

src/main/java/nl/requios/effortlessbuilding/create/foundation/gui/ILightingSettings.java

@@ -0,0 +1,12 @@
+package nl.requios.effortlessbuilding.create.foundation.gui;
+
+import com.mojang.blaze3d.platform.Lighting;
+
+public interface ILightingSettings {
+
+	void applyLighting();
+
+	static final ILightingSettings DEFAULT_3D = () -> Lighting.setupFor3DItems();
+	static final ILightingSettings DEFAULT_FLAT = () -> Lighting.setupForFlatItems();
+
+}

src/main/java/nl/requios/effortlessbuilding/create/foundation/gui/RemovedGuiUtils.java

@@ -0,0 +1,197 @@
+package nl.requios.effortlessbuilding.create.foundation.gui;
+
+import com.mojang.blaze3d.systems.RenderSystem;
+import com.mojang.blaze3d.vertex.PoseStack;
+import com.mojang.blaze3d.vertex.Tesselator;
+import com.mojang.math.Matrix4f;
+import net.minecraft.client.gui.Font;
+import net.minecraft.client.gui.screens.inventory.tooltip.ClientTooltipComponent;
+import net.minecraft.client.renderer.MultiBufferSource;
+import net.minecraft.network.chat.FormattedText;
+import net.minecraft.network.chat.Style;
+import net.minecraft.world.item.ItemStack;
+import net.minecraftforge.client.ForgeHooksClient;
+import net.minecraftforge.client.event.RenderTooltipEvent;
+import net.minecraftforge.client.gui.ScreenUtils;
+import net.minecraftforge.common.MinecraftForge;
+
+import javax.annotation.Nonnull;
+import java.util.ArrayList;
+import java.util.List;
+
+public class RemovedGuiUtils {
+	@Nonnull
+	private static ItemStack cachedTooltipStack = ItemStack.EMPTY;
+
+	public static void preItemToolTip(@Nonnull ItemStack stack) {
+		cachedTooltipStack = stack;
+	}
+
+	public static void postItemToolTip() {
+		cachedTooltipStack = ItemStack.EMPTY;
+	}
+
+	public static void drawHoveringText(PoseStack mStack, List<? extends FormattedText> textLines, int mouseX,
+		int mouseY, int screenWidth, int screenHeight, int maxTextWidth, Font font) {
+		drawHoveringText(mStack, textLines, mouseX, mouseY, screenWidth, screenHeight, maxTextWidth,
+			ScreenUtils.DEFAULT_BACKGROUND_COLOR, ScreenUtils.DEFAULT_BORDER_COLOR_START, ScreenUtils.DEFAULT_BORDER_COLOR_END,
+			font);
+	}
+
+	public static void drawHoveringText(PoseStack mStack, List<? extends FormattedText> textLines, int mouseX,
+		int mouseY, int screenWidth, int screenHeight, int maxTextWidth, int backgroundColor, int borderColorStart,
+		int borderColorEnd, Font font) {
+		drawHoveringText(cachedTooltipStack, mStack, textLines, mouseX, mouseY, screenWidth, screenHeight, maxTextWidth,
+			backgroundColor, borderColorStart, borderColorEnd, font);
+	}
+
+	public static void drawHoveringText(@Nonnull final ItemStack stack, PoseStack mStack,
+		List<? extends FormattedText> textLines, int mouseX, int mouseY, int screenWidth, int screenHeight,
+		int maxTextWidth, Font font) {
+		drawHoveringText(stack, mStack, textLines, mouseX, mouseY, screenWidth, screenHeight, maxTextWidth,
+			ScreenUtils.DEFAULT_BACKGROUND_COLOR, ScreenUtils.DEFAULT_BORDER_COLOR_START, ScreenUtils.DEFAULT_BORDER_COLOR_END,
+			font);
+	}
+
+	public static void drawHoveringText(@Nonnull final ItemStack stack, PoseStack pStack,
+		List<? extends FormattedText> textLines, int mouseX, int mouseY, int screenWidth, int screenHeight,
+		int maxTextWidth, int backgroundColor, int borderColorStart, int borderColorEnd, Font font) {
+		if (textLines.isEmpty())
+			return;
+
+		List<ClientTooltipComponent> list = ForgeHooksClient.gatherTooltipComponents(stack, textLines,
+			stack.getTooltipImage(), mouseX, screenWidth, screenHeight, font, font);
+		RenderTooltipEvent.Pre event =
+			new RenderTooltipEvent.Pre(stack, pStack, mouseX, mouseY, screenWidth, screenHeight, font, list);
+		if (MinecraftForge.EVENT_BUS.post(event))
+			return;
+
+		mouseX = event.getX();
+		mouseY = event.getY();
+		screenWidth = event.getScreenWidth();
+		screenHeight = event.getScreenHeight();
+		font = event.getFont();
+
+		// RenderSystem.disableRescaleNormal();
+		RenderSystem.disableDepthTest();
+		int tooltipTextWidth = 0;
+
+		for (FormattedText textLine : textLines) {
+			int textLineWidth = font.width(textLine);
+			if (textLineWidth > tooltipTextWidth)
+				tooltipTextWidth = textLineWidth;
+		}
+
+		boolean needsWrap = false;
+
+		int titleLinesCount = 1;
+		int tooltipX = mouseX + 12;
+		if (tooltipX + tooltipTextWidth + 4 > screenWidth) {
+			tooltipX = mouseX - 16 - tooltipTextWidth;
+			if (tooltipX < 4) // if the tooltip doesn't fit on the screen
+			{
+				if (mouseX > screenWidth / 2)
+					tooltipTextWidth = mouseX - 12 - 8;
+				else
+					tooltipTextWidth = screenWidth - 16 - mouseX;
+				needsWrap = true;
+			}
+		}
+
+		if (maxTextWidth > 0 && tooltipTextWidth > maxTextWidth) {
+			tooltipTextWidth = maxTextWidth;
+			needsWrap = true;
+		}
+
+		if (needsWrap) {
+			int wrappedTooltipWidth = 0;
+			List<FormattedText> wrappedTextLines = new ArrayList<>();
+			for (int i = 0; i < textLines.size(); i++) {
+				FormattedText textLine = textLines.get(i);
+				List<FormattedText> wrappedLine = font.getSplitter()
+					.splitLines(textLine, tooltipTextWidth, Style.EMPTY);
+				if (i == 0)
+					titleLinesCount = wrappedLine.size();
+
+				for (FormattedText line : wrappedLine) {
+					int lineWidth = font.width(line);
+					if (lineWidth > wrappedTooltipWidth)
+						wrappedTooltipWidth = lineWidth;
+					wrappedTextLines.add(line);
+				}
+			}
+			tooltipTextWidth = wrappedTooltipWidth;
+			textLines = wrappedTextLines;
+
+			if (mouseX > screenWidth / 2)
+				tooltipX = mouseX - 16 - tooltipTextWidth;
+			else
+				tooltipX = mouseX + 12;
+		}
+
+		int tooltipY = mouseY - 12;
+		int tooltipHeight = 8;
+
+		if (textLines.size() > 1) {
+			tooltipHeight += (textLines.size() - 1) * 10;
+			if (textLines.size() > titleLinesCount)
+				tooltipHeight += 2; // gap between title lines and next lines
+		}
+
+		if (tooltipY < 4)
+			tooltipY = 4;
+		else if (tooltipY + tooltipHeight + 4 > screenHeight)
+			tooltipY = screenHeight - tooltipHeight - 4;
+
+		final int zLevel = 400;
+		RenderTooltipEvent.Color colorEvent = new RenderTooltipEvent.Color(stack, pStack, tooltipX, tooltipY,
+			font, backgroundColor, borderColorStart, borderColorEnd, list);
+		MinecraftForge.EVENT_BUS.post(colorEvent);
+		backgroundColor = colorEvent.getBackgroundStart();
+		borderColorStart = colorEvent.getBorderStart();
+		borderColorEnd = colorEvent.getBorderEnd();
+
+		pStack.pushPose();
+		Matrix4f mat = pStack.last()
+			.pose();
+		ScreenUtils.drawGradientRect(mat, zLevel, tooltipX - 3, tooltipY - 4, tooltipX + tooltipTextWidth + 3,
+			tooltipY - 3, backgroundColor, backgroundColor);
+		ScreenUtils.drawGradientRect(mat, zLevel, tooltipX - 3, tooltipY + tooltipHeight + 3,
+			tooltipX + tooltipTextWidth + 3, tooltipY + tooltipHeight + 4, backgroundColor, backgroundColor);
+		ScreenUtils.drawGradientRect(mat, zLevel, tooltipX - 3, tooltipY - 3, tooltipX + tooltipTextWidth + 3,
+			tooltipY + tooltipHeight + 3, backgroundColor, backgroundColor);
+		ScreenUtils.drawGradientRect(mat, zLevel, tooltipX - 4, tooltipY - 3, tooltipX - 3, tooltipY + tooltipHeight + 3,
+			backgroundColor, backgroundColor);
+		ScreenUtils.drawGradientRect(mat, zLevel, tooltipX + tooltipTextWidth + 3, tooltipY - 3,
+			tooltipX + tooltipTextWidth + 4, tooltipY + tooltipHeight + 3, backgroundColor, backgroundColor);
+		ScreenUtils.drawGradientRect(mat, zLevel, tooltipX - 3, tooltipY - 3 + 1, tooltipX - 3 + 1,
+			tooltipY + tooltipHeight + 3 - 1, borderColorStart, borderColorEnd);
+		ScreenUtils.drawGradientRect(mat, zLevel, tooltipX + tooltipTextWidth + 2, tooltipY - 3 + 1,
+			tooltipX + tooltipTextWidth + 3, tooltipY + tooltipHeight + 3 - 1, borderColorStart, borderColorEnd);
+		ScreenUtils.drawGradientRect(mat, zLevel, tooltipX - 3, tooltipY - 3, tooltipX + tooltipTextWidth + 3,
+			tooltipY - 3 + 1, borderColorStart, borderColorStart);
+		ScreenUtils.drawGradientRect(mat, zLevel, tooltipX - 3, tooltipY + tooltipHeight + 2,
+			tooltipX + tooltipTextWidth + 3, tooltipY + tooltipHeight + 3, borderColorEnd, borderColorEnd);
+
+		MultiBufferSource.BufferSource renderType = MultiBufferSource.immediate(Tesselator.getInstance()
+			.getBuilder());
+		pStack.translate(0.0D, 0.0D, zLevel);
+
+		for (int lineNumber = 0; lineNumber < list.size(); ++lineNumber) {
+			ClientTooltipComponent line = list.get(lineNumber);
+			
+			if (line != null)
+				line.renderText(font, tooltipX, tooltipY, mat, renderType);
+
+			if (lineNumber + 1 == titleLinesCount)
+				tooltipY += 2;
+
+			tooltipY += 10;
+		}
+
+		renderType.endBatch();
+		pStack.popPose();
+
+		RenderSystem.enableDepthTest();
+	}
+}

src/main/java/nl/requios/effortlessbuilding/create/foundation/gui/Theme.java

@@ -0,0 +1,229 @@
+package nl.requios.effortlessbuilding.create.foundation.gui;
+
+import nl.requios.effortlessbuilding.create.foundation.utility.Color;
+import nl.requios.effortlessbuilding.create.foundation.utility.Couple;
+
+import javax.annotation.Nonnull;
+import javax.annotation.Nullable;
+import java.util.*;
+
+public class Theme {
+
+	private static final List<Theme> THEMES = new ArrayList<>();
+	public static final Theme BASE = addTheme(new Theme());
+
+	public static Theme addTheme(@Nonnull Theme theme) {
+		THEMES.add(theme);
+		THEMES.sort(Comparator.comparingInt(Theme::getPriority).reversed());
+		return theme;
+	}
+
+	public static void removeTheme(Theme theme) {
+		THEMES.remove(theme);
+	}
+
+	public static void reload() {
+		THEMES.forEach(Theme::init);
+	}
+
+	private static ColorHolder resolve(String key) {
+		return THEMES
+				.stream()
+				.map(theme -> theme.get(key))
+				.filter(Objects::nonNull)
+				.findFirst()
+				.map(holder -> holder.lookupKey == null ? holder : resolve(holder.lookupKey))
+				.orElse(ColorHolder.MISSING);
+	}
+
+	@Nonnull public static Couple<Color> p(@Nonnull Key key) {return p(key.get());}
+	@Nonnull public static Couple<Color> p(String key) {return resolve(key).asPair();}
+
+	@Nonnull public static Color c(@Nonnull Key key, boolean first) {return c(key.get(), first);}
+	@Nonnull public static Color c(String key, boolean first) {return p(key).get(first);}
+
+	public static int i(@Nonnull Key key, boolean first) {return i(key.get(), first);}
+	public static int i(String key, boolean first) {return p(key).get(first).getRGB();}
+
+	@Nonnull public static Color c(@Nonnull Key key) {return c(key.get());}
+	@Nonnull public static Color c(String key) {return resolve(key).get();}
+
+	public static int i(@Nonnull Key key) {return i(key.get());}
+	public static int i(String key) {return resolve(key).get().getRGB();}
+
+	//-----------//
+
+	protected final Map<String, ColorHolder> colors;
+	private int priority = 0;
+
+	protected Theme() {
+		colors = new HashMap<>();
+		init();
+	}
+
+	/*
+	 * Small note to addons: if you also want to make use of Theme,
+	 * and add new Keys, please do not use mixins. Instead make a Theme
+	 * subclass, override init and apply it via the static #addTheme
+	 *
+	 **/
+
+	protected void init() {
+		put(Key.BUTTON_IDLE, new Color(0xdd_8ab6d6, true), new Color(0x90_8ab6d6, true));
+		put(Key.BUTTON_HOVER, new Color(0xff_9ABBD3, true), new Color(0xd0_9ABBD3, true));
+		put(Key.BUTTON_CLICK, new Color(0xff_ffffff), new Color(0xee_ffffff));
+		put(Key.BUTTON_DISABLE, new Color(0x80_909090, true), new Color(0x60_909090, true));
+		put(Key.BUTTON_SUCCESS, new Color(0xcc_88f788, true), new Color(0xcc_20cc20, true));
+		put(Key.BUTTON_FAIL, new Color(0xcc_f78888, true), new Color(0xcc_cc2020, true));
+		put(Key.TEXT, new Color(0xff_eeeeee), new Color(0xff_a3a3a3));
+		put(Key.TEXT_DARKER, new Color(0xff_a3a3a3), new Color(0xff_808080));
+		put(Key.TEXT_ACCENT_STRONG, new Color(0xff_8ab6d6), new Color(0xff_8ab6d6));
+		put(Key.TEXT_ACCENT_SLIGHT, new Color(0xff_ddeeff), new Color(0xff_a0b0c0));
+		put(Key.STREAK, new Color(0x101010, false));
+		put(Key.VANILLA_TOOLTIP_BORDER, new Color(0x50_5000ff, true), new Color(0x50_28007f, true));
+		put(Key.VANILLA_TOOLTIP_BACKGROUND, new Color(0xf0_100010, true));
+
+		put(Key.PONDER_BUTTON_IDLE, new Color(0x60_c0c0ff, true), new Color(0x30_c0c0ff, true));
+		put(Key.PONDER_BUTTON_HOVER, new Color(0xf0_c0c0ff, true), new Color(0xa0_c0c0ff, true));
+		put(Key.PONDER_BUTTON_CLICK, new Color(0xff_ffffff), new Color(0xdd_ffffff));
+		put(Key.PONDER_BUTTON_DISABLE, new Color(0x80_909090, true), new Color(0x20_909090, true));
+		put(Key.PONDER_BACKGROUND_TRANSPARENT, new Color(0xdd_000000, true));
+		put(Key.PONDER_BACKGROUND_FLAT, new Color(0xff_000000, false));
+		put(Key.PONDER_BACKGROUND_IMPORTANT, new Color(0xdd_0e0e20, true));
+		put(Key.PONDER_IDLE, new Color(0x40ffeedd, true), new Color(0x20ffeedd, true));
+		put(Key.PONDER_HOVER, new Color(0x70ffffff, true), new Color(0x30ffffff, true));
+		put(Key.PONDER_HIGHLIGHT, new Color(0xf0ffeedd, true), new Color(0x60ffeedd, true));
+		put(Key.TEXT_WINDOW_BORDER, new Color(0x607a6000, true), new Color(0x207a6000, true));
+		put(Key.PONDER_BACK_ARROW, new Color(0xf0aa9999, true), new Color(0x30aa9999, true));
+		put(Key.PONDER_PROGRESSBAR, new Color(0x80ffeedd, true), new Color(0x50ffeedd, true));
+		put(Key.PONDER_MISSING_CREATE, new Color(0x70_984500, true), new Color(0x70_692400, true));
+		//put(Key.PONDER_MISSING_VANILLA, new Color(0x50_5000ff, true), new Color(0x50_300077, true));
+		lookup(Key.PONDER_MISSING_VANILLA, Key.VANILLA_TOOLTIP_BORDER);
+		put(Key.CONFIG_TITLE_A, new Color(0xffc69fbc, true), new Color(0xfff6b8bb, true));
+		put(Key.CONFIG_TITLE_B, new Color(0xfff6b8bb, true), new Color(0xfffbf994, true));
+		//put(Key., new Color(0x, true), new Color(0x, true));
+	}
+
+	protected void put(String key, Color c) {
+		colors.put(key, ColorHolder.single(c));
+	}
+
+	protected void put(Key key, Color c) {
+		put(key.get(), c);
+	}
+
+	protected void put(String key, Color c1, Color c2) {
+		colors.put(key, ColorHolder.pair(c1, c2));
+	}
+
+	protected void put(Key key, Color c1, Color c2) {
+		put(key.get(), c1, c2);
+	}
+
+	protected void lookup(Key key, Key source) {
+		colors.put(key.get(), ColorHolder.lookup(source.get()));
+	}
+
+	@Nullable protected ColorHolder get(String key) {
+		return colors.get(key);
+	}
+
+	public int getPriority() {
+		return priority;
+	}
+
+	public Theme setPriority(int priority) {
+		this.priority = priority;
+		return this;
+	}
+
+	public static class Key {
+
+		public static final Key BUTTON_IDLE = new Key();
+		public static final Key BUTTON_HOVER = new Key();
+		public static final Key BUTTON_CLICK = new Key();
+		public static final Key BUTTON_DISABLE = new Key();
+		public static final Key BUTTON_SUCCESS = new Key();
+		public static final Key BUTTON_FAIL = new Key();
+
+		public static final Key TEXT = new Key();
+		public static final Key TEXT_DARKER = new Key();
+		public static final Key TEXT_ACCENT_STRONG = new Key();
+		public static final Key TEXT_ACCENT_SLIGHT = new Key();
+
+		public static final Key STREAK = new Key();
+		public static final Key VANILLA_TOOLTIP_BORDER = new Key();
+		public static final Key VANILLA_TOOLTIP_BACKGROUND = new Key();
+
+		public static final Key PONDER_BACKGROUND_TRANSPARENT = new Key();
+		public static final Key PONDER_BACKGROUND_FLAT = new Key();
+		public static final Key PONDER_BACKGROUND_IMPORTANT = new Key();
+		public static final Key PONDER_IDLE = new Key();
+		public static final Key PONDER_HOVER = new Key();
+		public static final Key PONDER_HIGHLIGHT = new Key();
+		public static final Key TEXT_WINDOW_BORDER = new Key();
+		public static final Key PONDER_BACK_ARROW = new Key();
+		public static final Key PONDER_PROGRESSBAR = new Key();
+		public static final Key PONDER_MISSING_CREATE = new Key();
+		public static final Key PONDER_MISSING_VANILLA = new Key();
+
+		public static final Key PONDER_BUTTON_IDLE = new Key();
+		public static final Key PONDER_BUTTON_HOVER = new Key();
+		public static final Key PONDER_BUTTON_CLICK = new Key();
+		public static final Key PONDER_BUTTON_DISABLE = new Key();
+
+		public static final Key CONFIG_TITLE_A = new Key();
+		public static final Key CONFIG_TITLE_B = new Key();
+
+		private static int index = 0;
+
+		private final String s;
+
+		protected Key() {
+			this.s = "_" + index++;
+		}
+
+		protected Key(String s) {
+			this.s = s;
+		}
+
+		public String get() {
+			return s;
+		}
+	}
+
+	private static class ColorHolder {
+
+		private static final ColorHolder MISSING = ColorHolder.single(Color.BLACK);
+
+		private Couple<Color> colors;
+		private String lookupKey;
+
+		private static ColorHolder single(Color c) {
+			ColorHolder h = new ColorHolder();
+			h.colors = Couple.create(c.setImmutable(), c.setImmutable());
+			return h;
+		}
+
+		private static ColorHolder pair(Color first, Color second) {
+			ColorHolder h = new ColorHolder();
+			h.colors = Couple.create(first.setImmutable(), second.setImmutable());
+			return h;
+		}
+
+		private static ColorHolder lookup(String key) {
+			ColorHolder h = new ColorHolder();
+			h.lookupKey = key;
+			return h;
+		}
+
+		private Color get() {
+			return colors.getFirst();
+		}
+
+		private Couple<Color> asPair() {
+			return colors;
+		}
+
+	}
+}

src/main/java/nl/requios/effortlessbuilding/create/foundation/gui/TickableGuiEventListener.java

@@ -0,0 +1,7 @@
+package nl.requios.effortlessbuilding.create.foundation.gui;
+
+import net.minecraft.client.gui.components.events.GuiEventListener;
+
+public interface TickableGuiEventListener extends GuiEventListener {
+	void tick();
+}

src/main/java/nl/requios/effortlessbuilding/create/foundation/gui/UIRenderHelper.java

@@ -0,0 +1,316 @@
+package nl.requios.effortlessbuilding.create.foundation.gui;
+
+import com.mojang.blaze3d.pipeline.RenderTarget;
+import com.mojang.blaze3d.platform.GlConst;
+import com.mojang.blaze3d.platform.GlStateManager;
+import com.mojang.blaze3d.platform.Window;
+import com.mojang.blaze3d.systems.RenderSystem;
+import com.mojang.blaze3d.vertex.*;
+import com.mojang.math.Matrix4f;
+import com.mojang.math.Vector3f;
+import nl.requios.effortlessbuilding.create.foundation.utility.Color;
+import nl.requios.effortlessbuilding.create.foundation.utility.Couple;
+import net.minecraft.client.Minecraft;
+import net.minecraft.client.renderer.GameRenderer;
+import net.minecraftforge.client.gui.ScreenUtils;
+import org.lwjgl.opengl.GL20;
+import org.lwjgl.opengl.GL30;
+
+import javax.annotation.Nonnull;
+
+public class UIRenderHelper {
+
+	/**
+	 * An FBO that has a stencil buffer for use wherever stencil are necessary. Forcing the main FBO to have a stencil
+	 * buffer will cause GL error spam when using fabulous graphics.
+	 */
+	public static CustomRenderTarget framebuffer;
+
+	public static void init() {
+		RenderSystem.recordRenderCall(() -> {
+			Window mainWindow = Minecraft.getInstance().getWindow();
+			framebuffer = CustomRenderTarget.create(mainWindow);
+		});
+	}
+
+	public static void updateWindowSize(Window mainWindow) {
+		if (framebuffer != null)
+			framebuffer.resize(mainWindow.getWidth(), mainWindow.getHeight(), Minecraft.ON_OSX);
+	}
+
+	public static void drawFramebuffer(float alpha) {
+		framebuffer.renderWithAlpha(alpha);
+	}
+
+	/**
+	 * Switch from src to dst, after copying the contents of src to dst.
+	 */
+	public static void swapAndBlitColor(RenderTarget src, RenderTarget dst) {
+		GlStateManager._glBindFramebuffer(GL30.GL_READ_FRAMEBUFFER, src.frameBufferId);
+		GlStateManager._glBindFramebuffer(GL30.GL_DRAW_FRAMEBUFFER, dst.frameBufferId);
+		GlStateManager._glBlitFrameBuffer(0, 0, src.viewWidth, src.viewHeight, 0, 0, dst.viewWidth, dst.viewHeight, GL30.GL_COLOR_BUFFER_BIT, GL20.GL_LINEAR);
+
+		GlStateManager._glBindFramebuffer(GlConst.GL_FRAMEBUFFER, dst.frameBufferId);
+	}
+
+	public static void streak(PoseStack ms, float angle, int x, int y, int breadth, int length) {
+		streak(ms, angle, x, y, breadth, length, Theme.i(Theme.Key.STREAK));
+	}
+	// angle in degrees; 0° -> fading to the right
+	// x and y specify the middle point of the starting edge
+	// breadth is the total width of the streak
+
+	public static void streak(PoseStack ms, float angle, int x, int y, int breadth, int length, int color) {
+		int a1 = 0xa0 << 24;
+		int a2 = 0x80 << 24;
+		int a3 = 0x10 << 24;
+		int a4 = 0x00 << 24;
+
+		color &= 0x00FFFFFF;
+		int c1 = a1 | color;
+		int c2 = a2 | color;
+		int c3 = a3 | color;
+		int c4 = a4 | color;
+
+		ms.pushPose();
+		ms.translate(x, y, 0);
+		ms.mulPose(Vector3f.ZP.rotationDegrees(angle - 90));
+
+		streak(ms, breadth / 2, length, c1, c2, c3, c4);
+
+		ms.popPose();
+	}
+
+	public static void streak(PoseStack ms, float angle, int x, int y, int breadth, int length, Color c) {
+		Color color = c.copy().setImmutable();
+		int c1 = color.scaleAlpha(0.625f).getRGB();
+		int c2 = color.scaleAlpha(0.5f).getRGB();
+		int c3 = color.scaleAlpha(0.0625f).getRGB();
+		int c4 = color.scaleAlpha(0f).getRGB();
+
+		ms.pushPose();
+		ms.translate(x, y, 0);
+		ms.mulPose(Vector3f.ZP.rotationDegrees(angle - 90));
+
+		streak(ms, breadth / 2, length, c1, c2, c3, c4);
+
+		ms.popPose();
+	}
+
+	private static void streak(PoseStack ms, int width, int height, int c1, int c2, int c3, int c4) {
+		double split1 = .5;
+		double split2 = .75;
+		Matrix4f model = ms.last().pose();
+		ScreenUtils.drawGradientRect(model, 0, -width, 0, width, (int) (split1 * height), c1, c2);
+		ScreenUtils.drawGradientRect(model, 0, -width, (int) (split1 * height), width, (int) (split2 * height), c2, c3);
+		ScreenUtils.drawGradientRect(model, 0, -width, (int) (split2 * height), width, height, c3, c4);
+	}
+
+	/**
+	 * @see #angledGradient(MatrixStack, float, int, int, int, int, int, Color, Color)
+	 */
+	public static void angledGradient(@Nonnull PoseStack ms, float angle, int x, int y, int breadth, int length, Couple<Color> c) {
+		angledGradient(ms, angle, x, y, 0, breadth, length, c);
+	}
+
+	/**
+	 * @see #angledGradient(MatrixStack, float, int, int, int, int, int, Color, Color)
+	 */
+	public static void angledGradient(@Nonnull PoseStack ms, float angle, int x, int y, int z, int breadth, int length, Couple<Color> c) {
+		angledGradient(ms, angle, x, y, z, breadth, length, c.getFirst(), c.getSecond());
+	}
+
+	/**
+	 * @see #angledGradient(MatrixStack, float, int, int, int, int, int, Color, Color)
+	 */
+	public static void angledGradient(@Nonnull PoseStack ms, float angle, int x, int y, int breadth, int length, Color color1, Color color2) {
+		angledGradient(ms, angle, x, y, 0, breadth, length, color1, color2);
+	}
+
+	/**
+	 * x and y specify the middle point of the starting edge
+	 *
+	 * @param angle   the angle of the gradient in degrees; 0° means from left to right
+	 * @param color1  the color at the starting edge
+	 * @param color2  the color at the ending edge
+	 * @param breadth the total width of the gradient
+	 */
+	public static void angledGradient(@Nonnull PoseStack ms, float angle, int x, int y, int z, int breadth, int length, Color color1, Color color2) {
+		ms.pushPose();
+		ms.translate(x, y, z);
+		ms.mulPose(Vector3f.ZP.rotationDegrees(angle - 90));
+
+		Matrix4f model = ms.last().pose();
+		int w = breadth / 2;
+		ScreenUtils.drawGradientRect(model, 0, -w, 0, w, length, color1.getRGB(), color2.getRGB());
+
+		ms.popPose();
+	}
+
+	public static void breadcrumbArrow(PoseStack matrixStack, int x, int y, int z, int width, int height, int indent, Couple<Color> colors) {breadcrumbArrow(matrixStack, x, y, z, width, height, indent, colors.getFirst(), colors.getSecond());}
+
+	// draws a wide chevron-style breadcrumb arrow pointing left
+	public static void breadcrumbArrow(PoseStack matrixStack, int x, int y, int z, int width, int height, int indent, Color startColor, Color endColor) {
+		matrixStack.pushPose();
+		matrixStack.translate(x - indent, y, z);
+
+		breadcrumbArrow(matrixStack, width, height, indent, startColor, endColor);
+
+		matrixStack.popPose();
+	}
+
+	private static void breadcrumbArrow(PoseStack ms, int width, int height, int indent, Color c1, Color c2) {
+
+		/*
+		 * 0,0       x1,y1 ********************* x4,y4 ***** x7,y7
+		 *       ****                                     ****
+		 *   ****                                     ****
+		 * x0,y0     x2,y2                       x5,y5
+		 *   ****                                     ****
+		 *       ****                                     ****
+		 *           x3,y3 ********************* x6,y6 ***** x8,y8
+		 *
+		 */
+
+		float x0 = 0, y0 = height / 2f;
+		float x1 = indent, y1 = 0;
+		float x2 = indent, y2 = height / 2f;
+		float x3 = indent, y3 = height;
+		float x4 = width, y4 = 0;
+		float x5 = width, y5 = height / 2f;
+		float x6 = width, y6 = height;
+		float x7 = indent + width, y7 = 0;
+		float x8 = indent + width, y8 = height;
+
+		indent = Math.abs(indent);
+		width = Math.abs(width);
+		Color fc1 = Color.mixColors(c1, c2, 0);
+		Color fc2 = Color.mixColors(c1, c2, (indent) / (width + 2f * indent));
+		Color fc3 = Color.mixColors(c1, c2, (indent + width) / (width + 2f * indent));
+		Color fc4 = Color.mixColors(c1, c2, 1);
+
+		RenderSystem.disableTexture();
+		RenderSystem.enableBlend();
+		RenderSystem.disableCull();
+		RenderSystem.defaultBlendFunc();
+		RenderSystem.setShader(GameRenderer::getPositionColorShader);
+
+		Tesselator tessellator = Tesselator.getInstance();
+		BufferBuilder bufferbuilder = tessellator.getBuilder();
+		Matrix4f model = ms.last().pose();
+		bufferbuilder.begin(VertexFormat.Mode.TRIANGLES, DefaultVertexFormat.POSITION_COLOR);
+
+		bufferbuilder.vertex(model, x0, y0, 0).color(fc1.getRed(), fc1.getGreen(), fc1.getBlue(), fc1.getAlpha()).endVertex();
+		bufferbuilder.vertex(model, x1, y1, 0).color(fc2.getRed(), fc2.getGreen(), fc2.getBlue(), fc2.getAlpha()).endVertex();
+		bufferbuilder.vertex(model, x2, y2, 0).color(fc2.getRed(), fc2.getGreen(), fc2.getBlue(), fc2.getAlpha()).endVertex();
+
+		bufferbuilder.vertex(model, x0, y0, 0).color(fc1.getRed(), fc1.getGreen(), fc1.getBlue(), fc1.getAlpha()).endVertex();
+		bufferbuilder.vertex(model, x2, y2, 0).color(fc2.getRed(), fc2.getGreen(), fc2.getBlue(), fc2.getAlpha()).endVertex();
+		bufferbuilder.vertex(model, x3, y3, 0).color(fc2.getRed(), fc2.getGreen(), fc2.getBlue(), fc2.getAlpha()).endVertex();
+
+		bufferbuilder.vertex(model, x3, y3, 0).color(fc2.getRed(), fc2.getGreen(), fc2.getBlue(), fc2.getAlpha()).endVertex();
+		bufferbuilder.vertex(model, x1, y1, 0).color(fc2.getRed(), fc2.getGreen(), fc2.getBlue(), fc2.getAlpha()).endVertex();
+		bufferbuilder.vertex(model, x4, y4, 0).color(fc3.getRed(), fc3.getGreen(), fc3.getBlue(), fc3.getAlpha()).endVertex();
+
+		bufferbuilder.vertex(model, x3, y3, 0).color(fc2.getRed(), fc2.getGreen(), fc2.getBlue(), fc2.getAlpha()).endVertex();
+		bufferbuilder.vertex(model, x4, y4, 0).color(fc3.getRed(), fc3.getGreen(), fc3.getBlue(), fc3.getAlpha()).endVertex();
+		bufferbuilder.vertex(model, x6, y6, 0).color(fc3.getRed(), fc3.getGreen(), fc3.getBlue(), fc3.getAlpha()).endVertex();
+
+		bufferbuilder.vertex(model, x5, y5, 0).color(fc3.getRed(), fc3.getGreen(), fc3.getBlue(), fc3.getAlpha()).endVertex();
+		bufferbuilder.vertex(model, x4, y4, 0).color(fc3.getRed(), fc3.getGreen(), fc3.getBlue(), fc3.getAlpha()).endVertex();
+		bufferbuilder.vertex(model, x7, y7, 0).color(fc4.getRed(), fc4.getGreen(), fc4.getBlue(), fc4.getAlpha()).endVertex();
+
+		bufferbuilder.vertex(model, x6, y6, 0).color(fc3.getRed(), fc3.getGreen(), fc3.getBlue(), fc3.getAlpha()).endVertex();
+		bufferbuilder.vertex(model, x5, y5, 0).color(fc3.getRed(), fc3.getGreen(), fc3.getBlue(), fc3.getAlpha()).endVertex();
+		bufferbuilder.vertex(model, x8, y8, 0).color(fc4.getRed(), fc4.getGreen(), fc4.getBlue(), fc4.getAlpha()).endVertex();
+
+		tessellator.end();
+		RenderSystem.enableCull();
+		RenderSystem.disableBlend();
+		RenderSystem.enableTexture();
+	}
+
+	//just like AbstractGui#drawTexture, but with a color at every vertex
+	public static void drawColoredTexture(PoseStack ms, Color c, int x, int y, int tex_left, int tex_top, int width, int height) {
+		drawColoredTexture(ms, c, x, y, 0, (float) tex_left, (float) tex_top, width, height, 256, 256);
+	}
+
+	public static void drawColoredTexture(PoseStack ms, Color c, int x, int y, int z, float tex_left, float tex_top, int width, int height, int sheet_width, int sheet_height) {
+		drawColoredTexture(ms, c, x, x + width, y, y + height, z, width, height, tex_left, tex_top, sheet_width, sheet_height);
+	}
+
+	public static void drawStretched(PoseStack ms, int left, int top, int w, int h, int z, AllGuiTextures tex) {
+		tex.bind();
+		drawTexturedQuad(ms.last()
+			.pose(), Color.WHITE, left, left + w, top, top + h, z, tex.startX / 256f, (tex.startX + tex.width) / 256f,
+			tex.startY / 256f, (tex.startY + tex.height) / 256f);
+	}
+
+	private static void drawColoredTexture(PoseStack ms, Color c, int left, int right, int top, int bot, int z, int tex_width, int tex_height, float tex_left, float tex_top, int sheet_width, int sheet_height) {
+		drawTexturedQuad(ms.last().pose(), c, left, right, top, bot, z, (tex_left + 0.0F) / (float) sheet_width, (tex_left + (float) tex_width) / (float) sheet_width, (tex_top + 0.0F) / (float) sheet_height, (tex_top + (float) tex_height) / (float) sheet_height);
+	}
+
+	private static void drawTexturedQuad(Matrix4f m, Color c, int left, int right, int top, int bot, int z, float u1, float u2, float v1, float v2) {
+		Tesselator tesselator = Tesselator.getInstance();
+		BufferBuilder bufferbuilder = tesselator.getBuilder();
+		RenderSystem.enableBlend();
+		RenderSystem.defaultBlendFunc();
+		RenderSystem.setShader(GameRenderer::getPositionColorTexShader);
+		bufferbuilder.begin(VertexFormat.Mode.QUADS, DefaultVertexFormat.POSITION_COLOR_TEX);
+		bufferbuilder.vertex(m, (float) left , (float) bot, (float) z).color(c.getRed(), c.getGreen(), c.getBlue(), c.getAlpha()).uv(u1, v2).endVertex();
+		bufferbuilder.vertex(m, (float) right, (float) bot, (float) z).color(c.getRed(), c.getGreen(), c.getBlue(), c.getAlpha()).uv(u2, v2).endVertex();
+		bufferbuilder.vertex(m, (float) right, (float) top, (float) z).color(c.getRed(), c.getGreen(), c.getBlue(), c.getAlpha()).uv(u2, v1).endVertex();
+		bufferbuilder.vertex(m, (float) left , (float) top, (float) z).color(c.getRed(), c.getGreen(), c.getBlue(), c.getAlpha()).uv(u1, v1).endVertex();
+		tesselator.end();
+		RenderSystem.disableBlend();
+	}
+
+	public static void flipForGuiRender(PoseStack poseStack) {
+		poseStack.mulPoseMatrix(Matrix4f.createScaleMatrix(1, -1, 1));
+	}
+
+	public static class CustomRenderTarget extends RenderTarget {
+
+		public CustomRenderTarget(boolean useDepth) {
+			super(useDepth);
+		}
+
+		public static CustomRenderTarget create(Window mainWindow) {
+			CustomRenderTarget framebuffer = new CustomRenderTarget(true);
+			framebuffer.resize(mainWindow.getWidth(), mainWindow.getHeight(), Minecraft.ON_OSX);
+			framebuffer.setClearColor(0, 0, 0, 0);
+			framebuffer.enableStencil();
+			return framebuffer;
+		}
+
+		public void renderWithAlpha(float alpha) {
+			Window window = Minecraft.getInstance().getWindow();
+
+			float vx = (float) window.getGuiScaledWidth();
+			float vy = (float) window.getGuiScaledHeight();
+			float tx = (float) viewWidth / (float) width;
+			float ty = (float) viewHeight / (float) height;
+
+			RenderSystem.enableTexture();
+			RenderSystem.enableDepthTest();
+			RenderSystem.setShader(() -> Minecraft.getInstance().gameRenderer.blitShader);
+			RenderSystem.getShader().setSampler("DiffuseSampler", colorTextureId);
+
+			bindRead();
+
+			Tesselator tessellator = Tesselator.getInstance();
+			BufferBuilder bufferbuilder = tessellator.getBuilder();
+			bufferbuilder.begin(VertexFormat.Mode.QUADS, DefaultVertexFormat.POSITION_COLOR_TEX);
+
+			bufferbuilder.vertex(0, vy, 0).color(1, 1, 1, alpha).uv(0, 0).endVertex();
+			bufferbuilder.vertex(vx, vy, 0).color(1, 1, 1, alpha).uv(tx, 0).endVertex();
+			bufferbuilder.vertex(vx, 0, 0).color(1, 1, 1, alpha).uv(tx, ty).endVertex();
+			bufferbuilder.vertex(0, 0, 0).color(1, 1, 1, alpha).uv(0, ty).endVertex();
+
+			tessellator.end();
+			unbindRead();
+		}
+
+	}
+
+}

src/main/java/nl/requios/effortlessbuilding/create/foundation/gui/container/AbstractSimiContainerScreen.java

@@ -0,0 +1,175 @@
+package nl.requios.effortlessbuilding.create.foundation.gui.container;
+
+import com.mojang.blaze3d.platform.InputConstants;
+import com.mojang.blaze3d.vertex.PoseStack;
+import nl.requios.effortlessbuilding.create.foundation.gui.AllGuiTextures;
+import nl.requios.effortlessbuilding.create.foundation.gui.TickableGuiEventListener;
+import nl.requios.effortlessbuilding.create.foundation.gui.widget.AbstractSimiWidget;
+import net.minecraft.client.gui.components.AbstractWidget;
+import net.minecraft.client.gui.components.Widget;
+import net.minecraft.client.gui.components.events.GuiEventListener;
+import net.minecraft.client.gui.narration.NarratableEntry;
+import net.minecraft.client.gui.screens.inventory.AbstractContainerScreen;
+import net.minecraft.client.gui.screens.inventory.ContainerScreen;
+import net.minecraft.client.renderer.Rect2i;
+import net.minecraft.network.chat.Component;
+import net.minecraft.world.entity.player.Inventory;
+import net.minecraft.world.inventory.AbstractContainerMenu;
+import net.minecraftforge.api.distmarker.Dist;
+import net.minecraftforge.api.distmarker.OnlyIn;
+
+import javax.annotation.ParametersAreNonnullByDefault;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.List;
+
+@OnlyIn(Dist.CLIENT)
+@ParametersAreNonnullByDefault
+public abstract class AbstractSimiContainerScreen<T extends AbstractContainerMenu> extends AbstractContainerScreen<T> {
+
+	protected int windowXOffset, windowYOffset;
+
+	public AbstractSimiContainerScreen(T container, Inventory inv, Component title) {
+		super(container, inv, title);
+	}
+
+	/**
+	 * This method must be called before {@code super.init()}!
+	 */
+	protected void setWindowSize(int width, int height) {
+		imageWidth = width;
+		imageHeight = height;
+	}
+
+	/**
+	 * This method must be called before {@code super.init()}!
+	 */
+	protected void setWindowOffset(int xOffset, int yOffset) {
+		windowXOffset = xOffset;
+		windowYOffset = yOffset;
+	}
+
+	@Override
+	protected void init() {
+		super.init();
+		leftPos += windowXOffset;
+		topPos += windowYOffset;
+	}
+
+	@Override
+	protected void containerTick() {
+		for (GuiEventListener listener : children()) {
+			if (listener instanceof TickableGuiEventListener tickable) {
+				tickable.tick();
+			}
+		}
+	}
+
+	@SuppressWarnings("unchecked")
+	protected <W extends GuiEventListener & Widget & NarratableEntry> void addRenderableWidgets(W... widgets) {
+		for (W widget : widgets) {
+			addRenderableWidget(widget);
+		}
+	}
+
+	protected <W extends GuiEventListener & Widget & NarratableEntry> void addRenderableWidgets(Collection<W> widgets) {
+		for (W widget : widgets) {
+			addRenderableWidget(widget);
+		}
+	}
+
+	protected void removeWidgets(GuiEventListener... widgets) {
+		for (GuiEventListener widget : widgets) {
+			removeWidget(widget);
+		}
+	}
+
+	protected void removeWidgets(Collection<? extends GuiEventListener> widgets) {
+		for (GuiEventListener widget : widgets) {
+			removeWidget(widget);
+		}
+	}
+
+	@Override
+	public void render(PoseStack matrixStack, int mouseX, int mouseY, float partialTicks) {
+		partialTicks = minecraft.getFrameTime();
+
+		renderBackground(matrixStack);
+
+		super.render(matrixStack, mouseX, mouseY, partialTicks);
+
+		renderForeground(matrixStack, mouseX, mouseY, partialTicks);
+	}
+
+	@Override
+	protected void renderLabels(PoseStack poseStack, int mouseX, int mouseY) {
+		// no-op to prevent screen- and inventory-title from being rendered at incorrect
+		// location
+		// could also set this.titleX/Y and this.playerInventoryTitleX/Y to the proper
+		// values instead
+	}
+
+	protected void renderForeground(PoseStack ms, int mouseX, int mouseY, float partialTicks) {
+		renderTooltip(ms, mouseX, mouseY);
+		for (Widget widget : renderables) {
+			if (widget instanceof AbstractSimiWidget simiWidget && simiWidget.isHoveredOrFocused()) {
+				List<Component> tooltip = simiWidget.getToolTip();
+				if (tooltip.isEmpty())
+					continue;
+				int ttx = simiWidget.lockedTooltipX == -1 ? mouseX : simiWidget.lockedTooltipX + simiWidget.x;
+				int tty = simiWidget.lockedTooltipY == -1 ? mouseY : simiWidget.lockedTooltipY + simiWidget.y;
+				renderComponentTooltip(ms, tooltip, ttx, tty);
+			}
+		}
+	}
+
+	public int getLeftOfCentered(int textureWidth) {
+		return leftPos - windowXOffset + (imageWidth - textureWidth) / 2;
+	}
+
+//	public void renderPlayerInventory(PoseStack ms, int x, int y) {
+//		AllGuiTextures.PLAYER_INVENTORY.render(ms, x, y, this);
+//		font.draw(ms, playerInventoryTitle, x + 8, y + 6, 0x404040);
+//	}
+
+	@Override
+	public boolean keyPressed(int pKeyCode, int pScanCode, int pModifiers) {
+		InputConstants.Key mouseKey = InputConstants.getKey(pKeyCode, pScanCode);
+		if (getFocused() != null && this.minecraft.options.keyInventory.isActiveAndMatches(mouseKey))
+			return false;
+		return super.keyPressed(pKeyCode, pScanCode, pModifiers);
+	}
+	
+	@Override
+	public GuiEventListener getFocused() {
+		GuiEventListener focused = super.getFocused();
+		if (focused instanceof AbstractWidget && !((AbstractWidget) focused).isFocused())
+			focused = null;
+		setFocused(focused);
+		return focused;
+	}
+
+	/**
+	 * Used for moving JEI out of the way of extra things like block renders.
+	 *
+	 * @return the space that the GUI takes up outside the normal rectangle defined
+	 *         by {@link ContainerScreen}.
+	 */
+	public List<Rect2i> getExtraAreas() {
+		return Collections.emptyList();
+	}
+
+	@Deprecated
+	protected void debugWindowArea(PoseStack matrixStack) {
+		fill(matrixStack, leftPos + imageWidth, topPos + imageHeight, leftPos, topPos, 0xD3D3D3D3);
+	}
+
+	@Deprecated
+	protected void debugExtraAreas(PoseStack matrixStack) {
+		for (Rect2i area : getExtraAreas()) {
+			fill(matrixStack, area.getX() + area.getWidth(), area.getY() + area.getHeight(), area.getX(), area.getY(),
+				0xD3D3D3D3);
+		}
+	}
+
+}

src/main/java/nl/requios/effortlessbuilding/create/foundation/gui/container/ClearContainerPacket.java

@@ -0,0 +1,35 @@
+package nl.requios.effortlessbuilding.create.foundation.gui.container;
+
+import nl.requios.effortlessbuilding.create.foundation.networking.SimplePacketBase;
+import net.minecraft.network.FriendlyByteBuf;
+import net.minecraft.server.level.ServerPlayer;
+import net.minecraftforge.network.NetworkEvent.Context;
+
+import java.util.function.Supplier;
+
+public class ClearContainerPacket extends SimplePacketBase {
+
+	public ClearContainerPacket() {}
+
+	public ClearContainerPacket(FriendlyByteBuf buffer) {}
+
+	@Override
+	public void write(FriendlyByteBuf buffer) {}
+
+	@Override
+	public void handle(Supplier<Context> context) {
+		context.get()
+			.enqueueWork(() -> {
+				ServerPlayer player = context.get()
+					.getSender();
+				if (player == null)
+					return;
+				if (!(player.containerMenu instanceof IClearableContainer))
+					return;
+				((IClearableContainer) player.containerMenu).clearContents();
+			});
+		context.get()
+			.setPacketHandled(true);
+	}
+
+}

src/main/java/nl/requios/effortlessbuilding/create/foundation/gui/container/ContainerBase.java

@@ -0,0 +1,70 @@
+package nl.requios.effortlessbuilding.create.foundation.gui.container;
+
+import nl.requios.effortlessbuilding.create.foundation.utility.IInteractionChecker;
+import net.minecraft.network.FriendlyByteBuf;
+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.MenuType;
+import net.minecraft.world.inventory.Slot;
+import net.minecraftforge.api.distmarker.Dist;
+import net.minecraftforge.api.distmarker.OnlyIn;
+
+public abstract class ContainerBase<T> extends AbstractContainerMenu {
+
+	public Player player;
+	public Inventory playerInventory;
+	public T contentHolder;
+
+	protected ContainerBase(MenuType<?> type, int id, Inventory inv, FriendlyByteBuf extraData) {
+		super(type, id);
+		init(inv, createOnClient(extraData));
+	}
+
+	protected ContainerBase(MenuType<?> type, int id, Inventory inv, T contentHolder) {
+		super(type, id);
+		init(inv, contentHolder);
+	}
+
+	protected void init(Inventory inv, T contentHolderIn) {
+		player = inv.player;
+		playerInventory = inv;
+		contentHolder = contentHolderIn;
+		initAndReadInventory(contentHolder);
+		addSlots();
+		broadcastChanges();
+	}
+
+	@OnlyIn(Dist.CLIENT)
+	protected abstract T createOnClient(FriendlyByteBuf extraData);
+
+	protected abstract void initAndReadInventory(T contentHolder);
+
+	protected abstract void addSlots();
+
+	protected abstract void saveData(T contentHolder);
+
+	protected void addPlayerSlots(int x, int y) {
+		for (int hotbarSlot = 0; hotbarSlot < 9; ++hotbarSlot)
+			this.addSlot(new Slot(playerInventory, hotbarSlot, x + hotbarSlot * 18, y + 58));
+		for (int row = 0; row < 3; ++row)
+			for (int col = 0; col < 9; ++col)
+				this.addSlot(new Slot(playerInventory, col + row * 9 + 9, x + col * 18, y + row * 18));
+	}
+
+	@Override
+	public void removed(Player playerIn) {
+		super.removed(playerIn);
+		saveData(contentHolder);
+	}
+
+	@Override
+	public boolean stillValid(Player player) {
+		if (contentHolder == null)
+			return false;
+		if (contentHolder instanceof IInteractionChecker)
+			return ((IInteractionChecker) contentHolder).canPlayerUse(player);
+		return true;
+	}
+
+}

src/main/java/nl/requios/effortlessbuilding/create/foundation/gui/container/GhostItemContainer.java

@@ -0,0 +1,108 @@
+package nl.requios.effortlessbuilding.create.foundation.gui.container;
+
+import net.minecraft.network.FriendlyByteBuf;
+import net.minecraft.world.entity.player.Inventory;
+import net.minecraft.world.entity.player.Player;
+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.ItemHandlerHelper;
+import net.minecraftforge.items.ItemStackHandler;
+
+public abstract class GhostItemContainer<T> extends ContainerBase<T> implements IClearableContainer {
+
+	public ItemStackHandler ghostInventory;
+
+	protected GhostItemContainer(MenuType<?> type, int id, Inventory inv, FriendlyByteBuf extraData) {
+		super(type, id, inv, extraData);
+	}
+
+	protected GhostItemContainer(MenuType<?> type, int id, Inventory inv, T contentHolder) {
+		super(type, id, inv, contentHolder);
+	}
+
+	protected abstract ItemStackHandler createGhostInventory();
+
+	protected abstract boolean allowRepeats();
+
+	@Override
+	protected void initAndReadInventory(T contentHolder) {
+		ghostInventory = createGhostInventory();
+	}
+
+	@Override
+	public void clearContents() {
+		for (int i = 0; i < ghostInventory.getSlots(); i++)
+			ghostInventory.setStackInSlot(i, ItemStack.EMPTY);
+	}
+
+	@Override
+	public boolean canTakeItemForPickAll(ItemStack stack, Slot slotIn) {
+		return slotIn.container == playerInventory;
+	}
+
+	@Override
+	public boolean canDragTo(Slot slotIn) {
+		if (allowRepeats())
+			return true;
+		return slotIn.container == playerInventory;
+	}
+
+	@Override
+	public void clicked(int slotId, int dragType, ClickType clickTypeIn, Player player) {
+		if (slotId < 36) {
+			super.clicked(slotId, dragType, clickTypeIn, player);
+			return;
+		}
+		if (clickTypeIn == ClickType.THROW)
+			return;
+
+		ItemStack held = getCarried();
+		int slot = slotId - 36;
+		if (clickTypeIn == ClickType.CLONE) {
+			if (player.isCreative() && held.isEmpty()) {
+				ItemStack stackInSlot = ghostInventory.getStackInSlot(slot)
+						.copy();
+				stackInSlot.setCount(stackInSlot.getMaxStackSize());
+				setCarried(stackInSlot);
+				return;
+			}
+			return;
+		}
+
+		ItemStack insert;
+		if (held.isEmpty()) {
+			insert = ItemStack.EMPTY;
+		} else {
+			insert = held.copy();
+			insert.setCount(1);
+		}
+		ghostInventory.setStackInSlot(slot, insert);
+		getSlot(slotId).setChanged();
+	}
+
+	@Override
+	public ItemStack quickMoveStack(Player playerIn, int index) {
+		if (index < 36) {
+			ItemStack stackToInsert = playerInventory.getItem(index);
+			for (int i = 0; i < ghostInventory.getSlots(); i++) {
+				ItemStack stack = ghostInventory.getStackInSlot(i);
+				if (!allowRepeats() && ItemHandlerHelper.canItemStacksStack(stack, stackToInsert))
+					break;
+				if (stack.isEmpty()) {
+					ItemStack copy = stackToInsert.copy();
+					copy.setCount(1);
+					ghostInventory.insertItem(i, copy, false);
+					getSlot(i + 36).setChanged();
+					break;
+				}
+			}
+		} else {
+			ghostInventory.extractItem(index - 36, 1, false);
+			getSlot(index).setChanged();
+		}
+		return ItemStack.EMPTY;
+	}
+
+}

src/main/java/nl/requios/effortlessbuilding/create/foundation/gui/container/GhostItemSubmitPacket.java

@@ -0,0 +1,52 @@
+package nl.requios.effortlessbuilding.create.foundation.gui.container;
+
+import nl.requios.effortlessbuilding.create.foundation.networking.SimplePacketBase;
+import net.minecraft.network.FriendlyByteBuf;
+import net.minecraft.server.level.ServerPlayer;
+import net.minecraft.world.item.ItemStack;
+import net.minecraftforge.network.NetworkEvent.Context;
+
+import java.util.function.Supplier;
+
+public class GhostItemSubmitPacket extends SimplePacketBase {
+
+	private final ItemStack item;
+	private final int slot;
+
+	public GhostItemSubmitPacket(ItemStack item, int slot) {
+		this.item = item;
+		this.slot = slot;
+	}
+
+	public GhostItemSubmitPacket(FriendlyByteBuf buffer) {
+		item = buffer.readItem();
+		slot = buffer.readInt();
+	}
+
+	@Override
+	public void write(FriendlyByteBuf buffer) {
+		buffer.writeItem(item);
+		buffer.writeInt(slot);
+	}
+
+	@Override
+	public void handle(Supplier<Context> context) {
+		context.get()
+				.enqueueWork(() -> {
+					ServerPlayer player = context.get()
+							.getSender();
+					if (player == null)
+						return;
+
+					if (player.containerMenu instanceof GhostItemContainer) {
+						GhostItemContainer<?> c = (GhostItemContainer<?>) player.containerMenu;
+						c.ghostInventory.setStackInSlot(slot, item);
+						c.getSlot(36 + slot).setChanged();
+					}
+
+				});
+		context.get()
+				.setPacketHandled(true);
+	}
+
+}

src/main/java/nl/requios/effortlessbuilding/create/foundation/gui/container/IClearableContainer.java

@@ -0,0 +1,14 @@
+package nl.requios.effortlessbuilding.create.foundation.gui.container;
+
+//import nl.requios.effortlessbuilding.create.foundation.networking.AllPackets;
+
+public interface IClearableContainer {
+
+	default void sendClearPacket() {
+//		AllPackets.channel.sendToServer(new ClearContainerPacket());
+	}
+
+	@Deprecated //warning: does not work
+	public void clearContents();
+
+}

src/main/java/nl/requios/effortlessbuilding/create/foundation/gui/element/BoxElement.java

@@ -0,0 +1,153 @@
+package nl.requios.effortlessbuilding.create.foundation.gui.element;
+
+import com.mojang.blaze3d.systems.RenderSystem;
+import com.mojang.blaze3d.vertex.*;
+import com.mojang.math.Matrix4f;
+import nl.requios.effortlessbuilding.create.foundation.utility.Color;
+import nl.requios.effortlessbuilding.create.foundation.utility.Couple;
+import net.minecraft.client.renderer.GameRenderer;
+
+public class BoxElement extends RenderElement {
+
+	protected Color background = new Color(0xff000000, true);
+	protected Color borderTop = new Color(0x40ffeedd, true);
+	protected Color borderBot = new Color(0x20ffeedd, true);
+	protected int borderOffset = 2;
+
+	public <T extends BoxElement> T withBackground(Color color) {
+		this.background = color;
+		//noinspection unchecked
+		return (T) this;
+	}
+
+	public <T extends BoxElement> T withBackground(int color) {
+		return withBackground(new Color(color, true));
+	}
+
+	public <T extends BoxElement> T flatBorder(Color color) {
+		this.borderTop = color;
+		this.borderBot = color;
+		//noinspection unchecked
+		return (T) this;
+	}
+
+	public <T extends BoxElement> T flatBorder(int color) {
+		return flatBorder(new Color(color, true));
+	}
+
+	public <T extends BoxElement> T gradientBorder(Couple<Color> colors) {
+		this.borderTop = colors.getFirst();
+		this.borderBot = colors.getSecond();
+		//noinspection unchecked
+		return (T) this;
+	}
+
+	public <T extends BoxElement> T gradientBorder(Color top, Color bot) {
+		this.borderTop = top;
+		this.borderBot = bot;
+		//noinspection unchecked
+		return (T) this;
+	}
+
+	public <T extends BoxElement> T gradientBorder(int top, int bot) {
+		return gradientBorder(new Color(top, true), new Color(bot, true));
+	}
+
+	public <T extends BoxElement> T withBorderOffset(int offset) {
+		this.borderOffset = offset;
+		//noinspection unchecked
+		return (T) this;
+	}
+
+	@Override
+	public void render(PoseStack ms) {
+		renderBox(ms);
+	}
+
+	//total box width = 1 * 2 (outer border) + 1 * 2 (inner color border) + 2 * borderOffset + width
+	//defaults to 2 + 2 + 4 + 16 = 24px
+	//batch everything together to save a bunch of gl calls over ScreenUtils
+	protected void renderBox(PoseStack ms) {
+		/*
+		*          _____________
+		*        _|_____________|_
+		*       | | ___________ | |
+		*       | | |  |      | | |
+		*       | | |  |      | | |
+		*       | | |--*   |  | | |
+		*       | | |      h  | | |
+		*       | | |  --w-+  | | |
+		*       | | |         | | |
+		*       | | |_________| | |
+		*       |_|_____________|_|
+		*         |_____________|
+		*
+		* */
+		RenderSystem.disableTexture();
+		RenderSystem.enableBlend();
+		RenderSystem.defaultBlendFunc();
+		RenderSystem.setShader(GameRenderer::getPositionColorShader);
+
+		Matrix4f model = ms.last().pose();
+		int f = borderOffset;
+		Color c1 = background.copy().scaleAlpha(alpha);
+		Color c2 = borderTop.copy().scaleAlpha(alpha);
+		Color c3 = borderBot.copy().scaleAlpha(alpha);
+		Tesselator tessellator = Tesselator.getInstance();
+		BufferBuilder b = tessellator.getBuilder();
+
+		b.begin(VertexFormat.Mode.QUADS, DefaultVertexFormat.POSITION_COLOR);
+		//outer top
+		b.vertex(model, x - f - 1        , y - f - 2         , z).color(c1.getRed(), c1.getGreen(), c1.getBlue(), c1.getAlpha()).endVertex();
+		b.vertex(model, x - f - 1        , y - f - 1         , z).color(c1.getRed(), c1.getGreen(), c1.getBlue(), c1.getAlpha()).endVertex();
+		b.vertex(model, x + f + 1 + width, y - f - 1         , z).color(c1.getRed(), c1.getGreen(), c1.getBlue(), c1.getAlpha()).endVertex();
+		b.vertex(model, x + f + 1 + width, y - f - 2         , z).color(c1.getRed(), c1.getGreen(), c1.getBlue(), c1.getAlpha()).endVertex();
+		//outer left
+		b.vertex(model, x - f - 2        , y - f - 1         , z).color(c1.getRed(), c1.getGreen(), c1.getBlue(), c1.getAlpha()).endVertex();
+		b.vertex(model, x - f - 2        , y + f + 1 + height, z).color(c1.getRed(), c1.getGreen(), c1.getBlue(), c1.getAlpha()).endVertex();
+		b.vertex(model, x - f - 1        , y + f + 1 + height, z).color(c1.getRed(), c1.getGreen(), c1.getBlue(), c1.getAlpha()).endVertex();
+		b.vertex(model, x - f - 1        , y - f - 1         , z).color(c1.getRed(), c1.getGreen(), c1.getBlue(), c1.getAlpha()).endVertex();
+		//outer bottom
+		b.vertex(model, x - f - 1        , y + f + 1 + height, z).color(c1.getRed(), c1.getGreen(), c1.getBlue(), c1.getAlpha()).endVertex();
+		b.vertex(model, x - f - 1        , y + f + 2 + height, z).color(c1.getRed(), c1.getGreen(), c1.getBlue(), c1.getAlpha()).endVertex();
+		b.vertex(model, x + f + 1 + width, y + f + 2 + height, z).color(c1.getRed(), c1.getGreen(), c1.getBlue(), c1.getAlpha()).endVertex();
+		b.vertex(model, x + f + 1 + width, y + f + 1 + height, z).color(c1.getRed(), c1.getGreen(), c1.getBlue(), c1.getAlpha()).endVertex();
+		//outer right
+		b.vertex(model, x + f + 1 + width, y - f - 1         , z).color(c1.getRed(), c1.getGreen(), c1.getBlue(), c1.getAlpha()).endVertex();
+		b.vertex(model, x + f + 1 + width, y + f + 1 + height, z).color(c1.getRed(), c1.getGreen(), c1.getBlue(), c1.getAlpha()).endVertex();
+		b.vertex(model, x + f + 2 + width, y + f + 1 + height, z).color(c1.getRed(), c1.getGreen(), c1.getBlue(), c1.getAlpha()).endVertex();
+		b.vertex(model, x + f + 2 + width, y - f - 1         , z).color(c1.getRed(), c1.getGreen(), c1.getBlue(), c1.getAlpha()).endVertex();
+		//inner background - also render behind the inner edges
+		b.vertex(model, x - f - 1        , y - f - 1         , z).color(c1.getRed(), c1.getGreen(), c1.getBlue(), c1.getAlpha()).endVertex();
+		b.vertex(model, x - f - 1        , y + f + 1 + height, z).color(c1.getRed(), c1.getGreen(), c1.getBlue(), c1.getAlpha()).endVertex();
+		b.vertex(model, x + f + 1 + width, y + f + 1 + height, z).color(c1.getRed(), c1.getGreen(), c1.getBlue(), c1.getAlpha()).endVertex();
+		b.vertex(model, x + f + 1 + width, y - f - 1         , z).color(c1.getRed(), c1.getGreen(), c1.getBlue(), c1.getAlpha()).endVertex();
+		tessellator.end();
+		b.begin(VertexFormat.Mode.QUADS, DefaultVertexFormat.POSITION_COLOR);
+		//inner top - includes corners
+		b.vertex(model, x - f - 1        , y - f - 1         , z).color(c2.getRed(), c2.getGreen(), c2.getBlue(), c2.getAlpha()).endVertex();
+		b.vertex(model, x - f - 1        , y - f             , z).color(c2.getRed(), c2.getGreen(), c2.getBlue(), c2.getAlpha()).endVertex();
+		b.vertex(model, x + f + 1 + width, y - f             , z).color(c2.getRed(), c2.getGreen(), c2.getBlue(), c2.getAlpha()).endVertex();
+		b.vertex(model, x + f + 1 + width, y - f - 1         , z).color(c2.getRed(), c2.getGreen(), c2.getBlue(), c2.getAlpha()).endVertex();
+		//inner left - excludes corners
+		b.vertex(model, x - f - 1        , y - f             , z).color(c2.getRed(), c2.getGreen(), c2.getBlue(), c2.getAlpha()).endVertex();
+		b.vertex(model, x - f - 1        , y + f     + height, z).color(c3.getRed(), c3.getGreen(), c3.getBlue(), c3.getAlpha()).endVertex();
+		b.vertex(model, x - f            , y + f     + height, z).color(c3.getRed(), c3.getGreen(), c3.getBlue(), c3.getAlpha()).endVertex();
+		b.vertex(model, x - f            , y - f             , z).color(c2.getRed(), c2.getGreen(), c2.getBlue(), c2.getAlpha()).endVertex();
+		//inner bottom - includes corners
+		b.vertex(model, x - f - 1        , y + f     + height, z).color(c3.getRed(), c3.getGreen(), c3.getBlue(), c3.getAlpha()).endVertex();
+		b.vertex(model, x - f - 1        , y + f + 1 + height, z).color(c3.getRed(), c3.getGreen(), c3.getBlue(), c3.getAlpha()).endVertex();
+		b.vertex(model, x + f + 1 + width, y + f + 1 + height, z).color(c3.getRed(), c3.getGreen(), c3.getBlue(), c3.getAlpha()).endVertex();
+		b.vertex(model, x + f + 1 + width, y + f     + height, z).color(c3.getRed(), c3.getGreen(), c3.getBlue(), c3.getAlpha()).endVertex();
+		//inner right - excludes corners
+		b.vertex(model, x + f     + width, y - f             , z).color(c2.getRed(), c2.getGreen(), c2.getBlue(), c2.getAlpha()).endVertex();
+		b.vertex(model, x + f     + width, y + f     + height, z).color(c3.getRed(), c3.getGreen(), c3.getBlue(), c3.getAlpha()).endVertex();
+		b.vertex(model, x + f + 1 + width, y + f     + height, z).color(c3.getRed(), c3.getGreen(), c3.getBlue(), c3.getAlpha()).endVertex();
+		b.vertex(model, x + f + 1 + width, y - f             , z).color(c2.getRed(), c2.getGreen(), c2.getBlue(), c2.getAlpha()).endVertex();
+
+		tessellator.end();
+
+		RenderSystem.disableBlend();
+		RenderSystem.enableTexture();
+	}
+}

src/main/java/nl/requios/effortlessbuilding/create/foundation/gui/element/CombinedStencilElement.java

@@ -0,0 +1,79 @@
+package nl.requios.effortlessbuilding.create.foundation.gui.element;
+
+import com.mojang.blaze3d.vertex.PoseStack;
+
+import javax.annotation.Nonnull;
+
+public class CombinedStencilElement extends StencilElement {
+
+	private StencilElement element1;
+	private StencilElement element2;
+	private ElementMode mode;
+
+	private CombinedStencilElement() {}
+
+	public static CombinedStencilElement of(@Nonnull StencilElement element1, @Nonnull StencilElement element2) {
+		return of(element1, element2, ElementMode.FIRST);
+	}
+
+	public static CombinedStencilElement of(@Nonnull StencilElement element1, @Nonnull StencilElement element2, ElementMode mode) {
+		CombinedStencilElement e = new CombinedStencilElement();
+		e.element1 = element1;
+		e.element2 = element2;
+		e.mode = mode;
+		return e;
+	}
+
+	public <T extends CombinedStencilElement> T withFirst(StencilElement element) {
+		this.element1 = element;
+		//noinspection unchecked
+		return (T) this;
+	}
+
+	public <T extends CombinedStencilElement> T withSecond(StencilElement element) {
+		this.element2 = element;
+		//noinspection unchecked
+		return (T) this;
+	}
+
+	public <T extends CombinedStencilElement> T withMode(ElementMode mode) {
+		this.mode = mode;
+		//noinspection unchecked
+		return (T) this;
+	}
+
+	@Override
+	protected void renderStencil(PoseStack ms) {
+		ms.pushPose();
+		element1.transform(ms);
+		element1.withBounds(width, height);
+		element1.renderStencil(ms);
+		ms.popPose();
+		ms.pushPose();
+		element2.transform(ms);
+		element2.withBounds(width, height);
+		element2.renderStencil(ms);
+		ms.popPose();
+	}
+
+	@Override
+	protected void renderElement(PoseStack ms) {
+		if (mode.rendersFirst())
+			element1.<StencilElement>withBounds(width, height).renderElement(ms);
+
+		if (mode.rendersSecond())
+			element2.<StencilElement>withBounds(width, height).renderElement(ms);
+	}
+
+	public enum ElementMode {
+		FIRST, SECOND, BOTH;
+
+		boolean rendersFirst() {
+			return this == FIRST || this == BOTH;
+		}
+
+		boolean rendersSecond() {
+			return this == SECOND || this == BOTH;
+		}
+	}
+}

src/main/java/nl/requios/effortlessbuilding/create/foundation/gui/element/DelegatedStencilElement.java

@@ -0,0 +1,52 @@
+package nl.requios.effortlessbuilding.create.foundation.gui.element;
+
+import com.mojang.blaze3d.vertex.PoseStack;
+import nl.requios.effortlessbuilding.create.foundation.gui.UIRenderHelper;
+import nl.requios.effortlessbuilding.create.foundation.utility.Color;
+
+public class DelegatedStencilElement extends StencilElement {
+
+	protected static final ElementRenderer EMPTY_RENDERER = (ms, width, height, alpha) -> {};
+	protected static final ElementRenderer DEFAULT_ELEMENT = (ms, width, height, alpha) -> UIRenderHelper.angledGradient(ms, 0, -3, 5, height+4, width+6, new Color(0xff_10dd10).scaleAlpha(alpha), new Color(0xff_1010dd).scaleAlpha(alpha));
+
+	protected ElementRenderer stencil;
+	protected ElementRenderer element;
+
+	public DelegatedStencilElement() {
+		stencil = EMPTY_RENDERER;
+		element = DEFAULT_ELEMENT;
+	}
+
+	public DelegatedStencilElement(ElementRenderer stencil, ElementRenderer element) {
+		this.stencil = stencil;
+		this.element = element;
+	}
+
+	public <T extends DelegatedStencilElement> T withStencilRenderer(ElementRenderer renderer) {
+		stencil = renderer;
+		//noinspection unchecked
+		return (T) this;
+	}
+
+	public <T extends DelegatedStencilElement> T withElementRenderer(ElementRenderer renderer) {
+		element = renderer;
+		//noinspection unchecked
+		return (T) this;
+	}
+
+	@Override
+	protected void renderStencil(PoseStack ms) {
+		stencil.render(ms, width, height, 1);
+	}
+
+	@Override
+	protected void renderElement(PoseStack ms) {
+		element.render(ms, width, height, alpha);
+	}
+
+	@FunctionalInterface
+	public interface ElementRenderer {
+		void render(PoseStack ms, int width, int height, float alpha);
+	}
+
+}

src/main/java/nl/requios/effortlessbuilding/create/foundation/gui/element/GuiGameElement.java

@@ -0,0 +1,297 @@
+package nl.requios.effortlessbuilding.create.foundation.gui.element;
+
+import com.jozufozu.flywheel.core.PartialModel;
+import com.jozufozu.flywheel.core.model.ModelUtil;
+import com.mojang.blaze3d.platform.GlStateManager.DestFactor;
+import com.mojang.blaze3d.platform.GlStateManager.SourceFactor;
+import com.mojang.blaze3d.platform.Lighting;
+import com.mojang.blaze3d.systems.RenderSystem;
+import com.mojang.blaze3d.vertex.PoseStack;
+import com.mojang.math.Vector3f;
+//import nl.requios.effortlessbuilding.create.foundation.fluid.FluidRenderer;
+import nl.requios.effortlessbuilding.create.foundation.gui.ILightingSettings;
+import nl.requios.effortlessbuilding.create.foundation.gui.UIRenderHelper;
+import nl.requios.effortlessbuilding.create.foundation.utility.Color;
+import nl.requios.effortlessbuilding.create.foundation.utility.VecHelper;
+import net.minecraft.client.Minecraft;
+import net.minecraft.client.renderer.LightTexture;
+import net.minecraft.client.renderer.MultiBufferSource;
+import net.minecraft.client.renderer.RenderType;
+import net.minecraft.client.renderer.Sheets;
+import net.minecraft.client.renderer.block.BlockRenderDispatcher;
+import net.minecraft.client.renderer.block.model.ItemTransforms;
+import net.minecraft.client.renderer.entity.ItemRenderer;
+import net.minecraft.client.renderer.texture.OverlayTexture;
+import net.minecraft.client.resources.model.BakedModel;
+import net.minecraft.core.BlockPos;
+import net.minecraft.util.RandomSource;
+import net.minecraft.world.inventory.InventoryMenu;
+import net.minecraft.world.item.ItemStack;
+import net.minecraft.world.level.ItemLike;
+import net.minecraft.world.level.block.BaseFireBlock;
+import net.minecraft.world.level.block.Blocks;
+import net.minecraft.world.level.block.LiquidBlock;
+import net.minecraft.world.level.block.state.BlockState;
+import net.minecraft.world.level.material.Fluid;
+import net.minecraft.world.phys.Vec3;
+import net.minecraftforge.client.RenderTypeHelper;
+import net.minecraftforge.fluids.FluidStack;
+
+import javax.annotation.Nullable;
+
+public class GuiGameElement {
+
+	public static GuiRenderBuilder of(ItemStack stack) {
+		return new GuiItemRenderBuilder(stack);
+	}
+
+	public static GuiRenderBuilder of(ItemLike itemProvider) {
+		return new GuiItemRenderBuilder(itemProvider);
+	}
+
+	public static GuiRenderBuilder of(BlockState state) {
+		return new GuiBlockStateRenderBuilder(state);
+	}
+
+	public static GuiRenderBuilder of(PartialModel partial) {
+		return new GuiBlockPartialRenderBuilder(partial);
+	}
+
+	public static GuiRenderBuilder of(Fluid fluid) {
+		return new GuiBlockStateRenderBuilder(fluid.defaultFluidState()
+			.createLegacyBlock()
+			.setValue(LiquidBlock.LEVEL, 0));
+	}
+
+	public static abstract class GuiRenderBuilder extends RenderElement {
+		protected double xLocal, yLocal, zLocal;
+		protected double xRot, yRot, zRot;
+		protected double scale = 1;
+		protected int color = 0xFFFFFF;
+		protected Vec3 rotationOffset = Vec3.ZERO;
+		protected ILightingSettings customLighting = null;
+
+		public GuiRenderBuilder atLocal(double x, double y, double z) {
+			this.xLocal = x;
+			this.yLocal = y;
+			this.zLocal = z;
+			return this;
+		}
+
+		public GuiRenderBuilder rotate(double xRot, double yRot, double zRot) {
+			this.xRot = xRot;
+			this.yRot = yRot;
+			this.zRot = zRot;
+			return this;
+		}
+
+		public GuiRenderBuilder rotateBlock(double xRot, double yRot, double zRot) {
+			return this.rotate(xRot, yRot, zRot)
+				.withRotationOffset(VecHelper.getCenterOf(BlockPos.ZERO));
+		}
+
+		public GuiRenderBuilder scale(double scale) {
+			this.scale = scale;
+			return this;
+		}
+
+		public GuiRenderBuilder color(int color) {
+			this.color = color;
+			return this;
+		}
+
+		public GuiRenderBuilder withRotationOffset(Vec3 offset) {
+			this.rotationOffset = offset;
+			return this;
+		}
+
+		public GuiRenderBuilder lighting(ILightingSettings lighting) {
+			customLighting = lighting;
+			return this;
+		}
+
+		protected void prepareMatrix(PoseStack matrixStack) {
+			matrixStack.pushPose();
+			RenderSystem.setShaderColor(1.0F, 1.0F, 1.0F, 1.0F);
+			RenderSystem.enableDepthTest();
+			RenderSystem.enableBlend();
+			RenderSystem.blendFunc(SourceFactor.SRC_ALPHA, DestFactor.ONE_MINUS_SRC_ALPHA);
+			prepareLighting(matrixStack);
+		}
+
+		protected void transformMatrix(PoseStack matrixStack) {
+			matrixStack.translate(x, y, z);
+			matrixStack.scale((float) scale, (float) scale, (float) scale);
+			matrixStack.translate(xLocal, yLocal, zLocal);
+			UIRenderHelper.flipForGuiRender(matrixStack);
+			matrixStack.translate(rotationOffset.x, rotationOffset.y, rotationOffset.z);
+			matrixStack.mulPose(Vector3f.ZP.rotationDegrees((float) zRot));
+			matrixStack.mulPose(Vector3f.XP.rotationDegrees((float) xRot));
+			matrixStack.mulPose(Vector3f.YP.rotationDegrees((float) yRot));
+			matrixStack.translate(-rotationOffset.x, -rotationOffset.y, -rotationOffset.z);
+		}
+
+		protected void cleanUpMatrix(PoseStack matrixStack) {
+			matrixStack.popPose();
+			cleanUpLighting(matrixStack);
+		}
+
+		protected void prepareLighting(PoseStack matrixStack) {
+			if (customLighting != null) {
+				customLighting.applyLighting();
+			} else {
+				Lighting.setupFor3DItems();
+			}
+		}
+
+		protected void cleanUpLighting(PoseStack matrixStack) {
+			if (customLighting != null) {
+				Lighting.setupFor3DItems();
+			}
+		}
+	}
+
+	private static class GuiBlockModelRenderBuilder extends GuiRenderBuilder {
+
+		protected BakedModel blockModel;
+		protected BlockState blockState;
+
+		public GuiBlockModelRenderBuilder(BakedModel blockmodel, @Nullable BlockState blockState) {
+			this.blockState = blockState == null ? Blocks.AIR.defaultBlockState() : blockState;
+			this.blockModel = blockmodel;
+		}
+
+		@Override
+		public void render(PoseStack matrixStack) {
+			prepareMatrix(matrixStack);
+
+			Minecraft mc = Minecraft.getInstance();
+			BlockRenderDispatcher blockRenderer = mc.getBlockRenderer();
+			MultiBufferSource.BufferSource buffer = mc.renderBuffers()
+				.bufferSource();
+
+			transformMatrix(matrixStack);
+
+			RenderSystem.setShaderTexture(0, InventoryMenu.BLOCK_ATLAS);
+			renderModel(blockRenderer, buffer, matrixStack);
+
+			cleanUpMatrix(matrixStack);
+		}
+
+		protected void renderModel(BlockRenderDispatcher blockRenderer, MultiBufferSource.BufferSource buffer,
+			PoseStack ms) {
+			if (blockState.getBlock() == Blocks.AIR) {
+				RenderType renderType = Sheets.translucentCullBlockSheet();
+				blockRenderer.getModelRenderer()
+					.renderModel(ms.last(), buffer.getBuffer(renderType), blockState, blockModel, 1, 1, 1,
+						LightTexture.FULL_BRIGHT, OverlayTexture.NO_OVERLAY, ModelUtil.VIRTUAL_DATA, null);
+			} else {
+				int color = Minecraft.getInstance()
+					.getBlockColors()
+					.getColor(blockState, null, null, 0);
+				Color rgb = new Color(color == -1 ? this.color : color);
+
+				for (RenderType chunkType : blockModel.getRenderTypes(blockState, RandomSource.create(42L), ModelUtil.VIRTUAL_DATA)) {
+					RenderType renderType = RenderTypeHelper.getEntityRenderType(chunkType, true);
+					blockRenderer.getModelRenderer()
+						.renderModel(ms.last(), buffer.getBuffer(renderType), blockState, blockModel,
+							rgb.getRedAsFloat(), rgb.getGreenAsFloat(), rgb.getBlueAsFloat(),
+							LightTexture.FULL_BRIGHT, OverlayTexture.NO_OVERLAY, ModelUtil.VIRTUAL_DATA, chunkType);
+				}
+			}
+
+			buffer.endBatch();
+		}
+
+	}
+
+	public static class GuiBlockStateRenderBuilder extends GuiBlockModelRenderBuilder {
+
+		public GuiBlockStateRenderBuilder(BlockState blockstate) {
+			super(Minecraft.getInstance()
+				.getBlockRenderer()
+				.getBlockModel(blockstate), blockstate);
+		}
+
+		@Override
+		protected void renderModel(BlockRenderDispatcher blockRenderer, MultiBufferSource.BufferSource buffer,
+			PoseStack ms) {
+			if (blockState.getBlock() instanceof BaseFireBlock) {
+				Lighting.setupForFlatItems();
+				super.renderModel(blockRenderer, buffer, ms);
+				Lighting.setupFor3DItems();
+				return;
+			}
+
+			super.renderModel(blockRenderer, buffer, ms);
+
+			if (blockState.getFluidState()
+				.isEmpty())
+				return;
+
+//			FluidRenderer.renderFluidBox(new FluidStack(blockState.getFluidState()
+//				.getType(), 1000), 0, 0, 0, 1, 1, 1, buffer, ms, LightTexture.FULL_BRIGHT, false);
+//			buffer.endBatch();
+		}
+	}
+
+	public static class GuiBlockPartialRenderBuilder extends GuiBlockModelRenderBuilder {
+
+		public GuiBlockPartialRenderBuilder(PartialModel partial) {
+			super(partial.get(), null);
+		}
+
+	}
+
+	public static class GuiItemRenderBuilder extends GuiRenderBuilder {
+
+		private final ItemStack stack;
+
+		public GuiItemRenderBuilder(ItemStack stack) {
+			this.stack = stack;
+		}
+
+		public GuiItemRenderBuilder(ItemLike provider) {
+			this(new ItemStack(provider));
+		}
+
+		@Override
+		public void render(PoseStack matrixStack) {
+			prepareMatrix(matrixStack);
+			transformMatrix(matrixStack);
+			renderItemIntoGUI(matrixStack, stack, customLighting == null);
+			cleanUpMatrix(matrixStack);
+		}
+
+		public static void renderItemIntoGUI(PoseStack matrixStack, ItemStack stack, boolean useDefaultLighting) {
+			ItemRenderer renderer = Minecraft.getInstance().getItemRenderer();
+			BakedModel bakedModel = renderer.getModel(stack, null, null, 0);
+
+			renderer.textureManager.getTexture(InventoryMenu.BLOCK_ATLAS).setFilter(false, false);
+			RenderSystem.setShaderTexture(0, InventoryMenu.BLOCK_ATLAS);
+			RenderSystem.enableBlend();
+			RenderSystem.blendFunc(SourceFactor.SRC_ALPHA, DestFactor.ONE_MINUS_SRC_ALPHA);
+			RenderSystem.setShaderColor(1.0F, 1.0F, 1.0F, 1.0F);
+			matrixStack.pushPose();
+			matrixStack.translate(0, 0, 100.0F + renderer.blitOffset);
+			matrixStack.translate(8.0F, -8.0F, 0.0F);
+			matrixStack.scale(16.0F, 16.0F, 16.0F);
+			MultiBufferSource.BufferSource buffer = Minecraft.getInstance().renderBuffers().bufferSource();
+			boolean flatLighting = !bakedModel.usesBlockLight();
+			if (useDefaultLighting && flatLighting) {
+				Lighting.setupForFlatItems();
+			}
+
+			renderer.render(stack, ItemTransforms.TransformType.GUI, false, matrixStack, buffer, LightTexture.FULL_BRIGHT, OverlayTexture.NO_OVERLAY, bakedModel);
+			buffer.endBatch();
+			RenderSystem.enableDepthTest();
+			if (useDefaultLighting && flatLighting) {
+				Lighting.setupFor3DItems();
+			}
+
+			matrixStack.popPose();
+		}
+
+	}
+
+}

src/main/java/nl/requios/effortlessbuilding/create/foundation/gui/element/RenderElement.java

@@ -0,0 +1,89 @@
+package nl.requios.effortlessbuilding.create.foundation.gui.element;
+
+import com.mojang.blaze3d.vertex.PoseStack;
+
+public abstract class RenderElement implements ScreenElement {
+
+	public static final RenderElement EMPTY = new RenderElement() {
+		@Override
+		public void render(PoseStack ms) {
+		}
+	};
+
+	public static RenderElement of(ScreenElement renderable) {
+		return new SimpleRenderElement(renderable);
+	}
+
+	protected int width = 16, height = 16;
+	protected float x = 0, y = 0, z = 0;
+	protected float alpha = 1f;
+
+	public <T extends RenderElement> T at(float x, float y) {
+		this.x = x;
+		this.y = y;
+		//noinspection unchecked
+		return (T) this;
+	}
+
+	public <T extends RenderElement> T at(float x, float y, float z) {
+		this.x = x;
+		this.y = y;
+		this.z = z;
+		//noinspection unchecked
+		return (T) this;
+	}
+
+	public <T extends RenderElement> T withBounds(int width, int height) {
+		this.width = width;
+		this.height = height;
+		//noinspection unchecked
+		return (T) this;
+	}
+
+	public <T extends RenderElement> T withAlpha(float alpha) {
+		this.alpha = alpha;
+		//noinspection unchecked
+		return (T) this;
+	}
+
+	public int getWidth() {
+		return width;
+	}
+
+	public int getHeight() {
+		return height;
+	}
+
+	public float getX() {
+		return x;
+	}
+
+	public float getY() {
+		return y;
+	}
+
+	public float getZ() {
+		return z;
+	}
+
+	public abstract void render(PoseStack ms);
+
+	@Override
+	public void render(PoseStack ms, int x, int y) {
+		this.at(x, y).render(ms);
+	}
+
+	public static class SimpleRenderElement extends RenderElement {
+
+		private ScreenElement renderable;
+
+		public SimpleRenderElement(ScreenElement renderable) {
+			this.renderable = renderable;
+		}
+
+		@Override
+		public void render(PoseStack ms) {
+			renderable.render(ms, (int) x, (int) y);
+		}
+	}
+}

src/main/java/nl/requios/effortlessbuilding/create/foundation/gui/element/ScreenElement.java

@@ -0,0 +1,12 @@
+package nl.requios.effortlessbuilding.create.foundation.gui.element;
+
+import com.mojang.blaze3d.vertex.PoseStack;
+import net.minecraftforge.api.distmarker.Dist;
+import net.minecraftforge.api.distmarker.OnlyIn;
+
+public interface ScreenElement {
+
+	@OnlyIn(Dist.CLIENT)
+	void render(PoseStack ms, int x, int y);
+
+}

src/main/java/nl/requios/effortlessbuilding/create/foundation/gui/element/StencilElement.java

@@ -0,0 +1,50 @@
+package nl.requios.effortlessbuilding.create.foundation.gui.element;
+
+import com.mojang.blaze3d.systems.RenderSystem;
+import com.mojang.blaze3d.vertex.PoseStack;
+import net.minecraft.client.Minecraft;
+import org.lwjgl.opengl.GL11;
+
+public abstract class StencilElement extends RenderElement {
+
+	@Override
+	public void render(PoseStack ms) {
+		ms.pushPose();
+		transform(ms);
+		prepareStencil(ms);
+		renderStencil(ms);
+		prepareElement(ms);
+		renderElement(ms);
+		cleanUp(ms);
+		ms.popPose();
+	}
+
+	protected abstract void renderStencil(PoseStack ms);
+
+	protected abstract void renderElement(PoseStack ms);
+
+	protected void transform(PoseStack ms) {
+		ms.translate(x, y, z);
+	}
+
+	protected void prepareStencil(PoseStack ms) {
+		GL11.glDisable(GL11.GL_STENCIL_TEST);
+		RenderSystem.stencilMask(~0);
+		RenderSystem.clear(GL11.GL_STENCIL_BUFFER_BIT, Minecraft.ON_OSX);
+		GL11.glEnable(GL11.GL_STENCIL_TEST);
+		RenderSystem.stencilOp(GL11.GL_REPLACE, GL11.GL_KEEP, GL11.GL_KEEP);
+		RenderSystem.stencilMask(0xFF);
+		RenderSystem.stencilFunc(GL11.GL_NEVER, 1, 0xFF);
+	}
+
+	protected void prepareElement(PoseStack ms) {
+		GL11.glEnable(GL11.GL_STENCIL_TEST);
+		RenderSystem.stencilOp(GL11.GL_KEEP, GL11.GL_KEEP, GL11.GL_KEEP);
+		RenderSystem.stencilFunc(GL11.GL_EQUAL, 1, 0xFF);
+	}
+
+	protected void cleanUp(PoseStack ms) {
+		GL11.glDisable(GL11.GL_STENCIL_TEST);
+
+	}
+}

src/main/java/nl/requios/effortlessbuilding/create/foundation/gui/element/TextStencilElement.java

@@ -0,0 +1,78 @@
+package nl.requios.effortlessbuilding.create.foundation.gui.element;
+
+import com.mojang.blaze3d.vertex.PoseStack;
+import nl.requios.effortlessbuilding.create.foundation.utility.Components;
+import net.minecraft.client.gui.Font;
+import net.minecraft.network.chat.MutableComponent;
+
+public class TextStencilElement extends DelegatedStencilElement {
+
+	protected Font font;
+	protected MutableComponent component;
+	protected boolean centerVertically = false;
+	protected boolean centerHorizontally = false;
+
+	public TextStencilElement(Font font) {
+		super();
+		this.font = font;
+		height = 10;
+	}
+
+	public TextStencilElement(Font font, String text) {
+		this(font);
+		component = Components.literal(text);
+	}
+
+	public TextStencilElement(Font font, MutableComponent component) {
+		this(font);
+		this.component = component;
+	}
+
+	public TextStencilElement withText(String text) {
+		component = Components.literal(text);
+		return this;
+	}
+
+	public TextStencilElement withText(MutableComponent component) {
+		this.component = component;
+		return this;
+	}
+
+	public TextStencilElement centered(boolean vertical, boolean horizontal) {
+		this.centerVertically = vertical;
+		this.centerHorizontally = horizontal;
+		return this;
+	}
+
+	@Override
+	protected void renderStencil(PoseStack ms) {
+
+		float x = 0, y = 0;
+		if (centerHorizontally)
+			x = width / 2f - font.width(component) / 2f;
+
+		if (centerVertically)
+			y = height / 2f - (font.lineHeight - 1) / 2f;
+
+		font.draw(ms, component, x, y, 0xff_000000);
+	}
+
+	@Override
+	protected void renderElement(PoseStack ms) {
+		float x = 0, y = 0;
+		if (centerHorizontally)
+			x = width / 2f - font.width(component) / 2f;
+
+		if (centerVertically)
+			y = height / 2f - (font.lineHeight - 1) / 2f;
+
+		ms.pushPose();
+		ms.translate(x, y, 0);
+		element.render(ms, font.width(component), font.lineHeight + 2, alpha);
+		ms.popPose();
+	}
+
+	public MutableComponent getComponent() {
+		return component;
+	}
+}

src/main/java/nl/requios/effortlessbuilding/create/foundation/gui/widget/AbstractSimiWidget.java

@@ -0,0 +1,98 @@
+package nl.requios.effortlessbuilding.create.foundation.gui.widget;
+
+import com.mojang.blaze3d.vertex.PoseStack;
+import nl.requios.effortlessbuilding.create.foundation.gui.TickableGuiEventListener;
+import nl.requios.effortlessbuilding.create.foundation.utility.Components;
+import net.minecraft.client.gui.components.AbstractWidget;
+import net.minecraft.client.gui.narration.NarrationElementOutput;
+import net.minecraft.network.chat.Component;
+
+import javax.annotation.Nonnull;
+import java.util.LinkedList;
+import java.util.List;
+import java.util.function.BiConsumer;
+
+public abstract class AbstractSimiWidget extends AbstractWidget implements TickableGuiEventListener {
+
+	public static final int HEADER_RGB = 0x5391E1;
+	
+	protected float z;
+	protected boolean wasHovered = false;
+	protected List<Component> toolTip = new LinkedList<>();
+	protected BiConsumer<Integer, Integer> onClick = (_$, _$$) -> {};
+	
+	public int lockedTooltipX = -1;
+	public int lockedTooltipY = -1;
+
+	protected AbstractSimiWidget(int x, int y) {
+		this(x, y, 16, 16);
+	}
+
+	protected AbstractSimiWidget(int x, int y, int width, int height) {
+		this(x, y, width, height, Components.immutableEmpty());
+	}
+
+	protected AbstractSimiWidget(int x, int y, int width, int height, Component message) {
+		super(x, y, width, height, message);
+	}
+
+	public <T extends AbstractSimiWidget> T withCallback(BiConsumer<Integer, Integer> cb) {
+		this.onClick = cb;
+		//noinspection unchecked
+		return (T) this;
+	}
+
+	public <T extends AbstractSimiWidget> T withCallback(Runnable cb) {
+		return withCallback((_$, _$$) -> cb.run());
+	}
+
+	public <T extends AbstractSimiWidget> T atZLevel(float z) {
+		this.z = z;
+		//noinspection unchecked
+		return (T) this;
+	}
+
+	public List<Component> getToolTip() {
+		return toolTip;
+	}
+
+	@Override
+	public void tick() {}
+
+	@Override
+	public void render(@Nonnull PoseStack ms, int mouseX, int mouseY, float partialTicks) {
+		if (visible) {
+			isHovered = mouseX >= x && mouseY >= y && mouseX < x + width && mouseY < y + height;
+			beforeRender(ms, mouseX, mouseY, partialTicks);
+			renderButton(ms, mouseX, mouseY, partialTicks);
+			afterRender(ms, mouseX, mouseY, partialTicks);
+			wasHovered = isHoveredOrFocused();
+		}
+	}
+
+	protected void beforeRender(@Nonnull PoseStack ms, int mouseX, int mouseY, float partialTicks) {
+		ms.pushPose();
+	}
+
+	@Override
+	public void renderButton(@Nonnull PoseStack ms, int mouseX, int mouseY, float partialTicks) {
+	}
+
+	protected void afterRender(@Nonnull PoseStack ms, int mouseX, int mouseY, float partialTicks) {
+		ms.popPose();
+	}
+
+	public void runCallback(double mouseX, double mouseY) {
+		onClick.accept((int) mouseX, (int) mouseY);
+	}
+
+	@Override
+	public void onClick(double mouseX, double mouseY) {
+		runCallback(mouseX, mouseY);
+	}
+
+	@Override
+	public void updateNarration(NarrationElementOutput pNarrationElementOutput) {
+		defaultButtonNarrationText(pNarrationElementOutput);
+	}
+}

src/main/java/nl/requios/effortlessbuilding/create/foundation/gui/widget/BoxWidget.java

@@ -0,0 +1,228 @@
+package nl.requios.effortlessbuilding.create.foundation.gui.widget;
+
+import com.mojang.blaze3d.vertex.PoseStack;
+import nl.requios.effortlessbuilding.create.foundation.gui.Theme;
+import nl.requios.effortlessbuilding.create.foundation.gui.Theme.Key;
+import nl.requios.effortlessbuilding.create.foundation.gui.UIRenderHelper;
+import nl.requios.effortlessbuilding.create.foundation.gui.element.BoxElement;
+import nl.requios.effortlessbuilding.create.foundation.gui.element.DelegatedStencilElement;
+import nl.requios.effortlessbuilding.create.foundation.utility.Color;
+import nl.requios.effortlessbuilding.create.foundation.utility.Couple;
+import nl.requios.effortlessbuilding.create.foundation.utility.animation.LerpedFloat;
+
+import javax.annotation.Nonnull;
+import java.util.function.Function;
+
+public class BoxWidget extends ElementWidget {
+
+	public static final Function<BoxWidget, DelegatedStencilElement.ElementRenderer> gradientFactory = (box) -> (ms, w, h, alpha) -> UIRenderHelper.angledGradient(ms, 90, w/2, -2, w + 4, h + 4, box.gradientColor1, box.gradientColor2);
+
+	protected BoxElement box;
+
+	protected Color customBorderTop;
+	protected Color customBorderBot;
+	protected Color customBackground;
+	protected boolean animateColors = true;
+	protected LerpedFloat colorAnimation = LerpedFloat.linear();
+
+	protected Color gradientColor1, gradientColor2;
+	private Color previousColor1, previousColor2;
+	private Color colorTarget1 = Theme.c(getIdleTheme(), true).copy();
+	private Color colorTarget2 = Theme.c(getIdleTheme(), false).copy();
+
+	public BoxWidget() {
+		this(0, 0);
+	}
+
+	public BoxWidget(int x, int y) {
+		this(x, y, 16, 16);
+	}
+
+	public BoxWidget(int x, int y, int width, int height) {
+		super(x, y, width, height);
+		box = new BoxElement()
+				.at(x, y)
+				.withBounds(width, height);
+		gradientColor1 = colorTarget1;
+		gradientColor2 = colorTarget2;
+	}
+
+	public <T extends BoxWidget> T withBounds(int width, int height) {
+		this.width = width;
+		this.height = height;
+		//noinspection unchecked
+		return (T) this;
+	}
+
+	public <T extends BoxWidget> T withBorderColors(Couple<Color> colors) {
+		this.customBorderTop = colors.getFirst();
+		this.customBorderBot = colors.getSecond();
+		updateColorsFromState();
+		//noinspection unchecked
+		return (T) this;
+	}
+
+	public <T extends BoxWidget> T withBorderColors(Color top, Color bot) {
+		this.customBorderTop = top;
+		this.customBorderBot = bot;
+		updateColorsFromState();
+		//noinspection unchecked
+		return (T) this;
+	}
+
+	public <T extends BoxWidget> T withCustomBackground(Color color) {
+		this.customBackground = color;
+		//noinspection unchecked
+		return (T) this;
+	}
+
+	public <T extends BoxWidget> T animateColors(boolean b) {
+		this.animateColors = b;
+		//noinspection unchecked
+		return (T) this;
+	}
+
+	@Override
+	public void tick() {
+		super.tick();
+		colorAnimation.tickChaser();
+	}
+
+	@Override
+	public void onClick(double x, double y) {
+		super.onClick(x, y);
+
+		gradientColor1 = Theme.c(getClickTheme(), true);
+		gradientColor2 = Theme.c(getClickTheme(), false);
+		startGradientAnimation(getColorForState(true), getColorForState(false), true, 0.15);
+	}
+
+	@Override
+	protected void beforeRender(@Nonnull PoseStack ms, int mouseX, int mouseY, float partialTicks) {
+		super.beforeRender(ms, mouseX, mouseY, partialTicks);
+
+		if (isHovered != wasHovered) {
+			startGradientAnimation(
+					getColorForState(true),
+					getColorForState(false),
+					isHovered
+			);
+		}
+
+		if (colorAnimation.settled()) {
+			gradientColor1 = colorTarget1;
+			gradientColor2 = colorTarget2;
+		} else {
+			float animationValue = 1 - Math.abs(colorAnimation.getValue(partialTicks));
+			gradientColor1 = Color.mixColors(previousColor1, colorTarget1, animationValue);
+			gradientColor2 = Color.mixColors(previousColor2, colorTarget2, animationValue);
+		}
+
+	}
+
+	@Override
+	public void renderButton(@Nonnull PoseStack ms, int mouseX, int mouseY, float partialTicks) {
+		float fadeValue = fade.getValue(partialTicks);
+		if (fadeValue < .1f)
+			return;
+
+		box.withAlpha(fadeValue);
+		box.withBackground(customBackground != null ? customBackground : Theme.c(Theme.Key.PONDER_BACKGROUND_TRANSPARENT))
+				.gradientBorder(gradientColor1, gradientColor2)
+				.at(x, y, z)
+				.withBounds(width, height)
+				.render(ms);
+
+		super.renderButton(ms, mouseX, mouseY, partialTicks);
+
+		wasHovered = isHovered;
+	}
+
+	@Override
+	public boolean isMouseOver(double mX, double mY) {
+		if (!active || !visible)
+			return false;
+
+		float padX = 2 + paddingX;
+		float padY = 2 + paddingY;
+
+		return x - padX <= mX && y - padY <= mY && mX < x + padX + width && mY < y + padY + height;
+	}
+	
+	@Override
+	protected boolean clicked(double pMouseX, double pMouseY) {
+		if (!active || !visible)
+			return false;
+		return isMouseOver(pMouseX, pMouseY);
+	}
+
+	public BoxElement getBox() {
+		return box;
+	}
+
+	public void updateColorsFromState() {
+		colorTarget1 = getColorForState(true);
+		colorTarget2 = getColorForState(false);
+	}
+
+	public void animateGradientFromState() {
+		startGradientAnimation(
+				getColorForState(true),
+				getColorForState(false),
+				true
+		);
+	}
+
+	private void startGradientAnimation(Color c1, Color c2, boolean positive, double expSpeed) {
+		if (!animateColors)
+			return;
+
+		colorAnimation.startWithValue(positive ? 1 : -1);
+		colorAnimation.chase(0, expSpeed, LerpedFloat.Chaser.EXP);
+		colorAnimation.tickChaser();
+
+		previousColor1 = gradientColor1;
+		previousColor2 = gradientColor2;
+
+		colorTarget1 = c1;
+		colorTarget2 = c2;
+	}
+
+	private void startGradientAnimation(Color c1, Color c2, boolean positive) {
+		startGradientAnimation(c1, c2, positive, 0.6);
+	}
+
+	private Color getColorForState(boolean first) {
+		if (!active)
+			return Theme.p(getDisabledTheme()).get(first);
+
+		if (isHovered) {
+			if (first)
+				return customBorderTop != null ? customBorderTop.darker() : Theme.c(getHoverTheme(), true);
+			else
+				return customBorderBot != null ? customBorderBot.darker() : Theme.c(getHoverTheme(), false);
+		}
+
+		if (first)
+			return customBorderTop != null ? customBorderTop : Theme.c(getIdleTheme(), true);
+		else
+			return customBorderBot != null ? customBorderBot : Theme.c(getIdleTheme(), false);
+	}
+
+	public Key getDisabledTheme() {
+		return Theme.Key.BUTTON_DISABLE;
+	}
+
+	public Key getIdleTheme() {
+		return Theme.Key.BUTTON_IDLE;
+	}
+
+	public Key getHoverTheme() {
+		return Theme.Key.BUTTON_HOVER;
+	}
+
+	public Key getClickTheme() {
+		return Theme.Key.BUTTON_CLICK;
+	}
+
+}

src/main/java/nl/requios/effortlessbuilding/create/foundation/gui/widget/ElementWidget.java

@@ -0,0 +1,156 @@
+package nl.requios.effortlessbuilding.create.foundation.gui.widget;
+
+import com.mojang.blaze3d.vertex.PoseStack;
+import nl.requios.effortlessbuilding.create.foundation.gui.element.RenderElement;
+import nl.requios.effortlessbuilding.create.foundation.gui.element.ScreenElement;
+import nl.requios.effortlessbuilding.create.foundation.utility.animation.LerpedFloat;
+
+import javax.annotation.Nonnull;
+import java.util.function.Consumer;
+import java.util.function.UnaryOperator;
+
+public class ElementWidget extends AbstractSimiWidget {
+
+	protected RenderElement element = RenderElement.EMPTY;
+
+	protected boolean usesFade = false;
+	protected int fadeModX;
+	protected int fadeModY;
+	protected LerpedFloat fade = LerpedFloat.linear().startWithValue(1);
+
+	protected boolean rescaleElement = false;
+	protected float rescaleSizeX;
+	protected float rescaleSizeY;
+
+	protected float paddingX = 0;
+	protected float paddingY = 0;
+
+	public ElementWidget(int x, int y) {
+		super(x, y);
+	}
+
+	public ElementWidget(int x, int y, int width, int height) {
+		super(x, y, width, height);
+	}
+
+	public <T extends ElementWidget> T showingElement(RenderElement element) {
+		this.element = element;
+		//noinspection unchecked
+		return (T) this;
+	}
+
+	public <T extends ElementWidget> T showing(ScreenElement renderable) {
+		return this.showingElement(RenderElement.of(renderable));
+	}
+
+	public <T extends ElementWidget> T modifyElement(Consumer<RenderElement> consumer) {
+		if (element != null)
+			consumer.accept(element);
+		//noinspection unchecked
+		return (T) this;
+	}
+
+	public <T extends ElementWidget> T mapElement(UnaryOperator<RenderElement> function) {
+		if (element != null)
+			element = function.apply(element);
+		//noinspection unchecked
+		return (T) this;
+	}
+
+	public <T extends ElementWidget> T withPadding(float paddingX, float paddingY) {
+		this.paddingX = paddingX;
+		this.paddingY = paddingY;
+		//noinspection unchecked
+		return (T) this;
+	}
+
+	public <T extends ElementWidget> T enableFade(int fadeModifierX, int fadeModifierY) {
+		this.fade.startWithValue(0);
+		this.usesFade = true;
+		this.fadeModX = fadeModifierX;
+		this.fadeModY = fadeModifierY;
+		//noinspection unchecked
+		return (T) this;
+	}
+
+	public <T extends ElementWidget> T disableFade() {
+		this.fade.startWithValue(1);
+		this.usesFade = false;
+		//noinspection unchecked
+		return (T) this;
+	}
+
+	public LerpedFloat fade() {
+		return fade;
+	}
+
+	public <T extends ElementWidget> T fade(float target) {
+		fade.chase(target, 0.1, LerpedFloat.Chaser.EXP);
+		//noinspection unchecked
+		return (T) this;
+	}
+
+	/**
+	 * Rescaling and its effects aren't properly tested with most elements.
+	 * Thought it should work fine when using a TextStencilElement.
+	 * Check BaseConfigScreen's title for such an example.
+	 */
+	@Deprecated
+	public <T extends ElementWidget> T rescaleElement(float rescaleSizeX, float rescaleSizeY) {
+		this.rescaleElement = true;
+		this.rescaleSizeX = rescaleSizeX;
+		this.rescaleSizeY = rescaleSizeY;
+		//noinspection unchecked
+		return (T) this;
+	}
+
+	public <T extends ElementWidget> T disableRescale() {
+		this.rescaleElement = false;
+		//noinspection unchecked
+		return (T) this;
+	}
+
+	@Override
+	public void tick() {
+		super.tick();
+		fade.tickChaser();
+	}
+
+	@Override
+	protected void beforeRender(@Nonnull PoseStack ms, int mouseX, int mouseY, float partialTicks) {
+		super.beforeRender(ms, mouseX, mouseY, partialTicks);
+		isHovered = isMouseOver(mouseX, mouseY);
+
+		float fadeValue = fade.getValue(partialTicks);
+		element.withAlpha(fadeValue);
+		if (fadeValue < 1) {
+			ms.translate((1 - fadeValue) * fadeModX, (1 - fadeValue) * fadeModY, 0);
+		}
+	}
+
+	@Override
+	public void renderButton(@Nonnull PoseStack ms, int mouseX, int mouseY, float partialTicks) {
+		ms.pushPose();
+		ms.translate(x + paddingX, y + paddingY, z);
+		float innerWidth = width - 2 * paddingX;
+		float innerHeight = height - 2 * paddingY;
+		float eX = element.getX(), eY = element.getY();
+		if (rescaleElement) {
+			float xScale = innerWidth / rescaleSizeX;
+			float yScale = innerHeight / rescaleSizeY;
+			ms.scale(xScale, yScale, 1);
+			element.at(eX / xScale, eY / yScale);
+			innerWidth /= xScale;
+			innerHeight /= yScale;
+		}
+		element.withBounds((int) innerWidth, (int) innerHeight).render(ms);
+		ms.popPose();
+		if (rescaleElement) {
+			element.at(eX, eY);
+		}
+	}
+
+	public RenderElement getRenderElement() {
+		return element;
+	}
+}

src/main/java/nl/requios/effortlessbuilding/create/foundation/gui/widget/IconButton.java

@@ -0,0 +1,51 @@
+package nl.requios.effortlessbuilding.create.foundation.gui.widget;
+
+import com.mojang.blaze3d.systems.RenderSystem;
+import com.mojang.blaze3d.vertex.PoseStack;
+import nl.requios.effortlessbuilding.create.foundation.gui.AllGuiTextures;
+import nl.requios.effortlessbuilding.create.foundation.gui.element.ScreenElement;
+import net.minecraft.network.chat.Component;
+
+import javax.annotation.Nonnull;
+
+public class IconButton extends AbstractSimiWidget {
+
+	protected ScreenElement icon;
+
+	public IconButton(int x, int y, ScreenElement icon) {
+		this(x, y, 18, 18, icon);
+	}
+	
+	public IconButton(int x, int y, int w, int h, ScreenElement icon) {
+		super(x, y, w, h);
+		this.icon = icon;
+	}
+
+	@Override
+	public void renderButton(@Nonnull PoseStack matrixStack, int mouseX, int mouseY, float partialTicks) {
+		if (visible) {
+			isHovered = mouseX >= x && mouseY >= y && mouseX < x + width && mouseY < y + height;
+
+			AllGuiTextures button = !active ? AllGuiTextures.BUTTON_DOWN
+				: isHoveredOrFocused() ? AllGuiTextures.BUTTON_HOVER : AllGuiTextures.BUTTON;
+
+			RenderSystem.setShaderColor(1.0F, 1.0F, 1.0F, 1.0F);
+			drawBg(matrixStack, button);
+			icon.render(matrixStack, x + 1, y + 1);
+		}
+	}
+
+	protected void drawBg(PoseStack matrixStack, AllGuiTextures button) {
+		AllGuiTextures.BUTTON.bind();
+		blit(matrixStack, x, y, button.startX, button.startY, button.width, button.height);
+	}
+
+	public void setToolTip(Component text) {
+		toolTip.clear();
+		toolTip.add(text);
+	}
+
+	public void setIcon(ScreenElement icon) {
+		this.icon = icon;
+	}
+}

src/main/java/nl/requios/effortlessbuilding/create/foundation/gui/widget/Indicator.java

@@ -0,0 +1,41 @@
+package nl.requios.effortlessbuilding.create.foundation.gui.widget;
+
+import com.google.common.collect.ImmutableList;
+import com.mojang.blaze3d.vertex.PoseStack;
+import nl.requios.effortlessbuilding.create.foundation.gui.AllGuiTextures;
+import net.minecraft.network.chat.Component;
+
+import javax.annotation.Nonnull;
+
+public class Indicator extends AbstractSimiWidget {
+
+	public State state;
+
+	public Indicator(int x, int y, Component tooltip) {
+		super(x, y, AllGuiTextures.INDICATOR.width, AllGuiTextures.INDICATOR.height);
+		this.toolTip = ImmutableList.of(tooltip);
+		this.state = State.OFF;
+	}
+
+	@Override
+	public void render(@Nonnull PoseStack matrixStack, int mouseX, int mouseY, float partialTicks ) {
+		if (!visible)
+			return;
+		AllGuiTextures toDraw;
+		switch (state) {
+			case ON: toDraw = AllGuiTextures.INDICATOR_WHITE; break;
+			case OFF: toDraw = AllGuiTextures.INDICATOR; break;
+			case RED: toDraw = AllGuiTextures.INDICATOR_RED; break;
+			case YELLOW: toDraw = AllGuiTextures.INDICATOR_YELLOW; break;
+			case GREEN: toDraw = AllGuiTextures.INDICATOR_GREEN; break;
+			default: toDraw = AllGuiTextures.INDICATOR; break;
+		}
+		toDraw.render(matrixStack, x, y, this);
+	}
+
+	public enum State {
+		OFF, ON,
+		RED, YELLOW, GREEN;
+	}
+
+}

src/main/java/nl/requios/effortlessbuilding/create/foundation/gui/widget/Label.java

@@ -0,0 +1,88 @@
+package nl.requios.effortlessbuilding.create.foundation.gui.widget;
+
+import com.mojang.blaze3d.systems.RenderSystem;
+import com.mojang.blaze3d.vertex.PoseStack;
+import nl.requios.effortlessbuilding.create.foundation.utility.Components;
+import net.minecraft.client.Minecraft;
+import net.minecraft.client.gui.Font;
+import net.minecraft.network.chat.Component;
+import net.minecraft.network.chat.MutableComponent;
+
+import javax.annotation.Nonnull;
+
+public class Label extends AbstractSimiWidget {
+
+	public Component text;
+	public String suffix;
+	protected boolean hasShadow;
+	protected int color;
+	protected Font font;
+
+	public Label(int x, int y, Component text) {
+		super(x, y, Minecraft.getInstance().font.width(text), 10);
+		font = Minecraft.getInstance().font;
+		this.text = Components.literal("Label");
+		color = 0xFFFFFF;
+		hasShadow = false;
+		suffix = "";
+	}
+
+	public Label colored(int color) {
+		this.color = color;
+		return this;
+	}
+
+	public Label withShadow() {
+		this.hasShadow = true;
+		return this;
+	}
+
+	public Label withSuffix(String s) {
+		suffix = s;
+		return this;
+	}
+
+	public void setTextAndTrim(Component newText, boolean trimFront, int maxWidthPx) {
+		Font fontRenderer = Minecraft.getInstance().font;
+		
+		if (fontRenderer.width(newText) <= maxWidthPx) {
+			text = newText;
+			return;
+		}
+		
+		String trim = "...";
+		int trimWidth = fontRenderer.width(trim);
+
+		String raw = newText.getString();
+		StringBuilder builder = new StringBuilder(raw);
+		int startIndex = trimFront ? 0 : raw.length() - 1;
+		int endIndex = !trimFront ? 0 : raw.length() - 1;
+		int step = (int) Math.signum(endIndex - startIndex);
+
+		for (int i = startIndex; i != endIndex; i += step) {
+			String sub = builder.substring(trimFront ? i : startIndex, trimFront ? endIndex + 1 : i + 1);
+			if (fontRenderer.width(Components.literal(sub).setStyle(newText.getStyle())) + trimWidth <= maxWidthPx) {
+				text = Components.literal(trimFront ? trim + sub : sub + trim).setStyle(newText.getStyle());
+				return;
+			}
+		}
+
+	}
+
+	@Override
+	public void renderButton(@Nonnull PoseStack matrixStack, int mouseX, int mouseY, float partialTicks) {
+		if (text == null || text.getString().isEmpty())
+			return;
+
+		RenderSystem.setShaderColor(1, 1, 1, 1);
+		MutableComponent copy = text.plainCopy();
+		if (suffix != null && !suffix.isEmpty())
+			copy.append(suffix);
+		
+		if (hasShadow)
+			font.drawShadow(matrixStack, copy, x, y, color);
+		else
+			font.draw(matrixStack, copy, x, y, color);
+	}
+
+}

src/main/java/nl/requios/effortlessbuilding/create/foundation/gui/widget/ScrollInput.java

@@ -0,0 +1,176 @@
+package nl.requios.effortlessbuilding.create.foundation.gui.widget;
+
+import nl.requios.effortlessbuilding.create.AllKeys;
+//import nl.requios.effortlessbuilding.create.AllSoundEvents;
+import nl.requios.effortlessbuilding.create.foundation.utility.Components;
+import nl.requios.effortlessbuilding.create.foundation.utility.Lang;
+import net.minecraft.ChatFormatting;
+import net.minecraft.client.Minecraft;
+//import net.minecraft.client.resources.sounds.SimpleSoundInstance;
+import net.minecraft.network.chat.Component;
+import net.minecraft.network.chat.MutableComponent;
+
+import java.util.function.Consumer;
+import java.util.function.Function;
+
+public class ScrollInput extends AbstractSimiWidget {
+
+	protected Consumer<Integer> onScroll;
+	protected int state;
+	protected Component title = Lang.translateDirect("gui.scrollInput.defaultTitle");
+	protected final Component scrollToModify = Lang.translateDirect("gui.scrollInput.scrollToModify");
+	protected final Component shiftScrollsFaster = Lang.translateDirect("gui.scrollInput.shiftScrollsFaster");
+	protected Label displayLabel;
+	protected boolean inverted;
+	protected Function<Integer, Component> formatter;
+
+	protected int min, max;
+	protected int shiftStep;
+	Function<StepContext, Integer> step;
+
+	public ScrollInput(int xIn, int yIn, int widthIn, int heightIn) {
+		super(xIn, yIn, widthIn, heightIn);
+		state = 0;
+		min = 0;
+		max = 1;
+		shiftStep = 5;
+		step = standardStep();
+		formatter = i -> Components.literal(String.valueOf(i));
+	}
+
+	public Function<StepContext, Integer> standardStep() {
+		return c -> c.shift ? shiftStep : 1;
+	}
+
+	public ScrollInput inverted() {
+		inverted = true;
+		return this;
+	}
+
+	public ScrollInput withRange(int min, int max) {
+		this.min = min;
+		this.max = max;
+		return this;
+	}
+
+	public ScrollInput calling(Consumer<Integer> onScroll) {
+		this.onScroll = onScroll;
+		return this;
+	}
+
+	public ScrollInput format(Function<Integer, Component> formatter) {
+		this.formatter = formatter;
+		return this;
+	}
+
+	public ScrollInput removeCallback() {
+		this.onScroll = null;
+		return this;
+	}
+
+	public ScrollInput titled(MutableComponent title) {
+		this.title = title;
+		updateTooltip();
+		return this;
+	}
+
+	public ScrollInput withStepFunction(Function<StepContext, Integer> step) {
+		this.step = step;
+		return this;
+	}
+
+	public ScrollInput writingTo(Label label) {
+		this.displayLabel = label;
+		if (label != null)
+			writeToLabel();
+		return this;
+	}
+
+	public int getState() {
+		return state;
+	}
+
+	public ScrollInput setState(int state) {
+		this.state = state;
+		clampState();
+		updateTooltip();
+		if (displayLabel != null)
+			writeToLabel();
+		return this;
+	}
+
+	public ScrollInput withShiftStep(int step) {
+		shiftStep = step;
+		return this;
+	}
+
+	@Override
+	public boolean mouseScrolled(double mouseX, double mouseY, double delta) {
+		if (!this.visible || !this.isHovered) return false; //Added
+		
+		if (inverted)
+			delta *= -1;
+
+		StepContext context = new StepContext();
+		context.control = AllKeys.ctrlDown();
+		context.shift = AllKeys.shiftDown();
+		context.currentValue = state;
+		context.forward = delta > 0;
+
+		int priorState = state;
+		boolean shifted = AllKeys.shiftDown();
+		int step = (int) Math.signum(delta) * this.step.apply(context);
+
+		state += step;
+		if (shifted)
+			state -= state % shiftStep;
+
+		clampState();
+
+		if (priorState != state) {
+//			Minecraft.getInstance().getSoundManager().play(SimpleSoundInstance.forUI(AllSoundEvents.SCROLL_VALUE.getMainEvent(), 1.5f + 0.1f * (state-min)/(max-min)));
+			onChanged();
+		}
+
+//		return priorState != state;
+		return true; //Changed
+	}
+
+	protected void clampState() {
+		if (state >= max)
+			state = max - 1;
+		if (state < min)
+			state = min;
+	}
+
+	public void onChanged() {
+		if (displayLabel != null)
+			writeToLabel();
+		if (onScroll != null)
+			onScroll.accept(state);
+		updateTooltip();
+	}
+
+	protected void writeToLabel() {
+		displayLabel.text = formatter.apply(state);
+	}
+
+	protected void updateTooltip() {
+		toolTip.clear();
+		if (title == null)
+			return;
+		toolTip.add(title.plainCopy()
+			.withStyle(s -> s.withColor(HEADER_RGB)));
+		toolTip.add(scrollToModify.plainCopy()
+			.withStyle(ChatFormatting.ITALIC, ChatFormatting.DARK_GRAY));
+		toolTip.add(shiftScrollsFaster.plainCopy()
+			.withStyle(ChatFormatting.ITALIC, ChatFormatting.DARK_GRAY));
+	}
+
+	public static class StepContext {
+		public int currentValue;
+		public boolean forward;
+		public boolean shift;
+		public boolean control;
+	}
+}

src/main/java/nl/requios/effortlessbuilding/create/foundation/gui/widget/SelectionScrollInput.java

@@ -0,0 +1,67 @@
+package nl.requios.effortlessbuilding.create.foundation.gui.widget;
+
+import nl.requios.effortlessbuilding.create.foundation.utility.Components;
+import nl.requios.effortlessbuilding.create.foundation.utility.Lang;
+import net.minecraft.ChatFormatting;
+import net.minecraft.network.chat.Component;
+import net.minecraft.network.chat.MutableComponent;
+
+import java.util.ArrayList;
+import java.util.List;
+
+public class SelectionScrollInput extends ScrollInput {
+
+	private final MutableComponent scrollToSelect = Lang.translateDirect("gui.scrollInput.scrollToSelect");
+	protected List<? extends Component> options;
+
+	public SelectionScrollInput(int xIn, int yIn, int widthIn, int heightIn) {
+		super(xIn, yIn, widthIn, heightIn);
+		options = new ArrayList<>();
+		inverted();
+	}
+
+	public ScrollInput forOptions(List<? extends Component> options) {
+		this.options = options;
+		this.max = options.size();
+		format(options::get);
+		updateTooltip();
+		return this;
+	}
+
+	@Override
+	protected void updateTooltip() {
+		toolTip.clear();
+		if (title == null)
+			return;
+		toolTip.add(title.plainCopy()
+			.withStyle(s -> s.withColor(HEADER_RGB)));
+		int min = Math.min(this.max - 16, state - 7);
+		int max = Math.max(this.min + 16, state + 8);
+		min = Math.max(min, this.min);
+		max = Math.min(max, this.max);
+		if (this.min + 1 == min)
+			min--;
+		if (min > this.min)
+			toolTip.add(Components.literal("> ...").withStyle(ChatFormatting.GRAY));
+		if (this.max - 1 == max)
+			max++;
+		for (int i = min; i < max; i++) {
+			if (i == state)
+				toolTip.add(Components.empty()
+					.append("-> ")
+					.append(options.get(i))
+					.withStyle(ChatFormatting.WHITE));
+			else
+				toolTip.add(Components.empty()
+					.append("> ")
+					.append(options.get(i))
+					.withStyle(ChatFormatting.GRAY));
+		}
+		if (max < this.max)
+			toolTip.add(Components.literal("> ...").withStyle(ChatFormatting.GRAY));
+
+		toolTip.add(scrollToSelect.plainCopy()
+			.withStyle(ChatFormatting.DARK_GRAY, ChatFormatting.ITALIC));
+	}
+
+}

src/main/java/nl/requios/effortlessbuilding/create/foundation/gui/widget/TooltipArea.java

@@ -0,0 +1,25 @@
+package nl.requios.effortlessbuilding.create.foundation.gui.widget;
+
+import com.mojang.blaze3d.vertex.PoseStack;
+import net.minecraft.network.chat.Component;
+
+import java.util.List;
+
+public class TooltipArea extends AbstractSimiWidget {
+
+	public TooltipArea(int x, int y, int width, int height) {
+		super(x, y, width, height);
+	}
+
+	@Override
+	public void renderButton(PoseStack ms, int mouseX, int mouseY, float partialTicks) {
+		if (visible)
+			isHovered = mouseX >= x && mouseY >= y && mouseX < x + width && mouseY < y + height;
+	}
+
+	public TooltipArea withTooltip(List<Component> tooltip) {
+		this.toolTip = tooltip;
+		return this;
+	}
+
+}

src/main/java/nl/requios/effortlessbuilding/create/foundation/item/ItemDescription.java

@@ -0,0 +1,182 @@
+package nl.requios.effortlessbuilding.create.foundation.item;
+
+import net.minecraft.ChatFormatting;
+import net.minecraft.client.gui.screens.Screen;
+import net.minecraft.network.chat.Component;
+import net.minecraft.network.chat.MutableComponent;
+import nl.requios.effortlessbuilding.create.foundation.utility.Components;
+import nl.requios.effortlessbuilding.create.foundation.utility.Lang;
+
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.List;
+
+import static net.minecraft.ChatFormatting.*;
+import static nl.requios.effortlessbuilding.create.foundation.item.TooltipHelper.cutStringTextComponent;
+import static nl.requios.effortlessbuilding.create.foundation.item.TooltipHelper.cutTextComponent;
+
+public class ItemDescription {
+
+	public static final ItemDescription MISSING = new ItemDescription(null);
+	public static Component trim = Components.literal("                          ").withStyle(WHITE, STRIKETHROUGH);
+
+	public enum Palette {
+
+		Blue(BLUE, AQUA),
+		Green(DARK_GREEN, GREEN),
+		Yellow(GOLD, YELLOW),
+		Red(DARK_RED, RED),
+		Purple(DARK_PURPLE, LIGHT_PURPLE),
+		Gray(DARK_GRAY, GRAY),
+
+		;
+
+		private Palette(ChatFormatting primary, ChatFormatting highlight) {
+			color = primary;
+			hColor = highlight;
+		}
+
+		public ChatFormatting color;
+		public ChatFormatting hColor;
+	}
+
+	private List<Component> lines;
+	private List<Component> linesOnShift;
+	private List<Component> linesOnCtrl;
+	private Palette palette;
+
+	public ItemDescription(Palette palette) {
+		this.palette = palette;
+		lines = new ArrayList<>();
+		linesOnShift = new ArrayList<>();
+		linesOnCtrl = new ArrayList<>();
+	}
+
+	public ItemDescription withSummary(Component summary) {
+		addStrings(linesOnShift, cutTextComponent(summary, palette.color, palette.hColor));
+		return this;
+	}
+
+	public static String makeProgressBar(int length, int filledLength) {
+		String bar = " ";
+		int emptySpaces = length - filledLength;
+		for (int i = 0; i < filledLength; i++)
+			bar += "\u2588";
+		for (int i = 0; i < emptySpaces; i++)
+			bar += "\u2592";
+		return bar + " ";
+	}
+
+	public ItemDescription withBehaviour(String condition, String behaviour) {
+		add(linesOnShift, Components.literal(condition).withStyle(GRAY));
+		addStrings(linesOnShift, cutStringTextComponent(behaviour, palette.color, palette.hColor, 1));
+		return this;
+	}
+
+	public ItemDescription withControl(String condition, String action) {
+		add(linesOnCtrl, Components.literal(condition).withStyle(GRAY));
+		addStrings(linesOnCtrl, cutStringTextComponent(action, palette.color, palette.hColor, 1));
+		return this;
+	}
+
+	public ItemDescription createTabs() {
+		boolean hasDescription = !linesOnShift.isEmpty();
+		boolean hasControls = !linesOnCtrl.isEmpty();
+
+		if (hasDescription || hasControls) {
+			String[] holdDesc = Lang.translateDirect("tooltip.holdForDescription", "$")
+				.getString()
+				.split("\\$");
+			String[] holdCtrl = Lang.translateDirect("tooltip.holdForControls", "$")
+				.getString()
+				.split("\\$");
+			MutableComponent keyShift = Lang.translateDirect("tooltip.keyShift");
+			MutableComponent keyCtrl = Lang.translateDirect("tooltip.keyCtrl");
+			for (List<Component> list : Arrays.asList(lines, linesOnShift, linesOnCtrl)) {
+				boolean shift = list == linesOnShift;
+				boolean ctrl = list == linesOnCtrl;
+
+				if (holdDesc.length != 2 || holdCtrl.length != 2) {
+					list.add(0, Components.literal("Invalid lang formatting!"));
+					continue;
+				}
+
+				if (hasControls) {
+					MutableComponent tabBuilder = Components.empty();
+					tabBuilder.append(Components.literal(holdCtrl[0]).withStyle(DARK_GRAY));
+					tabBuilder.append(keyCtrl.plainCopy()
+						.withStyle(ctrl ? WHITE : GRAY));
+					tabBuilder.append(Components.literal(holdCtrl[1]).withStyle(DARK_GRAY));
+					list.add(0, tabBuilder);
+				}
+
+				if (hasDescription) {
+					MutableComponent tabBuilder = Components.empty();
+					tabBuilder.append(Components.literal(holdDesc[0]).withStyle(DARK_GRAY));
+					tabBuilder.append(keyShift.plainCopy()
+						.withStyle(shift ? WHITE : GRAY));
+					tabBuilder.append(Components.literal(holdDesc[1]).withStyle(DARK_GRAY));
+					list.add(0, tabBuilder);
+				}
+
+				if (shift || ctrl)
+					list.add(hasDescription && hasControls ? 2 : 1, Components.immutableEmpty());
+			}
+		}
+
+		if (!hasDescription)
+			linesOnShift = lines;
+		if (!hasControls)
+			linesOnCtrl = lines;
+
+		return this;
+	}
+
+	public static String hightlight(String s, Palette palette) {
+		return palette.hColor + s + palette.color;
+	}
+
+	public static void addStrings(List<Component> infoList, List<Component> textLines) {
+		textLines.forEach(s -> add(infoList, s));
+	}
+
+	public static void add(List<Component> infoList, List<Component> textLines) {
+		infoList.addAll(textLines);
+	}
+
+	public static void add(List<Component> infoList, Component line) {
+		infoList.add(line);
+	}
+
+	public Palette getPalette() {
+		return palette;
+	}
+
+	public List<Component> addInformation(List<Component> tooltip) {
+		if (Screen.hasShiftDown()) {
+			tooltip.addAll(linesOnShift);
+			return tooltip;
+		}
+
+		if (Screen.hasControlDown()) {
+			tooltip.addAll(linesOnCtrl);
+			return tooltip;
+		}
+
+		tooltip.addAll(lines);
+		return tooltip;
+	}
+
+	public List<Component> getLines() {
+		return lines;
+	}
+
+	public List<Component> getLinesOnCtrl() {
+		return linesOnCtrl;
+	}
+
+	public List<Component> getLinesOnShift() {
+		return linesOnShift;
+	}
+
+}

src/main/java/nl/requios/effortlessbuilding/create/foundation/item/ItemHandlerWrapper.java

@@ -0,0 +1,49 @@
+package nl.requios.effortlessbuilding.create.foundation.item;
+
+import net.minecraft.world.item.ItemStack;
+import net.minecraftforge.items.IItemHandlerModifiable;
+
+public class ItemHandlerWrapper implements IItemHandlerModifiable {
+
+	private IItemHandlerModifiable wrapped;
+
+	public ItemHandlerWrapper(IItemHandlerModifiable wrapped) {
+		this.wrapped = wrapped;
+	}
+
+	@Override
+	public int getSlots() {
+		return wrapped.getSlots();
+	}
+
+	@Override
+	public ItemStack getStackInSlot(int slot) {
+		return wrapped.getStackInSlot(slot);
+	}
+
+	@Override
+	public ItemStack insertItem(int slot, ItemStack stack, boolean simulate) {
+		return wrapped.insertItem(slot, stack, simulate);
+	}
+
+	@Override
+	public ItemStack extractItem(int slot, int amount, boolean simulate) {
+		return wrapped.extractItem(slot, amount, simulate);
+	}
+
+	@Override
+	public int getSlotLimit(int slot) {
+		return wrapped.getSlotLimit(slot);
+	}
+
+	@Override
+	public boolean isItemValid(int slot, ItemStack stack) {
+		return wrapped.isItemValid(slot, stack);
+	}
+
+	@Override
+	public void setStackInSlot(int slot, ItemStack stack) {
+		wrapped.setStackInSlot(slot, stack);
+	}
+
+}

src/main/java/nl/requios/effortlessbuilding/create/foundation/item/ItemHelper.java

@@ -0,0 +1,276 @@
+package nl.requios.effortlessbuilding.create.foundation.item;
+
+import nl.requios.effortlessbuilding.create.foundation.utility.Pair;
+import net.minecraft.core.BlockPos;
+import net.minecraft.core.NonNullList;
+import net.minecraft.util.Mth;
+import net.minecraft.world.Containers;
+import net.minecraft.world.item.ItemStack;
+import net.minecraft.world.item.crafting.Ingredient;
+import net.minecraft.world.level.Level;
+import net.minecraftforge.items.IItemHandler;
+import net.minecraftforge.items.ItemHandlerHelper;
+import org.apache.commons.lang3.mutable.MutableInt;
+
+import javax.annotation.Nullable;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.function.Function;
+import java.util.function.Predicate;
+
+public class ItemHelper {
+
+	public static void dropContents(Level world, BlockPos pos, IItemHandler inv) {
+		for (int slot = 0; slot < inv.getSlots(); slot++)
+			Containers.dropItemStack(world, pos.getX(), pos.getY(), pos.getZ(), inv.getStackInSlot(slot));
+	}
+
+	public static List<ItemStack> multipliedOutput(ItemStack in, ItemStack out) {
+		List<ItemStack> stacks = new ArrayList<>();
+		ItemStack result = out.copy();
+		result.setCount(in.getCount() * out.getCount());
+
+		while (result.getCount() > result.getMaxStackSize()) {
+			stacks.add(result.split(result.getMaxStackSize()));
+		}
+
+		stacks.add(result);
+		return stacks;
+	}
+
+	public static void addToList(ItemStack stack, List<ItemStack> stacks) {
+		for (ItemStack s : stacks) {
+			if (!ItemHandlerHelper.canItemStacksStack(stack, s))
+				continue;
+			int transferred = Math.min(s.getMaxStackSize() - s.getCount(), stack.getCount());
+			s.grow(transferred);
+			stack.shrink(transferred);
+		}
+		if (stack.getCount() > 0)
+			stacks.add(stack);
+	}
+
+	public static boolean isSameInventory(IItemHandler h1, IItemHandler h2) {
+		if (h1 == null || h2 == null)
+			return false;
+		if (h1.getSlots() != h2.getSlots())
+			return false;
+		for (int slot = 0; slot < h1.getSlots(); slot++) {
+			if (h1.getStackInSlot(slot) != h2.getStackInSlot(slot))
+				return false;
+		}
+		return true;
+	}
+
+	public static int calcRedstoneFromInventory(@Nullable IItemHandler inv) {
+		if (inv == null)
+			return 0;
+		int i = 0;
+		float f = 0.0F;
+		int totalSlots = inv.getSlots();
+
+		for (int j = 0; j < inv.getSlots(); ++j) {
+			int slotLimit = inv.getSlotLimit(j);
+			if (slotLimit == 0) {
+				totalSlots--;
+				continue;
+			}
+			ItemStack itemstack = inv.getStackInSlot(j);
+			if (!itemstack.isEmpty()) {
+				f += (float) itemstack.getCount() / (float) Math.min(slotLimit, itemstack.getMaxStackSize());
+				++i;
+			}
+		}
+
+		if (totalSlots == 0)
+			return 0;
+
+		f = f / totalSlots;
+		return Mth.floor(f * 14.0F) + (i > 0 ? 1 : 0);
+	}
+
+	public static List<Pair<Ingredient, MutableInt>> condenseIngredients(NonNullList<Ingredient> recipeIngredients) {
+		List<Pair<Ingredient, MutableInt>> actualIngredients = new ArrayList<>();
+		Ingredients: for (Ingredient igd : recipeIngredients) {
+			for (Pair<Ingredient, MutableInt> pair : actualIngredients) {
+				ItemStack[] stacks1 = pair.getFirst()
+					.getItems();
+				ItemStack[] stacks2 = igd.getItems();
+				if (stacks1.length != stacks2.length)
+					continue;
+				for (int i = 0; i <= stacks1.length; i++) {
+					if (i == stacks1.length) {
+						pair.getSecond()
+							.increment();
+						continue Ingredients;
+					}
+					if (!ItemStack.matches(stacks1[i], stacks2[i]))
+						break;
+				}
+			}
+			actualIngredients.add(Pair.of(igd, new MutableInt(1)));
+		}
+		return actualIngredients;
+	}
+
+	public static boolean matchIngredients(Ingredient i1, Ingredient i2) {
+		if (i1 == i2)
+			return true;
+		ItemStack[] stacks1 = i1.getItems();
+		ItemStack[] stacks2 = i2.getItems();
+		if (stacks1 == stacks2)
+			return true;
+		if (stacks1.length == stacks2.length) {
+			for (int i = 0; i < stacks1.length; i++)
+				if (!ItemStack.isSame(stacks1[i], stacks2[i]))
+					return false;
+			return true;
+		}
+		return false;
+	}
+
+	public static boolean matchAllIngredients(NonNullList<Ingredient> ingredients) {
+		if (ingredients.size() <= 1)
+			return true;
+		Ingredient firstIngredient = ingredients.get(0);
+		for (int i = 1; i < ingredients.size(); i++)
+			if (!matchIngredients(firstIngredient, ingredients.get(i)))
+				return false;
+		return true;
+	}
+
+	public static enum ExtractionCountMode {
+		EXACTLY, UPTO
+	}
+
+	public static ItemStack extract(IItemHandler inv, Predicate<ItemStack> test, boolean simulate) {
+		return extract(inv, test, ExtractionCountMode.UPTO, 64, simulate);
+	}
+
+	public static ItemStack extract(IItemHandler inv, Predicate<ItemStack> test, int exactAmount, boolean simulate) {
+		return extract(inv, test, ExtractionCountMode.EXACTLY, exactAmount, simulate);
+	}
+
+	public static ItemStack extract(IItemHandler inv, Predicate<ItemStack> test, ExtractionCountMode mode, int amount,
+		boolean simulate) {
+		ItemStack extracting = ItemStack.EMPTY;
+		boolean amountRequired = mode == ExtractionCountMode.EXACTLY;
+		boolean checkHasEnoughItems = amountRequired;
+		boolean hasEnoughItems = !checkHasEnoughItems;
+		boolean potentialOtherMatch = false;
+		int maxExtractionCount = amount;
+
+		Extraction: do {
+			extracting = ItemStack.EMPTY;
+
+			for (int slot = 0; slot < inv.getSlots(); slot++) {
+				int amountToExtractFromThisSlot =
+					Math.min(maxExtractionCount - extracting.getCount(), inv.getStackInSlot(slot)
+						.getMaxStackSize());
+				ItemStack stack = inv.extractItem(slot, amountToExtractFromThisSlot, true);
+
+				if (stack.isEmpty())
+					continue;
+				if (!test.test(stack))
+					continue;
+				if (!extracting.isEmpty() && !canItemStackAmountsStack(stack, extracting)) {
+					potentialOtherMatch = true;
+					continue;
+				}
+
+				if (extracting.isEmpty())
+					extracting = stack.copy();
+				else
+					extracting.grow(stack.getCount());
+
+				if (!simulate && hasEnoughItems)
+					inv.extractItem(slot, stack.getCount(), false);
+
+				if (extracting.getCount() >= maxExtractionCount) {
+					if (checkHasEnoughItems) {
+						hasEnoughItems = true;
+						checkHasEnoughItems = false;
+						continue Extraction;
+					} else {
+						break Extraction;
+					}
+				}
+			}
+
+			if (!extracting.isEmpty() && !hasEnoughItems && potentialOtherMatch) {
+				ItemStack blackListed = extracting.copy();
+				test = test.and(i -> !ItemHandlerHelper.canItemStacksStack(i, blackListed));
+				continue;
+			}
+
+			if (checkHasEnoughItems)
+				checkHasEnoughItems = false;
+			else
+				break Extraction;
+
+		} while (true);
+
+		if (amountRequired && extracting.getCount() < amount)
+			return ItemStack.EMPTY;
+
+		return extracting;
+	}
+
+	public static ItemStack extract(IItemHandler inv, Predicate<ItemStack> test,
+		Function<ItemStack, Integer> amountFunction, boolean simulate) {
+		ItemStack extracting = ItemStack.EMPTY;
+		int maxExtractionCount = 64;
+
+		for (int slot = 0; slot < inv.getSlots(); slot++) {
+			if (extracting.isEmpty()) {
+				ItemStack stackInSlot = inv.getStackInSlot(slot);
+				if (stackInSlot.isEmpty() || !test.test(stackInSlot))
+					continue;
+				int maxExtractionCountForItem = amountFunction.apply(stackInSlot);
+				if (maxExtractionCountForItem == 0)
+					continue;
+				maxExtractionCount = Math.min(maxExtractionCount, maxExtractionCountForItem);
+			}
+
+			ItemStack stack = inv.extractItem(slot, maxExtractionCount - extracting.getCount(), true);
+
+			if (!test.test(stack))
+				continue;
+			if (!extracting.isEmpty() && !canItemStackAmountsStack(stack, extracting))
+				continue;
+
+			if (extracting.isEmpty())
+				extracting = stack.copy();
+			else
+				extracting.grow(stack.getCount());
+
+			if (!simulate)
+				inv.extractItem(slot, stack.getCount(), false);
+			if (extracting.getCount() >= maxExtractionCount)
+				break;
+		}
+
+		return extracting;
+	}
+
+	public static boolean canItemStackAmountsStack(ItemStack a, ItemStack b) {
+		return ItemHandlerHelper.canItemStacksStack(a, b) && a.getCount() + b.getCount() <= a.getMaxStackSize();
+	}
+
+	public static ItemStack findFirstMatch(IItemHandler inv, Predicate<ItemStack> test) {
+		int slot = findFirstMatchingSlotIndex(inv, test);
+		if (slot == -1)
+			return ItemStack.EMPTY;
+		else
+			return inv.getStackInSlot(slot);
+	}
+
+	public static int findFirstMatchingSlotIndex(IItemHandler inv, Predicate<ItemStack> test) {
+		for (int slot = 0; slot < inv.getSlots(); slot++) {
+			ItemStack toTest = inv.getStackInSlot(slot);
+			if (test.test(toTest))
+				return slot;
+		}
+		return -1;
+	}
+}

src/main/java/nl/requios/effortlessbuilding/create/foundation/item/TagDependentIngredientItem.java

@@ -0,0 +1,31 @@
+package nl.requios.effortlessbuilding.create.foundation.item;
+
+import net.minecraft.core.NonNullList;
+import net.minecraft.tags.TagKey;
+import net.minecraft.world.item.CreativeModeTab;
+import net.minecraft.world.item.Item;
+import net.minecraft.world.item.ItemStack;
+import net.minecraftforge.registries.ForgeRegistries;
+import net.minecraftforge.registries.tags.ITagManager;
+
+public class TagDependentIngredientItem extends Item {
+
+	private TagKey<Item> tag;
+
+	public TagDependentIngredientItem(Properties properties, TagKey<Item> tag) {
+		super(properties);
+		this.tag = tag;
+	}
+
+	@Override
+	public void fillItemCategory(CreativeModeTab tab, NonNullList<ItemStack> list) {
+		if (!shouldHide())
+			super.fillItemCategory(tab, list);
+	}
+
+	public boolean shouldHide() {
+		ITagManager<Item> tagManager = ForgeRegistries.ITEMS.tags();
+		return !tagManager.isKnownTagName(tag) || tagManager.getTag(tag).isEmpty();
+	}
+
+}

src/main/java/nl/requios/effortlessbuilding/create/foundation/item/TooltipHelper.java

@@ -0,0 +1,312 @@
+package nl.requios.effortlessbuilding.create.foundation.item;
+
+import com.google.common.base.Strings;
+import com.mojang.bridge.game.Language;
+import nl.requios.effortlessbuilding.create.foundation.item.ItemDescription.Palette;
+import nl.requios.effortlessbuilding.create.foundation.utility.Components;
+import nl.requios.effortlessbuilding.create.foundation.utility.Couple;
+import nl.requios.effortlessbuilding.create.foundation.utility.FontHelper;
+import nl.requios.effortlessbuilding.create.foundation.utility.Lang;
+import net.minecraft.ChatFormatting;
+import net.minecraft.client.Minecraft;
+import net.minecraft.client.gui.Font;
+import net.minecraft.client.resources.language.I18n;
+import net.minecraft.network.chat.Component;
+import net.minecraft.network.chat.MutableComponent;
+import net.minecraft.world.entity.player.Player;
+import net.minecraft.world.item.Item;
+import net.minecraft.world.item.ItemStack;
+import net.minecraft.world.level.ItemLike;
+
+import java.text.BreakIterator;
+import java.util.*;
+import java.util.function.Supplier;
+
+public class TooltipHelper {
+
+	public static final int maxWidthPerLine = 200;
+	public static final Map<String, ItemDescription> cachedTooltips = new HashMap<>();
+	public static Language cachedLanguage;
+	private static boolean gogglesMode;
+	private static final Map<Item, Supplier<String>> tooltipReferrals = new HashMap<>();
+
+	public static MutableComponent holdShift(Palette color, boolean highlighted) {
+		return Lang.translateDirect("tooltip.holdForDescription", Lang.translateDirect("tooltip.keyShift")
+			.withStyle(ChatFormatting.GRAY))
+			.withStyle(ChatFormatting.DARK_GRAY);
+	}
+
+	public static void addHint(List<Component> tooltip, String hintKey, Object... messageParams) {
+		Component spacing = Components.literal("");
+		tooltip.add(spacing.plainCopy()
+			.append(Lang.translateDirect(hintKey + ".title"))
+			.withStyle(ChatFormatting.GOLD));
+		Component hint = Lang.translateDirect(hintKey);
+		List<Component> cutComponent = TooltipHelper.cutTextComponent(hint, ChatFormatting.GRAY, ChatFormatting.WHITE);
+		for (Component component : cutComponent)
+			tooltip.add(spacing.plainCopy()
+				.append(component));
+	}
+
+	public static void referTo(ItemLike item, Supplier<? extends ItemLike> itemWithTooltip) {
+		tooltipReferrals.put(item.asItem(), () -> itemWithTooltip.get()
+			.asItem()
+			.getDescriptionId());
+	}
+
+	public static void referTo(ItemLike item, String string) {
+		tooltipReferrals.put(item.asItem(), () -> string);
+	}
+
+	@Deprecated
+	public static List<String> cutString(Component s, ChatFormatting defaultColor, ChatFormatting highlightColor) {
+		return cutString(s.getString(), defaultColor, highlightColor, 0);
+	}
+
+	@Deprecated
+	public static List<String> cutString(String s, ChatFormatting defaultColor, ChatFormatting highlightColor,
+		int indent) {
+		// Apply markup
+		String markedUp = s.replaceAll("_([^_]+)_", highlightColor + "$1" + defaultColor);
+
+		// Split words
+		List<String> words = new LinkedList<>();
+		BreakIterator iterator = BreakIterator.getLineInstance(Minecraft.getInstance().getLocale());
+		iterator.setText(markedUp);
+		int start = iterator.first();
+		for (int end = iterator.next(); end != BreakIterator.DONE; start = end, end = iterator.next()) {
+			String word = markedUp.substring(start, end);
+			words.add(word);
+		}
+
+		Font font = Minecraft.getInstance().font;
+		List<String> lines = FontHelper.cutString(font, markedUp, maxWidthPerLine);
+
+		// Format
+		String lineStart = Strings.repeat(" ", indent);
+		List<String> formattedLines = new ArrayList<>(lines.size());
+		String format = defaultColor.toString();
+		for (String line : lines) {
+			String formattedLine = format + lineStart + line;
+			formattedLines.add(formattedLine);
+//			format = TextFormatting.getFormatString(formattedLine);
+		}
+		return formattedLines;
+	}
+
+	public static List<Component> cutStringTextComponent(String c, ChatFormatting defaultColor,
+		ChatFormatting highlightColor) {
+		return cutTextComponent(Components.literal(c), defaultColor, highlightColor, 0);
+	}
+
+	public static List<Component> cutTextComponent(Component c, ChatFormatting defaultColor,
+		ChatFormatting highlightColor) {
+		return cutTextComponent(c, defaultColor, highlightColor, 0);
+	}
+
+	public static List<Component> cutStringTextComponent(String c, ChatFormatting defaultColor,
+		ChatFormatting highlightColor, int indent) {
+		return cutTextComponent(Components.literal(c), defaultColor, highlightColor, indent);
+	}
+
+	public static List<Component> cutTextComponent(Component c, ChatFormatting defaultColor,
+		ChatFormatting highlightColor, int indent) {
+		String s = c.getString();
+
+		// Apply markup
+		String markedUp = s;// .replaceAll("_([^_]+)_", highlightColor + "$1" + defaultColor);
+
+		// Split words
+		List<String> words = new LinkedList<>();
+		BreakIterator iterator = BreakIterator.getLineInstance(Minecraft.getInstance().getLocale());
+		iterator.setText(markedUp);
+		int start = iterator.first();
+		for (int end = iterator.next(); end != BreakIterator.DONE; start = end, end = iterator.next()) {
+			String word = markedUp.substring(start, end);
+			words.add(word);
+		}
+
+		// Apply hard wrap
+		Font font = Minecraft.getInstance().font;
+		List<String> lines = new LinkedList<>();
+		StringBuilder currentLine = new StringBuilder();
+		int width = 0;
+		for (String word : words) {
+			int newWidth = font.width(word.replaceAll("_", ""));
+			if (width + newWidth > maxWidthPerLine) {
+				if (width > 0) {
+					String line = currentLine.toString();
+					lines.add(line);
+					currentLine = new StringBuilder();
+					width = 0;
+				} else {
+					lines.add(word);
+					continue;
+				}
+			}
+			currentLine.append(word);
+			width += newWidth;
+		}
+		if (width > 0) {
+			lines.add(currentLine.toString());
+		}
+
+		// Format
+		MutableComponent lineStart = Components.literal(Strings.repeat(" ", indent));
+		lineStart.withStyle(defaultColor);
+		List<Component> formattedLines = new ArrayList<>(lines.size());
+		Couple<ChatFormatting> f = Couple.create(highlightColor, defaultColor);
+
+		boolean currentlyHighlighted = false;
+		for (String string : lines) {
+			MutableComponent currentComponent = lineStart.plainCopy();
+			String[] split = string.split("_");
+			for (String part : split) {
+				currentComponent.append(Components.literal(part).withStyle(f.get(currentlyHighlighted)));
+				currentlyHighlighted = !currentlyHighlighted;
+			}
+
+			formattedLines.add(currentComponent);
+			currentlyHighlighted = !currentlyHighlighted;
+		}
+
+		return formattedLines;
+	}
+
+//	public static List<ITextComponent> cutTextComponentOld(ITextComponent c, TextFormatting defaultColor,
+//		TextFormatting highlightColor, int indent) {
+//		IFormattableTextComponent lineStart = StringTextComponent.EMPTY.copy();
+//		for (int i = 0; i < indent; i++)
+//			lineStart.append(" ");
+//		lineStart.formatted(defaultColor);
+//
+//		List<ITextComponent> lines = new ArrayList<>();
+//		String rawText = getUnformattedDeepText(c);
+//		String[] words = rawText.split(" ");
+//		String word;
+//		IFormattableTextComponent currentLine = lineStart.copy();
+//
+//		boolean firstWord = true;
+//		boolean lastWord;
+//
+//		// Apply hard wrap
+//		for (int i = 0; i < words.length; i++) {
+//			word = words[i];
+//			lastWord = i == words.length - 1;
+//
+//			if (!lastWord && !firstWord && getComponentLength(currentLine) + word.length() > maxCharsPerLine) {
+//				lines.add(currentLine);
+//				currentLine = lineStart.copy();
+//				firstWord = true;
+//			}
+//
+//			currentLine.append(new StringTextComponent((firstWord ? "" : " ") + word.replace("_", ""))
+//				.formatted(word.matches("_([^_]+)_") ? highlightColor : defaultColor));
+//			firstWord = false;
+//		}
+//
+//		if (!firstWord) {
+//			lines.add(currentLine);
+//		}
+//
+//		return lines;
+//	}
+
+	private static void checkLocale() {
+		Language currentLanguage = Minecraft.getInstance()
+			.getLanguageManager()
+			.getSelected();
+		if (cachedLanguage != currentLanguage) {
+			cachedTooltips.clear();
+			cachedLanguage = currentLanguage;
+		}
+	}
+
+	public static boolean hasTooltip(ItemStack stack, Player player) {
+		checkLocale();
+
+		String key = getTooltipTranslationKey(stack);
+		if (cachedTooltips.containsKey(key))
+			return cachedTooltips.get(key) != ItemDescription.MISSING;
+		return findTooltip(stack);
+	}
+
+	public static ItemDescription getTooltip(ItemStack stack) {
+		checkLocale();
+		String key = getTooltipTranslationKey(stack);
+		if (cachedTooltips.containsKey(key)) {
+			ItemDescription itemDescription = cachedTooltips.get(key);
+			if (itemDescription != ItemDescription.MISSING)
+				return itemDescription;
+		}
+		return null;
+	}
+
+	private static boolean findTooltip(ItemStack stack) {
+		String key = getTooltipTranslationKey(stack);
+		if (I18n.exists(key)) {
+			cachedTooltips.put(key, buildToolTip(key, stack));
+			return true;
+		}
+		cachedTooltips.put(key, ItemDescription.MISSING);
+		return false;
+	}
+
+	private static ItemDescription buildToolTip(String translationKey, ItemStack stack) {
+		ItemDescription tooltip = new ItemDescription(Palette.Blue);
+		String summaryKey = translationKey + ".summary";
+
+		// Summary
+		if (I18n.exists(summaryKey))
+			tooltip = tooltip.withSummary(Components.literal(I18n.get(summaryKey)));
+
+		// Requirements
+//		if (stack.getItem() instanceof BlockItem) {
+//			BlockItem item = (BlockItem) stack.getItem();
+//			if (item.getBlock() instanceof IRotate || item.getBlock() instanceof EngineBlock) {
+//				tooltip = tooltip.withKineticStats(item.getBlock());
+//			}
+//		}
+
+		// Behaviours
+		for (int i = 1; i < 100; i++) {
+			String conditionKey = translationKey + ".condition" + i;
+			String behaviourKey = translationKey + ".behaviour" + i;
+			if (!I18n.exists(conditionKey))
+				break;
+			if (i == 1)
+				tooltip.getLinesOnShift()
+					.add(Components.immutableEmpty());
+			tooltip.withBehaviour(I18n.get(conditionKey), I18n.get(behaviourKey));
+		}
+
+		// Controls
+		for (int i = 1; i < 100; i++) {
+			String controlKey = translationKey + ".control" + i;
+			String actionKey = translationKey + ".action" + i;
+			if (!I18n.exists(controlKey))
+				break;
+			tooltip.withControl(I18n.get(controlKey), I18n.get(actionKey));
+		}
+
+		return tooltip.createTabs();
+	}
+
+	public static String getTooltipTranslationKey(ItemStack stack) {
+		Item item = stack.getItem();
+		if (tooltipReferrals.containsKey(item))
+			return tooltipReferrals.get(item)
+				.get() + ".tooltip";
+		return item.getDescriptionId(stack) + ".tooltip";
+	}
+
+//	private static int getComponentLength(ITextComponent component) {
+//		AtomicInteger l = new AtomicInteger();
+//		TextProcessing.visitFormatted(component, Style.EMPTY, (s, style, charConsumer) -> {
+//			l.getAndIncrement();
+//			return true;
+//		});
+//		return l.get();
+//	}
+
+}

src/main/java/nl/requios/effortlessbuilding/create/foundation/item/UncontainableBlockItem.java

@@ -0,0 +1,15 @@
+package nl.requios.effortlessbuilding.create.foundation.item;
+
+import net.minecraft.world.item.BlockItem;
+import net.minecraft.world.level.block.Block;
+
+public class UncontainableBlockItem extends BlockItem {
+	public UncontainableBlockItem(Block block, Properties properties) {
+		super(block, properties);
+	}
+
+	@Override
+	public boolean canFitInsideContainerItems() {
+		return false;
+	}
+}

src/main/java/nl/requios/effortlessbuilding/create/foundation/item/render/CreateCustomRenderedItemModel.java

@@ -0,0 +1,12 @@
+package nl.requios.effortlessbuilding.create.foundation.item.render;
+
+import nl.requios.effortlessbuilding.create.Create;
+import net.minecraft.client.resources.model.BakedModel;
+
+public abstract class CreateCustomRenderedItemModel extends CustomRenderedItemModel {
+
+	public CreateCustomRenderedItemModel(BakedModel template, String basePath) {
+		super(template, Create.ID, basePath);
+	}
+
+}

src/main/java/nl/requios/effortlessbuilding/create/foundation/item/render/CustomRenderedItemModel.java

@@ -0,0 +1,74 @@
+package nl.requios.effortlessbuilding.create.foundation.item.render;
+
+import com.mojang.blaze3d.vertex.PoseStack;
+import net.minecraft.client.renderer.block.model.ItemTransforms;
+import net.minecraft.client.resources.model.BakedModel;
+import net.minecraft.client.resources.model.BlockModelRotation;
+import net.minecraft.client.resources.model.ModelBakery;
+import net.minecraft.resources.ResourceLocation;
+import net.minecraftforge.client.event.ModelEvent;
+import net.minecraftforge.client.model.BakedModelWrapper;
+
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.stream.Collectors;
+
+public abstract class CustomRenderedItemModel extends BakedModelWrapper<BakedModel> {
+
+	protected String namespace;
+	protected String basePath;
+	protected Map<String, BakedModel> partials = new HashMap<>();
+
+	public CustomRenderedItemModel(BakedModel template, String namespace, String basePath) {
+		super(template);
+		this.namespace = namespace;
+		this.basePath = basePath;
+	}
+
+	@Override
+	public boolean isCustomRenderer() {
+		return true;
+	}
+
+	@Override
+	public BakedModel applyTransform(ItemTransforms.TransformType cameraTransformType, PoseStack mat, boolean leftHand) {
+		// Super call returns originalModel, but we want to return this, else ISTER
+		// won't be used.
+		super.applyTransform(cameraTransformType, mat, leftHand);
+		return this;
+	}
+
+	public final BakedModel getOriginalModel() {
+		return originalModel;
+	}
+
+	public BakedModel getPartial(String name) {
+		return partials.get(name);
+	}
+
+	public final List<ResourceLocation> getModelLocations() {
+		return partials.keySet().stream().map(this::getPartialModelLocation).collect(Collectors.toList());
+	}
+
+	protected void addPartials(String... partials) {
+		for (String name : partials)
+			this.partials.put(name, null);
+	}
+
+	public void loadPartials(ModelEvent.BakingCompleted event) {
+		ModelBakery modelLoader = event.getModelBakery();
+		for (String name : partials.keySet())
+			partials.put(name, loadPartial(modelLoader, name));
+	}
+
+	@SuppressWarnings("deprecation")
+	protected BakedModel loadPartial(ModelBakery modelLoader, String name) {
+		return modelLoader.bake(getPartialModelLocation(name), BlockModelRotation.X0_Y0);
+	}
+
+	protected ResourceLocation getPartialModelLocation(String name) {
+		return new ResourceLocation(namespace, "item/" + basePath + "/" + name);
+	}
+
+}

src/main/java/nl/requios/effortlessbuilding/create/foundation/item/render/PartialItemModelRenderer.java

@@ -0,0 +1,95 @@
+package nl.requios.effortlessbuilding.create.foundation.item.render;
+
+import com.mojang.blaze3d.vertex.PoseStack;
+import com.mojang.blaze3d.vertex.VertexConsumer;
+import nl.requios.effortlessbuilding.create.foundation.render.RenderTypes;
+import nl.requios.effortlessbuilding.create.foundation.utility.Iterate;
+import net.minecraft.client.Minecraft;
+import net.minecraft.client.renderer.MultiBufferSource;
+import net.minecraft.client.renderer.RenderType;
+import net.minecraft.client.renderer.block.model.ItemTransforms;
+import net.minecraft.client.renderer.entity.ItemRenderer;
+import net.minecraft.client.resources.model.BakedModel;
+import net.minecraft.core.Direction;
+import net.minecraft.util.RandomSource;
+import net.minecraft.world.item.ItemStack;
+import net.minecraftforge.client.extensions.common.IClientItemExtensions;
+import net.minecraftforge.client.model.data.ModelData;
+
+public class PartialItemModelRenderer {
+
+	private static final PartialItemModelRenderer INSTANCE = new PartialItemModelRenderer();
+
+	private final RandomSource random = RandomSource.create();
+
+	private ItemStack stack;
+	private ItemTransforms.TransformType transformType;
+	private PoseStack ms;
+	private MultiBufferSource buffer;
+	private int overlay;
+
+	public static PartialItemModelRenderer of(ItemStack stack, ItemTransforms.TransformType transformType,
+		PoseStack ms, MultiBufferSource buffer, int overlay) {
+		PartialItemModelRenderer instance = INSTANCE;
+		instance.stack = stack;
+		instance.transformType = transformType;
+		instance.ms = ms;
+		instance.buffer = buffer;
+		instance.overlay = overlay;
+		return instance;
+	}
+
+	public void render(BakedModel model, int light) {
+		render(model, RenderTypes.getItemPartialTranslucent(), light);
+	}
+
+	public void renderSolid(BakedModel model, int light) {
+		render(model, RenderTypes.getItemPartialSolid(), light);
+	}
+
+//	public void renderSolidGlowing(BakedModel model, int light) {
+//		render(model, RenderTypes.getGlowingSolid(), light);
+//	}
+//
+//	public void renderGlowing(BakedModel model, int light) {
+//		render(model, RenderTypes.getGlowingTranslucent(), light);
+//	}
+
+	public void render(BakedModel model, RenderType type, int light) {
+		if (stack.isEmpty())
+			return;
+
+		ms.pushPose();
+		ms.translate(-0.5D, -0.5D, -0.5D);
+
+		if (!model.isCustomRenderer()) {
+			VertexConsumer vc = ItemRenderer.getFoilBufferDirect(buffer, type, true, stack.hasFoil());
+			for (BakedModel pass : model.getRenderPasses(stack, false)) {
+				renderBakedItemModel(pass, light, ms, vc);
+			}
+		} else
+			IClientItemExtensions.of(stack)
+				.getCustomRenderer()
+				.renderByItem(stack, transformType, ms, buffer, light, overlay);
+
+		ms.popPose();
+	}
+
+	private void renderBakedItemModel(BakedModel model, int light, PoseStack ms, VertexConsumer buffer) {
+		ItemRenderer ir = Minecraft.getInstance()
+			.getItemRenderer();
+		ModelData data = ModelData.EMPTY;
+
+		for (RenderType renderType : model.getRenderTypes(stack, false)) {
+			for (Direction direction : Iterate.directions) {
+				random.setSeed(42L);
+				ir.renderQuadList(ms, buffer, model.getQuads(null, direction, random, data, renderType), stack, light,
+					overlay);
+			}
+
+			random.setSeed(42L);
+			ir.renderQuadList(ms, buffer, model.getQuads(null, null, random, data, renderType), stack, light, overlay);
+		}
+	}
+
+}

src/main/java/nl/requios/effortlessbuilding/create/foundation/networking/ISyncPersistentData.java

@@ -0,0 +1,57 @@
+package nl.requios.effortlessbuilding.create.foundation.networking;
+
+import net.minecraft.client.Minecraft;
+import net.minecraft.nbt.CompoundTag;
+import net.minecraft.network.FriendlyByteBuf;
+import net.minecraft.world.entity.Entity;
+import net.minecraftforge.network.NetworkEvent.Context;
+import net.minecraftforge.network.PacketDistributor;
+
+import java.util.HashSet;
+import java.util.function.Supplier;
+
+public interface ISyncPersistentData {
+
+	void onPersistentDataUpdated();
+
+	public static class PersistentDataPacket extends SimplePacketBase {
+
+		private int entityId;
+		private Entity entity;
+		private CompoundTag readData;
+
+		public PersistentDataPacket(Entity entity) {
+			this.entity = entity;
+			this.entityId = entity.getId();
+		}
+
+		public PersistentDataPacket(FriendlyByteBuf buffer) {
+			entityId = buffer.readInt();
+			readData = buffer.readNbt();
+		}
+
+		@Override
+		public void write(FriendlyByteBuf buffer) {
+			buffer.writeInt(entityId);
+			buffer.writeNbt(entity.getPersistentData());
+		}
+
+		@Override
+		public void handle(Supplier<Context> context) {
+			context.get()
+				.enqueueWork(() -> {
+					Entity entityByID = Minecraft.getInstance().level.getEntity(entityId);
+					CompoundTag data = entityByID.getPersistentData();
+					new HashSet<>(data.getAllKeys()).forEach(data::remove);
+					data.merge(readData);
+					if (!(entityByID instanceof ISyncPersistentData))
+						return;
+					((ISyncPersistentData) entityByID).onPersistentDataUpdated();
+				});
+			context.get()
+				.setPacketHandled(true);
+		}
+
+	}
+
+}

src/main/java/nl/requios/effortlessbuilding/create/foundation/networking/SimplePacketBase.java

@@ -0,0 +1,14 @@
+package nl.requios.effortlessbuilding.create.foundation.networking;
+
+import net.minecraft.network.FriendlyByteBuf;
+import net.minecraftforge.network.NetworkEvent.Context;
+
+import java.util.function.Supplier;
+
+public abstract class SimplePacketBase {
+
+	public abstract void write(FriendlyByteBuf buffer);
+
+	public abstract void handle(Supplier<Context> context);
+
+}

src/main/java/nl/requios/effortlessbuilding/create/foundation/render/BakedModelRenderHelper.java

@@ -1,6 +1,7 @@
 package nl.requios.effortlessbuilding.create.foundation.render;
 
 import com.jozufozu.flywheel.core.model.ModelUtil;
+import com.jozufozu.flywheel.core.model.ShadeSeparatedBufferedData;
 import com.jozufozu.flywheel.util.Pair;
 import com.mojang.blaze3d.vertex.BufferBuilder.RenderedBuffer;
 import com.mojang.blaze3d.vertex.PoseStack;
@@ -22,8 +23,10 @@ public class BakedModelRenderHelper {
 	}
 
 	public static SuperByteBuffer standardModelRender(BakedModel model, BlockState referenceState, PoseStack ms) {
-		Pair<RenderedBuffer, Integer> pair = ModelUtil.getBufferBuilder(model, referenceState, ms);
+		ShadeSeparatedBufferedData data = ModelUtil.getBufferedData(model, referenceState, ms);
-		return new SuperByteBuffer(pair.first(), pair.second());
+		SuperByteBuffer sbb = new SuperByteBuffer(data);
+		data.release();
+		return sbb;
 	}
 
 }

src/main/java/nl/requios/effortlessbuilding/create/foundation/render/RenderTypes.java

@@ -20,7 +20,7 @@ import java.io.IOException;
 // TODO 1.17: use custom shaders instead of vanilla ones
 public class RenderTypes extends RenderStateShard {
 
-	public static final ShaderStateShard GLOWING_SHADER = new ShaderStateShard(() -> Shaders.glowingShader);
+//	public static final ShaderStateShard GLOWING_SHADER = new ShaderStateShard(() -> Shaders.glowingShader);
 
 	private static final RenderType OUTLINE_SOLID =
 		RenderType.create(createLayerName("outline_solid"), DefaultVertexFormat.NEW_ENTITY, VertexFormat.Mode.QUADS, 256, false,
@@ -49,33 +49,33 @@ public class RenderTypes extends RenderStateShard {
 				.createCompositeState(false));
 	}
 
-	public static RenderType getGlowingSolid(ResourceLocation texture) {
+//	public static RenderType getGlowingSolid(ResourceLocation texture) {
-		return RenderType.create(createLayerName("glowing_solid"), DefaultVertexFormat.NEW_ENTITY, VertexFormat.Mode.QUADS, 256,
+//		return RenderType.create(createLayerName("glowing_solid"), DefaultVertexFormat.NEW_ENTITY, VertexFormat.Mode.QUADS, 256,
-			true, false, RenderType.CompositeState.builder()
+//			true, false, RenderType.CompositeState.builder()
-				.setShaderState(GLOWING_SHADER)
+//				.setShaderState(GLOWING_SHADER)
-				.setTextureState(new TextureStateShard(texture, false, false))
+//				.setTextureState(new TextureStateShard(texture, false, false))
-				.setCullState(CULL)
+//				.setCullState(CULL)
-				.setLightmapState(LIGHTMAP)
+//				.setLightmapState(LIGHTMAP)
-				.setOverlayState(OVERLAY)
+//				.setOverlayState(OVERLAY)
-				.createCompositeState(true));
+//				.createCompositeState(true));
-	}
+//	}
+//
+//	private static final RenderType GLOWING_SOLID_DEFAULT = getGlowingSolid(InventoryMenu.BLOCK_ATLAS);
+//
+//	public static RenderType getGlowingSolid() {
+//		return GLOWING_SOLID_DEFAULT;
+//	}
 
-	private static final RenderType GLOWING_SOLID_DEFAULT = getGlowingSolid(InventoryMenu.BLOCK_ATLAS);
+//	public static RenderType getGlowingTranslucent(ResourceLocation texture) {
-
+//		return RenderType.create(createLayerName("glowing_translucent"), DefaultVertexFormat.NEW_ENTITY, VertexFormat.Mode.QUADS,
-	public static RenderType getGlowingSolid() {
+//			256, true, true, RenderType.CompositeState.builder()
-		return GLOWING_SOLID_DEFAULT;
+//				.setShaderState(GLOWING_SHADER)
-	}
+//				.setTextureState(new TextureStateShard(texture, false, false))
-
+//				.setTransparencyState(TRANSLUCENT_TRANSPARENCY)
-	public static RenderType getGlowingTranslucent(ResourceLocation texture) {
+//				.setLightmapState(LIGHTMAP)
-		return RenderType.create(createLayerName("glowing_translucent"), DefaultVertexFormat.NEW_ENTITY, VertexFormat.Mode.QUADS,
+//				.setOverlayState(OVERLAY)
-			256, true, true, RenderType.CompositeState.builder()
+//				.createCompositeState(true));
-				.setShaderState(GLOWING_SHADER)
+//	}
-				.setTextureState(new TextureStateShard(texture, false, false))
-				.setTransparencyState(TRANSLUCENT_TRANSPARENCY)
-				.setLightmapState(LIGHTMAP)
-				.setOverlayState(OVERLAY)
-				.createCompositeState(true));
-	}
 
 	private static final RenderType ADDITIVE = RenderType.create(createLayerName("additive"), DefaultVertexFormat.BLOCK,
 		VertexFormat.Mode.QUADS, 256, true, true, RenderType.CompositeState.builder()
@@ -91,11 +91,11 @@ public class RenderTypes extends RenderStateShard {
 		return ADDITIVE;
 	}
 
-	private static final RenderType GLOWING_TRANSLUCENT_DEFAULT = getGlowingTranslucent(InventoryMenu.BLOCK_ATLAS);
+//	private static final RenderType GLOWING_TRANSLUCENT_DEFAULT = getGlowingTranslucent(InventoryMenu.BLOCK_ATLAS);
 
-	public static RenderType getGlowingTranslucent() {
+//	public static RenderType getGlowingTranslucent() {
-		return GLOWING_TRANSLUCENT_DEFAULT;
+//		return GLOWING_TRANSLUCENT_DEFAULT;
-	}
+//	}
 
 	private static final RenderType ITEM_PARTIAL_SOLID =
 		RenderType.create(createLayerName("item_partial_solid"), DefaultVertexFormat.NEW_ENTITY, VertexFormat.Mode.QUADS, 256, true,
@@ -146,15 +146,15 @@ public class RenderTypes extends RenderStateShard {
 		super(null, null, null);
 	}
 
-	@EventBusSubscriber(value = Dist.CLIENT, bus = EventBusSubscriber.Bus.MOD)
+//	@EventBusSubscriber(value = Dist.CLIENT, bus = EventBusSubscriber.Bus.MOD)
-	private static class Shaders {
+//	private static class Shaders {
-		private static ShaderInstance glowingShader;
+//		private static ShaderInstance glowingShader;
-
+//
-		@SubscribeEvent
+//		@SubscribeEvent
-		public static void onRegisterShaders(RegisterShadersEvent event) throws IOException {
+//		public static void onRegisterShaders(RegisterShadersEvent event) throws IOException {
-			ResourceManager resourceManager = event.getResourceManager();
+//			ResourceManager resourceManager = event.getResourceManager();
-			event.registerShader(new ShaderInstance(resourceManager, Create.asResource("glowing_shader"), DefaultVertexFormat.NEW_ENTITY), shader -> glowingShader = shader);
+//			event.registerShader(new ShaderInstance(resourceManager, Create.asResource("glowing_shader"), DefaultVertexFormat.NEW_ENTITY), shader -> glowingShader = shader);
-		}
+//		}
-	}
+//	}
 
 }

src/main/java/nl/requios/effortlessbuilding/create/foundation/render/SuperByteBuffer.java

@@ -1,18 +1,27 @@
 package nl.requios.effortlessbuilding.create.foundation.render;
 
+import java.nio.ByteBuffer;
+import java.util.function.IntPredicate;
+
 import com.jozufozu.flywheel.api.vertex.ShadedVertexList;
+import com.jozufozu.flywheel.api.vertex.VertexList;
 import com.jozufozu.flywheel.backend.ShadersModHandler;
+import com.jozufozu.flywheel.core.model.ShadeSeparatedBufferedData;
 import com.jozufozu.flywheel.core.vertex.BlockVertexList;
 import com.jozufozu.flywheel.util.DiffuseLightCalculator;
 import com.jozufozu.flywheel.util.transform.TStack;
 import com.jozufozu.flywheel.util.transform.Transform;
-import com.mojang.blaze3d.vertex.BufferBuilder.DrawState;
+import com.mojang.blaze3d.vertex.BufferBuilder;
-import com.mojang.blaze3d.vertex.BufferBuilder.RenderedBuffer;
 import com.mojang.blaze3d.vertex.PoseStack;
 import com.mojang.blaze3d.vertex.VertexConsumer;
-import com.mojang.math.*;
+import com.mojang.math.Matrix3f;
+import com.mojang.math.Matrix4f;
+import com.mojang.math.Quaternion;
+import com.mojang.math.Vector3f;
+import com.mojang.math.Vector4f;
 import nl.requios.effortlessbuilding.create.foundation.block.render.SpriteShiftEntry;
 import nl.requios.effortlessbuilding.create.foundation.utility.Color;
+
 import it.unimi.dsi.fastutil.longs.Long2IntMap;
 import it.unimi.dsi.fastutil.longs.Long2IntOpenHashMap;
 import net.minecraft.client.Minecraft;
@@ -26,10 +35,11 @@ import net.minecraft.world.level.Level;
 
 public class SuperByteBuffer implements Transform<SuperByteBuffer>, TStack<SuperByteBuffer> {
 
-	private final ShadedVertexList template;
+	private final VertexList template;
+	private final IntPredicate shadedPredicate;
 
 	// Vertex Position
-	private final PoseStack transforms;
+	private final PoseStack transforms = new PoseStack();
 
 	// Vertex Coloring
 	private boolean shouldColor;
@@ -57,11 +67,28 @@ public class SuperByteBuffer implements Transform<SuperByteBuffer>, TStack<Super
 	// Temporary
 	private static final Long2IntMap WORLD_LIGHT_CACHE = new Long2IntOpenHashMap();
 
-	public SuperByteBuffer(RenderedBuffer buf, int unshadedStartVertex) {
+	public SuperByteBuffer(ByteBuffer vertexBuffer, BufferBuilder.DrawState drawState, int unshadedStartVertex) {
-		DrawState drawState = buf.drawState();
+		int vertexCount = drawState.vertexCount();
-		template = new BlockVertexList.Shaded(buf.vertexBuffer(), drawState.vertexCount(), drawState.format().getVertexSize(), unshadedStartVertex);
+		int stride = drawState.format().getVertexSize();
+
+		ShadedVertexList template = new BlockVertexList.Shaded(vertexBuffer, vertexCount, stride, unshadedStartVertex);
+		shadedPredicate = template::isShaded;
+		this.template = template;
+
+		transforms.pushPose();
+	}
+
+	public SuperByteBuffer(ShadeSeparatedBufferedData data) {
+		this(data.vertexBuffer(), data.drawState(), data.unshadedStartVertex());
+	}
+
+	public SuperByteBuffer(ByteBuffer vertexBuffer, BufferBuilder.DrawState drawState) {
+		int vertexCount = drawState.vertexCount();
+		int stride = drawState.format().getVertexSize();
+
+		template = new BlockVertexList(vertexBuffer, vertexCount, stride);
+		shadedPredicate = index -> true;
 
-		transforms = new PoseStack();
 		transforms.pushPose();
 	}
 
@@ -143,7 +170,7 @@ public class SuperByteBuffer implements Transform<SuperByteBuffer>, TStack<Super
 			if (disableDiffuseMult) {
 				builder.color(r, g, b, a);
 			} else {
-				float instanceDiffuse = diffuseCalculator.getDiffuse(nx, ny, nz, template.isShaded(i));
+				float instanceDiffuse = diffuseCalculator.getDiffuse(nx, ny, nz, shadedPredicate.test(i));
 				int colorR = transformColor(r, instanceDiffuse);
 				int colorG = transformColor(g, instanceDiffuse);
 				int colorB = transformColor(b, instanceDiffuse);
@@ -222,6 +249,10 @@ public class SuperByteBuffer implements Transform<SuperByteBuffer>, TStack<Super
 		return template.isEmpty();
 	}
 
+	public void delete() {
+		template.delete();
+	}
+
 	public PoseStack getTransforms() {
 		return transforms;
 	}

src/main/java/nl/requios/effortlessbuilding/create/foundation/utility/BlockHelper.java

@@ -32,6 +32,7 @@ import net.minecraft.world.level.material.FluidState;
 import net.minecraft.world.level.material.Material;
 import net.minecraftforge.common.IPlantable;
 import net.minecraftforge.common.MinecraftForge;
+import net.minecraftforge.common.util.BlockSnapshot;
 import net.minecraftforge.event.level.BlockEvent;
 
 import javax.annotation.Nullable;
@@ -144,7 +145,7 @@ public class BlockHelper {
 		destroyBlockAs(world, pos, null, ItemStack.EMPTY, effectChance, droppedItemCallback);
 	}
 
-	public static void destroyBlockAs(Level world, BlockPos pos, @Nullable Player player, ItemStack usedTool,
+	public static boolean destroyBlockAs(Level world, BlockPos pos, @Nullable Player player, ItemStack usedTool,
 		float effectChance, Consumer<ItemStack> droppedItemCallback) {
 		FluidState fluidState = world.getFluidState(pos);
 		BlockState state = world.getBlockState(pos);
@@ -157,7 +158,7 @@ public class BlockHelper {
 			BlockEvent.BreakEvent event = new BlockEvent.BreakEvent(world, pos, state, player);
 			MinecraftForge.EVENT_BUS.post(event);
 			if (event.isCanceled())
-				return;
+				return false;
 
 			if (event.getExpToDrop() > 0 && world instanceof ServerLevel)
 				state.getBlock()
@@ -178,19 +179,20 @@ public class BlockHelper {
 			if (state.getBlock() instanceof IceBlock && usedTool.getEnchantmentLevel(Enchantments.SILK_TOUCH) == 0) {
 				if (world.dimensionType()
 					.ultraWarm())
-					return;
+					return false;
 
 				Material material = world.getBlockState(pos.below())
 					.getMaterial();
 				if (material.blocksMotion() || material.isLiquid())
 					world.setBlockAndUpdate(pos, Blocks.WATER.defaultBlockState());
-				return;
+				return true;
 			}
 
 			state.spawnAfterBreak((ServerLevel) world, pos, ItemStack.EMPTY, true);
 		}
 		
 		world.setBlockAndUpdate(pos, fluidState.createLegacyBlock());
+		return true;
 	}
 
 	public static boolean isSolidWall(BlockGetter reader, BlockPos fromPos, Direction toDirection) {
@@ -223,7 +225,7 @@ public class BlockHelper {
 			.getBlock(), target.below());
 	}
 
-	public static void placeSchematicBlock(Level world, BlockState state, BlockPos target, ItemStack stack,
+	public static boolean placeSchematicBlock(Level world, Player player, BlockState state, BlockPos target, ItemStack stack,
 		@Nullable CompoundTag data) {
 		BlockEntity existingTile = world.getBlockEntity(target);
 
@@ -233,15 +235,12 @@ public class BlockHelper {
 		if (state.hasProperty(BlockStateProperties.WATERLOGGED))
 			state = state.setValue(BlockStateProperties.WATERLOGGED, Boolean.FALSE);
 
-//		if (AllBlocks.BELT.has(state)) {
+		if (state.getBlock() == Blocks.COMPOSTER)
-//			world.setBlock(target, state, 2);
+			state = Blocks.COMPOSTER.defaultBlockState();
-//			return;
+		else if (state.getBlock() != Blocks.SEA_PICKLE && state.getBlock() instanceof IPlantable)
-//		} else if (state.getBlock() == Blocks.COMPOSTER)
+			state = ((IPlantable) state.getBlock()).getPlant(world, target);
-//			state = Blocks.COMPOSTER.defaultBlockState();
+		else if (state.is(BlockTags.CAULDRONS))
-//		else if (state.getBlock() != Blocks.SEA_PICKLE && state.getBlock() instanceof IPlantable)
+			state = Blocks.CAULDRON.defaultBlockState();
-//			state = ((IPlantable) state.getBlock()).getPlant(world, target);
-//		else if (state.is(BlockTags.CAULDRONS))
-//			state = Blocks.CAULDRON.defaultBlockState();
 
 		if (world.dimensionType()
 			.ultraWarm() && state.getFluidState().is(FluidTags.WATER)) {
@@ -256,13 +255,13 @@ public class BlockHelper {
 					0.0D, 0.0D, 0.0D);
 			}
 			Block.dropResources(state, world, target);
-			return;
+			return true;
 		}
 
 		if (state.getBlock() instanceof BaseRailBlock) {
 			placeRailWithoutUpdate(world, state, target);
 		} else {
-			world.setBlock(target, state, 18);
+			world.setBlock(target, state, 2); //Changed flag from 18 to 3
 		}
 
 		if (data != null) {
@@ -286,10 +285,10 @@ public class BlockHelper {
 		}
 
 		try {
-			state.getBlock()
+			state.getBlock().setPlacedBy(world, target, state, null, stack);
-				.setPlacedBy(world, target, state, null, stack);
+		} catch (Exception ignored) {
-		} catch (Exception e) {
 		}
+		return true;
 	}
 
 	public static double getBounceMultiplier(Block block) {

src/main/java/nl/requios/effortlessbuilding/create/foundation/utility/ghost/GhostBlocks.java

@@ -1,6 +1,7 @@
 package nl.requios.effortlessbuilding.create.foundation.utility.ghost;
 
 import com.mojang.blaze3d.vertex.PoseStack;
+import nl.requios.effortlessbuilding.EffortlessBuilding;
 import nl.requios.effortlessbuilding.create.foundation.render.SuperRenderTypeBuffer;
 import net.minecraft.util.Mth;
 import net.minecraft.world.level.block.state.BlockState;

src/main/java/nl/requios/effortlessbuilding/create/foundation/utility/outliner/Outliner.java

@@ -154,7 +154,7 @@ public class Outliner {
 
 	public static class OutlineEntry {
 
-		static final int fadeTicks = 8;
+		static final int fadeTicks = 4;
 		private Outline outline;
 		private int ticksTillRemoval;
 

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

@@ -3,10 +3,8 @@ 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;
@@ -14,27 +12,26 @@ 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.network.chat.MutableComponent;
 import net.minecraft.sounds.SoundEvents;
 import net.minecraft.sounds.SoundSource;
 import net.minecraft.util.RandomSource;
+import net.minecraftforge.server.command.TextComponentHelper;
 import nl.requios.effortlessbuilding.ClientEvents;
-import nl.requios.effortlessbuilding.EffortlessBuilding;
+import nl.requios.effortlessbuilding.EffortlessBuildingClient;
 import nl.requios.effortlessbuilding.buildmode.ModeOptions;
-import nl.requios.effortlessbuilding.buildmode.ModeSettingsManager;
+import nl.requios.effortlessbuilding.create.foundation.item.ItemDescription;
-import nl.requios.effortlessbuilding.network.ModeActionMessage;
+import nl.requios.effortlessbuilding.create.foundation.item.TooltipHelper;
-import nl.requios.effortlessbuilding.network.ModeSettingsMessage;
+import nl.requios.effortlessbuilding.create.foundation.utility.Components;
-import nl.requios.effortlessbuilding.network.PacketHandler;
+import nl.requios.effortlessbuilding.create.foundation.utility.Lang;
-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 java.util.List;
 
 import static nl.requios.effortlessbuilding.buildmode.ModeOptions.*;
 
-import nl.requios.effortlessbuilding.buildmode.BuildModes.BuildModeEnum;
+import nl.requios.effortlessbuilding.buildmode.BuildModeEnum;
 import nl.requios.effortlessbuilding.buildmode.ModeOptions.ActionEnum;
 import nl.requios.effortlessbuilding.buildmode.ModeOptions.OptionEnum;
 
@@ -43,8 +40,6 @@ import nl.requios.effortlessbuilding.buildmode.ModeOptions.OptionEnum;
  * 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 {
 
 	public static final RadialMenu instance = new RadialMenu();
@@ -66,7 +61,8 @@ public class RadialMenu extends Screen {
 	private final double textDistance = 75;
 	private final double buttonDistance = 105;
 	private final float fadeSpeed = 0.3f;
-	private final int descriptionHeight = 100;
+	private final int buildModeDescriptionHeight = 100;
+	private final int actionDescriptionWidth = 200;
 
 	public BuildModeEnum switchTo = null;
 	public ActionEnum doAction = null;
@@ -93,14 +89,14 @@ public class RadialMenu extends Screen {
 	public void tick() {
 		super.tick();
 
-		if (!ClientEvents.isKeybindDown(2)) {
+		if (!ClientEvents.isKeybindDown(0)) {
 			onClose();
 		}
 	}
 
 	@Override
 	public void render(PoseStack ms, final int mouseX, final int mouseY, final float partialTicks) {
-		BuildModeEnum currentBuildMode = ModeSettingsManager.getModeSettings(minecraft.player).getBuildMode();
+		BuildModeEnum currentBuildMode = EffortlessBuildingClient.BUILD_MODES.getBuildMode();
 
 		ms.pushPose();
 		ms.translate(0, 0, 200);
@@ -148,18 +144,29 @@ public class RadialMenu extends Screen {
 		}
 
 		//Add actions
-		buttons.add(new MenuButton(ActionEnum.UNDO.name, ActionEnum.UNDO, -buttonDistance - 26, -13, Direction.UP));
+		boolean canReplace = minecraft.player != null && EffortlessBuildingClient.POWER_LEVEL.canReplaceBlocks(minecraft.player);
-		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_PLAYER_SETTINGS, -buttonDistance - 65, -13, Direction.UP));
-		buttons.add(new MenuButton(ActionEnum.OPEN_MODIFIER_SETTINGS.name, ActionEnum.OPEN_MODIFIER_SETTINGS, -buttonDistance - 26, 13, Direction.DOWN));
+		if (canReplace) {
-		buttons.add(new MenuButton(ActionEnum.REPLACE.name, ActionEnum.REPLACE, -buttonDistance, 13, Direction.DOWN));
+			buttons.add(new MenuButton(ActionEnum.TOGGLE_PROTECT_TILE_ENTITIES, -buttonDistance - 78, -13, Direction.UP));
+		}
+		buttons.add(new MenuButton(ActionEnum.OPEN_MODIFIER_SETTINGS, -buttonDistance - 52, -13, Direction.UP));
+		buttons.add(new MenuButton(ActionEnum.UNDO, -buttonDistance - 26, -13, Direction.UP));
+		buttons.add(new MenuButton(ActionEnum.REDO, -buttonDistance, -13, Direction.UP));
+
+		if (canReplace) {
+			buttons.add(new MenuButton(ActionEnum.REPLACE_ONLY_AIR, -buttonDistance - 78, 13, Direction.DOWN));
+			buttons.add(new MenuButton(ActionEnum.REPLACE_BLOCKS_AND_AIR, -buttonDistance - 52, 13, Direction.DOWN));
+			buttons.add(new MenuButton(ActionEnum.REPLACE_ONLY_BLOCKS, -buttonDistance - 26, 13, Direction.DOWN));
+			buttons.add(new MenuButton(ActionEnum.REPLACE_FILTERED_BY_OFFHAND, -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));
+				buttons.add(new MenuButton(action, buttonDistance + j * 26, -13 + i * 39, Direction.DOWN));
 			}
 		}
 
@@ -179,7 +186,7 @@ public class RadialMenu extends Screen {
 
 		drawIcons(ms, middleX, middleY, modes, buttons);
 
-		drawTexts(ms, currentBuildMode, middleX, middleY, modes, buttons, options);
+		drawTexts(ms, currentBuildMode, middleX, middleY, modes, buttons, options, mouseXX, mouseYY);
 
 		ms.popPose();
 	}
@@ -252,15 +259,17 @@ public class RadialMenu extends Screen {
 	private void drawSideButtonBackgrounds(BufferBuilder buffer, double middleX, double middleY, double mouseXCenter, double mouseYCenter, ArrayList<MenuButton> buttons) {
 		for (final MenuButton btn : buttons) {
 
-			final boolean isSelected =
+			final boolean isHighlighted = btn.x1 <= mouseXCenter && btn.x2 >= mouseXCenter && btn.y1 <= mouseYCenter && btn.y2 >= mouseYCenter;
+
+			boolean isSelected =
 					btn.action == getBuildSpeed() ||
 					btn.action == getFill() ||
 					btn.action == getCubeFill() ||
 					btn.action == getRaisedEdge() ||
 					btn.action == getLineThickness() ||
-					btn.action == getCircleStart();
+					btn.action == getCircleStart() ||
-
+					btn.action == EffortlessBuildingClient.BUILD_SETTINGS.getReplaceModeActionEnum() ||
-			final boolean isHighlighted = btn.x1 <= mouseXCenter && btn.x2 >= mouseXCenter && btn.y1 <= mouseYCenter && btn.y2 >= mouseYCenter;
+					btn.action == ActionEnum.TOGGLE_PROTECT_TILE_ENTITIES && EffortlessBuildingClient.BUILD_SETTINGS.shouldProtectTileEntities();
 
 			Vector4f color = sideButtonColor;
 			if (isSelected) color = selectedColor;
@@ -292,8 +301,7 @@ public class RadialMenu extends Screen {
 			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"));
+			menuRegion.mode.icon.render(ms, (int) (middleX + x - 8), (int) (middleY + y - 8));
-			blit(ms, (int) (middleX + x - 8), (int) (middleY + y - 8), 16, 16, 0, 0, 18, 18, 18, 18);
 		}
 
 		//Draw action icons
@@ -302,14 +310,13 @@ public class RadialMenu extends Screen {
 			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"));
+			button.action.icon.render(ms, (int) (middleX + x - 8), (int) (middleY + y - 8));
-			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, ArrayList<MenuRegion> modes, ArrayList<MenuButton> buttons, OptionEnum[] options) {
+	private void drawTexts(PoseStack ms, BuildModeEnum currentBuildMode, double middleX, double middleY, ArrayList<MenuRegion> modes, ArrayList<MenuButton> buttons, OptionEnum[] options, int mouseX, int mouseY) {
 		//font.drawStringWithShadow("Actions", (int) (middleX - buttonDistance - 13) - font.getStringWidth("Actions") * 0.5f, (int) middleY - 38, 0xffffffff);
 
 		//Draw option strings
@@ -321,6 +328,36 @@ public class RadialMenu extends Screen {
 		String credits = "Effortless Building";
 		font.drawShadow(ms, credits, width - font.width(credits) - 4, height - 10, watermarkTextColor);
 
+		//Draw power level info
+		String powerLevelValue = minecraft.player.isCreative() ? "Creative" : String.valueOf(EffortlessBuildingClient.POWER_LEVEL.getPowerLevel());
+		String powerLevelText = I18n.get("key.effortlessbuilding.power_level") + ": " + powerLevelValue;
+		font.drawShadow(ms, powerLevelText, width - font.width(powerLevelText) - 4, height - 22, minecraft.player.isCreative() ? watermarkTextColor : ChatFormatting.DARK_PURPLE.getColor());
+
+		//if hover over power level info, show tooltip
+		if (mouseX >= width - font.width(powerLevelText) - 14 && mouseX <= width && mouseY >= height - 24 && mouseY <= height) {
+			var tooltip = new ArrayList<Component>();
+			tooltip.add(Components.literal(powerLevelText).withStyle(ChatFormatting.DARK_PURPLE));
+			int placementReach = EffortlessBuildingClient.POWER_LEVEL.getPlacementReach(minecraft.player);
+			tooltip.add(Components.translatable("key.effortlessbuilding.placement_reach").withStyle(ChatFormatting.GRAY).append(": " + (placementReach == 0 ? "vanilla" : placementReach + " blocks")));
+			tooltip.add(Components.translatable("key.effortlessbuilding.max_blocks_per_axis").withStyle(ChatFormatting.GRAY).append(": " + EffortlessBuildingClient.POWER_LEVEL.getMaxBlocksPerAxis(minecraft.player)));
+			tooltip.add(Components.translatable("key.effortlessbuilding.max_blocks_placed_at_once").withStyle(ChatFormatting.GRAY).append(": " + EffortlessBuildingClient.POWER_LEVEL.getMaxBlocksPlacedAtOnce(minecraft.player)));
+			tooltip.add(Components.translatable("key.effortlessbuilding.max_mirror_radius").withStyle(ChatFormatting.GRAY).append(": " + EffortlessBuildingClient.POWER_LEVEL.getMaxMirrorRadius(minecraft.player) + " blocks"));
+
+			if (EffortlessBuildingClient.POWER_LEVEL.canIncreasePowerLevel() && !minecraft.player.isCreative()) {
+				tooltip.add(Components.literal(""));
+				tooltip.add(Components.translatable("key.effortlessbuilding.next_power_level").withStyle(ChatFormatting.DARK_AQUA).append(": " + EffortlessBuildingClient.POWER_LEVEL.getNextPowerLevel()));
+				tooltip.add(Components.translatable("key.effortlessbuilding.placement_reach").withStyle(ChatFormatting.GRAY).append(": " + EffortlessBuildingClient.POWER_LEVEL.getPlacementReach(minecraft.player, true) + " blocks"));
+				tooltip.add(Components.translatable("key.effortlessbuilding.max_blocks_per_axis").withStyle(ChatFormatting.GRAY).append(": " + EffortlessBuildingClient.POWER_LEVEL.getMaxBlocksPerAxis(minecraft.player, true)));
+				tooltip.add(Components.translatable("key.effortlessbuilding.max_blocks_placed_at_once").withStyle(ChatFormatting.GRAY).append(": " + EffortlessBuildingClient.POWER_LEVEL.getMaxBlocksPlacedAtOnce(minecraft.player, true)));
+				tooltip.add(Components.translatable("key.effortlessbuilding.max_mirror_radius").withStyle(ChatFormatting.GRAY).append(": " + EffortlessBuildingClient.POWER_LEVEL.getMaxMirrorRadius(minecraft.player, true) + " blocks"));
+				tooltip.add(Components.literal(""));
+				tooltip.addAll(TooltipHelper.cutTextComponent(Components.translatable("key.effortlessbuilding.next_power_level_how"), ChatFormatting.GRAY, ChatFormatting.WHITE));
+			}
+
+			renderComponentTooltip(ms, tooltip, mouseX, mouseY);
+		}
+
+
 		//Draw buildmode text
 		for (final MenuRegion menuRegion : modes) {
 
@@ -342,79 +379,46 @@ public class RadialMenu extends Screen {
 
 				//Draw description
 				text = I18n.get(menuRegion.mode.getDescriptionKey());
-				font.drawShadow(ms, text, (int) middleX - font.width(text) / 2f, (int) middleY + descriptionHeight, descriptionTextColor);
+				font.drawShadow(ms, text, (int) middleX - font.width(text) / 2f, (int) middleY + buildModeDescriptionHeight, descriptionTextColor);
 			}
 		}
 
 		//Draw action text
 		for (final MenuButton button : buttons) {
 			if (button.highlighted) {
-				String text = ChatFormatting.AQUA + button.name;
+
+				var tooltip = new ArrayList<Component>();
+				tooltip.add(Components.literal(button.name).withStyle(ChatFormatting.AQUA));
+
+				//Add description when holding shift
+				if (!button.description.isEmpty()) {
+					tooltip.add(TooltipHelper.holdShift(ItemDescription.Palette.Blue, hasShiftDown()));
+					if (hasShiftDown()) {
+						tooltip.addAll(TooltipHelper.cutStringTextComponent(button.description, ChatFormatting.GRAY, ChatFormatting.WHITE));
+					}
+				}
 
 				//Add keybind in brackets
-				String keybind = findKeybind(button, currentBuildMode);
+				var keybind = findKeybind(button);
-				String keybindFormatted = "";
+				if (keybind != null) tooltip.add(Lang.translateDirect("tooltip.keybind", keybind.withStyle(ChatFormatting.GRAY)).withStyle(ChatFormatting.DARK_GRAY));
-				if (!keybind.isEmpty())
+				renderComponentTooltip(ms, tooltip, mouseX, mouseY);
-					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){
+	private MutableComponent findKeybind(MenuButton button){
-		String result = "";
+
 		int keybindingIndex = -1;
-		if (button.action == ActionEnum.UNDO) keybindingIndex = 3;
+		if (button.action == ActionEnum.OPEN_MODIFIER_SETTINGS) keybindingIndex = 1;
-		if (button.action == ActionEnum.REDO) keybindingIndex = 4;
+		if (button.action == ActionEnum.UNDO) keybindingIndex = 2;
-		if (button.action == ActionEnum.REPLACE) keybindingIndex = 1;
+		if (button.action == ActionEnum.REDO) keybindingIndex = 3;
-		if (button.action == ActionEnum.OPEN_MODIFIER_SETTINGS) keybindingIndex = 0;
 
 		if (keybindingIndex != -1) {
 			KeyMapping keyMap = ClientEvents.keyBindings[keybindingIndex];
 
-			if (!keyMap.getKeyModifier().name().equals("none")) {
+			return Components.keybind(keyMap.getName());
-				result = keyMap.getKeyModifier().name() + " ";
 		}
-			result += I18n.get(keyMap.getKey().getName());
+		return null;
-		}
-
-		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(ClientEvents.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,
@@ -449,18 +453,11 @@ public class RadialMenu extends Screen {
 	}
 
 	private void performAction(boolean fromMouseClick) {
-		LocalPlayer player = Minecraft.getInstance().player;
-
-		ModeSettingsManager.ModeSettings modeSettings = ModeSettingsManager.getModeSettings(player);
 
 		if (switchTo != null) {
 			playRadialMenuSound();
 
-			modeSettings.setBuildMode(switchTo);
+			EffortlessBuildingClient.BUILD_MODES.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;
 		}
@@ -470,8 +467,7 @@ public class RadialMenu extends Screen {
 		if (action != null) {
 			playRadialMenuSound();
 
-			ModeOptions.performAction(player, action);
+			ModeOptions.performAction(minecraft.player, action);
-			PacketHandler.INSTANCE.sendToServer(new ModeActionMessage(action));
 
 			if (fromMouseClick) performedActionUsingMouse = true;
 		}
@@ -493,11 +489,17 @@ public class RadialMenu extends Screen {
 		public double y1, y2;
 		public boolean highlighted;
 		public String name;
+		public String description = "";
 		public Direction textSide;
 
-		public MenuButton(final String name, final ActionEnum action, final double x, final double y,
+		public MenuButton(final ActionEnum action, final double x, final double y,
 						  final Direction textSide) {
-			this.name = I18n.get(name);
+			this.name = I18n.get(action.getNameKey());
+
+			if (I18n.exists(action.getDescriptionKey())) {
+				this.description = I18n.get(action.getDescriptionKey());
+			}
+
 			this.action = action;
 			x1 = x - 10;
 			x2 = x + 10;

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

@@ -0,0 +1,111 @@
+package nl.requios.effortlessbuilding.gui.buildmodifier;
+
+import com.mojang.blaze3d.vertex.PoseStack;
+import net.minecraft.ChatFormatting;
+import net.minecraft.client.Minecraft;
+import net.minecraft.network.chat.Component;
+import net.minecraftforge.api.distmarker.Dist;
+import net.minecraftforge.api.distmarker.OnlyIn;
+import nl.requios.effortlessbuilding.AllGuiTextures;
+import nl.requios.effortlessbuilding.EffortlessBuildingClient;
+import nl.requios.effortlessbuilding.buildmodifier.Array;
+import nl.requios.effortlessbuilding.buildmodifier.BaseModifier;
+import nl.requios.effortlessbuilding.create.foundation.gui.widget.ScrollInput;
+import nl.requios.effortlessbuilding.gui.elements.LabeledScrollInput;
+import nl.requios.effortlessbuilding.utilities.MathHelper;
+import nl.requios.effortlessbuilding.systems.PowerLevel;
+
+import java.util.Vector;
+
+@OnlyIn(Dist.CLIENT)
+public class ArrayEntry extends BaseModifierEntry<Array> {
+
+	protected Vector<ScrollInput> offsetInputs = new Vector<>(3);
+	protected ScrollInput countInput;
+
+	public ArrayEntry(ModifiersScreen screen, BaseModifier array) {
+		super(screen, (Array) array, Component.literal("Array"), AllGuiTextures.ARRAY_ENTRY);
+
+		offsetInputs.clear();
+
+		for (int i = 0; i < 3; i++) {
+			final int index = i;
+			var scrollInput = new LabeledScrollInput(0, 0, 18, 18)
+				.titled(Component.literal(i == 0 ? "X Offset" : i == 1 ? "Y Offset" : "Z Offset"))
+				.calling(value -> {
+					modifier.offset = MathHelper.with(modifier.offset, index, value);
+					onValueChanged();
+				});
+			scrollInput.setState(MathHelper.get(modifier.offset, index));
+			offsetInputs.add(scrollInput);
+		}
+		listeners.addAll(offsetInputs);
+
+		countInput = new LabeledScrollInput(0, 0, 18, 18)
+			.withRange(1, 100)
+			.titled(Component.literal("Count"))
+			.calling(value -> {
+				modifier.count = value;
+				onValueChanged();
+			});
+		countInput.setState(modifier.count);
+		listeners.add(countInput);
+		
+		for (int i = 0; i < 3; i++) {
+			offsetInputs.get(i).onChanged();
+		}
+		countInput.onChanged();
+		
+		onValueChanged();
+	}
+
+	@Override
+	public void render(PoseStack ms, int index, int y, int x, int width, int height, int mouseX, int mouseY, boolean p_230432_9_, float partialTicks) {
+		super.render(ms, index, y, x, width, height, mouseX, mouseY, p_230432_9_, partialTicks);
+
+		//draw offset inputs
+		for (int i = 0; i < 3; i++) {
+			offsetInputs.get(i).x = left + 49 + 20 * i;
+			offsetInputs.get(i).y = top + 19;
+			offsetInputs.get(i).render(ms, mouseX, mouseY, partialTicks);
+		}
+		
+		//draw count input
+		countInput.x = left + 49;
+		countInput.y = top + 41;
+		countInput.render(ms, mouseX, mouseY, partialTicks);
+		
+		//draw reach label
+		reachLabel.x = right - 8 - getFont().width(reachLabel.text);
+		reachLabel.y = top + 24;
+		reachLabel.render(ms, mouseX, mouseY, partialTicks);
+	}
+
+	@Override
+	public void onValueChanged() {
+		super.onValueChanged();
+		
+		int currentReach = Math.max(-1, getArrayReach());
+		int maxReach = EffortlessBuildingClient.POWER_LEVEL.getMaxBlocksPerAxis(Minecraft.getInstance().player);
+		ChatFormatting reachColor = isCurrentReachValid(currentReach, maxReach) ? ChatFormatting.GRAY : ChatFormatting.RED;
+		var reachText = "" + reachColor + currentReach + ChatFormatting.GRAY + "/" + ChatFormatting.GRAY + maxReach;
+		reachLabel.text = Component.literal(reachText);
+	}
+
+	private int getArrayReach() {
+		try {
+			//find largest offset
+			double x = Math.abs(modifier.offset.getX());
+			double y = Math.abs(modifier.offset.getY());
+			double z = Math.abs(modifier.offset.getZ());
+			double largestOffset = Math.max(Math.max(x, y), z);
+			return (int) (largestOffset * modifier.count);
+		} 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/ArraySettingsGui.java

@@ -1,201 +0,0 @@
-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/BaseModifierEntry.java

@@ -0,0 +1,133 @@
+package nl.requios.effortlessbuilding.gui.buildmodifier;
+
+import com.mojang.blaze3d.vertex.PoseStack;
+import net.minecraft.network.chat.Component;
+import nl.requios.effortlessbuilding.AllGuiTextures;
+import nl.requios.effortlessbuilding.AllIcons;
+import nl.requios.effortlessbuilding.buildmodifier.BaseModifier;
+import nl.requios.effortlessbuilding.create.foundation.gui.AbstractSimiScreen;
+import nl.requios.effortlessbuilding.create.foundation.gui.widget.BoxWidget;
+import nl.requios.effortlessbuilding.create.foundation.gui.widget.ElementWidget;
+import nl.requios.effortlessbuilding.create.foundation.gui.widget.IconButton;
+import nl.requios.effortlessbuilding.create.foundation.gui.widget.Label;
+import nl.requios.effortlessbuilding.create.foundation.utility.Components;
+import nl.requios.effortlessbuilding.gui.elements.GuiCollapsibleScrollEntry;
+import nl.requios.effortlessbuilding.gui.elements.GuiScrollPane;
+import nl.requios.effortlessbuilding.gui.elements.MiniButton;
+
+public abstract class BaseModifierEntry<T extends BaseModifier> extends ModifiersScreenList.Entry {
+
+    public T modifier;
+    protected AllGuiTextures background;
+    protected MiniButton enableButton;
+    protected Label nameLabel;
+    protected MiniButton moveUpButton;
+    protected MiniButton moveDownButton;
+    protected MiniButton removeButton;
+    protected Label reachLabel;
+    
+    protected static final int BACKGROUND_WIDTH = 226;
+    protected static final int BACKGROUND_HEIGHT = 60;
+    protected int left = 0;
+    protected int right = 0;
+    protected int top = 0;
+    protected int bottom = 0;
+    
+
+    public BaseModifierEntry(ModifiersScreen screen, T modifier, Component name, AllGuiTextures background) {
+        super(screen);
+
+        this.modifier = modifier;
+        this.background = background;
+
+        enableButton = new MiniButton(0, 0, 100, 9)
+            .showing(AllGuiTextures.ENABLE_BUTTON_BACKGROUND)
+            .withCallback(() -> {
+                modifier.enabled = !modifier.enabled;
+                onValueChanged();
+            });
+        listeners.add(enableButton);
+        
+        nameLabel = new Label(65, 8, name);
+        nameLabel.text = name;
+        
+        moveUpButton = new MiniButton(0, 0, 9, 9)
+            .showing(AllGuiTextures.ARROW_UP)
+            .withCallback(() -> {
+                screen.moveModifierUp(this);
+                onValueChanged();
+            });
+        moveUpButton.setToolTip(Components.literal("Move up"));
+        listeners.add(moveUpButton);
+        
+        moveDownButton = new MiniButton(0, 0, 9, 9)
+            .showing(AllGuiTextures.ARROW_DOWN)
+            .withCallback(() -> {
+                screen.moveModifierDown(this);
+                onValueChanged();
+            });
+        moveDownButton.setToolTip(Components.literal("Move down"));
+        listeners.add(moveDownButton);
+        
+        removeButton = new MiniButton(0, 0, 9, 9)
+            .showing(AllGuiTextures.TRASH)
+            .withCallback(() -> {
+                screen.removeModifier(this);
+            });
+        removeButton.setToolTip(Components.literal("Remove"));
+        listeners.add(removeButton);
+        
+        reachLabel = new Label(0, 0, Components.immutableEmpty()).withShadow();
+        listeners.add(reachLabel);
+    }
+
+    @Override
+    public void tick() {
+        super.tick();
+    }
+
+    @Override
+    public void render(PoseStack ms, int index, int y, int x, int width, int height, int mouseX, int mouseY, boolean p_230432_9_, float partialTicks) {
+
+        left = x + width / 2 - BACKGROUND_WIDTH / 2;
+        right = x + width / 2 + BACKGROUND_WIDTH / 2;
+        top = y;
+        bottom = y + BACKGROUND_HEIGHT;
+        
+        background.render(ms, left, top, screen);
+        
+        enableButton.x = left + 4;
+        enableButton.y = top + 3;
+        enableButton.render(ms, mouseX, mouseY, partialTicks);
+        if (modifier.enabled)
+            AllGuiTextures.CHECKMARK.render(ms, left + 5, top + 3, screen);
+        
+        nameLabel.x = left + 18;
+        nameLabel.y = top + 4;
+        nameLabel.render(ms, mouseX, mouseY, partialTicks);
+    
+        moveUpButton.visible = screen.canMoveUp(this);
+        moveDownButton.visible = screen.canMoveDown(this);
+        
+        moveUpButton.x = right - 31;
+        moveUpButton.y = top + 3;
+        moveUpButton.render(ms, mouseX, mouseY, partialTicks);
+        
+        moveDownButton.x = right - 22;
+        moveDownButton.y = top + 3;
+        moveDownButton.render(ms, mouseX, mouseY, partialTicks);
+        
+        removeButton.x = right - 13;
+        removeButton.y = top + 3;
+        removeButton.render(ms, mouseX, mouseY, partialTicks);
+        
+        super.render(ms, index, y, x, width, height, mouseX, mouseY, p_230432_9_, partialTicks);
+    }
+
+    public void onValueChanged() {
+        if (modifier.enabled)
+            enableButton.setToolTip(Components.literal("Disable this modifier"));
+        else
+            enableButton.setToolTip(Components.literal("Enable this modifier"));
+    }
+}

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

@@ -0,0 +1,235 @@
+package nl.requios.effortlessbuilding.gui.buildmodifier;
+
+import com.mojang.blaze3d.vertex.PoseStack;
+import net.minecraft.client.Minecraft;
+import net.minecraft.network.chat.Component;
+import net.minecraft.world.phys.Vec3;
+import net.minecraftforge.api.distmarker.Dist;
+import net.minecraftforge.api.distmarker.OnlyIn;
+import nl.requios.effortlessbuilding.AllGuiTextures;
+import nl.requios.effortlessbuilding.AllIcons;
+import nl.requios.effortlessbuilding.EffortlessBuildingClient;
+import nl.requios.effortlessbuilding.buildmodifier.BaseModifier;
+import nl.requios.effortlessbuilding.buildmodifier.Mirror;
+import nl.requios.effortlessbuilding.create.foundation.gui.widget.IconButton;
+import nl.requios.effortlessbuilding.create.foundation.gui.widget.ScrollInput;
+import nl.requios.effortlessbuilding.create.foundation.utility.Components;
+import nl.requios.effortlessbuilding.gui.elements.LabeledScrollInput;
+import nl.requios.effortlessbuilding.utilities.MathHelper;
+import nl.requios.effortlessbuilding.systems.PowerLevel;
+
+import java.text.DecimalFormat;
+import java.util.Vector;
+
+@OnlyIn(Dist.CLIENT)
+public class MirrorEntry extends BaseModifierEntry<Mirror> {
+	
+	protected Vector<ScrollInput> positionInputs;
+	protected IconButton playerPositionButton;
+	protected IconButton toggleOffsetButton;
+	protected Vector<IconButton> axisButtons;
+	protected ScrollInput radiusInput;
+	protected IconButton showLinesButton;
+	protected IconButton showAreasButton;
+	protected DecimalFormat df = new DecimalFormat("#.#");
+	
+	public MirrorEntry(ModifiersScreen screen, BaseModifier mirror) {
+		super(screen, (Mirror) mirror, Component.literal("Mirror"), AllGuiTextures.MIRROR_ENTRY);
+		
+		positionInputs = new Vector<>();
+		axisButtons = new Vector<>();
+		
+		//Position
+		//ScrollInput works with double the value, so we can have 0.5 increments
+		for (int i = 0; i < 3; i++) {
+			final int index = i;
+			var scrollInput = new LabeledScrollInput(0, 0, 36, 18)
+				.showControlScrollsSlowerTooltip()
+				.titled(Component.literal(i == 0 ? "X Position" : i == 1 ? "Y Position" : "Z Position"))
+				.format(integer -> Component.literal(df.format(integer / 2.0)))
+				.withStepFunction(stepContext -> stepContext.shift ? 20 : stepContext.control ? 1 : 2)
+				.calling(value -> {
+					modifier.position = MathHelper.with(modifier.position, index, value / 2.0);
+					onValueChanged();
+				});
+			scrollInput.setState((int) (MathHelper.get(modifier.position, index) * 2.0));
+			positionInputs.add(scrollInput);
+		}
+		listeners.addAll(positionInputs);
+		
+		//Player position button
+		playerPositionButton = new IconButton(0, 0, AllIcons.I_PLAYER)
+			.withCallback(() -> {
+				modifier.position = Vec3.atLowerCornerOf(Minecraft.getInstance().player.blockPosition());
+				onValueChanged();
+			});
+		playerPositionButton.setToolTip(Components.literal("Set to player position"));
+		listeners.add(playerPositionButton);
+		
+		//Toggle offset button
+		toggleOffsetButton = new IconButton(0, 0, AllIcons.I_BLOCK_CENTER)
+			.withCallback(() -> {
+				if (modifier.position.x == Math.floor(modifier.position.x)) {
+					modifier.position = new Vec3(
+						Math.floor(modifier.position.x) + 0.5,
+						Math.floor(modifier.position.y) + 0.5,
+						Math.floor(modifier.position.z) + 0.5
+					);
+				}
+				else {
+					modifier.position = new Vec3(
+						Math.floor(modifier.position.x),
+						Math.floor(modifier.position.y),
+						Math.floor(modifier.position.z)
+					);
+				}
+				onValueChanged();
+			});
+		listeners.add(toggleOffsetButton);
+		
+		//Axis buttons
+		for (int i = 0; i < 3; i++) {
+			final int index = i;
+			IconButton button = new IconButton(0, 0, i == 0 ? AllIcons.I_X_ON : i == 1 ? AllIcons.I_Y_OFF : AllIcons.I_Z_OFF)
+				.withCallback(() -> {
+					modifier.toggleMirrorAxis(index);
+					onValueChanged();
+				});
+			button.setToolTip(Components.literal(i == 0 ? "X Axis" : i == 1 ? "Y Axis" : "Z Axis"));
+			axisButtons.add(button);
+		}
+		listeners.addAll(axisButtons);
+		
+		//Radius
+		radiusInput = new LabeledScrollInput(0, 0, 27, 18)
+			.withRange(0, EffortlessBuildingClient.POWER_LEVEL.getMaxMirrorRadius(Minecraft.getInstance().player))
+			.titled(Minecraft.getInstance().player.isCreative() ?
+					Component.literal("Radius") :
+					Component.literal("Radius. Use Reach Upgrade items to increase maximum."))
+			.calling(value -> {
+				modifier.radius = value;
+				onValueChanged();
+			});
+		radiusInput.setState(modifier.radius);
+		listeners.add(radiusInput);
+		
+		//Show lines button
+		showLinesButton = new IconButton(0, 0, AllIcons.I_SHOW_LINES)
+			.withCallback(() -> {
+				modifier.drawLines = !modifier.drawLines;
+				onValueChanged();
+			});
+		listeners.add(showLinesButton);
+		
+		//Show areas button
+		showAreasButton = new IconButton(0, 0, AllIcons.I_SHOW_AREAS)
+			.withCallback(() -> {
+				modifier.drawPlanes = !modifier.drawPlanes;
+				onValueChanged();
+			});
+		listeners.add(showAreasButton);
+		
+		for (ScrollInput positionInput : positionInputs) {
+			positionInput.onChanged();
+		}
+		radiusInput.onChanged();
+	}
+	
+	@Override
+	public void render(PoseStack ms, int index, int y, int x, int width, int height, int mouseX, int mouseY, boolean p_230432_9_, float partialTicks) {
+		super.render(ms, index, y, x, width, height, mouseX, mouseY, p_230432_9_, partialTicks);
+		
+		//draw position inputs
+		for (int i = 0; i < 3; i++) {
+			ScrollInput input = positionInputs.get(i);
+			input.x = left + 49 + 38 * i;
+			input.y = top + 19;
+			input.render(ms, mouseX, mouseY, partialTicks);
+		}
+		
+		//draw player position button
+		playerPositionButton.x = left + 163;
+		playerPositionButton.y = top + 19;
+		playerPositionButton.render(ms, mouseX, mouseY, partialTicks);
+		
+		//draw toggle offset button
+		toggleOffsetButton.x = left + 183;
+		toggleOffsetButton.y = top + 19;
+		toggleOffsetButton.render(ms, mouseX, mouseY, partialTicks);
+		
+		//draw axis buttons
+		for (int i = 0; i < 3; i++) {
+			IconButton button = axisButtons.get(i);
+			button.x = left + 49 + 18 * i;
+			button.y = top + 41;
+			button.render(ms, mouseX, mouseY, partialTicks);
+		}
+		
+		//draw radius input
+		radiusInput.x = left + 134;
+		radiusInput.y = top + 41;
+		radiusInput.render(ms, mouseX, mouseY, partialTicks);
+		
+		//draw show lines button
+		showLinesButton.x = left + 163;
+		showLinesButton.y = top + 41;
+		showLinesButton.render(ms, mouseX, mouseY, partialTicks);
+		
+		//draw show areas button
+		showAreasButton.x = left + 183;
+		showAreasButton.y = top + 41;
+		showAreasButton.render(ms, mouseX, mouseY, partialTicks);
+	}
+	
+	@Override
+	public void onValueChanged() {
+		super.onValueChanged();
+		
+		//Position
+		for (int i = 0; i < 3; i++) {
+			ScrollInput input = positionInputs.get(i);
+			input.setState((int) (MathHelper.get(modifier.position, i) * 2.0));
+		}
+		
+		//Toggle offset button
+		if (modifier.position.x == Math.floor(modifier.position.x)) {
+			toggleOffsetButton.setIcon(AllIcons.I_BLOCK_CENTER);
+			toggleOffsetButton.setToolTip(Components.literal("Set position to center of block, for uneven numbered builds."));
+		}
+		else {
+			toggleOffsetButton.setIcon(AllIcons.I_BLOCK_CORNER);
+			toggleOffsetButton.setToolTip(Components.literal("Set position to corner of block, for even numbered builds."));
+		}
+		
+		//Axis buttons
+		for (int i = 0; i < 3; i++) {
+			IconButton button = axisButtons.get(i);
+			if (modifier.getMirrorAxis(i)) {
+				button.setIcon(i == 0 ? AllIcons.I_X_ON : i == 1 ? AllIcons.I_Y_ON : AllIcons.I_Z_ON);
+			}
+			else {
+				button.setIcon(i == 0 ? AllIcons.I_X_OFF : i == 1 ? AllIcons.I_Y_OFF : AllIcons.I_Z_OFF);
+			}
+		}
+		
+		//Show lines button
+		if (modifier.drawLines) {
+			showLinesButton.setIcon(AllIcons.I_SHOW_LINES);
+			showLinesButton.setToolTip(Components.literal("Show mirror lines"));
+		}
+		else {
+			showLinesButton.setIcon(AllIcons.I_HIDE_LINES);
+			showLinesButton.setToolTip(Components.literal("Show mirror lines"));
+		}
+		
+		//Show areas button
+		if (modifier.drawPlanes) {
+			showAreasButton.setIcon(AllIcons.I_SHOW_AREAS);
+			showAreasButton.setToolTip(Components.literal("Show mirror areas"));
+		}
+		else {
+			showAreasButton.setIcon(AllIcons.I_HIDE_AREAS);
+			showAreasButton.setToolTip(Components.literal("Show mirror areas"));
+		}
+	}
+}

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

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

@@ -1,156 +0,0 @@
-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.ClientEvents;
-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 == ClientEvents.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/ModifiersScreen.java

@@ -0,0 +1,174 @@
+package nl.requios.effortlessbuilding.gui.buildmodifier;
+
+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.api.distmarker.Dist;
+import net.minecraftforge.api.distmarker.OnlyIn;
+import nl.requios.effortlessbuilding.ClientEvents;
+import nl.requios.effortlessbuilding.EffortlessBuilding;
+import nl.requios.effortlessbuilding.EffortlessBuildingClient;
+import nl.requios.effortlessbuilding.buildmodifier.Array;
+import nl.requios.effortlessbuilding.buildmodifier.BaseModifier;
+import nl.requios.effortlessbuilding.buildmodifier.Mirror;
+import nl.requios.effortlessbuilding.buildmodifier.RadialMirror;
+import nl.requios.effortlessbuilding.create.foundation.gui.AbstractSimiScreen;
+import nl.requios.effortlessbuilding.create.foundation.gui.AllIcons;
+import nl.requios.effortlessbuilding.create.foundation.gui.widget.BoxWidget;
+import nl.requios.effortlessbuilding.create.foundation.utility.Components;
+import nl.requios.effortlessbuilding.gui.elements.GuiScrollPane;
+import nl.requios.effortlessbuilding.network.PacketHandler;
+
+import javax.annotation.Nonnull;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+
+@OnlyIn(Dist.CLIENT)
+public class ModifiersScreen extends AbstractSimiScreen {
+	protected ModifiersScreenList list;
+	protected BoxWidget addArrayButton;
+	protected BoxWidget addMirrorButton;
+	protected BoxWidget addRadialMirrorButton;
+	protected BoxWidget closeButton;
+
+	public ModifiersScreen() {
+		super(Component.translatable("effortlessbuilding.screen.modifier_settings"));
+	}
+
+	@Override
+	//Create buttons and labels and add them to buttonList/labelList
+	protected void init() {
+		super.init();
+
+		int listWidth = Math.min(width - 80, 300);
+		int yCenter = height / 2;
+		int listL = this.width / 2 - listWidth / 2;
+		int listR = this.width / 2 + listWidth / 2;
+
+		list = new ModifiersScreenList(minecraft, listWidth, height - 80, 45, height - 45, 68);
+		list.setLeftPos(this.width / 2 - list.getWidth() / 2);
+
+		addRenderableWidget(list);
+
+		initScrollEntries();
+
+		addArrayButton = new BoxWidget(listR - 90, 10, 20, 20)
+			.withPadding(2, 2)
+			.withCallback(() -> addModifier(new Array()));
+		addArrayButton.showingElement(AllIcons.I_ADD.asStencil().withElementRenderer(BoxWidget.gradientFactory.apply(addArrayButton)));
+		addArrayButton.getToolTip().add(Components.literal("Add Array"));
+		
+		addMirrorButton = new BoxWidget(listR - 60, 10, 20, 20)
+			.withPadding(2, 2)
+			.withCallback(() -> addModifier(new Mirror()));
+		addMirrorButton.showingElement(AllIcons.I_ADD.asStencil().withElementRenderer(BoxWidget.gradientFactory.apply(addMirrorButton)));
+		addMirrorButton.getToolTip().add(Components.literal("Add Mirror"));
+		
+		addRadialMirrorButton = new BoxWidget(listR - 30, 10, 20, 20)
+			.withPadding(2, 2)
+			.withCallback(() -> addModifier(new RadialMirror()));
+		addRadialMirrorButton.showingElement(AllIcons.I_ADD.asStencil().withElementRenderer(BoxWidget.gradientFactory.apply(addRadialMirrorButton)));
+		addRadialMirrorButton.getToolTip().add(Components.literal("Add Radial Mirror"));
+
+		closeButton = new BoxWidget(listL - 30, yCenter - 10, 20, 20)
+			.withPadding(2, 2)
+			.withCallback(this::onClose);
+		closeButton.showingElement(AllIcons.I_CONFIG_BACK.asStencil().withElementRenderer(BoxWidget.gradientFactory.apply(closeButton)));
+		closeButton.getToolTip().add(Components.literal("Close"));
+
+		addRenderableWidget(addArrayButton);
+		addRenderableWidget(addMirrorButton);
+		addRenderableWidget(addRadialMirrorButton);
+		addRenderableWidget(closeButton);
+	}
+
+	private void initScrollEntries() {
+
+		list.children().clear();
+		var modifierSettingsList = EffortlessBuildingClient.BUILD_MODIFIERS.getModifierSettingsList();
+		for (BaseModifier modifier : modifierSettingsList) {
+			var entry = createModifierPanel(modifier);
+			list.children().add(entry);
+		}
+	}
+
+	private BaseModifierEntry createModifierPanel(BaseModifier modifier) {
+		if (modifier instanceof Mirror) {
+			return new MirrorEntry(this, modifier);
+		} else if (modifier instanceof Array) {
+			return new ArrayEntry(this, modifier);
+		} else if (modifier instanceof RadialMirror) {
+			return new RadialMirrorEntry(this, modifier);
+		} else {
+			return null;
+		}
+	}
+
+	private void addModifier(BaseModifier modifier) {
+		var entry = createModifierPanel(modifier);
+		list.children().add(entry);
+		EffortlessBuildingClient.BUILD_MODIFIERS.addModifierSettings(modifier);
+	}
+	
+	public void removeModifier(BaseModifierEntry entry) {
+		list.children().remove(entry);
+		EffortlessBuildingClient.BUILD_MODIFIERS.removeModifierSettings(entry.modifier);
+	}
+	
+	public boolean canMoveUp(BaseModifierEntry modifierEntry) {
+		int index = list.children().indexOf(modifierEntry);
+		return index > 0;
+	}
+	
+	public boolean canMoveDown(BaseModifierEntry modifierEntry) {
+		int index = list.children().indexOf(modifierEntry);
+		return index < list.children().size() - 1;
+	}
+	
+	public void moveModifierUp(BaseModifierEntry modifierEntry) {
+		int index = list.children().indexOf(modifierEntry);
+		if (index == 0) return;
+		
+		Collections.swap(list.children(), index, index - 1);
+		EffortlessBuildingClient.BUILD_MODIFIERS.moveUp(modifierEntry.modifier);
+	}
+	
+	public void moveModifierDown(BaseModifierEntry modifierEntry) {
+		int index = list.children().indexOf(modifierEntry);
+		if (index == list.children().size() - 1) return;
+		
+		Collections.swap(list.children(), index, index + 1);
+		EffortlessBuildingClient.BUILD_MODIFIERS.moveDown(modifierEntry.modifier);
+	}
+	
+	@Override
+	public void resize(@Nonnull Minecraft client, int width, int height) {
+		double scroll = list.getScrollAmount();
+		init(client, width, height);
+		list.setScrollAmount(scroll);
+	}
+	
+	@Override
+	protected void renderWindow(PoseStack ms, int mouseX, int mouseY, float partialTicks) {
+	
+	}
+	
+	@Override
+	public void onClose() {
+		super.onClose();
+		EffortlessBuildingClient.BUILD_MODIFIERS.save();
+	}
+	
+	@Override
+	public boolean keyPressed(int keyCode, int p_96553_, int p_96554_) {
+		if (keyCode == ClientEvents.keyBindings[1].getKey().getValue()) {
+			onClose();
+			return true;
+		}
+
+		return super.keyPressed(keyCode, p_96553_, p_96554_);
+	}
+}

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

@@ -0,0 +1,187 @@
+package nl.requios.effortlessbuilding.gui.buildmodifier;
+
+import com.mojang.blaze3d.platform.Window;
+import com.mojang.blaze3d.systems.RenderSystem;
+import com.mojang.blaze3d.vertex.PoseStack;
+import net.minecraft.client.Minecraft;
+import net.minecraft.client.gui.Font;
+import net.minecraft.client.gui.components.ObjectSelectionList;
+import net.minecraft.client.gui.components.events.GuiEventListener;
+import net.minecraft.network.chat.Component;
+import nl.requios.effortlessbuilding.create.foundation.gui.TickableGuiEventListener;
+import nl.requios.effortlessbuilding.create.foundation.gui.UIRenderHelper;
+import nl.requios.effortlessbuilding.create.foundation.gui.widget.AbstractSimiWidget;
+import nl.requios.effortlessbuilding.create.foundation.utility.Color;
+import nl.requios.effortlessbuilding.create.foundation.utility.Components;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Objects;
+
+//Based on Create's ConfigScreenList
+public class ModifiersScreenList extends ObjectSelectionList<ModifiersScreenList.Entry> implements TickableGuiEventListener {
+
+    public ModifiersScreenList(Minecraft mc, int width, int height, int y0, int y1, int itemHeight) {
+        super(mc, width, height, y0, y1, itemHeight);
+        setRenderBackground(false);
+        setRenderTopAndBottom(false);
+        setRenderSelection(false);
+        headerHeight = 3;
+    }
+
+    @Override
+    public void render(PoseStack ms, int mouseX, int mouseY, float partialTicks) {
+        Color c = new Color(0x60_000000);
+        UIRenderHelper.angledGradient(ms, 90, x0 + width / 2, y0, width, 5, c, Color.TRANSPARENT_BLACK);
+        UIRenderHelper.angledGradient(ms, -90, x0 + width / 2, y1, width, 5, c, Color.TRANSPARENT_BLACK);
+        UIRenderHelper.angledGradient(ms, 0, x0, y0 + height / 2, height, 5, c, Color.TRANSPARENT_BLACK);
+        UIRenderHelper.angledGradient(ms, 180, x1, y0 + height / 2, height, 5, c, Color.TRANSPARENT_BLACK);
+
+        super.render(ms, mouseX, mouseY, partialTicks);
+    }
+
+    @Override
+    protected void renderList(PoseStack p_239228_, int p_239229_, int p_239230_, float p_239231_) {
+        Window window = minecraft.getWindow();
+        double d0 = window.getGuiScale();
+        RenderSystem.enableScissor((int) (this.x0 * d0), (int) (window.getHeight() - (this.y1 * d0)), (int) (this.width * d0), (int) (this.height * d0));
+        super.renderList(p_239228_, p_239229_, p_239230_, p_239231_);
+        RenderSystem.disableScissor();
+    }
+    
+    public void renderWindowForeground(PoseStack ms, int mouseX, int mouseY, float partialTicks) {
+        renderListForeground(ms, mouseX, mouseY, partialTicks);
+    }
+    
+    protected void renderListForeground(PoseStack pPoseStack, int pMouseX, int pMouseY, float pPartialTick) {
+        int i = this.getRowLeft();
+        int j = this.getRowWidth();
+        int k = this.itemHeight - 4;
+        int l = this.getItemCount();
+        
+        for(int i1 = 0; i1 < l; ++i1) {
+            int j1 = this.getRowTop(i1);
+            int k1 = j1 + itemHeight;
+            if (k1 >= this.y0 && j1 <= this.y1) {
+                renderItemForeground(pPoseStack, pMouseX, pMouseY, pPartialTick, i1, i, j1, j, k);
+            }
+        }
+    }
+    
+    protected void renderItemForeground(PoseStack pPoseStack, int pMouseX, int pMouseY, float pPartialTick, int pIndex, int pLeft, int pTop, int pWidth, int pHeight) {
+        Entry e = this.getEntry(pIndex);
+        e.renderForeground(pPoseStack, pIndex, pTop, pLeft, pWidth, pHeight, pMouseX, pMouseY, Objects.equals(this.getHovered(), e), pPartialTick);
+    }
+
+    @Override
+    public boolean mouseClicked(double x, double y, int button) {
+        if (children().stream().anyMatch(e -> e.mouseClicked(x, y, button)))
+            return true;
+        return super.mouseClicked(x, y, button);
+    }
+    
+    @Override
+    public boolean keyPressed(int pKeyCode, int pScanCode, int pModifiers) {
+        if (children().stream().anyMatch(e -> e.keyPressed(pKeyCode, pScanCode, pModifiers)))
+            return true;
+        return super.keyPressed(pKeyCode, pScanCode, pModifiers);
+    }
+    
+    @Override
+    public boolean charTyped(char pCodePoint, int pModifiers) {
+        if (children().stream().anyMatch(e -> e.charTyped(pCodePoint, pModifiers)))
+            return true;
+        return super.charTyped(pCodePoint, pModifiers);
+    }
+    
+    @Override
+    public boolean mouseScrolled(double pMouseX, double pMouseY, double pDelta) {
+        if (children().stream().anyMatch(e -> e.mouseScrolled(pMouseX, pMouseY, pDelta)))
+            return true;
+        return super.mouseScrolled(pMouseX, pMouseY, pDelta);
+    }
+    
+    @Override
+    public int getRowWidth() {
+        return width - 16;
+    }
+
+    @Override
+    protected int getScrollbarPosition() {
+        return x0 + this.width - 6;
+    }
+
+    @Override
+    public void tick() {
+        children().forEach(Entry::tick);
+    }
+
+    public static abstract class Entry extends ObjectSelectionList.Entry<Entry> implements TickableGuiEventListener {
+        protected final ModifiersScreen screen;
+        protected List<GuiEventListener> listeners;
+
+        protected Entry(ModifiersScreen screen) {
+            this.screen = screen;
+            listeners = new ArrayList<>();
+        }
+
+        @Override
+        public boolean mouseClicked(double x, double y, int button) {
+            return getGuiListeners().stream().anyMatch(l -> l.mouseClicked(x, y, button));
+        }
+
+        @Override
+        public boolean keyPressed(int keyCode, int scanCode, int modifiers) {
+            return getGuiListeners().stream().anyMatch(l -> l.keyPressed(keyCode, scanCode, modifiers));
+        }
+
+        @Override
+        public boolean charTyped(char ch, int modifiers) {
+            return getGuiListeners().stream().anyMatch(l -> l.charTyped(ch, modifiers));
+        }
+    
+        @Override
+        public boolean mouseScrolled(double x, double y, double delta) {
+            return getGuiListeners().stream().anyMatch(l -> l.mouseScrolled(x, y, delta));
+        }
+    
+        @Override
+        public void render(PoseStack ms, int index, int y, int x, int width, int height, int mouseX, int mouseY, boolean p_230432_9_, float partialTicks) {
+    
+//            UIRenderHelper.streak(ms, 0, x - 10, y + height / 2, height - 6, width, 0xdd_000000);
+//            UIRenderHelper.streak(ms, 180, x + (int) (width * 1.35f) + 10, y + height / 2, height - 6, width / 8 * 7, 0xdd_000000);
+    
+        }
+        
+        public void renderForeground(PoseStack ms, int index, int y, int x, int width, int height, int mouseX, int mouseY, boolean p_230432_9_, float partialTicks) {
+    
+            for (var listener : listeners) {
+                if (listener instanceof AbstractSimiWidget simiWidget && simiWidget.isHoveredOrFocused()
+                    && simiWidget.visible) {
+                    List<Component> tooltip = simiWidget.getToolTip();
+                    if (tooltip.isEmpty())
+                        continue;
+                    int ttx = simiWidget.lockedTooltipX == -1 ? mouseX : simiWidget.lockedTooltipX + simiWidget.x;
+                    int tty = simiWidget.lockedTooltipY == -1 ? mouseY : simiWidget.lockedTooltipY + simiWidget.y;
+                    screen.renderComponentTooltip(ms, tooltip, ttx, tty);
+                }
+            }
+        }
+
+        @Override
+        public void tick() {}
+
+        public List<GuiEventListener> getGuiListeners() {
+            return listeners;
+        }
+
+        @Override
+        public Component getNarration() {
+            return Components.immutableEmpty();
+        }
+        
+        public Font getFont() {
+            return Minecraft.getInstance().font;
+        }
+    }
+}

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

@@ -0,0 +1,242 @@
+package nl.requios.effortlessbuilding.gui.buildmodifier;
+
+import com.mojang.blaze3d.vertex.PoseStack;
+import net.minecraft.client.Minecraft;
+import net.minecraft.network.chat.Component;
+import net.minecraft.world.phys.Vec3;
+import net.minecraftforge.api.distmarker.Dist;
+import net.minecraftforge.api.distmarker.OnlyIn;
+import nl.requios.effortlessbuilding.AllGuiTextures;
+import nl.requios.effortlessbuilding.AllIcons;
+import nl.requios.effortlessbuilding.EffortlessBuildingClient;
+import nl.requios.effortlessbuilding.buildmodifier.BaseModifier;
+import nl.requios.effortlessbuilding.buildmodifier.RadialMirror;
+import nl.requios.effortlessbuilding.create.foundation.gui.widget.IconButton;
+import nl.requios.effortlessbuilding.create.foundation.gui.widget.ScrollInput;
+import nl.requios.effortlessbuilding.create.foundation.utility.Components;
+import nl.requios.effortlessbuilding.gui.elements.LabeledScrollInput;
+import nl.requios.effortlessbuilding.utilities.MathHelper;
+import nl.requios.effortlessbuilding.systems.PowerLevel;
+
+import java.text.DecimalFormat;
+import java.util.Vector;
+
+@OnlyIn(Dist.CLIENT)
+public class RadialMirrorEntry extends BaseModifierEntry<RadialMirror> {
+
+	protected Vector<ScrollInput> positionInputs;
+	protected IconButton playerPositionButton;
+	protected IconButton toggleOffsetButton;
+	protected ScrollInput slicesInput;
+	protected IconButton alternateButton;
+	protected ScrollInput radiusInput;
+	protected IconButton showLinesButton;
+	protected IconButton showAreasButton;
+	protected DecimalFormat df = new DecimalFormat("#.#");
+
+	public RadialMirrorEntry(ModifiersScreen screen, BaseModifier radialMirror) {
+		super(screen, (RadialMirror) radialMirror, Component.literal("Radial Mirror"), AllGuiTextures.RADIAL_MIRROR_ENTRY);
+
+		positionInputs = new Vector<>();
+
+		//Position
+		//ScrollInput works with double the value, so we can have 0.5 increments
+		for (int i = 0; i < 3; i++) {
+			final int index = i;
+			var scrollInput = new LabeledScrollInput(0, 0, 36, 18)
+				.showControlScrollsSlowerTooltip()
+				.titled(Component.literal(i == 0 ? "X Position" : i == 1 ? "Y Position" : "Z Position"))
+				.format(integer -> Component.literal(df.format(integer / 2.0)))
+				.withStepFunction(stepContext -> stepContext.shift ? 20 : stepContext.control ? 1 : 2)
+				.calling(value -> {
+					modifier.position = MathHelper.with(modifier.position, index, value / 2.0);
+					onValueChanged();
+				});
+			scrollInput.setState((int) (MathHelper.get(modifier.position, index) * 2.0));
+			positionInputs.add(scrollInput);
+		}
+		listeners.addAll(positionInputs);
+
+		//Player position button
+		playerPositionButton = new IconButton(0, 0, AllIcons.I_PLAYER)
+			.withCallback(() -> {
+				modifier.position = Vec3.atLowerCornerOf(Minecraft.getInstance().player.blockPosition());
+				onValueChanged();
+			});
+		playerPositionButton.setToolTip(Components.literal("Set to player position"));
+		listeners.add(playerPositionButton);
+
+		//Toggle offset button
+		toggleOffsetButton = new IconButton(0, 0, AllIcons.I_BLOCK_CENTER)
+			.withCallback(() -> {
+				if (modifier.position.x == Math.floor(modifier.position.x)) {
+					modifier.position = new Vec3(
+							Math.floor(modifier.position.x) + 0.5,
+							Math.floor(modifier.position.y) + 0.5,
+							Math.floor(modifier.position.z) + 0.5
+					);
+				}
+				else {
+					modifier.position = new Vec3(
+							Math.floor(modifier.position.x),
+							Math.floor(modifier.position.y),
+							Math.floor(modifier.position.z)
+					);
+				}
+				onValueChanged();
+			});
+		listeners.add(toggleOffsetButton);
+
+		//Slices
+		slicesInput = new LabeledScrollInput(0, 0, 27, 18)
+			.withRange(3, 1000)
+			.titled(Component.literal("Slices"))
+			.calling(value -> {
+				modifier.slices = value;
+				onValueChanged();
+			});
+		slicesInput.setState(modifier.slices);
+		listeners.add(slicesInput);
+
+		//Alternate
+		alternateButton = new IconButton(0, 0, AllIcons.I_ALTERNATE_OFF)
+			.withCallback(() -> {
+				modifier.alternate = !modifier.alternate;
+				onValueChanged();
+			});
+		listeners.add(alternateButton);
+
+		//Radius
+		radiusInput = new LabeledScrollInput(0, 0, 27, 18)
+			.withRange(0, EffortlessBuildingClient.POWER_LEVEL.getMaxMirrorRadius(Minecraft.getInstance().player))
+			.titled(Minecraft.getInstance().player.isCreative() ?
+					Component.literal("Radius") :
+					Component.literal("Radius. Use Reach Upgrade items to increase maximum."))
+			.calling(value -> {
+				modifier.radius = value;
+				onValueChanged();
+			});
+		radiusInput.setState(modifier.radius);
+		listeners.add(radiusInput);
+
+		//Show lines button
+		showLinesButton = new IconButton(0, 0, AllIcons.I_SHOW_LINES)
+			.withCallback(() -> {
+				modifier.drawLines = !modifier.drawLines;
+				onValueChanged();
+			});
+		listeners.add(showLinesButton);
+
+		//Show areas button
+		showAreasButton = new IconButton(0, 0, AllIcons.I_SHOW_AREAS)
+			.withCallback(() -> {
+				modifier.drawPlanes = !modifier.drawPlanes;
+				onValueChanged();
+			});
+		listeners.add(showAreasButton);
+
+		for (ScrollInput positionInput : positionInputs) {
+			positionInput.onChanged();
+		}
+		radiusInput.onChanged();
+	}
+
+	@Override
+	public void render(PoseStack ms, int index, int y, int x, int width, int height, int mouseX, int mouseY, boolean p_230432_9_, float partialTicks) {
+		super.render(ms, index, y, x, width, height, mouseX, mouseY, p_230432_9_, partialTicks);
+
+		//draw position inputs
+		for (int i = 0; i < 3; i++) {
+			ScrollInput input = positionInputs.get(i);
+			input.x = left + 49 + 38 * i;
+			input.y = top + 19;
+			input.render(ms, mouseX, mouseY, partialTicks);
+		}
+
+		//draw player position button
+		playerPositionButton.x = left + 163;
+		playerPositionButton.y = top + 19;
+		playerPositionButton.render(ms, mouseX, mouseY, partialTicks);
+
+		//draw toggle offset button
+		toggleOffsetButton.x = left + 183;
+		toggleOffsetButton.y = top + 19;
+		toggleOffsetButton.render(ms, mouseX, mouseY, partialTicks);
+
+		//draw slices input
+		slicesInput.x = left + 49;
+		slicesInput.y = top + 41;
+		slicesInput.render(ms, mouseX, mouseY, partialTicks);
+
+		//draw alternate button
+		alternateButton.x = left + 78;
+		alternateButton.y = top + 41;
+		alternateButton.render(ms, mouseX, mouseY, partialTicks);
+
+		//draw radius input
+		radiusInput.x = left + 134;
+		radiusInput.y = top + 41;
+		radiusInput.render(ms, mouseX, mouseY, partialTicks);
+
+		//draw show lines button
+		showLinesButton.x = left + 163;
+		showLinesButton.y = top + 41;
+		showLinesButton.render(ms, mouseX, mouseY, partialTicks);
+
+		//draw show areas button
+		showAreasButton.x = left + 183;
+		showAreasButton.y = top + 41;
+		showAreasButton.render(ms, mouseX, mouseY, partialTicks);
+	}
+
+	@Override
+	public void onValueChanged() {
+		super.onValueChanged();
+
+		//Position
+		for (int i = 0; i < 3; i++) {
+			ScrollInput input = positionInputs.get(i);
+			input.setState((int) (MathHelper.get(modifier.position, i) * 2.0));
+		}
+
+		//Toggle offset button
+		if (modifier.position.x == Math.floor(modifier.position.x)) {
+			toggleOffsetButton.setIcon(AllIcons.I_BLOCK_CENTER);
+			toggleOffsetButton.setToolTip(Components.literal("Set position to center of block, for uneven numbered builds."));
+		}
+		else {
+			toggleOffsetButton.setIcon(AllIcons.I_BLOCK_CORNER);
+			toggleOffsetButton.setToolTip(Components.literal("Set position to corner of block, for even numbered builds."));
+		}
+
+		//Toggle alternate button
+		if (modifier.alternate) {
+			alternateButton.setIcon(AllIcons.I_ALTERNATE_ON);
+			alternateButton.setToolTip(Components.literal("Alternating the direction of every other slice."));
+		}
+		else {
+			alternateButton.setIcon(AllIcons.I_ALTERNATE_OFF);
+			alternateButton.setToolTip(Components.literal("Alternate the direction of every other slice. Currently off."));
+		}
+
+		//Show lines button
+		if (modifier.drawLines) {
+			showLinesButton.setIcon(AllIcons.I_SHOW_LINES);
+			showLinesButton.setToolTip(Components.literal("Show mirror lines"));
+		}
+		else {
+			showLinesButton.setIcon(AllIcons.I_HIDE_LINES);
+			showLinesButton.setToolTip(Components.literal("Show mirror lines"));
+		}
+
+		//Show areas button
+		if (modifier.drawPlanes) {
+			showAreasButton.setIcon(AllIcons.I_SHOW_AREAS);
+			showAreasButton.setToolTip(Components.literal("Show mirror areas"));
+		}
+		else {
+			showAreasButton.setIcon(AllIcons.I_HIDE_AREAS);
+			showAreasButton.setToolTip(Components.literal("Show mirror areas"));
+		}
+	}
+}

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

@@ -1,289 +0,0 @@
-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;
-	}
-}