Bumped version number

Disabled capability logs. Using build mode enum name to get icon.
Updated to 1.19.3.
2023-01-28 22:36:10 +01:00 · 2023-01-28 22:10:02 +01:00 · 2023-01-14 18:10:45 +01:00 · 2023-01-14 15:35:43 +01:00 · 2022-10-25 21:52:14 +02:00 · 2022-10-24 21:01:19 +02:00
46 changed files with 337 additions and 312 deletions
--- a/.gitattributes
+++ b/.gitattributes
@@ -0,0 +1,5 @@
+# Disable autocrlf on generated files, they always generate with LF
+# Add any extra files or paths here to make git stop saying they
+# are changed when only line endings change.
+src/generated/**/.cache/cache text eol=lf
+src/generated/**/*.json text eol=lf
--- a/build.gradle
+++ b/build.gradle
@@ -1,31 +1,24 @@
-buildscript {
-    repositories {
-        maven { url = 'https://files.minecraftforge.net/maven' }
-        mavenCentral()
-    }
-    dependencies {
-        classpath group: 'net.minecraftforge.gradle', name: 'ForgeGradle', version: '5.1+', changing: true
-    }
+plugins {
+    id 'eclipse'
+    id 'maven-publish'
+    id 'net.minecraftforge.gradle' version '5.1.+'
 }
-apply plugin: 'net.minecraftforge.gradle'
-// Only edit below this line, the above code adds and enables the necessary things for Forge to be setup.
-apply plugin: 'eclipse'
-apply plugin: 'maven-publish'

-version = '1.18-2.40'
-group = 'nl.requios.effortlessbuilding' // http://maven.apache.org/guides/mini/guide-naming-conventions.html
+version = '1.19.3-2.40'
+group = 'nl.requios.effortlessbuilding'
 archivesBaseName = 'effortlessbuilding'

 // 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'}"
 minecraft {
    // The mappings can be changed at any time, and must be in the following format.
    // snapshot_YYYYMMDD   Snapshot are built nightly.
    // stable_#            Stables are built at the discretion of the MCP team.
    // Use non-default mappings at your own risk. they may not always work.
    // Simply re-run your setup task after changing the mappings to update your workspace.
-    mappings channel: 'official', version: '1.18.2'
+    mappings channel: 'official', version: '1.19.3'
    accessTransformer = file('src/main/resources/META-INF/accesstransformer.cfg')
    // makeObfSourceJar = false // an Srg named sources jar is made by default. uncomment this to disable.

@@ -41,6 +34,9 @@ minecraft {
            // 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'
+			
            mods {
                effortlessbuilding {
                    source sourceSets.main
@@ -51,12 +47,31 @@ minecraft {
        server {
            workingDirectory project.file('run')

-            // Recommended logging data for a userdev environment (SCAN,REGISTRIES,REGISTRYDUMP)
            property 'forge.logging.markers', 'REGISTRIES'

-            // Recommended logging level for the console
            property 'forge.logging.console.level', 'debug'

+            property 'forge.enabledGameTestNamespaces', 'effortlessbuilding'
+
+            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
@@ -65,12 +80,10 @@ minecraft {
        }

        data {
-            workingDirectory project.file('run')
+			workingDirectory project.file('run')

-            // Recommended logging data for a userdev environment (SCAN,REGISTRIES,REGISTRYDUMP)
            property 'forge.logging.markers', 'REGISTRIES'

-            // Recommended logging level for the console
            property 'forge.logging.console.level', 'debug'

            // Specify the modid for data generation, where to output the resulting resource, and where to look for existing resources.
@@ -85,11 +98,24 @@ minecraft {
    }
 }

+// 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'
+    // }
+}
+
 dependencies {
-    // Specify the version of Minecraft to use, If this is any group other then 'net.minecraft' it is assumed
-    // that the dep is a ForgeGradle 'patcher' dependency. And it's patches will be applied.
+    // Specify the version of Minecraft to use. If this is any group other than 'net.minecraft', it is assumed
+    // 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.18.2-40.0.19'
+    minecraft 'net.minecraftforge:forge:1.19.3-44.1.0'

    // Real mod deobf dependency examples - these get remapped to your current mappings
    // compileOnly fg.deobf("mezz.jei:jei-${mc_version}:${jei_version}:api") // Adds JEI API as a compile dependency
@@ -102,7 +128,6 @@ dependencies {
    // For more info...
    // http://www.gradle.org/docs/current/userguide/artifact_dependencies_tutorial.html
    // http://www.gradle.org/docs/current/userguide/dependency_management.html
-
 }

 // Example for how to get properties into the manifest for reading by the runtime..
@@ -113,18 +138,18 @@ jar {
            "Specification-Vendor": "requios",
            "Specification-Version": "1", // We are version 1 of ourselves
            "Implementation-Title": project.name,
-            "Implementation-Version": "${version}",
+            "Implementation-Version": project.jar.archiveVersion,
            "Implementation-Vendor" :"requios",
            "Implementation-Timestamp": new Date().format("yyyy-MM-dd'T'HH:mm:ssZ")
        ])
    }
 }

-// Example configuration to allow publishing using the maven-publish task
+// Example configuration to allow publishing using the maven-publish plugin
 // This is the preferred method to reobfuscate your jar file
-jar.finalizedBy('reobfJar') 
+jar.finalizedBy('reobfJar')
 // However if you are in a multi-project build, dev time needs unobfed jar files, so you can delay the obfuscation until publishing by doing
-//publish.dependsOn('reobfJar')
+// publish.dependsOn('reobfJar')

 publishing {
    publications {
@@ -134,7 +159,11 @@ publishing {
    }
    repositories {
        maven {
-            url "file:///${project.projectDir}/mcmodsrepo"
+            url "file://${project.projectDir}/mcmodsrepo"
        }
    }
 }
+
+tasks.withType(JavaCompile).configureEach {
+    options.encoding = 'UTF-8' // Use the UTF-8 charset for Java compilation
+}
--- a/settings.gradle
+++ b/settings.gradle
@@ -0,0 +1,6 @@
+pluginManagement {
+    repositories {
+        gradlePluginPortal()
+        maven { url = 'https://maven.minecraftforge.net/' }
+    }
+}
--- a/src/main/java/nl/requios/effortlessbuilding/EffortlessBuilding.java
+++ b/src/main/java/nl/requios/effortlessbuilding/EffortlessBuilding.java
@@ -1,11 +1,13 @@
 package nl.requios.effortlessbuilding;

+import net.minecraft.network.chat.Component;
 import net.minecraft.world.entity.player.Player;
 import net.minecraft.world.inventory.AbstractContainerMenu;
 import net.minecraft.world.inventory.MenuType;
+import net.minecraft.world.item.CreativeModeTabs;
 import net.minecraft.world.item.Item;
-import net.minecraft.network.chat.TextComponent;
 import net.minecraftforge.common.capabilities.RegisterCapabilitiesEvent;
+import net.minecraftforge.event.CreativeModeTabEvent;
 import net.minecraftforge.eventbus.api.SubscribeEvent;
 import net.minecraftforge.fml.DistExecutor;
 import net.minecraftforge.fml.ModLoadingContext;
@@ -43,7 +45,7 @@ public class EffortlessBuilding {

 	//Registration
 	private static final DeferredRegister<Item> ITEMS = DeferredRegister.create(ForgeRegistries.ITEMS, MODID);
-	private static final DeferredRegister<MenuType<?>> CONTAINERS = DeferredRegister.create(ForgeRegistries.CONTAINERS, EffortlessBuilding.MODID);
+	private static final DeferredRegister<MenuType<?>> CONTAINERS = DeferredRegister.create(ForgeRegistries.MENU_TYPES, 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);
@@ -89,11 +91,25 @@ public class EffortlessBuilding {
 	}

 	@SubscribeEvent
-	public void registerCapabilities(RegisterCapabilitiesEvent event){
+	public void registerCapabilities(RegisterCapabilitiesEvent event) {
 		event.register(ModifierCapabilityManager.IModifierCapability.class);
 		event.register(ModeCapabilityManager.IModeCapability.class);
 	}

+	@SubscribeEvent
+	public void registerCreativeModeTabs(CreativeModeTabEvent.BuildContents event) {
+		if (event.getTab() == CreativeModeTabs.TOOLS_AND_UTILITIES){
+			event.accept(RANDOMIZER_BAG_ITEM);
+			event.accept(GOLDEN_RANDOMIZER_BAG_ITEM);
+			event.accept(DIAMOND_RANDOMIZER_BAG_ITEM);
+			event.accept(REACH_UPGRADE_1_ITEM);
+			event.accept(REACH_UPGRADE_2_ITEM);
+			event.accept(REACH_UPGRADE_3_ITEM);
+		}
+
+		//To create custom tab see https://gist.github.com/ChampionAsh5357/c21724bafbc630da2ed8899fe0c1d226
+	}
+
 	public static void log(String msg) {
 		logger.info(msg);
 	}
@@ -103,7 +119,7 @@ public class EffortlessBuilding {
 	}

 	public static void log(Player player, String msg, boolean actionBar) {
-		player.displayClientMessage(new TextComponent(msg), actionBar);
+		player.displayClientMessage(Component.literal(msg), actionBar);
 	}

 	//Log with translation supported, call either on client or server (which then sends a message)
--- a/src/main/java/nl/requios/effortlessbuilding/ForgeEventHandler.java
+++ b/src/main/java/nl/requios/effortlessbuilding/ForgeEventHandler.java
@@ -10,9 +10,8 @@ import net.minecraft.server.level.ServerPlayer;
 import net.minecraft.resources.ResourceLocation;
 import net.minecraftforge.common.util.FakePlayer;
 import net.minecraftforge.event.AttachCapabilitiesEvent;
-import net.minecraftforge.event.RegisterCommandsEvent;
 import net.minecraftforge.event.entity.player.PlayerEvent;
-import net.minecraftforge.event.world.BlockEvent;
+import net.minecraftforge.event.level.BlockEvent;
 import net.minecraftforge.eventbus.api.SubscribeEvent;
 import net.minecraftforge.fml.common.Mod;
 import net.minecraftforge.network.PacketDistributor;
@@ -30,7 +29,7 @@ import nl.requios.effortlessbuilding.network.PacketHandler;
 import nl.requios.effortlessbuilding.network.RequestLookAtMessage;

@Mod.EventBusSubscriber(modid = EffortlessBuilding.MODID, bus = Mod.EventBusSubscriber.Bus.FORGE)
-public class EventHandler {
+public class ForgeEventHandler {

 	@SubscribeEvent
 	public static void attachCapabilities(AttachCapabilitiesEvent<Entity> event) {
@@ -43,7 +42,7 @@ public class EventHandler {

 	@SubscribeEvent
 	public static void onBlockPlaced(BlockEvent.EntityPlaceEvent event) {
-		if (event.getWorld().isClientSide()) return;
+		if (event.getLevel().isClientSide()) return;

 		if (!(event.getEntity() instanceof Player)) return;

@@ -86,7 +85,7 @@ public class EventHandler {

 	@SubscribeEvent
 	public static void onBlockBroken(BlockEvent.BreakEvent event) {
-		if (event.getWorld().isClientSide()) return;
+		if (event.getLevel().isClientSide()) return;

 		if (event.getPlayer() instanceof FakePlayer) return;

@@ -112,16 +111,16 @@ public class EventHandler {

 	@SubscribeEvent
 	public static void onPlayerLoggedIn(PlayerEvent.PlayerLoggedInEvent event) {
-		if (event.getPlayer() instanceof FakePlayer) return;
-		Player player = event.getPlayer();
+		if (event.getEntity() instanceof FakePlayer) return;
+		Player player = event.getEntity();
 		ModifierSettingsManager.handleNewPlayer(player);
 		ModeSettingsManager.handleNewPlayer(player);
 	}

 	@SubscribeEvent
 	public static void onPlayerLoggedOut(PlayerEvent.PlayerLoggedOutEvent event) {
-		if (event.getPlayer() instanceof FakePlayer) return;
-		Player player = event.getPlayer();
+		if (event.getEntity() instanceof FakePlayer) return;
+		Player player = event.getEntity();
 		if (player.getCommandSenderWorld().isClientSide) return;

 		UndoRedo.clear(player);
@@ -130,16 +129,16 @@ public class EventHandler {

 	@SubscribeEvent
 	public static void onPlayerRespawn(PlayerEvent.PlayerRespawnEvent event) {
-		if (event.getPlayer() instanceof FakePlayer) return;
-		Player player = event.getPlayer();
+		if (event.getEntity() instanceof FakePlayer) return;
+		Player player = event.getEntity();
 		ModifierSettingsManager.handleNewPlayer(player);
 		ModeSettingsManager.handleNewPlayer(player);
 	}

 	@SubscribeEvent
 	public static void onPlayerChangedDimension(PlayerEvent.PlayerChangedDimensionEvent event) {
-		if (event.getPlayer() instanceof FakePlayer) return;
-		Player player = event.getPlayer();
+		if (event.getEntity() instanceof FakePlayer) return;
+		Player player = event.getEntity();
 		if (player.getCommandSenderWorld().isClientSide) return;

 		//Set build mode to normal
@@ -163,12 +162,12 @@ public class EventHandler {

 	@SubscribeEvent
 	public static void onPlayerClone(PlayerEvent.Clone event) {
-		if (event.getPlayer() instanceof FakePlayer) return;
+		if (event.getEntity() instanceof FakePlayer) return;
 		//Attach capabilities on death, otherwise crash
 		Player oldPlayer = event.getOriginal();
 		oldPlayer.revive();

-		Player newPlayer = event.getPlayer();
+		Player newPlayer = event.getEntity();
 		ModifierSettingsManager.setModifierSettings(newPlayer, ModifierSettingsManager.getModifierSettings(oldPlayer));
 		ModeSettingsManager.setModeSettings(newPlayer, ModeSettingsManager.getModeSettings(oldPlayer));
 	}
--- a/src/main/java/nl/requios/effortlessbuilding/ModClientEventHandler.java
+++ b/src/main/java/nl/requios/effortlessbuilding/ModClientEventHandler.java
@@ -1,22 +1,49 @@
 package nl.requios.effortlessbuilding;

+import com.mojang.blaze3d.platform.InputConstants;
 import com.mojang.blaze3d.vertex.DefaultVertexFormat;
+import net.minecraft.client.KeyMapping;
 import net.minecraft.client.renderer.ShaderInstance;
 import net.minecraft.resources.ResourceLocation;
 import net.minecraftforge.api.distmarker.Dist;
+import net.minecraftforge.client.event.RegisterKeyMappingsEvent;
 import net.minecraftforge.client.event.RegisterShadersEvent;
+import net.minecraftforge.client.settings.KeyConflictContext;
+import net.minecraftforge.client.settings.KeyModifier;
 import net.minecraftforge.eventbus.api.SubscribeEvent;
 import net.minecraftforge.fml.common.Mod;
+import nl.requios.effortlessbuilding.proxy.ClientProxy;
 import nl.requios.effortlessbuilding.render.BuildRenderTypes;
+import org.lwjgl.glfw.GLFW;

 import java.io.IOException;

@Mod.EventBusSubscriber(bus = Mod.EventBusSubscriber.Bus.MOD, value = {Dist.CLIENT})
 public class ModClientEventHandler {

+	@SubscribeEvent
+	public static void registerKeyMappings(RegisterKeyMappingsEvent event) {
+		EffortlessBuilding.log("Registering KeyMappings!");
+
+		// register key bindings
+		ClientProxy.keyBindings = new KeyMapping[6];
+
+		// instantiate the key bindings
+		ClientProxy.keyBindings[0] = new KeyMapping("key.effortlessbuilding.hud.desc", KeyConflictContext.IN_GAME, InputConstants.getKey(GLFW.GLFW_KEY_KP_ADD, 0), "key.effortlessbuilding.category");
+		ClientProxy.keyBindings[1] = new KeyMapping("key.effortlessbuilding.replace.desc", KeyConflictContext.IN_GAME, InputConstants.getKey(GLFW.GLFW_KEY_KP_SUBTRACT, 0), "key.effortlessbuilding.category");
+		ClientProxy.keyBindings[2] = new KeyMapping("key.effortlessbuilding.mode.desc", KeyConflictContext.IN_GAME, InputConstants.getKey(GLFW.GLFW_KEY_LEFT_ALT, 0), "key.effortlessbuilding.category");
+		ClientProxy.keyBindings[3] = new KeyMapping("key.effortlessbuilding.undo.desc", KeyConflictContext.IN_GAME, KeyModifier.CONTROL, InputConstants.getKey(GLFW.GLFW_KEY_Z, 0), "key.effortlessbuilding.category");
+		ClientProxy.keyBindings[4] = new KeyMapping("key.effortlessbuilding.redo.desc", KeyConflictContext.IN_GAME, KeyModifier.CONTROL, InputConstants.getKey(GLFW.GLFW_KEY_Y, 0), "key.effortlessbuilding.category");
+		ClientProxy.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 : ClientProxy.keyBindings) {
+			event.register(keyBinding);
+		}
+	}
+
 	@SubscribeEvent
 	public static void registerShaders(RegisterShadersEvent event) throws IOException {
-		event.registerShader(new ShaderInstance(event.getResourceManager(),
+		event.registerShader(new ShaderInstance(event.getResourceProvider(),
 				new ResourceLocation(EffortlessBuilding.MODID, "dissolve"),
 				DefaultVertexFormat.BLOCK),
 				shaderInstance -> BuildRenderTypes.dissolveShaderInstance = shaderInstance);
--- a/src/main/java/nl/requios/effortlessbuilding/buildmode/BuildModes.java
+++ b/src/main/java/nl/requios/effortlessbuilding/buildmode/BuildModes.java
@@ -1,6 +1,5 @@
 package nl.requios.effortlessbuilding.buildmode;

-import com.mojang.math.Vector4f;
 import net.minecraft.world.entity.player.Player;
 import net.minecraft.core.Direction;
 import net.minecraft.core.BlockPos;
@@ -15,6 +14,7 @@ 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 org.joml.Vector4f;

 import java.util.ArrayList;
 import java.util.Dictionary;
--- a/src/main/java/nl/requios/effortlessbuilding/gui/buildmode/PlayerSettingsGui.java
+++ b/src/main/java/nl/requios/effortlessbuilding/gui/buildmode/PlayerSettingsGui.java
@@ -12,12 +12,10 @@ import net.minecraft.client.gui.components.ObjectSelectionList;
 import net.minecraft.sounds.SoundEvents;
 import net.minecraft.util.Mth;
 import net.minecraft.network.chat.Component;
-import net.minecraft.network.chat.TextComponent;
-import net.minecraft.network.chat.TranslatableComponent;
 import net.minecraftforge.api.distmarker.Dist;
 import net.minecraftforge.api.distmarker.OnlyIn;
 import net.minecraftforge.client.gui.widget.ExtendedButton;
-import net.minecraftforge.client.gui.widget.Slider;
+import net.minecraftforge.client.gui.widget.ForgeSlider;
 import nl.requios.effortlessbuilding.EffortlessBuilding;

 import javax.annotation.ParametersAreNonnullByDefault;
@@ -33,7 +31,7 @@ public class PlayerSettingsGui extends Screen {
 	private Button closeButton;

 	public PlayerSettingsGui() {
-		super(new TranslatableComponent("effortlessbuilding.screen.player_settings"));
+		super(Component.translatable("effortlessbuilding.screen.player_settings"));
 	}

 	@Override
@@ -54,12 +52,10 @@ public class PlayerSettingsGui extends Screen {
 		addRenderableOnly(shaderTypeButton);

 		yy += 50;
-		Slider slider = new Slider(right - 200, yy, 200, 20, TextComponent.EMPTY, TextComponent.EMPTY, 0.5, 2.0, 1.0, true, true, (button) -> {
-
-		});
+		ForgeSlider slider = new ForgeSlider(right - 200, yy, 200, 20, Component.empty(), Component.empty(), 0.5, 2.0, 1.0, true);
 		addRenderableOnly(slider);

-		closeButton = new ExtendedButton(left + 50, bottom - 20, 180, 20, new TextComponent("Done"), (button) -> this.minecraft.player.closeContainer());
+		closeButton = new ExtendedButton(left + 50, bottom - 20, 180, 20, Component.literal("Done"), (button) -> this.minecraft.player.closeContainer());
 		addRenderableOnly(closeButton);
 	}

@@ -111,7 +107,7 @@ public class PlayerSettingsGui extends Screen {
 		}

 		ShaderType(String name) {
-			this.name = new TextComponent(name);
+			this.name = Component.literal(name);
 		}
 	}

@@ -216,7 +212,7 @@ public class PlayerSettingsGui extends Screen {
 				this.renderHeader(ms, k, l, tessellator);
 			}

-			this.renderList(ms, k, l, p_render_1_, p_render_2_, p_render_3_);
+			this.renderList(ms, p_render_1_, p_render_2_, p_render_3_);
 			RenderSystem.disableDepthTest();
 //            this.renderHoleBackground(0, this.y0, 255, 255);
 //            this.renderHoleBackground(this.y1, this.height, 255, 255);
--- a/src/main/java/nl/requios/effortlessbuilding/gui/buildmode/RadialMenu.java
+++ b/src/main/java/nl/requios/effortlessbuilding/gui/buildmode/RadialMenu.java
@@ -2,7 +2,6 @@ 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;
@@ -13,10 +12,11 @@ import net.minecraft.client.KeyMapping;
 import net.minecraft.client.resources.sounds.SimpleSoundInstance;
 import net.minecraft.core.Direction;
 import net.minecraft.ChatFormatting;
-import net.minecraft.network.chat.TranslatableComponent;
+import net.minecraft.network.chat.Component;
 import net.minecraft.resources.ResourceLocation;
 import net.minecraft.sounds.SoundEvents;
 import net.minecraft.sounds.SoundSource;
+import net.minecraft.util.RandomSource;
 import nl.requios.effortlessbuilding.EffortlessBuilding;
 import nl.requios.effortlessbuilding.buildmode.ModeOptions;
 import nl.requios.effortlessbuilding.buildmode.ModeSettingsManager;
@@ -25,6 +25,7 @@ import nl.requios.effortlessbuilding.network.ModeSettingsMessage;
 import nl.requios.effortlessbuilding.network.PacketHandler;
 import nl.requios.effortlessbuilding.proxy.ClientProxy;
 import org.apache.commons.lang3.text.WordUtils;
+import org.joml.Vector4f;
 import org.lwjgl.opengl.GL11;

 import javax.annotation.ParametersAreNonnullByDefault;
@@ -46,7 +47,7 @@ import nl.requios.effortlessbuilding.buildmode.ModeOptions.OptionEnum;
 public class RadialMenu extends Screen {

 	public static final RadialMenu instance = new RadialMenu();
-
+	
 	private final Vector4f radialButtonColor = new Vector4f(0f, 0f, 0f, .5f);
 	private final Vector4f sideButtonColor = new Vector4f(.5f, .5f, .5f, .5f);
 	private final Vector4f highlightColor = new Vector4f(.6f, .8f, 1f, .6f);
@@ -73,7 +74,7 @@ public class RadialMenu extends Screen {
 	private float visibility;

 	public RadialMenu() {
-		super(new TranslatableComponent("effortlessbuilding.screen.radial_menu"));
+		super(Component.translatable("effortlessbuilding.screen.radial_menu"));
 	}

 	public boolean isVisible() {
@@ -165,7 +166,8 @@ public class RadialMenu extends Screen {
 		doAction = null;

 		//Draw buildmode backgrounds
-		drawRadialButtonBackgrounds(currentBuildMode, buffer, middleX, middleY, mouseXCenter, mouseYCenter, mouseRadians, quarterCircle, modes);
+		drawRadialButtonBackgrounds(currentBuildMode, buffer, middleX, middleY, mouseXCenter, mouseYCenter, mouseRadians,
+				quarterCircle, modes);

 		//Draw action backgrounds
 		drawSideButtonBackgrounds(buffer, middleX, middleY, mouseXCenter, mouseYCenter, buttons);
@@ -276,7 +278,8 @@ public class RadialMenu extends Screen {
 		}
 	}

-	private void drawIcons(PoseStack ms, double middleX, double middleY, ArrayList<MenuRegion> modes, ArrayList<MenuButton> buttons) {
+	private void drawIcons(PoseStack ms, double middleX, double middleY,
+						   ArrayList<MenuRegion> modes, ArrayList<MenuButton> buttons) {
 		ms.pushPose();
 		RenderSystem.enableTexture();
 		RenderSystem.setShader(GameRenderer::getPositionColorTexShader);
@@ -476,8 +479,8 @@ public class RadialMenu extends Screen {
 	public static void playRadialMenuSound() {
 		final float volume = 0.1f;
 		if (volume >= 0.0001f) {
-			SimpleSoundInstance sound = new SimpleSoundInstance(SoundEvents.UI_BUTTON_CLICK, SoundSource.MASTER, volume,
-					1.0f, Minecraft.getInstance().player.blockPosition());
+			SimpleSoundInstance sound = new SimpleSoundInstance(SoundEvents.UI_BUTTON_CLICK.get(), SoundSource.MASTER, volume,
+					1.0f, RandomSource.create(), Minecraft.getInstance().player.blockPosition());
 			Minecraft.getInstance().getSoundManager().play(sound);
 		}
 	}
--- a/src/main/java/nl/requios/effortlessbuilding/gui/buildmodifier/ArraySettingsGui.java
+++ b/src/main/java/nl/requios/effortlessbuilding/gui/buildmodifier/ArraySettingsGui.java
@@ -1,11 +1,10 @@
 package nl.requios.effortlessbuilding.gui.buildmodifier;

 import com.mojang.blaze3d.vertex.PoseStack;
-import net.minecraft.client.gui.components.Widget;
+import net.minecraft.client.gui.components.Renderable;
 import net.minecraft.client.gui.screens.Screen;
-import net.minecraft.client.gui.components.AbstractWidget;
 import net.minecraft.core.BlockPos;
-import net.minecraft.network.chat.TextComponent;
+import net.minecraft.network.chat.Component;
 import net.minecraft.ChatFormatting;
 import net.minecraftforge.api.distmarker.Dist;
 import net.minecraftforge.api.distmarker.OnlyIn;
@@ -34,7 +33,7 @@ public class ArraySettingsGui extends GuiCollapsibleScrollEntry {
 	}

 	@Override
-	public void init(List<Widget> renderables) {
+	public void init(List<Renderable> renderables) {
 		super.init(renderables);

 		int y = top;
@@ -50,23 +49,23 @@ public class ArraySettingsGui extends GuiCollapsibleScrollEntry {
 		y = top + 20;
 		textArrayOffsetX = new GuiNumberField(font, renderables, left + 70, y, 50, 18);
 		textArrayOffsetX.setNumber(0);
-		textArrayOffsetX.setTooltip(new TextComponent("How much each copy is shifted."));
+		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(new TextComponent("How much each copy is shifted."));
+		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(new TextComponent("How much each copy is shifted."));
+		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(new TextComponent("How many copies should be made."));
+		textArrayCount.setTooltip(Component.literal("How many copies should be made."));
 		arrayNumberFieldList.add(textArrayCount);

 		ModifierSettingsManager.ModifierSettings modifierSettings = ModifierSettingsManager.getModifierSettings(mc.player);
@@ -94,7 +93,7 @@ public class ArraySettingsGui extends GuiCollapsibleScrollEntry {

 		buttonArrayEnabled.render(ms, mouseX, mouseY, partialTicks);
 		if (buttonArrayEnabled.isChecked()) {
-			buttonArrayEnabled.y = yy;
+			buttonArrayEnabled.setY(yy);
 			font.draw(ms, "Array enabled", left + offset, yy + 2, 0xFFFFFF);

 			yy = y + 20;
@@ -118,7 +117,7 @@ public class ArraySettingsGui extends GuiCollapsibleScrollEntry {

 			arrayNumberFieldList.forEach(numberField -> numberField.drawNumberField(ms, mouseX, mouseY, partialTicks));
 		} else {
-			buttonArrayEnabled.y = yy;
+			buttonArrayEnabled.setY(yy);
 			font.draw(ms, "Array disabled", left + offset, yy + 2, 0x999999);
 		}

--- a/src/main/java/nl/requios/effortlessbuilding/gui/buildmodifier/MirrorSettingsGui.java
+++ b/src/main/java/nl/requios/effortlessbuilding/gui/buildmodifier/MirrorSettingsGui.java
@@ -1,13 +1,12 @@
 package nl.requios.effortlessbuilding.gui.buildmodifier;

 import com.mojang.blaze3d.vertex.PoseStack;
-import net.minecraft.client.gui.components.Widget;
+import net.minecraft.client.gui.components.Renderable;
 import net.minecraft.client.gui.screens.Screen;
-import net.minecraft.client.gui.components.AbstractWidget;
 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.network.chat.TextComponent;
 import net.minecraft.ChatFormatting;
 import net.minecraftforge.api.distmarker.Dist;
 import net.minecraftforge.api.distmarker.OnlyIn;
@@ -41,7 +40,7 @@ public class MirrorSettingsGui extends GuiCollapsibleScrollEntry {
 	}

 	@Override
-	public void init(List<Widget> renderables) {
+	public void init(List<Renderable> renderables) {
 		super.init(renderables);

 		int y = top - 2;
@@ -58,17 +57,17 @@ public class MirrorSettingsGui extends GuiCollapsibleScrollEntry {
 		textMirrorPosX = new GuiNumberField(font, renderables, left + 58, y, 62, 18);
 		textMirrorPosX.setNumber(0);
 		textMirrorPosX.setTooltip(
-			Arrays.asList(new TextComponent("The position of the mirror."), new TextComponent("For odd numbered builds add 0.5.").withStyle(ChatFormatting.GRAY)));
+			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(new TextComponent("The position of the mirror."), new TextComponent("For odd numbered builds add 0.5.").withStyle(ChatFormatting.GRAY)));
+		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(new TextComponent("The position of the mirror."), new TextComponent("For odd numbered builds add 0.5.").withStyle(ChatFormatting.GRAY)));
+		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;
@@ -85,9 +84,9 @@ public class MirrorSettingsGui extends GuiCollapsibleScrollEntry {
 		textMirrorRadius = new GuiNumberField(font, renderables, left + 218, y, 62, 18);
 		textMirrorRadius.setNumber(50);
 		//TODO change to diameter (remove /2)
-		textMirrorRadius.setTooltip(Arrays.asList(new TextComponent("How far the mirror reaches in any direction."),
-			new TextComponent("Max: ").withStyle(ChatFormatting.GRAY).append(new TextComponent(String.valueOf(ReachHelper.getMaxReach(mc.player) / 2)).withStyle(ChatFormatting.GOLD)),
-			new TextComponent("Upgradeable in survival with reach upgrades.").withStyle(ChatFormatting.GRAY)));
+		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;
@@ -97,41 +96,41 @@ public class MirrorSettingsGui extends GuiCollapsibleScrollEntry {
 			textMirrorPosY.setNumber(pos.y);
 			textMirrorPosZ.setNumber(pos.z);
 		});
-		buttonCurrentPosition.setTooltip(new TextComponent("Set mirror position to current player position"));
+		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(new TextComponent("Set mirror position to corner of block"), new TextComponent("for even numbered builds")));
+				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(new TextComponent("Set mirror position to middle of block"), new TextComponent("for odd numbered builds")));
+				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(new TextComponent("Set mirror position to middle of block"), new TextComponent("for odd numbered builds")));
+		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(new TextComponent(drawLines ? "Hide lines" : "Show lines"));
+			buttonDrawLines.setTooltip(Component.literal(drawLines ? "Hide lines" : "Show lines"));
 		});
-		buttonDrawLines.setTooltip(new TextComponent("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(new TextComponent(drawPlanes ? "Hide area" : "Show area"));
+			buttonDrawPlanes.setTooltip(Component.literal(drawPlanes ? "Hide area" : "Show area"));
 		});
-		buttonDrawPlanes.setTooltip(new TextComponent("Show area"));
+		buttonDrawPlanes.setTooltip(Component.literal("Show area"));
 		mirrorIconButtonList.add(buttonDrawPlanes);

 		ModifierSettingsManager.ModifierSettings modifierSettings = ModifierSettingsManager.getModifierSettings(mc.player);
@@ -149,14 +148,14 @@ public class MirrorSettingsGui extends GuiCollapsibleScrollEntry {
 			drawPlanes = m.drawPlanes;
 			buttonDrawLines.setUseAlternateIcon(drawLines);
 			buttonDrawPlanes.setUseAlternateIcon(drawPlanes);
-			buttonDrawLines.setTooltip(new TextComponent(drawLines ? "Hide lines" : "Show lines"));
-			buttonDrawPlanes.setTooltip(new TextComponent(drawPlanes ? "Hide area" : "Show area"));
+			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(new TextComponent("Set mirror position to middle of block"), new TextComponent("for odd numbered builds")));
+				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(new TextComponent("Set mirror position to corner of block"), new TextComponent("for even numbered builds")));
+				buttonToggleOdd.setTooltip(Arrays.asList(Component.literal("Set mirror position to corner of block"), Component.literal("for even numbered builds")));
 			}
 			buttonToggleOdd.setUseAlternateIcon(toggleOdd);
 		}
@@ -182,7 +181,7 @@ public class MirrorSettingsGui extends GuiCollapsibleScrollEntry {

 		buttonMirrorEnabled.render(ms, mouseX, mouseY, partialTicks);
 		if (buttonMirrorEnabled.isChecked()) {
-			buttonMirrorEnabled.y = yy;
+			buttonMirrorEnabled.setY(yy);
 			font.draw(ms, "Mirror enabled", left + offset, yy + 2, 0xFFFFFF);

 			yy = y + 18;
@@ -196,23 +195,23 @@ public class MirrorSettingsGui extends GuiCollapsibleScrollEntry {

 			yy = y + 50;
 			font.draw(ms, "Direction", left + offset, yy + 2, 0xFFFFFF);
-			buttonMirrorX.y = yy;
-			buttonMirrorY.y = yy;
-			buttonMirrorZ.y = yy;
+			buttonMirrorX.setY(yy);
+			buttonMirrorY.setY(yy);
+			buttonMirrorZ.setY(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;
+			buttonCurrentPosition.setY(yy);
+			buttonToggleOdd.setY(yy);
+			buttonDrawLines.setY(yy);
+			buttonDrawPlanes.setY(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;
+			buttonMirrorEnabled.setY(yy);
 			font.draw(ms, "Mirror disabled", left + offset, yy + 2, 0x999999);
 		}

--- a/src/main/java/nl/requios/effortlessbuilding/gui/buildmodifier/ModifierSettingsGui.java
+++ b/src/main/java/nl/requios/effortlessbuilding/gui/buildmodifier/ModifierSettingsGui.java
@@ -2,13 +2,12 @@ package nl.requios.effortlessbuilding.gui.buildmodifier;

 import com.mojang.blaze3d.vertex.PoseStack;
 import net.minecraft.client.Minecraft;
-import net.minecraft.client.gui.components.AbstractWidget;
 import net.minecraft.client.gui.screens.Screen;
 import net.minecraft.client.gui.components.Button;
-import net.minecraft.network.chat.TextComponent;
-import net.minecraft.network.chat.TranslatableComponent;
+import net.minecraft.network.chat.Component;
 import net.minecraftforge.api.distmarker.Dist;
 import net.minecraftforge.api.distmarker.OnlyIn;
+import net.minecraftforge.client.gui.widget.ExtendedButton;
 import nl.requios.effortlessbuilding.EffortlessBuilding;
 import nl.requios.effortlessbuilding.buildmodifier.Array;
 import nl.requios.effortlessbuilding.buildmodifier.Mirror;
@@ -19,9 +18,6 @@ import nl.requios.effortlessbuilding.network.ModifierSettingsMessage;
 import nl.requios.effortlessbuilding.network.PacketHandler;
 import nl.requios.effortlessbuilding.proxy.ClientProxy;

-import java.util.ArrayList;
-import java.util.List;
-
@OnlyIn(Dist.CLIENT)
 public class ModifierSettingsGui extends Screen {

@@ -33,7 +29,7 @@ public class ModifierSettingsGui extends Screen {
 	private RadialMirrorSettingsGui radialMirrorSettingsGui;

 	public ModifierSettingsGui() {
-		super(new TranslatableComponent("effortlessbuilding.screen.modifier_settings"));
+		super(Component.translatable("effortlessbuilding.screen.modifier_settings"));
 	}

 	@Override
@@ -55,7 +51,7 @@ public class ModifierSettingsGui extends Screen {

 		//Close button
 		int y = height - 26;
-		buttonClose = new Button(width / 2 - 100, y, 200, 20, new TextComponent("Close"), (button) -> {
+		buttonClose = new ExtendedButton(width / 2 - 100, y, 200, 20, Component.literal("Close"), (button) -> {
 			Minecraft.getInstance().player.closeContainer();
 		});
 		addRenderableOnly(buttonClose);
--- a/src/main/java/nl/requios/effortlessbuilding/gui/buildmodifier/RadialMirrorSettingsGui.java
+++ b/src/main/java/nl/requios/effortlessbuilding/gui/buildmodifier/RadialMirrorSettingsGui.java
@@ -1,13 +1,12 @@
 package nl.requios.effortlessbuilding.gui.buildmodifier;

 import com.mojang.blaze3d.vertex.PoseStack;
-import net.minecraft.client.gui.components.Widget;
+import net.minecraft.client.gui.components.Renderable;
 import net.minecraft.client.gui.screens.Screen;
-import net.minecraft.client.gui.components.AbstractWidget;
 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.network.chat.TextComponent;
 import net.minecraft.ChatFormatting;
 import net.minecraftforge.api.distmarker.Dist;
 import net.minecraftforge.api.distmarker.OnlyIn;
@@ -41,7 +40,7 @@ public class RadialMirrorSettingsGui extends GuiCollapsibleScrollEntry {
 	}

 	@Override
-	public void init(List<Widget> renderables) {
+	public void init(List<Renderable> renderables) {
 		super.init(renderables);

 		int y = top - 2;
@@ -58,31 +57,31 @@ public class RadialMirrorSettingsGui extends GuiCollapsibleScrollEntry {
 		textRadialMirrorPosX = new GuiNumberField(font, renderables, left + 58, y, 62, 18);
 		textRadialMirrorPosX.setNumber(0);
 		textRadialMirrorPosX.setTooltip(
-			Arrays.asList(new TextComponent("The position of the radial mirror."), new TextComponent("For odd numbered builds add 0.5.").withStyle(ChatFormatting.GRAY)));
+			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(new TextComponent("The position of the radial mirror."), new TextComponent("For odd numbered builds add 0.5.").withStyle(ChatFormatting.GRAY)));
+		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(new TextComponent("The position of the radial mirror."), new TextComponent("For odd numbered builds add 0.5.").withStyle(ChatFormatting.GRAY)));
+		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(new TextComponent("The number of repeating slices."), new TextComponent("Minimally 2.").withStyle(ChatFormatting.GRAY)));
+		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(new TextComponent("How far the radial mirror reaches from its center position."),
-			new TextComponent("Max: ").withStyle(ChatFormatting.GRAY).append(new TextComponent(String.valueOf(ReachHelper.getMaxReach(mc.player) / 2)).withStyle(ChatFormatting.GOLD)),
-			new TextComponent("Upgradeable in survival with reach upgrades.").withStyle(ChatFormatting.GRAY)));
+		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;
@@ -92,41 +91,41 @@ public class RadialMirrorSettingsGui extends GuiCollapsibleScrollEntry {
 			textRadialMirrorPosY.setNumber(pos.y);
 			textRadialMirrorPosZ.setNumber(pos.z);
 		});
-		buttonCurrentPosition.setTooltip(new TextComponent("Set radial mirror position to current player position"));
+		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(new TextComponent("Set mirror position to corner of block"), new TextComponent("for even numbered builds")));
+				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(new TextComponent("Set mirror position to middle of block"), new TextComponent("for odd numbered builds")));
+				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(new TextComponent("Set radial mirror position to middle of block"), new TextComponent("for odd numbered builds")));
+		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(new TextComponent(drawLines ? "Hide lines" : "Show lines"));
+			buttonDrawLines.setTooltip(Component.literal(drawLines ? "Hide lines" : "Show lines"));
 		});
-		buttonDrawLines.setTooltip(new TextComponent("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(new TextComponent(drawPlanes ? "Hide area" : "Show area"));
+			buttonDrawPlanes.setTooltip(Component.literal(drawPlanes ? "Hide area" : "Show area"));
 		});
-		buttonDrawPlanes.setTooltip(new TextComponent("Show area"));
+		buttonDrawPlanes.setTooltip(Component.literal("Show area"));
 		radialMirrorIconButtonList.add(buttonDrawPlanes);

 		y = top + 76;
@@ -147,14 +146,14 @@ public class RadialMirrorSettingsGui extends GuiCollapsibleScrollEntry {
 			drawPlanes = r.drawPlanes;
 			buttonDrawLines.setUseAlternateIcon(drawLines);
 			buttonDrawPlanes.setUseAlternateIcon(drawPlanes);
-			buttonDrawLines.setTooltip(new TextComponent(drawLines ? "Hide lines" : "Show lines"));
-			buttonDrawPlanes.setTooltip(new TextComponent(drawPlanes ? "Hide area" : "Show area"));
+			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(new TextComponent("Set radial mirror position to middle of block"), new TextComponent("for odd numbered builds")));
+				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(new TextComponent("Set radial mirror position to corner of block"), new TextComponent("for even numbered builds")));
+				buttonToggleOdd.setTooltip(Arrays.asList(Component.literal("Set radial mirror position to corner of block"), Component.literal("for even numbered builds")));
 			}
 			buttonToggleOdd.setUseAlternateIcon(toggleOdd);
 		}
@@ -179,7 +178,7 @@ public class RadialMirrorSettingsGui extends GuiCollapsibleScrollEntry {

 		buttonRadialMirrorEnabled.render(ms, mouseX, mouseY, partialTicks);
 		if (buttonRadialMirrorEnabled.isChecked()) {
-			buttonRadialMirrorEnabled.y = yy;
+			buttonRadialMirrorEnabled.setY(yy);
 			font.draw(ms, "Radial mirror enabled", left + offset, yy + 2, 0xFFFFFF);

 			yy = y + 18;
@@ -198,20 +197,20 @@ public class RadialMirrorSettingsGui extends GuiCollapsibleScrollEntry {
 			textRadialMirrorRadius.y = yy - 3;

 			yy = y + 72;
-			buttonCurrentPosition.y = yy;
-			buttonToggleOdd.y = yy;
-			buttonDrawLines.y = yy;
-			buttonDrawPlanes.y = yy;
+			buttonCurrentPosition.setY(yy);
+			buttonToggleOdd.setY(yy);
+			buttonDrawLines.setY(yy);
+			buttonDrawPlanes.setY(yy);

 			yy = y + 76;
-			buttonRadialMirrorAlternate.y = yy;
+			buttonRadialMirrorAlternate.setY(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;
+			buttonRadialMirrorEnabled.setY(yy);
 			font.draw(ms, "Radial mirror disabled", left + offset, yy + 2, 0x999999);
 		}

--- a/src/main/java/nl/requios/effortlessbuilding/gui/elements/GuiCheckBoxFixed.java
+++ b/src/main/java/nl/requios/effortlessbuilding/gui/elements/GuiCheckBoxFixed.java
@@ -3,8 +3,9 @@ package nl.requios.effortlessbuilding.gui.elements;
 import com.mojang.blaze3d.vertex.PoseStack;
 import net.minecraft.client.Minecraft;
 import net.minecraft.client.gui.components.Button;
-import net.minecraft.network.chat.TextComponent;
-import net.minecraftforge.client.gui.GuiUtils;
+import net.minecraft.network.chat.Component;
+import net.minecraftforge.client.gui.ScreenUtils;
+import net.minecraftforge.client.gui.widget.ExtendedButton;

 import javax.annotation.ParametersAreNonnullByDefault;

@@ -12,13 +13,13 @@ import javax.annotation.ParametersAreNonnullByDefault;
 * This class provides a checkbox style control.
 */
@ParametersAreNonnullByDefault
-public class GuiCheckBoxFixed extends Button {
+public class GuiCheckBoxFixed extends ExtendedButton {
 	private final int boxWidth;
 	private boolean isChecked;

 	public GuiCheckBoxFixed(int xPos, int yPos, String displayString, boolean isChecked) {
-		super(xPos, yPos, Minecraft.getInstance().font.width(displayString) + 2 + 11, 11, new TextComponent(displayString), b -> {
-		});
+		super(xPos, yPos, Minecraft.getInstance().font.width(displayString) + 2 + 11, 11,
+				Component.literal(displayString), b -> {}, DEFAULT_NARRATION);
 		this.isChecked = isChecked;
 		this.boxWidth = 11;
 		this.height = 11;
@@ -29,8 +30,8 @@ public class GuiCheckBoxFixed extends Button {
 	public void renderButton(PoseStack ms, int mouseX, int mouseY, float partial) {
 		if (this.visible) {
 			Minecraft mc = Minecraft.getInstance();
-			this.isHovered = mouseX >= this.x && mouseY >= this.y && mouseX < this.x + this.boxWidth && mouseY < this.y + this.height;
-			GuiUtils.drawContinuousTexturedBox(ms, WIDGETS_LOCATION, this.x, this.y, 0, 46, this.boxWidth, this.height, 200, 20, 2, 3, 2, 2, this.getBlitOffset());
+			this.isHovered = mouseX >= this.getX() && mouseY >= this.getY() && mouseX < this.getX() + this.boxWidth && mouseY < this.getY() + this.height;
+			ScreenUtils.blitWithBorder(ms, WIDGETS_LOCATION, this.getX(), this.getY(), 0, 46, this.boxWidth, this.height, 200, 20, 2, 3, 2, 2, this.getBlitOffset());
 			this.renderBg(ms, mc, mouseX, mouseY);
 			int color = 14737632;

@@ -41,9 +42,9 @@ public class GuiCheckBoxFixed extends Button {
 			}

 			if (this.isChecked)
-				drawCenteredString(ms, mc.font, "x", this.x + this.boxWidth / 2 + 1, this.y + 1, 14737632);
+				drawCenteredString(ms, mc.font, "x", this.getX() + this.boxWidth / 2 + 1, this.getY() + 1, 14737632);

-			drawString(ms, mc.font, getMessage(), this.x + this.boxWidth + 2, this.y + 2, color);
+			drawString(ms, mc.font, getMessage(), this.getX() + this.boxWidth + 2, this.getY() + 2, color);
 		}
 	}

--- a/src/main/java/nl/requios/effortlessbuilding/gui/elements/GuiCollapsibleScrollEntry.java
+++ b/src/main/java/nl/requios/effortlessbuilding/gui/elements/GuiCollapsibleScrollEntry.java
@@ -3,7 +3,7 @@ package nl.requios.effortlessbuilding.gui.elements;
 import com.mojang.blaze3d.vertex.PoseStack;
 import net.minecraft.client.Minecraft;
 import net.minecraft.client.gui.Font;
-import net.minecraft.client.gui.components.Widget;
+import net.minecraft.client.gui.components.Renderable;
 import net.minecraft.client.gui.screens.Screen;
 import net.minecraft.client.gui.components.AbstractWidget;
 import net.minecraftforge.api.distmarker.Dist;
@@ -28,7 +28,7 @@ public abstract class GuiCollapsibleScrollEntry implements GuiScrollPane.IScroll
 	}

 	@Override
-	public void init(List<Widget> renderables) {
+	public void init(List<Renderable> renderables) {
 		left = scrollPane.getWidth() / 2 - 140;
 		right = scrollPane.getWidth() / 2 + 140;
 		top = scrollPane.getHeight() / 2 - 100;
--- a/src/main/java/nl/requios/effortlessbuilding/gui/elements/GuiIconButton.java
+++ b/src/main/java/nl/requios/effortlessbuilding/gui/elements/GuiIconButton.java
@@ -2,14 +2,13 @@ package nl.requios.effortlessbuilding.gui.elements;

 import com.mojang.blaze3d.systems.RenderSystem;
 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.resources.ResourceLocation;
 import net.minecraft.network.chat.Component;
-import net.minecraft.network.chat.TextComponent;
 import net.minecraftforge.api.distmarker.Dist;
 import net.minecraftforge.api.distmarker.OnlyIn;
+import net.minecraftforge.client.gui.widget.ExtendedButton;

 import javax.annotation.ParametersAreNonnullByDefault;
 import java.util.ArrayList;
@@ -18,7 +17,7 @@ import java.util.List;

@OnlyIn(Dist.CLIENT)
@ParametersAreNonnullByDefault
-public class GuiIconButton extends Button {
+public class GuiIconButton extends ExtendedButton {

 	private final ResourceLocation resourceLocation;
 	private final int iconX, iconY, iconWidth, iconHeight, iconAltX, iconAltY;
@@ -30,7 +29,7 @@ public class GuiIconButton extends Button {
 	}

 	public GuiIconButton(int x, int y, int width, int height, int iconX, int iconY, int iconWidth, int iconHeight, int iconAltX, int iconAltY, ResourceLocation resourceLocation, Button.OnPress onPress) {
-		super(x, y, width, height, TextComponent.EMPTY, onPress);
+		super(x, y, width, height, Component.empty(), onPress, DEFAULT_NARRATION);
 		this.iconX = iconX;
 		this.iconY = iconY;
 		this.iconWidth = iconWidth;
@@ -56,7 +55,7 @@ public class GuiIconButton extends Button {
 	public void render(PoseStack ms, int mouseX, int mouseY, float partialTicks) {
 		super.render(ms, mouseX, mouseY, partialTicks);
 		if (this.visible) {
-			this.isHovered = mouseX >= this.x && mouseY >= this.y && mouseX < this.x + this.width && mouseY < this.y + this.height;
+			this.isHovered = mouseX >= this.getX() && mouseY >= this.getY() && mouseX < this.getX() + this.width && mouseY < this.getY() + this.height;
 			RenderSystem.setShaderTexture(0, this.resourceLocation);
 			int currentIconX = this.iconX;
 			int currentIconY = this.iconY;
@@ -67,12 +66,12 @@ public class GuiIconButton extends Button {
 			}

 			//Draws a textured rectangle at the current z-value. Used to be drawTexturedModalRect in Gui.
-			this.blit(ms, this.x, this.y, currentIconX, currentIconY, this.iconWidth, this.iconHeight);
+			this.blit(ms, this.getX(), this.getY(), currentIconX, currentIconY, this.iconWidth, this.iconHeight);
 		}
 	}

 	public void drawTooltip(PoseStack ms, Screen screen, int mouseX, int mouseY) {
-		boolean flag = mouseX >= x && mouseX < x + width && mouseY >= y && mouseY < y + height;
+		boolean flag = mouseX >= this.getX() && mouseX < this.getX() + width && mouseY >= this.getY() && mouseY < this.getY() + height;

 		if (flag) {
 			screen.renderComponentTooltip(ms, tooltip, mouseX - 10, mouseY + 25);
--- a/src/main/java/nl/requios/effortlessbuilding/gui/elements/GuiNumberField.java
+++ b/src/main/java/nl/requios/effortlessbuilding/gui/elements/GuiNumberField.java
@@ -4,18 +4,18 @@ import com.mojang.blaze3d.vertex.PoseStack;
 import net.minecraft.MethodsReturnNonnullByDefault;
 import net.minecraft.client.gui.GuiComponent;
 import net.minecraft.client.gui.Font;
-import net.minecraft.client.gui.components.Widget;
+import net.minecraft.client.gui.components.Renderable;
 import net.minecraft.client.gui.screens.Screen;
 import net.minecraft.client.gui.components.EditBox;
-import net.minecraft.client.gui.components.AbstractWidget;
 import net.minecraft.client.gui.components.Button;
 import net.minecraft.network.chat.Component;
-import net.minecraft.network.chat.TextComponent;
 import net.minecraft.ChatFormatting;
 import net.minecraftforge.api.distmarker.Dist;
 import net.minecraftforge.api.distmarker.OnlyIn;
+import net.minecraftforge.client.gui.widget.ExtendedButton;

 import javax.annotation.ParametersAreNonnullByDefault;
+import java.awt.*;
 import java.text.DecimalFormat;
 import java.text.ParseException;
 import java.util.ArrayList;
@@ -35,21 +35,21 @@ public class GuiNumberField extends GuiComponent {

 	List<Component> tooltip = new ArrayList<>();

-	public GuiNumberField(Font font, List<Widget> renderables, int x, int y, int width, int height) {
+	public GuiNumberField(Font font, List<Renderable> renderables, int x, int y, int width, int height) {
 		this.x = x;
 		this.y = y;
 		this.width = width;
 		this.height = height;

-		textField = new EditBox(font, x + buttonWidth + 1, y + 1, width - 2 * buttonWidth - 2, height - 2, TextComponent.EMPTY);
-		minusButton = new Button(x, y - 1, buttonWidth, height + 2, new TextComponent("-"), button -> {
+		textField = new EditBox(font, x + buttonWidth + 1, y + 1, width - 2 * buttonWidth - 2, height - 2, Component.empty());
+		minusButton = new ExtendedButton(x, y - 1, buttonWidth, height + 2, Component.literal("-"), button -> {
 			float valueChanged = 1f;
 			if (Screen.hasControlDown()) valueChanged = 5f;
 			if (Screen.hasShiftDown()) valueChanged = 10f;

 			setNumber(getNumber() - valueChanged);
 		});
-		plusButton = new Button(x + width - buttonWidth, y - 1, buttonWidth, height + 2, new TextComponent("+"), button -> {
+		plusButton = new ExtendedButton(x + width - buttonWidth, y - 1, buttonWidth, height + 2, Component.literal("+"), button -> {
 			float valueChanged = 1f;
 			if (Screen.hasControlDown()) valueChanged = 5f;
 			if (Screen.hasShiftDown()) valueChanged = 10f;
@@ -99,9 +99,9 @@ public class GuiNumberField extends GuiComponent {
 	}

 	public void drawNumberField(PoseStack ms, int mouseX, int mouseY, float partialTicks) {
-		textField.y = y + 1;
-		minusButton.y = y - 1;
-		plusButton.y = y - 1;
+		textField.setY(y + 1);
+		minusButton.setY(y - 1);
+		plusButton.setY(y - 1);

 		textField.render(ms, mouseX, mouseY, partialTicks);
 		minusButton.render(ms, mouseX, mouseY, partialTicks);
@@ -124,17 +124,17 @@ public class GuiNumberField extends GuiComponent {
 		}

 		if (insideMinusButton) {
-			textLines.add(new TextComponent("Hold ").append(new TextComponent("shift ").withStyle(ChatFormatting.AQUA)).append("for ")
-				.append(new TextComponent("10").withStyle(ChatFormatting.RED)));
-			textLines.add(new TextComponent("Hold ").append(new TextComponent("ctrl ").withStyle(ChatFormatting.AQUA)).append("for ")
-				.append(new TextComponent("5").withStyle(ChatFormatting.RED)));
+			textLines.add(Component.literal("Hold ").append(Component.literal("shift ").withStyle(ChatFormatting.AQUA)).append("for ")
+				.append(Component.literal("10").withStyle(ChatFormatting.RED)));
+			textLines.add(Component.literal("Hold ").append(Component.literal("ctrl ").withStyle(ChatFormatting.AQUA)).append("for ")
+				.append(Component.literal("5").withStyle(ChatFormatting.RED)));
 		}

 		if (insidePlusButton) {
-			textLines.add(new TextComponent("Hold ").append(new TextComponent("shift ").withStyle(ChatFormatting.DARK_GREEN)).append("for ")
-				.append(new TextComponent("10").withStyle(ChatFormatting.RED)));
-			textLines.add(new TextComponent("Hold ").append(new TextComponent("ctrl ").withStyle(ChatFormatting.DARK_GREEN)).append("for ")
-				.append(new TextComponent("5").withStyle(ChatFormatting.RED)));
+			textLines.add(Component.literal("Hold ").append(Component.literal("shift ").withStyle(ChatFormatting.DARK_GREEN)).append("for ")
+				.append(Component.literal("10").withStyle(ChatFormatting.RED)));
+			textLines.add(Component.literal("Hold ").append(Component.literal("ctrl ").withStyle(ChatFormatting.DARK_GREEN)).append("for ")
+				.append(Component.literal("5").withStyle(ChatFormatting.RED)));
 		}

 		screen.renderComponentTooltip(ms, textLines, mouseX - 10, mouseY + 25);
--- a/src/main/java/nl/requios/effortlessbuilding/gui/elements/GuiScrollPane.java
+++ b/src/main/java/nl/requios/effortlessbuilding/gui/elements/GuiScrollPane.java
@@ -6,7 +6,7 @@ import com.mojang.blaze3d.systems.RenderSystem;
 import net.minecraft.MethodsReturnNonnullByDefault;
 import net.minecraft.client.Minecraft;
 import net.minecraft.client.gui.Font;
-import net.minecraft.client.gui.components.Widget;
+import net.minecraft.client.gui.components.Renderable;
 import net.minecraft.client.gui.components.events.GuiEventListener;
 import net.minecraft.client.gui.screens.Screen;
 import net.minecraft.client.gui.components.AbstractWidget;
@@ -398,7 +398,7 @@ public class GuiScrollPane extends SlotGui {
 	}

 	//PASSTHROUGHS
-	public void init(List<Widget> renderables) {
+	public void init(List<Renderable> renderables) {
 		for (IScrollEntry entry : this.listEntries) {
 			entry.init(renderables);
 		}
@@ -436,7 +436,7 @@ public class GuiScrollPane extends SlotGui {
 	}

 	public interface IScrollEntry {
-		void init(List<Widget> renderables);
+		void init(List<Renderable> renderables);

 		void updateScreen();

--- a/src/main/java/nl/requios/effortlessbuilding/gui/elements/SlotGui.java
+++ b/src/main/java/nl/requios/effortlessbuilding/gui/elements/SlotGui.java
@@ -6,7 +6,7 @@ import net.minecraft.MethodsReturnNonnullByDefault;
 import net.minecraft.client.Minecraft;
 import net.minecraft.client.gui.components.events.AbstractContainerEventHandler;
 import net.minecraft.client.gui.components.events.GuiEventListener;
-import net.minecraft.client.gui.components.Widget;
+import net.minecraft.client.gui.components.Renderable;
 import net.minecraft.util.Mth;
 import net.minecraftforge.api.distmarker.Dist;
 import net.minecraftforge.api.distmarker.OnlyIn;
@@ -19,7 +19,7 @@ import java.util.List;
@ParametersAreNonnullByDefault
@MethodsReturnNonnullByDefault
@SuppressWarnings("deprecation")
-public abstract class SlotGui extends AbstractContainerEventHandler implements Widget {
+public abstract class SlotGui extends AbstractContainerEventHandler implements Renderable {
 	protected final Minecraft minecraft;
 	protected final int itemHeight;
 	protected int width;
--- a/src/main/java/nl/requios/effortlessbuilding/helper/SurvivalHelper.java
+++ b/src/main/java/nl/requios/effortlessbuilding/helper/SurvivalHelper.java
@@ -1,38 +1,34 @@
 package nl.requios.effortlessbuilding.helper;

 import net.minecraft.advancements.CriteriaTriggers;
+import net.minecraft.core.BlockPos;
+import net.minecraft.core.Direction;
 import net.minecraft.core.Registry;
-import net.minecraft.resources.ResourceLocation;
+import net.minecraft.core.registries.Registries;
+import net.minecraft.server.level.ServerPlayer;
+import net.minecraft.sounds.SoundSource;
 import net.minecraft.tags.BlockTags;
-import net.minecraft.tags.Tag;
-import net.minecraft.world.level.material.Material;
+import net.minecraft.world.InteractionHand;
 import net.minecraft.world.entity.Entity;
 import net.minecraft.world.entity.player.Player;
-import net.minecraft.server.level.ServerPlayer;
 import net.minecraft.world.item.BlockItem;
 import net.minecraft.world.item.ItemStack;
-import net.minecraft.world.level.block.state.pattern.BlockInWorld;
-import net.minecraft.core.Direction;
-import net.minecraft.world.InteractionHand;
-import net.minecraft.sounds.SoundSource;
-import net.minecraft.core.BlockPos;
-import net.minecraft.world.phys.shapes.VoxelShape;
-import net.minecraft.world.phys.Vec3;
 import net.minecraft.world.level.Level;
-import net.minecraftforge.common.data.ForgeBlockTagsProvider;
-import net.minecraftforge.event.ForgeEventFactory;
-import nl.requios.effortlessbuilding.BuildConfig;
-import nl.requios.effortlessbuilding.buildmodifier.ModifierSettingsManager;
-import nl.requios.effortlessbuilding.compatibility.CompatHelper;
-
-import javax.annotation.Nonnull;
-import javax.annotation.Nullable;
-
 import net.minecraft.world.level.block.Block;
 import net.minecraft.world.level.block.Blocks;
 import net.minecraft.world.level.block.SlabBlock;
 import net.minecraft.world.level.block.SoundType;
 import net.minecraft.world.level.block.state.BlockState;
+import net.minecraft.world.level.block.state.pattern.BlockInWorld;
+import net.minecraft.world.level.material.Material;
+import net.minecraft.world.phys.Vec3;
+import net.minecraft.world.phys.shapes.VoxelShape;
+import net.minecraftforge.event.ForgeEventFactory;
+import nl.requios.effortlessbuilding.BuildConfig;
+import nl.requios.effortlessbuilding.buildmodifier.ModifierSettingsManager;
+import nl.requios.effortlessbuilding.compatibility.CompatHelper;
+
+import javax.annotation.Nullable;

 public class SurvivalHelper {

@@ -244,7 +240,8 @@ public class SurvivalHelper {
 		} else {
 			//Adventure mode
 			BlockInWorld blockinworld = new BlockInWorld(world, pos, false);
-			return stack.hasAdventureModePlaceTagForBlock(world.registryAccess().registryOrThrow(Registry.BLOCK_REGISTRY), blockinworld);
+			Registry<Block> registry = world.registryAccess().registryOrThrow(Registries.BLOCK);
+			return stack.hasAdventureModePlaceTagForBlock(registry, blockinworld);
 		}
 	}

--- a/src/main/java/nl/requios/effortlessbuilding/item/AbstractRandomizerBagItem.java
+++ b/src/main/java/nl/requios/effortlessbuilding/item/AbstractRandomizerBagItem.java
@@ -17,7 +17,6 @@ import net.minecraft.core.BlockPos;
 import net.minecraft.world.phys.BlockHitResult;
 import net.minecraft.world.phys.Vec3;
 import net.minecraft.network.chat.Component;
-import net.minecraft.network.chat.TextComponent;
 import net.minecraft.ChatFormatting;
 import net.minecraft.world.level.Level;
 import net.minecraftforge.common.capabilities.ICapabilityProvider;
@@ -51,7 +50,7 @@ public abstract class AbstractRandomizerBagItem extends Item {
    private static final Random rand = new Random(currentSeed);

    public AbstractRandomizerBagItem() {
-        super(new Item.Properties().tab(CreativeModeTab.TAB_TOOLS).stacksTo(1));
+        super(new Item.Properties().stacksTo(1));
    }

    public abstract int getInventorySize();
@@ -130,7 +129,7 @@ public abstract class AbstractRandomizerBagItem extends Item {
        if (ctx.getPlayer() != null && ctx.getPlayer().isShiftKeyDown()) { //ctx.isPlacerSneaking()
            if (world.isClientSide) return InteractionResult.SUCCESS;
            //Open inventory
-            NetworkHooks.openGui((ServerPlayer) player, getContainerProvider(item));
+            NetworkHooks.openScreen((ServerPlayer) player, getContainerProvider(item));
        } else {
            if (world.isClientSide) return InteractionResult.SUCCESS;

@@ -183,7 +182,7 @@ public abstract class AbstractRandomizerBagItem extends Item {
        if (player.isShiftKeyDown()) {
            if (world.isClientSide) return new InteractionResultHolder<>(InteractionResult.SUCCESS, bag);
            //Open inventory
-            NetworkHooks.openGui((ServerPlayer) player, getContainerProvider(bag));
+            NetworkHooks.openScreen((ServerPlayer) player, getContainerProvider(bag));
        } else {
            //Use item
            //Get bag inventory
@@ -212,15 +211,10 @@ public abstract class AbstractRandomizerBagItem extends Item {

    @Override
    public void appendHoverText(ItemStack stack, @Nullable Level world, List<Component> tooltip, TooltipFlag flag) {
-        tooltip.add(new TextComponent(ChatFormatting.BLUE + "Rightclick" + ChatFormatting.GRAY + " to place a random block"));
-        tooltip.add(new TextComponent(ChatFormatting.BLUE + "Sneak + rightclick" + ChatFormatting.GRAY + " to open inventory"));
+        tooltip.add(Component.literal(ChatFormatting.BLUE + "Rightclick" + ChatFormatting.GRAY + " to place a random block"));
+        tooltip.add(Component.literal(ChatFormatting.BLUE + "Sneak + rightclick" + ChatFormatting.GRAY + " to open inventory"));
        if (world != null && world.players().size() > 1) {
-            tooltip.add(new TextComponent(ChatFormatting.YELLOW + "Experimental on servers: may lose inventory"));
+            tooltip.add(Component.literal(ChatFormatting.YELLOW + "Experimental on servers: may lose inventory"));
        }
    }
-
-    @Override
-    public String getDescriptionId() {
-        return this.getRegistryName().toString();
-    }
 }
--- a/src/main/java/nl/requios/effortlessbuilding/item/DiamondRandomizerBagItem.java
+++ b/src/main/java/nl/requios/effortlessbuilding/item/DiamondRandomizerBagItem.java
@@ -1,7 +1,6 @@
 package nl.requios.effortlessbuilding.item;

 import net.minecraft.network.chat.Component;
-import net.minecraft.network.chat.TranslatableComponent;
 import net.minecraft.world.MenuProvider;
 import net.minecraft.world.entity.player.Inventory;
 import net.minecraft.world.entity.player.Player;
@@ -34,7 +33,7 @@ public class DiamondRandomizerBagItem extends AbstractRandomizerBagItem{

        @Override
        public Component getDisplayName() {
-            return new TranslatableComponent("effortlessbuilding:diamond_randomizer_bag");
+            return Component.translatable("item.effortlessbuilding.diamond_randomizer_bag");
        }

        @Nullable
--- a/src/main/java/nl/requios/effortlessbuilding/item/GoldenRandomizerBagItem.java
+++ b/src/main/java/nl/requios/effortlessbuilding/item/GoldenRandomizerBagItem.java
@@ -1,7 +1,6 @@
 package nl.requios.effortlessbuilding.item;

 import net.minecraft.network.chat.Component;
-import net.minecraft.network.chat.TranslatableComponent;
 import net.minecraft.world.MenuProvider;
 import net.minecraft.world.entity.player.Inventory;
 import net.minecraft.world.entity.player.Player;
@@ -34,7 +33,7 @@ public class GoldenRandomizerBagItem extends AbstractRandomizerBagItem{

        @Override
        public Component getDisplayName() {
-            return new TranslatableComponent("effortlessbuilding:golden_randomizer_bag");
+            return Component.translatable("item.effortlessbuilding.golden_randomizer_bag");
        }

        @Nullable
--- a/src/main/java/nl/requios/effortlessbuilding/item/RandomizerBagItem.java
+++ b/src/main/java/nl/requios/effortlessbuilding/item/RandomizerBagItem.java
@@ -1,7 +1,6 @@
 package nl.requios.effortlessbuilding.item;

 import net.minecraft.network.chat.Component;
-import net.minecraft.network.chat.TranslatableComponent;
 import net.minecraft.world.MenuProvider;
 import net.minecraft.world.entity.player.Inventory;
 import net.minecraft.world.entity.player.Player;
@@ -34,7 +33,7 @@ public class RandomizerBagItem extends AbstractRandomizerBagItem {

 		@Override
 		public Component getDisplayName() {
-			return new TranslatableComponent("effortlessbuilding:randomizer_bag");
+			return Component.translatable("item.effortlessbuilding.randomizer_bag");
 		}

 		@Nullable
--- a/src/main/java/nl/requios/effortlessbuilding/item/ReachUpgrade1Item.java
+++ b/src/main/java/nl/requios/effortlessbuilding/item/ReachUpgrade1Item.java
@@ -7,7 +7,6 @@ import net.minecraft.world.item.Item;
 import net.minecraft.world.item.CreativeModeTab;
 import net.minecraft.world.item.ItemStack;
 import net.minecraft.network.chat.Component;
-import net.minecraft.network.chat.TextComponent;
 import net.minecraft.ChatFormatting;
 import net.minecraft.world.level.Level;
 import nl.requios.effortlessbuilding.BuildConfig;
@@ -30,7 +29,7 @@ import net.minecraft.world.InteractionResultHolder;
 public class ReachUpgrade1Item extends Item {

 	public ReachUpgrade1Item() {
-		super(new Item.Properties().tab(CreativeModeTab.TAB_TOOLS).stacksTo(1));
+		super(new Item.Properties().stacksTo(1));
 	}

 	@Override
@@ -49,14 +48,14 @@ public class ReachUpgrade1Item extends Item {
 			if (world.isClientSide) EffortlessBuilding.log(player, "Upgraded reach to " + ReachHelper.getMaxReach(player));
 			player.setItemInHand(hand, ItemStack.EMPTY);

-			SoundEvent soundEvent = new SoundEvent(new ResourceLocation("entity.player.levelup"));
+			SoundEvent soundEvent = SoundEvent.createVariableRangeEvent(new ResourceLocation("entity.player.levelup"));
 			player.playSound(soundEvent, 1f, 1f);
 		} else if (currentLevel > 0) {
 			if (world.isClientSide)
 				EffortlessBuilding.log(player, "Already used this upgrade! Current reach is " + ReachHelper
 					.getMaxReach(player) + ".");

-			SoundEvent soundEvent = new SoundEvent(new ResourceLocation("item.armor.equip_leather"));
+			SoundEvent soundEvent = SoundEvent.createVariableRangeEvent(new ResourceLocation("item.armor.equip_leather"));
 			player.playSound(soundEvent, 1f, 1f);
 		}
 		return new InteractionResultHolder<>(InteractionResult.PASS, player.getItemInHand(hand));
@@ -64,11 +63,7 @@ public class ReachUpgrade1Item extends Item {

 	@Override
 	public void appendHoverText(ItemStack stack, @Nullable Level world, List<Component> tooltip, TooltipFlag flag) {
-		tooltip.add(new TextComponent(ChatFormatting.GRAY + "Consume to increase reach to " + ChatFormatting.BLUE + BuildConfig.reach.maxReachLevel1.get()));
+		tooltip.add(Component.literal(ChatFormatting.GRAY + "Consume to increase reach to " + ChatFormatting.BLUE + BuildConfig.reach.maxReachLevel1.get()));
 	}

-	@Override
-	public String getDescriptionId() {
-		return this.getRegistryName().toString();
-	}
 }
--- a/src/main/java/nl/requios/effortlessbuilding/item/ReachUpgrade2Item.java
+++ b/src/main/java/nl/requios/effortlessbuilding/item/ReachUpgrade2Item.java
@@ -7,7 +7,6 @@ import net.minecraft.world.item.Item;
 import net.minecraft.world.item.CreativeModeTab;
 import net.minecraft.world.item.ItemStack;
 import net.minecraft.network.chat.Component;
-import net.minecraft.network.chat.TextComponent;
 import net.minecraft.ChatFormatting;
 import net.minecraft.world.level.Level;
 import nl.requios.effortlessbuilding.BuildConfig;
@@ -17,6 +16,7 @@ import nl.requios.effortlessbuilding.helper.ReachHelper;

 import javax.annotation.Nullable;
 import javax.annotation.ParametersAreNonnullByDefault;
+import java.awt.*;
 import java.util.List;

 import net.minecraft.resources.ResourceLocation;
@@ -30,7 +30,7 @@ import net.minecraft.world.InteractionResultHolder;
 public class ReachUpgrade2Item extends Item {

 	public ReachUpgrade2Item() {
-		super(new Item.Properties().tab(CreativeModeTab.TAB_TOOLS).stacksTo(1));
+		super(new Item.Properties().stacksTo(1));
 	}

 	@Override
@@ -48,19 +48,19 @@ public class ReachUpgrade2Item extends Item {
 			if (world.isClientSide) EffortlessBuilding.log(player, "Upgraded reach to " + ReachHelper.getMaxReach(player));
 			player.setItemInHand(hand, ItemStack.EMPTY);

-			SoundEvent soundEvent = new SoundEvent(new ResourceLocation("entity.player.levelup"));
+			SoundEvent soundEvent = SoundEvent.createVariableRangeEvent(new ResourceLocation("entity.player.levelup"));
 			player.playSound(soundEvent, 1f, 1f);
 		} else if (currentLevel < 1) {
 			if (world.isClientSide) EffortlessBuilding.log(player, "Use Reach Upgrade 1 first.");

-			SoundEvent soundEvent = new SoundEvent(new ResourceLocation("item.armor.equip_leather"));
+			SoundEvent soundEvent = SoundEvent.createVariableRangeEvent(new ResourceLocation("item.armor.equip_leather"));
 			player.playSound(soundEvent, 1f, 1f);
 		} else if (currentLevel > 1) {
 			if (world.isClientSide)
 				EffortlessBuilding.log(player, "Already used this upgrade! Current reach is " + ReachHelper
 					.getMaxReach(player) + ".");

-			SoundEvent soundEvent = new SoundEvent(new ResourceLocation("item.armor.equip_leather"));
+			SoundEvent soundEvent = SoundEvent.createVariableRangeEvent(new ResourceLocation("item.armor.equip_leather"));
 			player.playSound(soundEvent, 1f, 1f);
 		}
 		return new InteractionResultHolder<>(InteractionResult.PASS, player.getItemInHand(hand));
@@ -68,12 +68,7 @@ public class ReachUpgrade2Item extends Item {

 	@Override
 	public void appendHoverText(ItemStack stack, @Nullable Level world, List<Component> tooltip, TooltipFlag flag) {
-		tooltip.add(new TextComponent(ChatFormatting.GRAY + "Consume to increase reach to " + ChatFormatting.BLUE + BuildConfig.reach.maxReachLevel2.get()));
-		tooltip.add(new TextComponent(ChatFormatting.GRAY + "Previous upgrades need to be consumed first"));
-	}
-
-	@Override
-	public String getDescriptionId() {
-		return this.getRegistryName().toString();
+		tooltip.add(Component.literal(ChatFormatting.GRAY + "Consume to increase reach to " + ChatFormatting.BLUE + BuildConfig.reach.maxReachLevel2.get()));
+		tooltip.add(Component.literal(ChatFormatting.GRAY + "Previous upgrades need to be consumed first"));
 	}
 }
--- a/src/main/java/nl/requios/effortlessbuilding/item/ReachUpgrade3Item.java
+++ b/src/main/java/nl/requios/effortlessbuilding/item/ReachUpgrade3Item.java
@@ -7,7 +7,6 @@ import net.minecraft.world.item.Item;
 import net.minecraft.world.item.CreativeModeTab;
 import net.minecraft.world.item.ItemStack;
 import net.minecraft.network.chat.Component;
-import net.minecraft.network.chat.TextComponent;
 import net.minecraft.ChatFormatting;
 import net.minecraft.world.level.Level;
 import nl.requios.effortlessbuilding.BuildConfig;
@@ -30,7 +29,7 @@ import net.minecraft.world.InteractionResultHolder;
 public class ReachUpgrade3Item extends Item {

 	public ReachUpgrade3Item() {
-		super(new Item.Properties().tab(CreativeModeTab.TAB_TOOLS).stacksTo(1));
+		super(new Item.Properties().stacksTo(1));
 	}

 	@Override
@@ -48,7 +47,7 @@ public class ReachUpgrade3Item extends Item {
 			if (world.isClientSide) EffortlessBuilding.log(player, "Upgraded reach to " + ReachHelper.getMaxReach(player));
 			player.setItemInHand(hand, ItemStack.EMPTY);

-			SoundEvent soundEvent = new SoundEvent(new ResourceLocation("entity.player.levelup"));
+			SoundEvent soundEvent = SoundEvent.createVariableRangeEvent(new ResourceLocation("entity.player.levelup"));
 			player.playSound(soundEvent, 1f, 1f);
 		} else if (currentLevel < 2) {
 			if (currentLevel == 0)
@@ -56,14 +55,14 @@ public class ReachUpgrade3Item extends Item {
 			if (currentLevel == 1)
 				if (world.isClientSide) EffortlessBuilding.log(player, "Use Reach Upgrade 2 first.");

-			SoundEvent soundEvent = new SoundEvent(new ResourceLocation("item.armor.equip_leather"));
+			SoundEvent soundEvent = SoundEvent.createVariableRangeEvent(new ResourceLocation("item.armor.equip_leather"));
 			player.playSound(soundEvent, 1f, 1f);
 		} else if (currentLevel > 2) {
 			if (world.isClientSide)
 				EffortlessBuilding.log(player, "Already used this upgrade! Current reach is " + ReachHelper
 					.getMaxReach(player) + ".");

-			SoundEvent soundEvent = new SoundEvent(new ResourceLocation("item.armor.equip_leather"));
+			SoundEvent soundEvent = SoundEvent.createVariableRangeEvent(new ResourceLocation("item.armor.equip_leather"));
 			player.playSound(soundEvent, 1f, 1f);
 		}
 		return new InteractionResultHolder<>(InteractionResult.PASS, player.getItemInHand(hand));
@@ -71,12 +70,8 @@ public class ReachUpgrade3Item extends Item {

 	@Override
 	public void appendHoverText(ItemStack stack, @Nullable Level world, List<Component> tooltip, TooltipFlag flag) {
-		tooltip.add(new TextComponent(ChatFormatting.GRAY + "Consume to increase reach to " + ChatFormatting.BLUE + BuildConfig.reach.maxReachLevel3.get()));
-		tooltip.add(new TextComponent(ChatFormatting.GRAY + "Previous upgrades need to be consumed first"));
+		tooltip.add(Component.literal(ChatFormatting.GRAY + "Consume to increase reach to " + ChatFormatting.BLUE + BuildConfig.reach.maxReachLevel3.get()));
+		tooltip.add(Component.literal(ChatFormatting.GRAY + "Previous upgrades need to be consumed first"));
 	}

-	@Override
-	public String getDescriptionId() {
-		return this.getRegistryName().toString();
-	}
 }
--- a/src/main/java/nl/requios/effortlessbuilding/proxy/ClientProxy.java
+++ b/src/main/java/nl/requios/effortlessbuilding/proxy/ClientProxy.java
@@ -23,9 +23,9 @@ import net.minecraft.world.phys.Vec3;
 import net.minecraft.ChatFormatting;
 import net.minecraft.world.level.Level;
 import net.minecraftforge.api.distmarker.Dist;
-import net.minecraftforge.client.ClientRegistry;
-import net.minecraftforge.client.event.ScreenOpenEvent;
 import net.minecraftforge.client.event.InputEvent;
+import net.minecraftforge.client.event.RegisterKeyMappingsEvent;
+import net.minecraftforge.client.event.ScreenEvent;
 import net.minecraftforge.client.settings.KeyConflictContext;
 import net.minecraftforge.client.settings.KeyModifier;
 import net.minecraftforge.event.TickEvent;
@@ -71,21 +71,7 @@ public class ClientProxy implements IProxy {

 	@Override
 	public void clientSetup(FMLClientSetupEvent event) {
-		// register key bindings
-		keyBindings = new KeyMapping[6];
-
-		// instantiate the key bindings
-		keyBindings[0] = new KeyMapping("key.effortlessbuilding.hud.desc", KeyConflictContext.UNIVERSAL, 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.mode.desc", KeyConflictContext.IN_GAME, InputConstants.getKey(GLFW.GLFW_KEY_LEFT_ALT, 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.redo.desc", KeyConflictContext.IN_GAME, KeyModifier.CONTROL, InputConstants.getKey(GLFW.GLFW_KEY_Y, 0), "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");
-
-		// register all the key bindings
-		for (KeyMapping keyBinding : keyBindings) {
-			ClientRegistry.registerKeyBinding(keyBinding);
-		}
+		//Keybindings are setup and registered in ModClientEventHandler

 		MenuScreens.register(EffortlessBuilding.RANDOMIZER_BAG_CONTAINER.get(), RandomizerBagScreen::new);
 		MenuScreens.register(EffortlessBuilding.GOLDEN_RANDOMIZER_BAG_CONTAINER.get(), GoldenRandomizerBagScreen::new);
@@ -226,7 +212,7 @@ public class ClientProxy implements IProxy {
 	}

 	@SubscribeEvent(receiveCanceled = true)
-	public static void onKeyPress(InputEvent.KeyInputEvent event) {
+	public static void onKeyPress(InputEvent.Key event) {
 		LocalPlayer player = Minecraft.getInstance().player;
 		if (player == null)
 			return;
@@ -310,7 +296,7 @@ public class ClientProxy implements IProxy {
 	}

 	@SubscribeEvent
-	public static void onGuiOpen(ScreenOpenEvent event) {
+	public static void onGuiOpen(ScreenEvent event) {
 		Player player = Minecraft.getInstance().player;
 		if (player != null) {
 			BuildModes.initializeMode(player);
--- a/src/main/java/nl/requios/effortlessbuilding/render/BlockPreviewRenderer.java
+++ b/src/main/java/nl/requios/effortlessbuilding/render/BlockPreviewRenderer.java
@@ -241,6 +241,7 @@ public class BlockPreviewRenderer {
 			VertexConsumer buffer = RenderHandler.beginLines(renderTypeBuffer);
 			HitResult objectMouseOver = Minecraft.getInstance().hitResult;
 			HitResult breakingRaytrace = ReachHelper.canBreakFar(player) ? lookingAt : objectMouseOver;
+
 			if (player.isCreative() && noBlockInHand && breakingRaytrace != null && breakingRaytrace.getType() == HitResult.Type.BLOCK) {
 				BlockHitResult blockBreakingRaytrace = (BlockHitResult) breakingRaytrace;
 				List<BlockPos> breakCoordinates = BuildModifiers.findCoordinates(player, blockBreakingRaytrace.getBlockPos());
--- a/src/main/java/nl/requios/effortlessbuilding/render/BuildRenderTypes.java
+++ b/src/main/java/nl/requios/effortlessbuilding/render/BuildRenderTypes.java
@@ -2,24 +2,18 @@ package nl.requios.effortlessbuilding.render;

 import com.mojang.blaze3d.shaders.Uniform;
 import com.mojang.blaze3d.systems.RenderSystem;
+import com.mojang.blaze3d.vertex.DefaultVertexFormat;
 import com.mojang.blaze3d.vertex.VertexFormat;
-import net.minecraft.Util;
-import net.minecraft.client.Minecraft;
 import net.minecraft.client.renderer.RenderStateShard;
 import net.minecraft.client.renderer.RenderType;
 import net.minecraft.client.renderer.ShaderInstance;
-import net.minecraft.client.renderer.texture.TextureAtlas;
-import com.mojang.blaze3d.vertex.DefaultVertexFormat;
 import net.minecraft.core.BlockPos;
 import net.minecraft.resources.ResourceLocation;
 import net.minecraft.world.phys.Vec3;
-import nl.requios.effortlessbuilding.BuildConfig;
 import nl.requios.effortlessbuilding.EffortlessBuilding;
-import org.lwjgl.opengl.*;

 import java.util.OptionalDouble;
-import java.util.function.Consumer;
-import java.util.function.Function;
+

 public class BuildRenderTypes extends RenderType {
 	public static ResourceLocation shaderMaskTextureLocation = new ResourceLocation(EffortlessBuilding.MODID, "textures/shader_mask.png");
--- a/src/main/java/nl/requios/effortlessbuilding/render/ModifierRenderer.java
+++ b/src/main/java/nl/requios/effortlessbuilding/render/ModifierRenderer.java
@@ -3,13 +3,13 @@ package nl.requios.effortlessbuilding.render;
 import com.mojang.blaze3d.vertex.PoseStack;
 import com.mojang.blaze3d.vertex.VertexConsumer;
 import net.minecraft.client.renderer.MultiBufferSource;
-import com.mojang.math.Matrix4f;
 import net.minecraft.world.phys.Vec3;
 import net.minecraftforge.api.distmarker.Dist;
 import net.minecraftforge.api.distmarker.OnlyIn;
 import nl.requios.effortlessbuilding.buildmodifier.Mirror;
 import nl.requios.effortlessbuilding.buildmodifier.ModifierSettingsManager;
 import nl.requios.effortlessbuilding.buildmodifier.RadialMirror;
+import org.joml.Matrix4f;

 import java.awt.*;

--- a/src/main/java/nl/requios/effortlessbuilding/render/RenderHandler.java
+++ b/src/main/java/nl/requios/effortlessbuilding/render/RenderHandler.java
@@ -19,8 +19,8 @@ import net.minecraft.world.phys.AABB;
 import net.minecraft.world.phys.Vec3;
 import net.minecraft.world.phys.shapes.VoxelShape;
 import net.minecraftforge.api.distmarker.Dist;
-import net.minecraftforge.client.event.RenderLevelLastEvent;
-import net.minecraftforge.client.model.data.EmptyModelData;
+import net.minecraftforge.client.event.RenderLevelStageEvent;
+import net.minecraftforge.client.model.data.ModelData;
 import net.minecraftforge.eventbus.api.EventPriority;
 import net.minecraftforge.eventbus.api.SubscribeEvent;
 import net.minecraftforge.fml.common.Mod;
@@ -28,6 +28,8 @@ import nl.requios.effortlessbuilding.EffortlessBuilding;
 import nl.requios.effortlessbuilding.buildmode.ModeSettingsManager;
 import nl.requios.effortlessbuilding.buildmodifier.ModifierSettingsManager;

+import static net.minecraftforge.client.event.RenderLevelStageEvent.Stage.AFTER_PARTICLES;
+
 /***
 * Main render class for Effortless Building
 */
@@ -35,8 +37,8 @@ import nl.requios.effortlessbuilding.buildmodifier.ModifierSettingsManager;
 public class RenderHandler {

 	@SubscribeEvent
-	public static void onRender(RenderLevelLastEvent event) {
-		if (event.getPhase() != EventPriority.NORMAL)
+	public static void onRender(RenderLevelStageEvent event) {
+		if (event.getPhase() != EventPriority.NORMAL || event.getStage() != AFTER_PARTICLES)
 			return;

 		PoseStack matrixStack = event.getPoseStack();
@@ -91,15 +93,10 @@ public class RenderHandler {
 		RenderType blockPreviewRenderType = BuildRenderTypes.getBlockPreviewRenderType(dissolve, blockPos, firstPos, secondPos, red);
 		VertexConsumer buffer = renderTypeBuffer.getBuffer(blockPreviewRenderType);

-//        MinecraftServer server = Minecraft.getInstance().getIntegratedServer();
-//        World world = DimensionManager.getWorld(server, DimensionType.OVERWORLD, false, true);
-
 		try {
 			BakedModel model = dispatcher.getBlockModel(blockState);
 			dispatcher.getModelRenderer().renderModel(matrixStack.last(), buffer, blockState, model,
-					1f, 1f, 1f, 0, OverlayTexture.NO_OVERLAY, EmptyModelData.INSTANCE);
-//        blockRendererDispatcher.getBlockModelRenderer().renderModel(world, blockRendererDispatcher.getModelForState(blockState),
-//                blockState, logicPos, matrixStack, renderTypeBuffer.getBuffer(renderType), true, new Random(), blockState.getPositionRandom(logicPos), i);
+					1f, 1f, 1f, 0, OverlayTexture.NO_OVERLAY, ModelData.EMPTY, blockPreviewRenderType);
 		} catch (NullPointerException e) {
 			EffortlessBuilding.logger.warn("RenderHandler::renderBlockPreview cannot render " + blockState.getBlock().toString());

--- a/src/main/resources/META-INF/mods.toml
+++ b/src/main/resources/META-INF/mods.toml
@@ -1,6 +1,6 @@
 modLoader="javafml"
 # Forge for 1.17.1 is version 37
-loaderVersion="[39,)"
+loaderVersion="[41,)"
 license="GNU LESSER GENERAL PUBLIC LICENSE"
 issueTrackerURL="https://bitbucket.org/Requios/effortless-building/issues?status=new&status=open"
 showAsResourcePack=false
@@ -20,13 +20,13 @@ Makes building easier by providing tools like mirrors, arrays, build modes and a
 [[dependencies.effortlessbuilding]]
    modId="forge"
    mandatory=true
-    versionRange="[39,)"
+    versionRange="[41,)"
    ordering="NONE"
    side="BOTH"

 [[dependencies.effortlessbuilding]]
    modId="minecraft"
    mandatory=true
-    versionRange="[1.18.1,1.19)"
+    versionRange="[1.18.1,1.20)"
    ordering="NONE"
    side="BOTH"
--- a/src/main/resources/assets/effortlessbuilding/lang/en_us.json
+++ b/src/main/resources/assets/effortlessbuilding/lang/en_us.json
@@ -11,12 +11,12 @@
    "key.effortlessbuilding.redo.desc": "Redo",
    "key.effortlessbuilding.altplacement.desc": "Alternative placement",

-    "effortlessbuilding:randomizer_bag": "Leather Randomizer Bag",
-    "effortlessbuilding:golden_randomizer_bag": "Golden Randomizer Bag",
-    "effortlessbuilding:diamond_randomizer_bag": "Diamond Randomizer Bag",
-    "effortlessbuilding:reach_upgrade1": "Reach Upgrade 1",
-    "effortlessbuilding:reach_upgrade2": "Reach Upgrade 2",
-    "effortlessbuilding:reach_upgrade3": "Reach Upgrade 3",
+    "item.effortlessbuilding.randomizer_bag": "Leather Randomizer Bag",
+    "item.effortlessbuilding.golden_randomizer_bag": "Golden Randomizer Bag",
+    "item.effortlessbuilding.diamond_randomizer_bag": "Diamond Randomizer Bag",
+    "item.effortlessbuilding.reach_upgrade1": "Reach Upgrade 1",
+    "item.effortlessbuilding.reach_upgrade2": "Reach Upgrade 2",
+    "item.effortlessbuilding.reach_upgrade3": "Reach Upgrade 3",

    "effortlessbuilding.mode.normal": "Disable",
    "effortlessbuilding.mode.normal_plus": "Single",
--- a/src/main/resources/assets/effortlessbuilding/models/item/diamond_randomizer_bag.json
+++ b/src/main/resources/assets/effortlessbuilding/models/item/diamond_randomizer_bag.json
@@ -1,6 +1,6 @@
 {
    "parent": "item/generated",
    "textures": {
-        "layer0": "effortlessbuilding:items/diamondrandomizerbag"
+        "layer0": "effortlessbuilding:item/diamondrandomizerbag"
    }
 }
--- a/src/main/resources/assets/effortlessbuilding/models/item/golden_randomizer_bag.json
+++ b/src/main/resources/assets/effortlessbuilding/models/item/golden_randomizer_bag.json
@@ -1,6 +1,6 @@
 {
    "parent": "item/generated",
    "textures": {
-        "layer0": "effortlessbuilding:items/goldenrandomizerbag"
+        "layer0": "effortlessbuilding:item/goldenrandomizerbag"
    }
 }
--- a/src/main/resources/assets/effortlessbuilding/models/item/randomizer_bag.json
+++ b/src/main/resources/assets/effortlessbuilding/models/item/randomizer_bag.json
@@ -1,6 +1,6 @@
 {
    "parent": "item/generated",
    "textures": {
-        "layer0": "effortlessbuilding:items/randomizerbag"
+        "layer0": "effortlessbuilding:item/randomizerbag"
    }
 }
--- a/src/main/resources/assets/effortlessbuilding/models/item/reach_upgrade1.json
+++ b/src/main/resources/assets/effortlessbuilding/models/item/reach_upgrade1.json
@@ -1,6 +1,6 @@
 {
    "parent": "item/generated",
    "textures": {
-        "layer0": "effortlessbuilding:items/reachupgrade1"
+        "layer0": "effortlessbuilding:item/reachupgrade1"
    }
 }
--- a/src/main/resources/assets/effortlessbuilding/models/item/reach_upgrade2.json
+++ b/src/main/resources/assets/effortlessbuilding/models/item/reach_upgrade2.json
@@ -1,6 +1,6 @@
 {
    "parent": "item/generated",
    "textures": {
-        "layer0": "effortlessbuilding:items/reachupgrade2"
+        "layer0": "effortlessbuilding:item/reachupgrade2"
    }
 }
--- a/src/main/resources/assets/effortlessbuilding/models/item/reach_upgrade3.json
+++ b/src/main/resources/assets/effortlessbuilding/models/item/reach_upgrade3.json
@@ -1,6 +1,6 @@
 {
    "parent": "item/generated",
    "textures": {
-        "layer0": "effortlessbuilding:items/reachupgrade3"
+        "layer0": "effortlessbuilding:item/reachupgrade3"
    }
 }
--- a/src/main/resources/assets/effortlessbuilding/textures/items/diamondrandomizerbag.png
+++ b/src/main/resources/assets/effortlessbuilding/textures/items/diamondrandomizerbag.png
--- a/src/main/resources/assets/effortlessbuilding/textures/items/goldenrandomizerbag.png
+++ b/src/main/resources/assets/effortlessbuilding/textures/items/goldenrandomizerbag.png
--- a/src/main/resources/assets/effortlessbuilding/textures/items/randomizerbag.png
+++ b/src/main/resources/assets/effortlessbuilding/textures/items/randomizerbag.png
--- a/src/main/resources/assets/effortlessbuilding/textures/items/reachupgrade1.png
+++ b/src/main/resources/assets/effortlessbuilding/textures/items/reachupgrade1.png
--- a/src/main/resources/assets/effortlessbuilding/textures/items/reachupgrade2.png
+++ b/src/main/resources/assets/effortlessbuilding/textures/items/reachupgrade2.png
--- a/src/main/resources/assets/effortlessbuilding/textures/items/reachupgrade3.png
+++ b/src/main/resources/assets/effortlessbuilding/textures/items/reachupgrade3.png
Author	SHA1	Message	Date
Christian	028976577c	Bumped version number	2023-01-28 22:36:10 +01:00
Christian	4114f89584	Disabled capability logs. Using build mode enum name to get icon.	2023-01-28 22:10:02 +01:00
Christian Knaapen	292f362092	Updated to 1.19.3. Item textures must be in 'textures/item' instead of 'textures/items'. Item language keys changed to 'item.my_mod.my_item_name'. Using org.joml for math stuff. Buttons need DEFAULT_NARRATION in constructor.	2023-01-14 18:10:45 +01:00
Christian Knaapen	ea59fef099	Changed reach upgrade recipes. Made radial menu smaller. Cleaned up radial menu code. Added russian language. Tweaked cube icon.	2023-01-14 15:35:43 +01:00
Christian Knaapen	5e6c42d372	Fixed disassembling blocks with the Create Wrench duplicating the item when a build mode other than Normal is used. Disabled break outlines in survival, because breaking multiple blocks in survival is deprecated.	2022-10-25 21:52:14 +02:00
Christian Knaapen	14460c2c01	Fixed keybindings not being registered.	2022-10-24 21:01:19 +02:00
Christian Knaapen	3b31a74780	Merge branch 'master' into 1.19	2022-07-30 10:48:08 +02:00
manapart	911d4b5605	Merged in 1.19 (pull request #4 ) 1.19 Approved-by: Requios	2022-07-30 08:46:57 +00:00
Christian Knaapen	13ee819439	Merge branch '1.18'	2022-07-30 10:02:13 +02:00
ManApart	319fedc2dd	seemingly working with forge .99	2022-07-16 16:14:40 -04:00
ManApart	c7e6230424	seems to be working fine	2022-07-10 08:19:33 -04:00
ManApart	e7ef54bd80	starting game	2022-07-10 08:10:57 -04:00
ManApart	d5af0b097e	compiling	2022-07-10 08:05:19 -04:00
ManApart	63b95df0ff	upgrade translatable component	2022-07-10 07:59:17 -04:00
ManApart	b3730896e5	upgrade text component	2022-07-10 07:55:10 -04:00
ManApart	675a4930af	initial gradle changes	2022-07-10 07:45:49 -04:00