Merge branch 'port/1.19.4' into 1.19.4

Mojang no longer automatically loads textures in `textures/items` as they now load textures from `textures/item`

build.gradle

@@ -2,7 +2,6 @@ buildscript {
     repositories {
         maven { url = 'https://maven.minecraftforge.net' }
         mavenCentral()
-        jcenter()
         maven { url = 'https://repo.spongepowered.org/repository/maven-public' }
         maven { url = 'https://maven.parchmentmc.org' }
     }
@@ -30,7 +29,9 @@ ext.buildNumber = System.getenv('BUILD_NUMBER')
 
 version = mod_version
 group = 'nl.requios.effortlessbuilding'
-archivesBaseName = "effortlessbuilding-${artifact_minecraft_version}"
+base {
+    archivesName = "effortlessbuilding-${artifact_minecraft_version}"
+}
 
 java.toolchain.languageVersion = JavaLanguageVersion.of(17)
 
@@ -121,7 +122,7 @@ dependencies {
     minecraft "net.minecraftforge:forge:${minecraft_version}-${forge_version}"
 
     jarJar("com.jozufozu.flywheel:flywheel-forge-${flywheel_minecraft_version}:${flywheel_version}") {
-        jarJar.ranged(it, '[0.6.9,0.6.10)')
+        jarJar.ranged(it, '[0.6.9,0.7)')
     }
 
     if (flywheelInWorkspace) {
@@ -155,7 +156,7 @@ jar {
             "Specification-Title": "effortlessbuilding",
             "Specification-Vendor": "requios",
             "Specification-Version": "1",
-            "Implementation-Title": project.jar.baseName,
+            "Implementation-Title": project.name,
             "Implementation-Version": project.jar.archiveVersion,
             "Implementation-Vendor" :"requios",
             "Implementation-Timestamp": new Date().format("yyyy-MM-dd'T'HH:mm:ssZ")
@@ -184,7 +185,7 @@ tasks.jarJar.finalizedBy('reobfJarJar')
 publishing {
     publications {
         mavenJava(MavenPublication) {
-            artifactId = archivesBaseName
+            artifactId = base.archivesName.get()
 
             from components.java
             fg.component(it)

gradle.properties

@@ -3,18 +3,18 @@
 org.gradle.jvmargs=-Xmx3G
 org.gradle.daemon=false
 
-mod_version = 3.4
+mod_version = 3.7
-artifact_minecraft_version = 1.19.2
+artifact_minecraft_version = 1.19.4
 
-minecraft_version = 1.19.2
+minecraft_version = 1.19.4
-forge_version = 43.1.47
+forge_version = 45.2.6
 
-forgegradle_version = 5.1.53
+forgegradle_version = 6.0.7
 mixingradle_version = 0.7-SNAPSHOT
 mixin_version = 0.8.5
 librarian_version = 1.+
 cursegradle_version = 1.4.0
-parchment_version = 2022.11.27
+parchment_version = 2023.06.26
 
-flywheel_minecraft_version = 1.19.2
+flywheel_minecraft_version = 1.19.3
-flywheel_version = 0.6.9-18
+flywheel_version = 0.6.9-2

gradle/wrapper/gradle-wrapper.properties

@@ -1,5 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.3-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.1.1-bin.zip
+networkTimeout=10000
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists

gradlew

@@ -1,7 +1,7 @@
 #!/bin/sh
 
 #
-# Copyright <EFBFBD> 2015-2021 the original authors.
+# Copyright © 2015-2021 the original authors.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -32,10 +32,10 @@
 #       Busybox and similar reduced shells will NOT work, because this script
 #       requires all of these POSIX shell features:
 #         * functions;
-#         * expansions <EFBFBD>$var<EFBFBD>, <EFBFBD>${var}<EFBFBD>, <EFBFBD>${var:-default}<EFBFBD>, <EFBFBD>${var+SET}<EFBFBD>,
+#         * expansions «$var», «${var}», «${var:-default}», «${var+SET}»,
-#           <EFBFBD>${var#prefix}<EFBFBD>, <EFBFBD>${var%suffix}<EFBFBD>, and <EFBFBD>$( cmd )<EFBFBD>;
+#           «${var#prefix}», «${var%suffix}», and «$( cmd )»;
-#         * compound commands having a testable exit status, especially <EFBFBD>case<EFBFBD>;
+#         * compound commands having a testable exit status, especially «case»;
-#         * various built-in commands including <EFBFBD>command<EFBFBD>, <EFBFBD>set<EFBFBD>, and <EFBFBD>ulimit<EFBFBD>.
+#         * various built-in commands including «command», «set», and «ulimit».
 #
 #   Important for patching:
 #
@@ -55,7 +55,7 @@
 #       Darwin, MinGW, and NonStop.
 #
 #   (3) This script is generated from the Groovy template
-#       https://github.com/gradle/gradle/blob/master/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
+#       https://github.com/gradle/gradle/blob/HEAD/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
 #       within the Gradle project.
 #
 #       You can find Gradle at https://github.com/gradle/gradle/.
@@ -80,10 +80,10 @@ do
     esac
 done
 
-APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit
+# This is normally unused
-
+# shellcheck disable=SC2034
-APP_NAME="Gradle"
 APP_BASE_NAME=${0##*/}
+APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit
 
 # Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
 DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
@@ -143,12 +143,16 @@ fi
 if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then
     case $MAX_FD in #(
       max*)
+        # In POSIX sh, ulimit -H is undefined. That's why the result is checked to see if it worked.
+        # shellcheck disable=SC3045 
         MAX_FD=$( ulimit -H -n ) ||
             warn "Could not query maximum file descriptor limit"
     esac
     case $MAX_FD in  #(
       '' | soft) :;; #(
       *)
+        # In POSIX sh, ulimit -n is undefined. That's why the result is checked to see if it worked.
+        # shellcheck disable=SC3045 
         ulimit -n "$MAX_FD" ||
             warn "Could not set maximum file descriptor limit to $MAX_FD"
     esac
@@ -205,6 +209,12 @@ set -- \
         org.gradle.wrapper.GradleWrapperMain \
         "$@"
 
+# Stop when "xargs" is not available.
+if ! command -v xargs >/dev/null 2>&1
+then
+    die "xargs is not available"
+fi
+
 # Use "xargs" to parse quoted args.
 #
 # With -n1 it outputs one arg per line, with the quotes and backslashes removed.

gradlew.bat

@@ -14,7 +14,7 @@
 @rem limitations under the License.
 @rem
 
-@if "%DEBUG%" == "" @echo off
+@if "%DEBUG%"=="" @echo off
 @rem ##########################################################################
 @rem
 @rem  Gradle startup script for Windows
@@ -25,7 +25,8 @@
 if "%OS%"=="Windows_NT" setlocal
 
 set DIRNAME=%~dp0
-if "%DIRNAME%" == "" set DIRNAME=.
+if "%DIRNAME%"=="" set DIRNAME=.
+@rem This is normally unused
 set APP_BASE_NAME=%~n0
 set APP_HOME=%DIRNAME%
 
@@ -40,7 +41,7 @@ if defined JAVA_HOME goto findJavaFromJavaHome
 
 set JAVA_EXE=java.exe
 %JAVA_EXE% -version >NUL 2>&1
-if "%ERRORLEVEL%" == "0" goto execute
+if %ERRORLEVEL% equ 0 goto execute
 
 echo.
 echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
@@ -75,13 +76,15 @@ set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
 
 :end
 @rem End local scope for the variables with windows NT shell
-if "%ERRORLEVEL%"=="0" goto mainEnd
+if %ERRORLEVEL% equ 0 goto mainEnd
 
 :fail
 rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of
 rem the _cmd.exe /c_ return code!
-if  not "" == "%GRADLE_EXIT_CONSOLE%" exit 1
+set EXIT_CODE=%ERRORLEVEL%
-exit /b 1
+if %EXIT_CODE% equ 0 set EXIT_CODE=1
+if not ""=="%GRADLE_EXIT_CONSOLE%" exit %EXIT_CODE%
+exit /b %EXIT_CODE%
 
 :mainEnd
 if "%OS%"=="Windows_NT" endlocal

settings.gradle

@@ -4,3 +4,7 @@ pluginManagement {
         maven { url = 'https://maven.minecraftforge.net/' }
     }
 }
+
+plugins {
+    id 'org.gradle.toolchains.foojay-resolver-convention' version '0.5.0'
+}

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

@@ -50,20 +50,20 @@ public enum AllGuiTextures implements ScreenElement {
 
     @OnlyIn(Dist.CLIENT)
     @Override
-    public void render(PoseStack ms, int x, int y) {
+    public void render(PoseStack poseStack, int x, int y) {
         bind();
-        GuiComponent.blit(ms, x, y, 0, startX, startY, width, height, 256, 256);
+        GuiComponent.blit(poseStack, x, y, 0, startX, startY, width, height, 256, 256);
     }
 
     @OnlyIn(Dist.CLIENT)
-    public void render(PoseStack ms, int x, int y, GuiComponent component) {
+    public void render(PoseStack poseStack, int x, int y, GuiComponent component) {
         bind();
-        component.blit(ms, x, y, startX, startY, width, height);
+        component.blit(poseStack, x, y, 0, startX, startY, width, height, 256, 256);
     }
     
     @OnlyIn(Dist.CLIENT)
-    public void render(PoseStack ms, int x, int y, Color c) {
+    public void render(PoseStack poseStack, int x, int y, Color c, GuiComponent component) {
         bind();
-        UIRenderHelper.drawColoredTexture(ms, c, x, y, startX, startY, width, height);
+        UIRenderHelper.drawColoredTexture(poseStack, c, x, y, startX, startY, width, height);
     }
 }

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

@@ -3,7 +3,6 @@ package nl.requios.effortlessbuilding;
 import com.mojang.blaze3d.systems.RenderSystem;
 import com.mojang.blaze3d.vertex.PoseStack;
 import com.mojang.blaze3d.vertex.VertexConsumer;
-import com.mojang.math.Matrix4f;
 import net.minecraft.client.gui.GuiComponent;
 import net.minecraft.client.renderer.LightTexture;
 import net.minecraft.client.renderer.MultiBufferSource;
@@ -16,6 +15,7 @@ import nl.requios.effortlessbuilding.create.Create;
 import nl.requios.effortlessbuilding.create.foundation.gui.element.DelegatedStencilElement;
 import nl.requios.effortlessbuilding.create.foundation.gui.element.ScreenElement;
 import nl.requios.effortlessbuilding.create.foundation.utility.Color;
+import org.joml.Matrix4f;
 
 public class AllIcons implements ScreenElement {
     
@@ -101,22 +101,15 @@ public class AllIcons implements ScreenElement {
         return new AllIcons(x = 0, ++y);
     }
 
-    @OnlyIn(Dist.CLIENT)
     public void bind() {
         RenderSystem.setShaderTexture(0, ICON_ATLAS);
     }
 
     @OnlyIn(Dist.CLIENT)
     @Override
-    public void render(PoseStack matrixStack, int x, int y) {
+    public void render(PoseStack ms, int x, int y) {
         bind();
-        GuiComponent.blit(matrixStack, x, y, 0, iconX, iconY, 16, 16, 256, 256);
+        GuiComponent.blit(ms, x, y, 0, iconX, iconY, 16, 16, 256, 256);
-    }
-    
-    @OnlyIn(Dist.CLIENT)
-    public void render(PoseStack matrixStack, int x, int y, GuiComponent component) {
-        bind();
-        component.blit(matrixStack, x, y, iconX, iconY, 16, 16);
     }
 
     @OnlyIn(Dist.CLIENT)

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

@@ -20,7 +20,6 @@ import nl.requios.effortlessbuilding.buildmode.ModeOptions;
 import nl.requios.effortlessbuilding.gui.buildmode.PlayerSettingsGui;
 import nl.requios.effortlessbuilding.gui.buildmode.RadialMenu;
 import nl.requios.effortlessbuilding.gui.buildmodifier.ModifiersScreen;
-import nl.requios.effortlessbuilding.systems.PowerLevel;
 import org.lwjgl.glfw.GLFW;
 
 @EventBusSubscriber(Dist.CLIENT)

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

@@ -3,12 +3,16 @@ package nl.requios.effortlessbuilding;
 import com.mojang.serialization.Codec;
 import net.minecraft.network.chat.Component;
 import net.minecraft.world.entity.player.Player;
+import net.minecraft.world.flag.FeatureFlags;
 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.world.item.ItemStack;
 import net.minecraftforge.api.distmarker.Dist;
 import net.minecraftforge.common.MinecraftForge;
 import net.minecraftforge.common.loot.IGlobalLootModifier;
+import net.minecraftforge.event.CreativeModeTabEvent;
 import net.minecraftforge.eventbus.api.IEventBus;
 import net.minecraftforge.fml.DistExecutor;
 import net.minecraftforge.fml.ModLoadingContext;
@@ -36,6 +40,8 @@ import nl.requios.effortlessbuilding.systems.UndoRedo;
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
 
+import java.util.List;
+
 @Mod(EffortlessBuilding.MODID)
 public class EffortlessBuilding {
 
@@ -78,6 +84,7 @@ public class EffortlessBuilding {
 		IEventBus forgeEventBus = MinecraftForge.EVENT_BUS;
 
 		modEventBus.addListener(EffortlessBuilding::setup);
+		modEventBus.addListener(EffortlessBuilding::addTabContents);
 
 		DistExecutor.unsafeRunWhenOn(Dist.CLIENT, () -> () -> EffortlessBuildingClient.onConstructorClient(modEventBus, forgeEventBus));
 
@@ -88,9 +95,9 @@ public class EffortlessBuilding {
 		LOOT_MODIFIERS.register(FMLJavaModLoadingContext.get().getModEventBus());
 
 		//Register config
-		ModLoadingContext.get().registerConfig(ModConfig.Type.COMMON, CommonConfig.spec);
+		modLoadingContext.registerConfig(ModConfig.Type.COMMON, CommonConfig.spec);
-		ModLoadingContext.get().registerConfig(ModConfig.Type.CLIENT, ClientConfig.spec);
+		modLoadingContext.registerConfig(ModConfig.Type.CLIENT, ClientConfig.spec);
-		ModLoadingContext.get().registerConfig(ModConfig.Type.SERVER, ServerConfig.spec);
+		modLoadingContext.registerConfig(ModConfig.Type.SERVER, ServerConfig.spec);
 	}
 
 	public static void setup(final FMLCommonSetupEvent event) {
@@ -99,8 +106,15 @@ public class EffortlessBuilding {
 		CompatHelper.setup();
 	}
 
+	public static void addTabContents(final CreativeModeTabEvent.BuildContents event) {
+		if (event.getTab() == CreativeModeTabs.TOOLS_AND_UTILITIES) {
+			List<ItemStack> stacks = ITEMS.getEntries().stream().map(reg -> new ItemStack(reg.get())).toList();
+			event.acceptAll(stacks);
+		}
+	}
+
 	public static <T extends AbstractContainerMenu> MenuType<T> registerContainer(IContainerFactory<T> fact){
-		MenuType<T> type = new MenuType<T>(fact);
+		MenuType<T> type = new MenuType<T>(fact, FeatureFlags.REGISTRY.allFlags());
 		return type;
 	}
 

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

@@ -1,16 +1,16 @@
 package nl.requios.effortlessbuilding.buildmode;
 
-import com.mojang.math.Vector4f;
+import nl.requios.effortlessbuilding.create.foundation.utility.Color;
 
 public enum BuildModeCategoryEnum {
-    BASIC(new Vector4f(0f, .5f, 1f, .8f)),
+    BASIC(new Color(0f, .5f, 1f, .8f)),
-    DIAGONAL(new Vector4f(0.56f, 0.28f, 0.87f, .8f)),
+    DIAGONAL(new Color(0.56f, 0.28f, 0.87f, .8f)),
-    CIRCULAR(new Vector4f(0.29f, 0.76f, 0.3f, 1f)),
+    CIRCULAR(new Color(0.29f, 0.76f, 0.3f, 1f)),
-    ROOF(new Vector4f(0.83f, 0.87f, 0.23f, .8f));
+    ROOF(new Color(0.83f, 0.87f, 0.23f, .8f));
 
-    public final Vector4f color;
+    public final Color color;
 
-    BuildModeCategoryEnum(Vector4f color) {
+    BuildModeCategoryEnum(Color color) {
         this.color = color;
     }
 }

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

@@ -164,7 +164,7 @@ public abstract class ThreeClicksBuildMode extends BaseBuildMode {
 				}
 			}
 		}
-		return new BlockPos(selected.lineBound);
+		return BlockPos.containing(selected.lineBound);
 	}
 
 //	protected abstract BlockEntry findSecondPos(List<BlockEntry> blocks);
@@ -197,7 +197,7 @@ public abstract class ThreeClicksBuildMode extends BaseBuildMode {
 
 		//Make it from a plane into a line, on y axis only
 		private Vec3 toLongestLine(Vec3 boundVec, BlockPos secondPos) {
-			BlockPos bound = new BlockPos(boundVec);
+			BlockPos bound = BlockPos.containing(boundVec);
 			return new Vec3(secondPos.getX(), bound.getY(), secondPos.getZ());
 		}
 

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

@@ -6,7 +6,6 @@ import net.minecraft.world.entity.player.Player;
 import nl.requios.effortlessbuilding.EffortlessBuildingClient;
 import nl.requios.effortlessbuilding.utilities.BlockEntry;
 import nl.requios.effortlessbuilding.utilities.BlockSet;
-import nl.requios.effortlessbuilding.systems.PowerLevel;
 
 import java.util.List;
 

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

@@ -20,7 +20,7 @@ public class DiagonalLine extends ThreeClicksBuildMode {
 		int iterations = (int) Math.ceil(first.distanceTo(second) * sampleMultiplier);
 		for (double t = 0; t <= 1.0; t += 1.0 / iterations) {
 			Vec3 lerp = first.add(second.subtract(first).scale(t));
-			BlockPos candidate = new BlockPos(lerp);
+			BlockPos candidate = BlockPos.containing(lerp);
 			//Only add if not equal to the last in the list
 			if (list.isEmpty() || !list.get(list.size() - 1).equals(candidate))
 				list.add(candidate);

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

@@ -7,7 +7,6 @@ import nl.requios.effortlessbuilding.EffortlessBuildingClient;
 import nl.requios.effortlessbuilding.buildmode.BuildModes;
 import nl.requios.effortlessbuilding.buildmode.ModeOptions;
 import nl.requios.effortlessbuilding.buildmode.TwoClicksBuildMode;
-import nl.requios.effortlessbuilding.systems.PowerLevel;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -34,7 +33,7 @@ public class Floor extends TwoClicksBuildMode {
 		//Then only 1 can be valid, return that one
 		Criteria selected = criteriaList.get(0);
 
-		return new BlockPos(selected.planeBound);
+		return BlockPos.containing(selected.planeBound);
 	}
 
 	public static List<BlockPos> getFloorBlocks(Player player, int x1, int y1, int z1, int x2, int y2, int z2) {

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

@@ -1,12 +1,11 @@
 package nl.requios.effortlessbuilding.buildmode.buildmodes;
 
-import net.minecraft.world.entity.player.Player;
 import net.minecraft.core.BlockPos;
+import net.minecraft.world.entity.player.Player;
 import net.minecraft.world.phys.Vec3;
 import nl.requios.effortlessbuilding.EffortlessBuildingClient;
 import nl.requios.effortlessbuilding.buildmode.BuildModes;
 import nl.requios.effortlessbuilding.buildmode.TwoClicksBuildMode;
-import nl.requios.effortlessbuilding.systems.PowerLevel;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -59,7 +58,7 @@ public class Line extends TwoClicksBuildMode {
 
 		}
 
-		return new BlockPos(selected.lineBound);
+		return BlockPos.containing(selected.lineBound);
 	}
 
 	public static List<BlockPos> getLineBlocks(Player player, int x1, int y1, int z1, int x2, int y2, int z2) {
@@ -90,7 +89,7 @@ public class Line extends TwoClicksBuildMode {
 
 	public static void addZLineBlocks(List<BlockPos> list, int z1, int z2, int x, int y) {
 		for (int z = z1; z1 < z2 ? z <= z2 : z >= z2; z += z1 < z2 ? 1 : -1) {
-			list.add(new BlockPos(x, y, z));
+			list.add(BlockPos.containing(x, y, z));
 		}
 	}
 
@@ -120,7 +119,7 @@ public class Line extends TwoClicksBuildMode {
 		//Make it from a plane into a line
 		//Select the axis that is longest
 		private Vec3 toLongestLine(Vec3 boundVec, BlockPos firstPos) {
-			BlockPos bound = new BlockPos(boundVec);
+			BlockPos bound = BlockPos.containing(boundVec);
 
 			BlockPos firstToSecond = bound.subtract(firstPos);
 			firstToSecond = new BlockPos(Math.abs(firstToSecond.getX()), Math.abs(firstToSecond.getY()), Math.abs(firstToSecond.getZ()));

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

@@ -5,7 +5,6 @@ import net.minecraft.core.BlockPos;
 import nl.requios.effortlessbuilding.EffortlessBuildingClient;
 import nl.requios.effortlessbuilding.buildmode.ModeOptions;
 import nl.requios.effortlessbuilding.buildmode.ThreeClicksBuildMode;
-import nl.requios.effortlessbuilding.systems.PowerLevel;
 
 import java.util.ArrayList;
 import java.util.List;

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

@@ -7,7 +7,6 @@ import nl.requios.effortlessbuilding.EffortlessBuildingClient;
 import nl.requios.effortlessbuilding.buildmode.BuildModes;
 import nl.requios.effortlessbuilding.buildmode.ModeOptions;
 import nl.requios.effortlessbuilding.buildmode.TwoClicksBuildMode;
-import nl.requios.effortlessbuilding.systems.PowerLevel;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -49,7 +48,7 @@ public class Wall extends TwoClicksBuildMode {
 			}
 		}
 
-		return new BlockPos(selected.planeBound);
+		return BlockPos.containing(selected.planeBound);
 	}
 
 	public static List<BlockPos> getWallBlocks(Player player, int x1, int y1, int z1, int x2, int y2, int z2) {

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

@@ -1,24 +1,12 @@
 package nl.requios.effortlessbuilding.buildmodifier;
 
 import net.minecraft.nbt.CompoundTag;
-import net.minecraft.nbt.NbtUtils;
-import net.minecraft.nbt.Tag;
-import net.minecraft.world.level.block.state.BlockState;
 import net.minecraft.world.entity.player.Player;
-import net.minecraft.world.item.ItemStack;
-import net.minecraft.core.Direction;
-import net.minecraft.world.InteractionHand;
 import net.minecraft.core.BlockPos;
-import net.minecraft.world.phys.Vec3;
 import net.minecraft.core.Vec3i;
-import net.minecraftforge.items.IItemHandler;
-import nl.requios.effortlessbuilding.item.AbstractRandomizerBagItem;
 import nl.requios.effortlessbuilding.utilities.BlockEntry;
 import nl.requios.effortlessbuilding.utilities.BlockSet;
 
-import java.util.ArrayList;
-import java.util.List;
-
 public class Array extends BaseModifier {
 
 	public Vec3i offset = BlockPos.ZERO;

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

@@ -1,7 +1,6 @@
 package nl.requios.effortlessbuilding.buildmodifier;
 
 import net.minecraft.nbt.CompoundTag;
-import net.minecraft.nbt.Tag;
 import net.minecraft.world.entity.player.Player;
 import nl.requios.effortlessbuilding.utilities.BlockSet;
 

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

@@ -2,8 +2,6 @@ package nl.requios.effortlessbuilding.buildmodifier;
 
 import net.minecraft.client.Minecraft;
 import net.minecraft.nbt.CompoundTag;
-import net.minecraft.nbt.NbtUtils;
-import net.minecraft.nbt.Tag;
 import net.minecraft.world.entity.player.Player;
 import net.minecraft.core.BlockPos;
 import net.minecraft.world.phys.Vec3;
@@ -50,7 +48,7 @@ public class Mirror extends BaseModifier {
 	private void performMirrorX(BlockSet blocks, BlockEntry blockEntry) {
 		//find mirror position
 		double x = position.x + (position.x - blockEntry.blockPos.getX() - 0.5);
-		BlockPos newBlockPos = new BlockPos(x, blockEntry.blockPos.getY(), blockEntry.blockPos.getZ());
+		BlockPos newBlockPos = BlockPos.containing(x, blockEntry.blockPos.getY(), blockEntry.blockPos.getZ());
 
 		if (blocks.containsKey(newBlockPos)) return;
 
@@ -66,7 +64,7 @@ public class Mirror extends BaseModifier {
 	private void performMirrorY(BlockSet blocks, BlockEntry blockEntry) {
 		//find mirror position
 		double y = position.y + (position.y - blockEntry.blockPos.getY() - 0.5);
-		BlockPos newBlockPos = new BlockPos(blockEntry.blockPos.getX(), y, blockEntry.blockPos.getZ());
+		BlockPos newBlockPos = BlockPos.containing(blockEntry.blockPos.getX(), y, blockEntry.blockPos.getZ());
 
 		if (blocks.containsKey(newBlockPos)) return;
 
@@ -81,7 +79,7 @@ public class Mirror extends BaseModifier {
 	private void performMirrorZ(BlockSet blocks, BlockEntry blockEntry) {
 		//find mirror position
 		double z = position.z + (position.z - blockEntry.blockPos.getZ() - 0.5);
-		BlockPos newBlockPos = new BlockPos(blockEntry.blockPos.getX(), blockEntry.blockPos.getY(), z);
+		BlockPos newBlockPos = BlockPos.containing(blockEntry.blockPos.getX(), blockEntry.blockPos.getY(), z);
 
 		if (blocks.containsKey(newBlockPos)) return;
 

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

@@ -4,23 +4,15 @@ import net.minecraft.client.Minecraft;
 import net.minecraft.nbt.CompoundTag;
 import net.minecraft.world.level.block.state.BlockState;
 import net.minecraft.world.entity.player.Player;
-import net.minecraft.world.item.ItemStack;
-import net.minecraft.core.Direction;
-import net.minecraft.world.InteractionHand;
 import net.minecraft.world.level.block.Mirror;
 import net.minecraft.world.level.block.Rotation;
 import net.minecraft.core.BlockPos;
 import net.minecraft.util.Mth;
 import net.minecraft.world.phys.Vec3;
-import net.minecraftforge.items.IItemHandler;
 import nl.requios.effortlessbuilding.EffortlessBuildingClient;
-import nl.requios.effortlessbuilding.item.AbstractRandomizerBagItem;
 import nl.requios.effortlessbuilding.utilities.BlockEntry;
 import nl.requios.effortlessbuilding.utilities.BlockSet;
 
-import java.util.ArrayList;
-import java.util.List;
-
 public class RadialMirror extends BaseModifier {
 
 	public Vec3 position = new Vec3(0.5, 64.5, 0.5);
@@ -77,7 +69,7 @@ public class RadialMirror extends BaseModifier {
 			}
 
 			Vec3 relNewVec = relStartVec.yRot((float) curAngle);
-			BlockPos newBlockPos = new BlockPos(position.add(relNewVec));
+			BlockPos newBlockPos = BlockPos.containing(position.add(relNewVec));
 
 			if (blocks.containsKey(newBlockPos)) continue;
 

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

@@ -7,7 +7,6 @@ import net.minecraft.world.item.BlockItem;
 import net.minecraft.world.item.Item;
 import net.minecraft.world.item.ItemStack;
 import net.minecraftforge.items.IItemHandler;
-import net.minecraftforge.items.ItemHandlerHelper;
 import nl.requios.effortlessbuilding.create.foundation.item.ItemHelper;
 import nl.requios.effortlessbuilding.item.AbstractRandomizerBagItem;
 

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

@@ -1,13 +1,8 @@
 package nl.requios.effortlessbuilding.create;
 
 import com.mojang.blaze3d.platform.InputConstants;
-import net.minecraft.client.KeyMapping;
 import net.minecraft.client.Minecraft;
 import net.minecraft.client.gui.screens.Screen;
-import net.minecraftforge.api.distmarker.Dist;
-import net.minecraftforge.client.event.RegisterKeyMappingsEvent;
-import net.minecraftforge.eventbus.api.SubscribeEvent;
-import net.minecraftforge.fml.common.Mod.EventBusSubscriber;
 import org.lwjgl.glfw.GLFW;
 
 public class AllKeys {

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

@@ -1,12 +1,7 @@
 package nl.requios.effortlessbuilding.create;
 
-import net.minecraft.world.level.block.Blocks;
-import net.minecraft.world.phys.AABB;
 import net.minecraftforge.api.distmarker.Dist;
-import net.minecraftforge.event.TickEvent;
-import net.minecraftforge.eventbus.api.SubscribeEvent;
 import net.minecraftforge.fml.common.Mod;
-import nl.requios.effortlessbuilding.create.foundation.utility.Color;
 
 @Mod.EventBusSubscriber(Dist.CLIENT)
 public class CreateClientTest {

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

@@ -4,11 +4,10 @@ import com.mojang.blaze3d.systems.RenderSystem;
 import com.mojang.blaze3d.vertex.PoseStack;
 import net.minecraft.client.Minecraft;
 import net.minecraft.client.multiplayer.ClientLevel;
-import net.minecraft.world.level.Level;
 import net.minecraft.world.level.LevelAccessor;
 import net.minecraft.world.phys.Vec3;
 import net.minecraftforge.api.distmarker.Dist;
-import net.minecraftforge.client.event.RenderLevelLastEvent;
+import net.minecraftforge.client.event.RenderLevelStageEvent;
 import net.minecraftforge.client.event.ViewportEvent;
 import net.minecraftforge.event.TickEvent;
 import net.minecraftforge.event.TickEvent.ClientTickEvent;
@@ -58,7 +57,9 @@ public class ClientEvents {
 	}
 
 	@SubscribeEvent
-	public static void onRenderWorld(RenderLevelLastEvent event) {
+	public static void onRenderWorld(RenderLevelStageEvent event) {
+		if(event.getStage() != RenderLevelStageEvent.Stage.AFTER_CUTOUT_BLOCKS) return;
+
 		Vec3 cameraPos = Minecraft.getInstance().gameRenderer.getMainCamera()
 			.getPosition();
 		float pt = AnimationTickHolder.getPartialTicks();

src/main/java/nl/requios/effortlessbuilding/create/foundation/ModFilePackResources.java

@@ -10,7 +10,7 @@ public class ModFilePackResources extends PathPackResources {
 	protected final String sourcePath;
 
 	public ModFilePackResources(String name, IModFile modFile, String sourcePath) {
-		super(name, modFile.findResource(sourcePath));
+		super(name, true, modFile.findResource(sourcePath));
 		this.modFile = modFile;
 		this.sourcePath = sourcePath;
 	}

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

@@ -2,16 +2,17 @@ package nl.requios.effortlessbuilding.create.foundation.gui;
 
 import com.mojang.blaze3d.platform.InputConstants;
 import com.mojang.blaze3d.vertex.PoseStack;
-import nl.requios.effortlessbuilding.create.foundation.gui.widget.AbstractSimiWidget;
-import nl.requios.effortlessbuilding.create.foundation.utility.Components;
 import net.minecraft.client.gui.components.AbstractWidget;
-import net.minecraft.client.gui.components.Widget;
+import net.minecraft.client.gui.components.EditBox;
+import net.minecraft.client.gui.components.Renderable;
 import net.minecraft.client.gui.components.events.GuiEventListener;
 import net.minecraft.client.gui.narration.NarratableEntry;
 import net.minecraft.client.gui.screens.Screen;
 import net.minecraft.network.chat.Component;
 import net.minecraftforge.api.distmarker.Dist;
 import net.minecraftforge.api.distmarker.OnlyIn;
+import nl.requios.effortlessbuilding.create.foundation.gui.widget.AbstractSimiWidget;
+import nl.requios.effortlessbuilding.create.foundation.utility.Components;
 import nl.requios.effortlessbuilding.gui.buildmodifier.ModifiersScreenList;
 
 import java.util.Collection;
@@ -65,19 +66,26 @@ public abstract class AbstractSimiScreen extends Screen {
 		}
 	}
 
+	@Override
+	public boolean mouseClicked(double pMouseX, double pMouseY, int pButton) {
+		if (getFocused() != null && !getFocused().isMouseOver(pMouseX, pMouseY))
+			setFocused(null);
+		return super.mouseClicked(pMouseX, pMouseY, pButton);
+	}
+	
 	@Override
 	public boolean isPauseScreen() {
 		return false;
 	}
 
 	@SuppressWarnings("unchecked")
-	protected <W extends GuiEventListener & Widget & NarratableEntry> void addRenderableWidgets(W... widgets) {
+	protected <W extends GuiEventListener & Renderable & NarratableEntry> void addRenderableWidgets(W... widgets) {
 		for (W widget : widgets) {
 			addRenderableWidget(widget);
 		}
 	}
 
-	protected <W extends GuiEventListener & Widget & NarratableEntry> void addRenderableWidgets(Collection<W> widgets) {
+	protected <W extends GuiEventListener & Renderable & NarratableEntry> void addRenderableWidgets(Collection<W> widgets) {
 		for (W widget : widgets) {
 			addRenderableWidget(widget);
 		}
@@ -98,7 +106,6 @@ public abstract class AbstractSimiScreen extends Screen {
 	@Override
 	public void render(PoseStack ms, int mouseX, int mouseY, float partialTicks) {
 		partialTicks = minecraft.getFrameTime();
-
 		ms.pushPose();
 
 		prepareFrame();
@@ -116,7 +123,7 @@ public abstract class AbstractSimiScreen extends Screen {
 	@Override
 	public boolean keyPressed(int keyCode, int scanCode, int modifiers) {
 		boolean keyPressed = super.keyPressed(keyCode, scanCode, modifiers);
-		if (keyPressed || getFocused() != null)
+		if (keyPressed || getFocused() instanceof EditBox)
 			return keyPressed;
 
 		InputConstants.Key mouseKey = InputConstants.getKey(keyCode, scanCode);
@@ -137,14 +144,14 @@ public abstract class AbstractSimiScreen extends Screen {
 	protected abstract void renderWindow(PoseStack ms, int mouseX, int mouseY, float partialTicks);
 
 	protected void renderWindowForeground(PoseStack ms, int mouseX, int mouseY, float partialTicks) {
-		for (Widget widget : renderables) {
+		for (Renderable widget : renderables) {
-			if (widget instanceof AbstractSimiWidget simiWidget && simiWidget.isHoveredOrFocused()
+			if (widget instanceof AbstractSimiWidget simiWidget && simiWidget.isMouseOver(mouseX, mouseY)
 				&& simiWidget.visible) {
 				List<Component> tooltip = simiWidget.getToolTip();
 				if (tooltip.isEmpty())
 					continue;
-				int ttx = simiWidget.lockedTooltipX == -1 ? mouseX : simiWidget.lockedTooltipX + simiWidget.x;
+				int ttx = simiWidget.lockedTooltipX == -1 ? mouseX : simiWidget.lockedTooltipX + simiWidget.getX();
-				int tty = simiWidget.lockedTooltipY == -1 ? mouseY : simiWidget.lockedTooltipY + simiWidget.y;
+				int tty = simiWidget.lockedTooltipY == -1 ? mouseY : simiWidget.lockedTooltipY + simiWidget.getY();
 				renderComponentTooltip(ms, tooltip, ttx, tty);
 			}
 
@@ -153,14 +160,13 @@ public abstract class AbstractSimiScreen extends Screen {
 				list.renderWindowForeground(ms, mouseX, mouseY, partialTicks);
 			}
 		}
-		
 	}
 
 	protected void endFrame() {}
 
 	@Deprecated
-	protected void debugWindowArea(PoseStack matrixStack) {
+	protected void debugWindowArea(PoseStack graphics) {
-		fill(matrixStack, guiLeft + windowWidth, guiTop + windowHeight, guiLeft, guiTop, 0xD3D3D3D3);
+		fill(graphics, guiLeft + windowWidth, guiTop + windowHeight, guiLeft, guiTop, 0xD3D3D3D3);
 	}
 
 	@Override

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

@@ -2,13 +2,13 @@ package nl.requios.effortlessbuilding.create.foundation.gui;
 
 import com.mojang.blaze3d.systems.RenderSystem;
 import com.mojang.blaze3d.vertex.PoseStack;
-import nl.requios.effortlessbuilding.create.Create;
-import nl.requios.effortlessbuilding.create.foundation.gui.element.ScreenElement;
-import nl.requios.effortlessbuilding.create.foundation.utility.Color;
 import net.minecraft.client.gui.GuiComponent;
 import net.minecraft.resources.ResourceLocation;
 import net.minecraftforge.api.distmarker.Dist;
 import net.minecraftforge.api.distmarker.OnlyIn;
+import nl.requios.effortlessbuilding.create.Create;
+import nl.requios.effortlessbuilding.create.foundation.gui.element.ScreenElement;
+import nl.requios.effortlessbuilding.create.foundation.utility.Color;
 
 public enum AllGuiTextures implements ScreenElement {
 
@@ -73,11 +73,9 @@ public enum AllGuiTextures implements ScreenElement {
 		RenderSystem.setShaderTexture(0, location);
 	}
 
-	@OnlyIn(Dist.CLIENT)
-	@Override
 	public void render(PoseStack ms, int x, int y) {
 		bind();
-		GuiComponent.blit(ms, x, y, 0, startX, startY, width, height, 256, 256);
+		GuiComponent.blit(ms, x, y, startX, startY, width, height);
 	}
 
 	@OnlyIn(Dist.CLIENT)

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

@@ -3,11 +3,6 @@ package nl.requios.effortlessbuilding.create.foundation.gui;
 import com.mojang.blaze3d.systems.RenderSystem;
 import com.mojang.blaze3d.vertex.PoseStack;
 import com.mojang.blaze3d.vertex.VertexConsumer;
-import com.mojang.math.Matrix4f;
-import nl.requios.effortlessbuilding.create.Create;
-import nl.requios.effortlessbuilding.create.foundation.gui.element.DelegatedStencilElement;
-import nl.requios.effortlessbuilding.create.foundation.gui.element.ScreenElement;
-import nl.requios.effortlessbuilding.create.foundation.utility.Color;
 import net.minecraft.client.gui.GuiComponent;
 import net.minecraft.client.renderer.LightTexture;
 import net.minecraft.client.renderer.MultiBufferSource;
@@ -16,6 +11,11 @@ import net.minecraft.resources.ResourceLocation;
 import net.minecraft.world.phys.Vec3;
 import net.minecraftforge.api.distmarker.Dist;
 import net.minecraftforge.api.distmarker.OnlyIn;
+import nl.requios.effortlessbuilding.create.Create;
+import nl.requios.effortlessbuilding.create.foundation.gui.element.DelegatedStencilElement;
+import nl.requios.effortlessbuilding.create.foundation.gui.element.ScreenElement;
+import nl.requios.effortlessbuilding.create.foundation.utility.Color;
+import org.joml.Matrix4f;
 
 public class AllIcons implements ScreenElement {
 
@@ -81,7 +81,7 @@ public class AllIcons implements ScreenElement {
 	public static final AllIcons
 		I_TOOL_DEPLOY = newRow(),
 		I_SKIP_MISSING = next(),
-		I_SKIP_TILES = next(),
+		I_SKIP_BLOCK_ENTITIES = next(),
 		I_DICE = next(),
 		I_TUNNEL_SPLIT = next(),
 		I_TUNNEL_FORCED_SPLIT = next(),
@@ -173,20 +173,14 @@ public class AllIcons implements ScreenElement {
 
 	@OnlyIn(Dist.CLIENT)
 	@Override
-	public void render(PoseStack matrixStack, int x, int y) {
+	public void render(PoseStack ms, int x, int y) {
 		bind();
-		GuiComponent.blit(matrixStack, x, y, 0, iconX, iconY, 16, 16, 256, 256);
+		GuiComponent.blit(ms, x, y, 0, iconX, iconY, 16, 16, 256, 256);
-	}
-
-	@OnlyIn(Dist.CLIENT)
-	public void render(PoseStack matrixStack, int x, int y, GuiComponent component) {
-		bind();
-		component.blit(matrixStack, x, y, iconX, iconY, 16, 16);
 	}
 
 	@OnlyIn(Dist.CLIENT)
 	public void render(PoseStack ms, MultiBufferSource buffer, int color) {
-		VertexConsumer builder = buffer.getBuffer(RenderType.textSeeThrough(ICON_ATLAS));
+		VertexConsumer builder = buffer.getBuffer(RenderType.text(ICON_ATLAS));
 		Matrix4f matrix = ms.last().pose();
 		Color rgb = new Color(color);
 		int light = LightTexture.FULL_BRIGHT;

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

@@ -2,13 +2,13 @@ package nl.requios.effortlessbuilding.create.foundation.gui;
 
 import com.mojang.blaze3d.systems.RenderSystem;
 import com.mojang.blaze3d.vertex.PoseStack;
-import nl.requios.effortlessbuilding.create.foundation.gui.element.BoxElement;
-import nl.requios.effortlessbuilding.create.foundation.gui.element.TextStencilElement;
-import nl.requios.effortlessbuilding.create.foundation.gui.widget.BoxWidget;
 import net.minecraft.client.Minecraft;
 import net.minecraft.client.gui.screens.Screen;
 import net.minecraft.network.chat.FormattedText;
 import net.minecraft.network.chat.Style;
+import nl.requios.effortlessbuilding.create.foundation.gui.element.BoxElement;
+import nl.requios.effortlessbuilding.create.foundation.gui.element.TextStencilElement;
+import nl.requios.effortlessbuilding.create.foundation.gui.widget.BoxWidget;
 import org.lwjgl.opengl.GL30;
 
 import javax.annotation.Nonnull;
@@ -199,7 +199,7 @@ public class ConfirmationScreen extends AbstractSimiScreen {
 
 		prepareFrame();
 
-		this.fillGradient(ms, 0, 0, this.width, this.height, 0x70101010, 0x80101010);
+		fillGradient(ms, 0, 0, this.width, this.height, 0x70101010, 0x80101010);
 	}
 
 

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

@@ -1,8 +1,10 @@
 package nl.requios.effortlessbuilding.create.foundation.gui;
 
+import org.joml.Matrix4f;
+import org.joml.Vector3f;
+
 import com.mojang.blaze3d.systems.RenderSystem;
-import com.mojang.math.Matrix4f;
+import com.mojang.math.Axis;
-import com.mojang.math.Vector3f;
 
 public class CustomLightingSettings implements ILightingSettings {
 
@@ -19,20 +21,20 @@ public class CustomLightingSettings implements ILightingSettings {
 	}
 
 	protected void init(float yRot1, float xRot1, float yRot2, float xRot2, boolean doubleLight) {
-		light1 = Vector3f.ZP.copy();
+		light1 = new Vector3f(0, 0, 1);
-		light1.transform(Vector3f.YP.rotationDegrees(yRot1));
+		light1.rotate(Axis.YP.rotationDegrees(yRot1));
-		light1.transform(Vector3f.XN.rotationDegrees(xRot1));
+		light1.rotate(Axis.XN.rotationDegrees(xRot1));
 
 		if (doubleLight) {
-			light2 = Vector3f.ZP.copy();
+			light2 = new Vector3f(0, 0, 1);
-			light2.transform(Vector3f.YP.rotationDegrees(yRot2));
+			light2.rotate(Axis.YP.rotationDegrees(yRot2));
-			light2.transform(Vector3f.XN.rotationDegrees(xRot2));
+			light2.rotate(Axis.XN.rotationDegrees(xRot2));
 		} else {
-			light2 = Vector3f.ZERO;
+			light2 = new Vector3f();
 		}
 
 		lightMatrix = new Matrix4f();
-		lightMatrix.setIdentity();
+		lightMatrix.identity();
 	}
 
 	@Override

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

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

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

@@ -5,19 +5,21 @@ import com.mojang.blaze3d.platform.GlConst;
 import com.mojang.blaze3d.platform.GlStateManager;
 import com.mojang.blaze3d.platform.Window;
 import com.mojang.blaze3d.systems.RenderSystem;
-import com.mojang.blaze3d.vertex.*;
+import com.mojang.blaze3d.vertex.BufferBuilder;
-import com.mojang.math.Matrix4f;
+import com.mojang.blaze3d.vertex.DefaultVertexFormat;
-import com.mojang.math.Vector3f;
+import com.mojang.blaze3d.vertex.PoseStack;
-import nl.requios.effortlessbuilding.create.foundation.utility.Color;
+import com.mojang.blaze3d.vertex.Tesselator;
-import nl.requios.effortlessbuilding.create.foundation.utility.Couple;
+import com.mojang.blaze3d.vertex.VertexFormat;
+import com.mojang.math.Axis;
 import net.minecraft.client.Minecraft;
 import net.minecraft.client.renderer.GameRenderer;
 import net.minecraftforge.client.gui.ScreenUtils;
+import nl.requios.effortlessbuilding.create.foundation.utility.Color;
+import nl.requios.effortlessbuilding.create.foundation.utility.Couple;
+import org.joml.Matrix4f;
 import org.lwjgl.opengl.GL20;
 import org.lwjgl.opengl.GL30;
 
-import javax.annotation.Nonnull;
-
 public class UIRenderHelper {
 
 	/**
@@ -74,7 +76,7 @@ public class UIRenderHelper {
 
 		ms.pushPose();
 		ms.translate(x, y, 0);
-		ms.mulPose(Vector3f.ZP.rotationDegrees(angle - 90));
+		ms.mulPose(Axis.ZP.rotationDegrees(angle - 90));
 
 		streak(ms, breadth / 2, length, c1, c2, c3, c4);
 
@@ -90,7 +92,7 @@ public class UIRenderHelper {
 
 		ms.pushPose();
 		ms.translate(x, y, 0);
-		ms.mulPose(Vector3f.ZP.rotationDegrees(angle - 90));
+		ms.mulPose(Axis.ZP.rotationDegrees(angle - 90));
 
 		streak(ms, breadth / 2, length, c1, c2, c3, c4);
 
@@ -101,29 +103,29 @@ public class UIRenderHelper {
 		double split1 = .5;
 		double split2 = .75;
 		Matrix4f model = ms.last().pose();
-		ScreenUtils.drawGradientRect(model, 0, -width, 0, width, (int) (split1 * height), c1, c2);
+		ScreenUtils.drawGradientRect(model, -width, 0, width, (int) (split1 * height), 0, c1, c2);
-		ScreenUtils.drawGradientRect(model, 0, -width, (int) (split1 * height), width, (int) (split2 * height), c2, c3);
+		ScreenUtils.drawGradientRect(model, -width, (int) (split1 * height), width, (int) (split2 * height), 0, c2, c3);
-		ScreenUtils.drawGradientRect(model, 0, -width, (int) (split2 * height), width, height, c3, c4);
+		ScreenUtils.drawGradientRect(model, -width, (int) (split2 * height), width, height, 0, c3, c4);
 	}
 
 	/**
-	 * @see #angledGradient(MatrixStack, float, int, int, int, int, int, Color, Color)
+	 * @see #angledGradient(PoseStack, float, int, int, int, int, int, Color, Color)
 	 */
-	public static void angledGradient(@Nonnull PoseStack ms, float angle, int x, int y, int breadth, int length, Couple<Color> c) {
+	public static void angledGradient(PoseStack ms, float angle, int x, int y, int breadth, int length, Couple<Color> c) {
 		angledGradient(ms, angle, x, y, 0, breadth, length, c);
 	}
 
 	/**
-	 * @see #angledGradient(MatrixStack, float, int, int, int, int, int, Color, Color)
+	 * @see #angledGradient(PoseStack, float, int, int, int, int, int, Color, Color)
 	 */
-	public static void angledGradient(@Nonnull PoseStack ms, float angle, int x, int y, int z, int breadth, int length, Couple<Color> c) {
+	public static void angledGradient(PoseStack ms, float angle, int x, int y, int z, int breadth, int length, Couple<Color> c) {
 		angledGradient(ms, angle, x, y, z, breadth, length, c.getFirst(), c.getSecond());
 	}
 
 	/**
-	 * @see #angledGradient(MatrixStack, float, int, int, int, int, int, Color, Color)
+	 * @see #angledGradient(PoseStack, float, int, int, int, int, int, Color, Color)
 	 */
-	public static void angledGradient(@Nonnull PoseStack ms, float angle, int x, int y, int breadth, int length, Color color1, Color color2) {
+	public static void angledGradient(PoseStack ms, float angle, int x, int y, int breadth, int length, Color color1, Color color2) {
 		angledGradient(ms, angle, x, y, 0, breadth, length, color1, color2);
 	}
 
@@ -135,28 +137,28 @@ public class UIRenderHelper {
 	 * @param color2  the color at the ending edge
 	 * @param breadth the total width of the gradient
 	 */
-	public static void angledGradient(@Nonnull PoseStack ms, float angle, int x, int y, int z, int breadth, int length, Color color1, Color color2) {
+	public static void angledGradient(PoseStack ms, float angle, int x, int y, int z, int breadth, int length, Color color1, Color color2) {
 		ms.pushPose();
 		ms.translate(x, y, z);
-		ms.mulPose(Vector3f.ZP.rotationDegrees(angle - 90));
+		ms.mulPose(Axis.ZP.rotationDegrees(angle - 90));
 
-		Matrix4f model = ms.last().pose();
 		int w = breadth / 2;
-		ScreenUtils.drawGradientRect(model, 0, -w, 0, w, length, color1.getRGB(), color2.getRGB());
+		Matrix4f model = ms.last().pose();
+		ScreenUtils.drawGradientRect(model, -w, 0, w, length, 0, color1.getRGB(), color2.getRGB());
 
 		ms.popPose();
 	}
 
-	public static void breadcrumbArrow(PoseStack matrixStack, int x, int y, int z, int width, int height, int indent, Couple<Color> colors) {breadcrumbArrow(matrixStack, x, y, z, width, height, indent, colors.getFirst(), colors.getSecond());}
+	public static void breadcrumbArrow(PoseStack ms, int x, int y, int z, int width, int height, int indent, Couple<Color> colors) {breadcrumbArrow(ms, x, y, z, width, height, indent, colors.getFirst(), colors.getSecond());}
 
 	// draws a wide chevron-style breadcrumb arrow pointing left
-	public static void breadcrumbArrow(PoseStack matrixStack, int x, int y, int z, int width, int height, int indent, Color startColor, Color endColor) {
+	public static void breadcrumbArrow(PoseStack ms, int x, int y, int z, int width, int height, int indent, Color startColor, Color endColor) {
-		matrixStack.pushPose();
+		ms.pushPose();
-		matrixStack.translate(x - indent, y, z);
+		ms.translate(x - indent, y, z);
 
-		breadcrumbArrow(matrixStack, width, height, indent, startColor, endColor);
+		breadcrumbArrow(ms, width, height, indent, startColor, endColor);
 
-		matrixStack.popPose();
+		ms.popPose();
 	}
 
 	private static void breadcrumbArrow(PoseStack ms, int width, int height, int indent, Color c1, Color c2) {
@@ -189,7 +191,7 @@ public class UIRenderHelper {
 		Color fc3 = Color.mixColors(c1, c2, (indent + width) / (width + 2f * indent));
 		Color fc4 = Color.mixColors(c1, c2, 1);
 
-		RenderSystem.disableTexture();
+//		RenderSystem.disableTexture();
 		RenderSystem.enableBlend();
 		RenderSystem.disableCull();
 		RenderSystem.defaultBlendFunc();
@@ -227,7 +229,7 @@ public class UIRenderHelper {
 		tessellator.end();
 		RenderSystem.enableCull();
 		RenderSystem.disableBlend();
-		RenderSystem.enableTexture();
+//		RenderSystem.enableTexture();
 	}
 
 	//just like AbstractGui#drawTexture, but with a color at every vertex
@@ -246,6 +248,13 @@ public class UIRenderHelper {
 			tex.startY / 256f, (tex.startY + tex.height) / 256f);
 	}
 
+	public static void drawCropped(PoseStack ms, int left, int top, int w, int h, int z, AllGuiTextures tex) {
+		tex.bind();
+		drawTexturedQuad(ms.last()
+			.pose(), Color.WHITE, left, left + w, top, top + h, z, tex.startX / 256f, (tex.startX + w) / 256f,
+			tex.startY / 256f, (tex.startY + h) / 256f);
+	}
+
 	private static void drawColoredTexture(PoseStack ms, Color c, int left, int right, int top, int bot, int z, int tex_width, int tex_height, float tex_left, float tex_top, int sheet_width, int sheet_height) {
 		drawTexturedQuad(ms.last().pose(), c, left, right, top, bot, z, (tex_left + 0.0F) / (float) sheet_width, (tex_left + (float) tex_width) / (float) sheet_width, (tex_top + 0.0F) / (float) sheet_height, (tex_top + (float) tex_height) / (float) sheet_height);
 	}
@@ -266,7 +275,7 @@ public class UIRenderHelper {
 	}
 
 	public static void flipForGuiRender(PoseStack poseStack) {
-		poseStack.mulPoseMatrix(Matrix4f.createScaleMatrix(1, -1, 1));
+		poseStack.mulPoseMatrix(new Matrix4f().scaling(1, -1, 1));
 	}
 
 	public static class CustomRenderTarget extends RenderTarget {
@@ -291,7 +300,7 @@ public class UIRenderHelper {
 			float tx = (float) viewWidth / (float) width;
 			float ty = (float) viewHeight / (float) height;
 
-			RenderSystem.enableTexture();
+//			RenderSystem.enableTexture();
 			RenderSystem.enableDepthTest();
 			RenderSystem.setShader(() -> Minecraft.getInstance().gameRenderer.blitShader);
 			RenderSystem.getShader().setSampler("DiffuseSampler", colorTextureId);

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

@@ -2,11 +2,9 @@ package nl.requios.effortlessbuilding.create.foundation.gui.container;
 
 import com.mojang.blaze3d.platform.InputConstants;
 import com.mojang.blaze3d.vertex.PoseStack;
-import nl.requios.effortlessbuilding.create.foundation.gui.AllGuiTextures;
-import nl.requios.effortlessbuilding.create.foundation.gui.TickableGuiEventListener;
-import nl.requios.effortlessbuilding.create.foundation.gui.widget.AbstractSimiWidget;
 import net.minecraft.client.gui.components.AbstractWidget;
-import net.minecraft.client.gui.components.Widget;
+import net.minecraft.client.gui.components.EditBox;
+import net.minecraft.client.gui.components.Renderable;
 import net.minecraft.client.gui.components.events.GuiEventListener;
 import net.minecraft.client.gui.narration.NarratableEntry;
 import net.minecraft.client.gui.screens.inventory.AbstractContainerScreen;
@@ -17,6 +15,8 @@ import net.minecraft.world.entity.player.Inventory;
 import net.minecraft.world.inventory.AbstractContainerMenu;
 import net.minecraftforge.api.distmarker.Dist;
 import net.minecraftforge.api.distmarker.OnlyIn;
+import nl.requios.effortlessbuilding.create.foundation.gui.TickableGuiEventListener;
+import nl.requios.effortlessbuilding.create.foundation.gui.widget.AbstractSimiWidget;
 
 import javax.annotation.ParametersAreNonnullByDefault;
 import java.util.Collection;
@@ -66,13 +66,13 @@ public abstract class AbstractSimiContainerScreen<T extends AbstractContainerMen
 	}
 
 	@SuppressWarnings("unchecked")
-	protected <W extends GuiEventListener & Widget & NarratableEntry> void addRenderableWidgets(W... widgets) {
+	protected <W extends GuiEventListener & Renderable & NarratableEntry> void addRenderableWidgets(W... widgets) {
 		for (W widget : widgets) {
 			addRenderableWidget(widget);
 		}
 	}
 
-	protected <W extends GuiEventListener & Widget & NarratableEntry> void addRenderableWidgets(Collection<W> widgets) {
+	protected <W extends GuiEventListener & Renderable & NarratableEntry> void addRenderableWidgets(Collection<W> widgets) {
 		for (W widget : widgets) {
 			addRenderableWidget(widget);
 		}
@@ -91,18 +91,18 @@ public abstract class AbstractSimiContainerScreen<T extends AbstractContainerMen
 	}
 
 	@Override
-	public void render(PoseStack matrixStack, int mouseX, int mouseY, float partialTicks) {
+	public void render(PoseStack ms, int mouseX, int mouseY, float partialTicks) {
 		partialTicks = minecraft.getFrameTime();
 
-		renderBackground(matrixStack);
+		renderBackground(ms);
 
-		super.render(matrixStack, mouseX, mouseY, partialTicks);
+		super.render(ms, mouseX, mouseY, partialTicks);
 
-		renderForeground(matrixStack, mouseX, mouseY, partialTicks);
+		renderForeground(ms, mouseX, mouseY, partialTicks);
 	}
 
 	@Override
-	protected void renderLabels(PoseStack poseStack, int mouseX, int mouseY) {
+	protected void renderLabels(PoseStack ms, int mouseX, int mouseY) {
 		// no-op to prevent screen- and inventory-title from being rendered at incorrect
 		// location
 		// could also set this.titleX/Y and this.playerInventoryTitleX/Y to the proper
@@ -111,13 +111,13 @@ public abstract class AbstractSimiContainerScreen<T extends AbstractContainerMen
 
 	protected void renderForeground(PoseStack ms, int mouseX, int mouseY, float partialTicks) {
 		renderTooltip(ms, mouseX, mouseY);
-		for (Widget widget : renderables) {
+		for (Renderable widget : renderables) {
-			if (widget instanceof AbstractSimiWidget simiWidget && simiWidget.isHoveredOrFocused()) {
+			if (widget instanceof AbstractSimiWidget simiWidget && simiWidget.isMouseOver(mouseX, mouseY)) {
 				List<Component> tooltip = simiWidget.getToolTip();
 				if (tooltip.isEmpty())
 					continue;
-				int ttx = simiWidget.lockedTooltipX == -1 ? mouseX : simiWidget.lockedTooltipX + simiWidget.x;
+				int ttx = simiWidget.lockedTooltipX == -1 ? mouseX : simiWidget.lockedTooltipX + simiWidget.getX();
-				int tty = simiWidget.lockedTooltipY == -1 ? mouseY : simiWidget.lockedTooltipY + simiWidget.y;
+				int tty = simiWidget.lockedTooltipY == -1 ? mouseY : simiWidget.lockedTooltipY + simiWidget.getY();
 				renderComponentTooltip(ms, tooltip, ttx, tty);
 			}
 		}
@@ -127,19 +127,26 @@ public abstract class AbstractSimiContainerScreen<T extends AbstractContainerMen
 		return leftPos - windowXOffset + (imageWidth - textureWidth) / 2;
 	}
 
-//	public void renderPlayerInventory(PoseStack ms, int x, int y) {
+//	public void renderPlayerInventory(PoseStack graphics, int x, int y) {
-//		AllGuiTextures.PLAYER_INVENTORY.render(ms, x, y, this);
+//		AllGuiTextures.PLAYER_INVENTORY.render(graphics, x, y);
-//		font.draw(ms, playerInventoryTitle, x + 8, y + 6, 0x404040);
+//		graphics.drawString(font, playerInventoryTitle, x + 8, y + 6, 0x404040, false);
 //	}
 
 	@Override
 	public boolean keyPressed(int pKeyCode, int pScanCode, int pModifiers) {
 		InputConstants.Key mouseKey = InputConstants.getKey(pKeyCode, pScanCode);
-		if (getFocused() != null && this.minecraft.options.keyInventory.isActiveAndMatches(mouseKey))
+		if (getFocused() instanceof EditBox && this.minecraft.options.keyInventory.isActiveAndMatches(mouseKey))
 			return false;
 		return super.keyPressed(pKeyCode, pScanCode, pModifiers);
 	}
 	
+	@Override
+	public boolean mouseClicked(double pMouseX, double pMouseY, int pButton) {
+		if (getFocused() != null && !getFocused().isMouseOver(pMouseX, pMouseY))
+			setFocused(null);
+		return super.mouseClicked(pMouseX, pMouseY, pButton);
+	}
+	
 	@Override
 	public GuiEventListener getFocused() {
 		GuiEventListener focused = super.getFocused();
@@ -160,14 +167,14 @@ public abstract class AbstractSimiContainerScreen<T extends AbstractContainerMen
 	}
 
 	@Deprecated
-	protected void debugWindowArea(PoseStack matrixStack) {
+	protected void debugWindowArea(PoseStack ms) {
-		fill(matrixStack, leftPos + imageWidth, topPos + imageHeight, leftPos, topPos, 0xD3D3D3D3);
+		fill(ms, leftPos + imageWidth, topPos + imageHeight, leftPos, topPos, 0xD3D3D3D3);
 	}
 
 	@Deprecated
-	protected void debugExtraAreas(PoseStack matrixStack) {
+	protected void debugExtraAreas(PoseStack ms) {
 		for (Rect2i area : getExtraAreas()) {
-			fill(matrixStack, area.getX() + area.getWidth(), area.getY() + area.getHeight(), area.getX(), area.getY(),
+			fill(ms, area.getX() + area.getWidth(), area.getY() + area.getHeight(), area.getX(), area.getY(),
 				0xD3D3D3D3);
 		}
 	}

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

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

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

@@ -0,0 +1,30 @@
+package nl.requios.effortlessbuilding.create.foundation.gui.container;
+
+import net.minecraft.network.FriendlyByteBuf;
+import net.minecraft.server.level.ServerPlayer;
+import net.minecraftforge.network.NetworkEvent.Context;
+import nl.requios.effortlessbuilding.create.foundation.networking.SimplePacketBase;
+
+public class ClearMenuPacket extends SimplePacketBase {
+
+	public ClearMenuPacket() {}
+
+	public ClearMenuPacket(FriendlyByteBuf buffer) {}
+
+	@Override
+	public void write(FriendlyByteBuf buffer) {}
+
+	@Override
+	public boolean handle(Context context) {
+		context.enqueueWork(() -> {
+			ServerPlayer player = context.getSender();
+			if (player == null)
+				return;
+			if (!(player.containerMenu instanceof IClearableMenu))
+				return;
+			((IClearableMenu) player.containerMenu).clearContents();
+		});
+		return true;
+	}
+
+}

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

@@ -10,15 +10,15 @@ import net.minecraft.world.item.ItemStack;
 import net.minecraftforge.items.ItemHandlerHelper;
 import net.minecraftforge.items.ItemStackHandler;
 
-public abstract class GhostItemContainer<T> extends ContainerBase<T> implements IClearableContainer {
+public abstract class GhostItemMenu<T> extends MenuBase<T> implements IClearableMenu {
 
 	public ItemStackHandler ghostInventory;
 
-	protected GhostItemContainer(MenuType<?> type, int id, Inventory inv, FriendlyByteBuf extraData) {
+	protected GhostItemMenu(MenuType<?> type, int id, Inventory inv, FriendlyByteBuf extraData) {
 		super(type, id, inv, extraData);
 	}
 
-	protected GhostItemContainer(MenuType<?> type, int id, Inventory inv, T contentHolder) {
+	protected GhostItemMenu(MenuType<?> type, int id, Inventory inv, T contentHolder) {
 		super(type, id, inv, contentHolder);
 	}
 

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

@@ -1,12 +1,10 @@
 package nl.requios.effortlessbuilding.create.foundation.gui.container;
 
-import nl.requios.effortlessbuilding.create.foundation.networking.SimplePacketBase;
 import net.minecraft.network.FriendlyByteBuf;
 import net.minecraft.server.level.ServerPlayer;
 import net.minecraft.world.item.ItemStack;
 import net.minecraftforge.network.NetworkEvent.Context;
-
+import nl.requios.effortlessbuilding.create.foundation.networking.SimplePacketBase;
-import java.util.function.Supplier;
 
 public class GhostItemSubmitPacket extends SimplePacketBase {
 
@@ -30,23 +28,18 @@ public class GhostItemSubmitPacket extends SimplePacketBase {
 	}
 
 	@Override
-	public void handle(Supplier<Context> context) {
+	public boolean handle(Context context) {
-		context.get()
+		context.enqueueWork(() -> {
-				.enqueueWork(() -> {
+			ServerPlayer player = context.getSender();
-					ServerPlayer player = context.get()
+			if (player == null)
-							.getSender();
+				return;
-					if (player == null)
-						return;
 
-					if (player.containerMenu instanceof GhostItemContainer) {
+			if (player.containerMenu instanceof GhostItemMenu<?> menu) {
-						GhostItemContainer<?> c = (GhostItemContainer<?>) player.containerMenu;
+				menu.ghostInventory.setStackInSlot(slot, item);
-						c.ghostInventory.setStackInSlot(slot, item);
+				menu.getSlot(36 + slot).setChanged();
-						c.getSlot(36 + slot).setChanged();
+			}
-					}
+		});
-
+		return true;
-				});
-		context.get()
-				.setPacketHandled(true);
 	}
 
 }

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

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

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

@@ -0,0 +1,11 @@
+package nl.requios.effortlessbuilding.create.foundation.gui.container;
+
+public interface IClearableMenu {
+
+	default void sendClearPacket() {
+//		PacketHandler.INSTANCE.sendToServer(new ClearMenuPacket());
+	}
+
+	public void clearContents();
+
+}

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

@@ -1,6 +1,5 @@
 package nl.requios.effortlessbuilding.create.foundation.gui.container;
 
-import nl.requios.effortlessbuilding.create.foundation.utility.IInteractionChecker;
 import net.minecraft.network.FriendlyByteBuf;
 import net.minecraft.world.entity.player.Inventory;
 import net.minecraft.world.entity.player.Player;
@@ -9,19 +8,20 @@ import net.minecraft.world.inventory.MenuType;
 import net.minecraft.world.inventory.Slot;
 import net.minecraftforge.api.distmarker.Dist;
 import net.minecraftforge.api.distmarker.OnlyIn;
+import nl.requios.effortlessbuilding.create.foundation.utility.IInteractionChecker;
 
-public abstract class ContainerBase<T> extends AbstractContainerMenu {
+public abstract class MenuBase<T> extends AbstractContainerMenu {
 
 	public Player player;
 	public Inventory playerInventory;
 	public T contentHolder;
 
-	protected ContainerBase(MenuType<?> type, int id, Inventory inv, FriendlyByteBuf extraData) {
+	protected MenuBase(MenuType<?> type, int id, Inventory inv, FriendlyByteBuf extraData) {
 		super(type, id);
 		init(inv, createOnClient(extraData));
 	}
 
-	protected ContainerBase(MenuType<?> type, int id, Inventory inv, T contentHolder) {
+	protected MenuBase(MenuType<?> type, int id, Inventory inv, T contentHolder) {
 		super(type, id);
 		init(inv, contentHolder);
 	}

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

@@ -1,11 +1,15 @@
 package nl.requios.effortlessbuilding.create.foundation.gui.element;
 
 import com.mojang.blaze3d.systems.RenderSystem;
-import com.mojang.blaze3d.vertex.*;
+import com.mojang.blaze3d.vertex.BufferBuilder;
-import com.mojang.math.Matrix4f;
+import com.mojang.blaze3d.vertex.DefaultVertexFormat;
+import com.mojang.blaze3d.vertex.PoseStack;
+import com.mojang.blaze3d.vertex.Tesselator;
+import com.mojang.blaze3d.vertex.VertexFormat;
+import net.minecraft.client.renderer.GameRenderer;
 import nl.requios.effortlessbuilding.create.foundation.utility.Color;
 import nl.requios.effortlessbuilding.create.foundation.utility.Couple;
-import net.minecraft.client.renderer.GameRenderer;
+import org.joml.Matrix4f;
 
 public class BoxElement extends RenderElement {
 
@@ -83,7 +87,7 @@ public class BoxElement extends RenderElement {
 		*         |_____________|
 		*
 		* */
-		RenderSystem.disableTexture();
+//		RenderSystem.disableTexture();
 		RenderSystem.enableBlend();
 		RenderSystem.defaultBlendFunc();
 		RenderSystem.setShader(GameRenderer::getPositionColorShader);
@@ -148,6 +152,6 @@ public class BoxElement extends RenderElement {
 		tessellator.end();
 
 		RenderSystem.disableBlend();
-		RenderSystem.enableTexture();
+//		RenderSystem.enableTexture();
 	}
 }

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

@@ -1,9 +1,9 @@
 package nl.requios.effortlessbuilding.create.foundation.gui.element;
 
-import com.mojang.blaze3d.vertex.PoseStack;
-
 import javax.annotation.Nonnull;
 
+import com.mojang.blaze3d.vertex.PoseStack;
+
 public class CombinedStencilElement extends StencilElement {
 
 	private StencilElement element1;
@@ -57,12 +57,12 @@ public class CombinedStencilElement extends StencilElement {
 	}
 
 	@Override
-	protected void renderElement(PoseStack ms) {
+	protected void renderElement(PoseStack graphics) {
 		if (mode.rendersFirst())
-			element1.<StencilElement>withBounds(width, height).renderElement(ms);
+			element1.<StencilElement>withBounds(width, height).renderElement(graphics);
 
 		if (mode.rendersSecond())
-			element2.<StencilElement>withBounds(width, height).renderElement(ms);
+			element2.<StencilElement>withBounds(width, height).renderElement(graphics);
 	}
 
 	public enum ElementMode {

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

@@ -6,8 +6,8 @@ import nl.requios.effortlessbuilding.create.foundation.utility.Color;
 
 public class DelegatedStencilElement extends StencilElement {
 
-	protected static final ElementRenderer EMPTY_RENDERER = (ms, width, height, alpha) -> {};
+	protected static final ElementRenderer EMPTY_RENDERER = (graphics, width, height, alpha) -> {};
-	protected static final ElementRenderer DEFAULT_ELEMENT = (ms, width, height, alpha) -> UIRenderHelper.angledGradient(ms, 0, -3, 5, height+4, width+6, new Color(0xff_10dd10).scaleAlpha(alpha), new Color(0xff_1010dd).scaleAlpha(alpha));
+	protected static final ElementRenderer DEFAULT_ELEMENT = (graphics, width, height, alpha) -> UIRenderHelper.angledGradient(graphics, 0, -3, 5, height+4, width+6, new Color(0xff_10dd10).scaleAlpha(alpha), new Color(0xff_1010dd).scaleAlpha(alpha));
 
 	protected ElementRenderer stencil;
 	protected ElementRenderer element;

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

@@ -7,25 +7,20 @@ import com.mojang.blaze3d.platform.GlStateManager.SourceFactor;
 import com.mojang.blaze3d.platform.Lighting;
 import com.mojang.blaze3d.systems.RenderSystem;
 import com.mojang.blaze3d.vertex.PoseStack;
-import com.mojang.math.Vector3f;
+import com.mojang.math.Axis;
-//import nl.requios.effortlessbuilding.create.foundation.fluid.FluidRenderer;
-import nl.requios.effortlessbuilding.create.foundation.gui.ILightingSettings;
-import nl.requios.effortlessbuilding.create.foundation.gui.UIRenderHelper;
-import nl.requios.effortlessbuilding.create.foundation.utility.Color;
-import nl.requios.effortlessbuilding.create.foundation.utility.VecHelper;
 import net.minecraft.client.Minecraft;
 import net.minecraft.client.renderer.LightTexture;
 import net.minecraft.client.renderer.MultiBufferSource;
 import net.minecraft.client.renderer.RenderType;
 import net.minecraft.client.renderer.Sheets;
 import net.minecraft.client.renderer.block.BlockRenderDispatcher;
-import net.minecraft.client.renderer.block.model.ItemTransforms;
 import net.minecraft.client.renderer.entity.ItemRenderer;
 import net.minecraft.client.renderer.texture.OverlayTexture;
 import net.minecraft.client.resources.model.BakedModel;
 import net.minecraft.core.BlockPos;
 import net.minecraft.util.RandomSource;
 import net.minecraft.world.inventory.InventoryMenu;
+import net.minecraft.world.item.ItemDisplayContext;
 import net.minecraft.world.item.ItemStack;
 import net.minecraft.world.level.ItemLike;
 import net.minecraft.world.level.block.BaseFireBlock;
@@ -35,7 +30,10 @@ import net.minecraft.world.level.block.state.BlockState;
 import net.minecraft.world.level.material.Fluid;
 import net.minecraft.world.phys.Vec3;
 import net.minecraftforge.client.RenderTypeHelper;
-import net.minecraftforge.fluids.FluidStack;
+import nl.requios.effortlessbuilding.create.foundation.gui.ILightingSettings;
+import nl.requios.effortlessbuilding.create.foundation.gui.UIRenderHelper;
+import nl.requios.effortlessbuilding.create.foundation.utility.Color;
+import nl.requios.effortlessbuilding.create.foundation.utility.VecHelper;
 
 import javax.annotation.Nullable;
 
@@ -125,9 +123,9 @@ public class GuiGameElement {
 			matrixStack.translate(xLocal, yLocal, zLocal);
 			UIRenderHelper.flipForGuiRender(matrixStack);
 			matrixStack.translate(rotationOffset.x, rotationOffset.y, rotationOffset.z);
-			matrixStack.mulPose(Vector3f.ZP.rotationDegrees((float) zRot));
+			matrixStack.mulPose(Axis.ZP.rotationDegrees((float) zRot));
-			matrixStack.mulPose(Vector3f.XP.rotationDegrees((float) xRot));
+			matrixStack.mulPose(Axis.XP.rotationDegrees((float) xRot));
-			matrixStack.mulPose(Vector3f.YP.rotationDegrees((float) yRot));
+			matrixStack.mulPose(Axis.YP.rotationDegrees((float) yRot));
 			matrixStack.translate(-rotationOffset.x, -rotationOffset.y, -rotationOffset.z);
 		}
 
@@ -270,10 +268,11 @@ public class GuiGameElement {
 			renderer.textureManager.getTexture(InventoryMenu.BLOCK_ATLAS).setFilter(false, false);
 			RenderSystem.setShaderTexture(0, InventoryMenu.BLOCK_ATLAS);
 			RenderSystem.enableBlend();
+			RenderSystem.enableCull();
 			RenderSystem.blendFunc(SourceFactor.SRC_ALPHA, DestFactor.ONE_MINUS_SRC_ALPHA);
 			RenderSystem.setShaderColor(1.0F, 1.0F, 1.0F, 1.0F);
 			matrixStack.pushPose();
-			matrixStack.translate(0, 0, 100.0F + renderer.blitOffset);
+			matrixStack.translate(0, 0, 100.0F);
 			matrixStack.translate(8.0F, -8.0F, 0.0F);
 			matrixStack.scale(16.0F, 16.0F, 16.0F);
 			MultiBufferSource.BufferSource buffer = Minecraft.getInstance().renderBuffers().bufferSource();
@@ -282,8 +281,10 @@ public class GuiGameElement {
 				Lighting.setupForFlatItems();
 			}
 
-			renderer.render(stack, ItemTransforms.TransformType.GUI, false, matrixStack, buffer, LightTexture.FULL_BRIGHT, OverlayTexture.NO_OVERLAY, bakedModel);
+			renderer.render(stack, ItemDisplayContext.GUI, false, matrixStack, buffer, LightTexture.FULL_BRIGHT, OverlayTexture.NO_OVERLAY, bakedModel);
+			RenderSystem.disableDepthTest();
 			buffer.endBatch();
+			
 			RenderSystem.enableDepthTest();
 			if (useDefaultLighting && flatLighting) {
 				Lighting.setupFor3DItems();

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

@@ -7,6 +7,6 @@ import net.minecraftforge.api.distmarker.OnlyIn;
 public interface ScreenElement {
 
 	@OnlyIn(Dist.CLIENT)
-	void render(PoseStack ms, int x, int y);
+	void render(PoseStack poseStack, int x, int y);
 
 }

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

@@ -1,9 +1,11 @@
 package nl.requios.effortlessbuilding.create.foundation.gui.element;
 
+import org.lwjgl.opengl.GL11;
+
 import com.mojang.blaze3d.systems.RenderSystem;
 import com.mojang.blaze3d.vertex.PoseStack;
+
 import net.minecraft.client.Minecraft;
-import org.lwjgl.opengl.GL11;
 
 public abstract class StencilElement extends RenderElement {
 
@@ -19,9 +21,9 @@ public abstract class StencilElement extends RenderElement {
 		ms.popPose();
 	}
 
-	protected abstract void renderStencil(PoseStack ms);
+	protected abstract void renderStencil(PoseStack graphics);
 
-	protected abstract void renderElement(PoseStack ms);
+	protected abstract void renderElement(PoseStack graphics);
 
 	protected void transform(PoseStack ms) {
 		ms.translate(x, y, z);

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

@@ -1,9 +1,9 @@
 package nl.requios.effortlessbuilding.create.foundation.gui.element;
 
 import com.mojang.blaze3d.vertex.PoseStack;
-import nl.requios.effortlessbuilding.create.foundation.utility.Components;
 import net.minecraft.client.gui.Font;
 import net.minecraft.network.chat.MutableComponent;
+import nl.requios.effortlessbuilding.create.foundation.utility.Components;
 
 public class TextStencilElement extends DelegatedStencilElement {
 
@@ -46,7 +46,6 @@ public class TextStencilElement extends DelegatedStencilElement {
 
 	@Override
 	protected void renderStencil(PoseStack ms) {
-
 		float x = 0, y = 0;
 		if (centerHorizontally)
 			x = width / 2f - font.width(component) / 2f;
@@ -54,7 +53,7 @@ public class TextStencilElement extends DelegatedStencilElement {
 		if (centerVertically)
 			y = height / 2f - (font.lineHeight - 1) / 2f;
 
-		font.draw(ms, component, x, y, 0xff_000000);
+		font.draw(ms, component, Math.round(x), Math.round(y), 0xff_000000);
 	}
 
 	@Override

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

@@ -1,11 +1,13 @@
 package nl.requios.effortlessbuilding.create.foundation.gui.widget;
 
 import com.mojang.blaze3d.vertex.PoseStack;
-import nl.requios.effortlessbuilding.create.foundation.gui.TickableGuiEventListener;
-import nl.requios.effortlessbuilding.create.foundation.utility.Components;
 import net.minecraft.client.gui.components.AbstractWidget;
 import net.minecraft.client.gui.narration.NarrationElementOutput;
+import net.minecraft.client.gui.screens.inventory.tooltip.ClientTooltipPositioner;
+import net.minecraft.client.gui.screens.inventory.tooltip.DefaultTooltipPositioner;
 import net.minecraft.network.chat.Component;
+import nl.requios.effortlessbuilding.create.foundation.gui.TickableGuiEventListener;
+import nl.requios.effortlessbuilding.create.foundation.utility.Components;
 
 import javax.annotation.Nonnull;
 import java.util.LinkedList;
@@ -15,6 +17,7 @@ import java.util.function.BiConsumer;
 public abstract class AbstractSimiWidget extends AbstractWidget implements TickableGuiEventListener {
 
 	public static final int HEADER_RGB = 0x5391E1;
+	public static final int HINT_RGB = 0x96B7E0;
 
 	protected float z;
 	protected boolean wasHovered = false;
@@ -36,6 +39,11 @@ public abstract class AbstractSimiWidget extends AbstractWidget implements Ticka
 		super(x, y, width, height, message);
 	}
 
+	@Override
+	protected ClientTooltipPositioner createTooltipPositioner() {
+		return DefaultTooltipPositioner.INSTANCE;
+	}
+
 	public <T extends AbstractSimiWidget> T withCallback(BiConsumer<Integer, Integer> cb) {
 		this.onClick = cb;
 		//noinspection unchecked
@@ -60,22 +68,18 @@ public abstract class AbstractSimiWidget extends AbstractWidget implements Ticka
 	public void tick() {}
 
 	@Override
-	public void render(@Nonnull PoseStack ms, int mouseX, int mouseY, float partialTicks) {
+	public void renderWidget(@Nonnull PoseStack ms, int mouseX, int mouseY, float partialTicks) {
-		if (visible) {
+		beforeRender(ms, mouseX, mouseY, partialTicks);
-			isHovered = mouseX >= x && mouseY >= y && mouseX < x + width && mouseY < y + height;
+		doRender(ms, mouseX, mouseY, partialTicks);
-			beforeRender(ms, mouseX, mouseY, partialTicks);
+		afterRender(ms, mouseX, mouseY, partialTicks);
-			renderButton(ms, mouseX, mouseY, partialTicks);
+		wasHovered = isHoveredOrFocused();
-			afterRender(ms, mouseX, mouseY, partialTicks);
-			wasHovered = isHoveredOrFocused();
-		}
 	}
 
 	protected void beforeRender(@Nonnull PoseStack ms, int mouseX, int mouseY, float partialTicks) {
 		ms.pushPose();
 	}
 
-	@Override
+	protected void doRender(@Nonnull PoseStack ms, int mouseX, int mouseY, float partialTicks) {
-	public void renderButton(@Nonnull PoseStack ms, int mouseX, int mouseY, float partialTicks) {
 	}
 
 	protected void afterRender(@Nonnull PoseStack ms, int mouseX, int mouseY, float partialTicks) {
@@ -92,7 +96,7 @@ public abstract class AbstractSimiWidget extends AbstractWidget implements Ticka
 	}
 
 	@Override
-	public void updateNarration(NarrationElementOutput pNarrationElementOutput) {
+	public void updateWidgetNarration(NarrationElementOutput pNarrationElementOutput) {
 		defaultButtonNarrationText(pNarrationElementOutput);
 	}
 }

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

@@ -2,7 +2,6 @@ package nl.requios.effortlessbuilding.create.foundation.gui.widget;
 
 import com.mojang.blaze3d.vertex.PoseStack;
 import nl.requios.effortlessbuilding.create.foundation.gui.Theme;
-import nl.requios.effortlessbuilding.create.foundation.gui.Theme.Key;
 import nl.requios.effortlessbuilding.create.foundation.gui.UIRenderHelper;
 import nl.requios.effortlessbuilding.create.foundation.gui.element.BoxElement;
 import nl.requios.effortlessbuilding.create.foundation.gui.element.DelegatedStencilElement;
@@ -10,7 +9,6 @@ import nl.requios.effortlessbuilding.create.foundation.utility.Color;
 import nl.requios.effortlessbuilding.create.foundation.utility.Couple;
 import nl.requios.effortlessbuilding.create.foundation.utility.animation.LerpedFloat;
 
-import javax.annotation.Nonnull;
 import java.util.function.Function;
 
 public class BoxWidget extends ElementWidget {
@@ -98,7 +96,7 @@ public class BoxWidget extends ElementWidget {
 	}
 
 	@Override
-	protected void beforeRender(@Nonnull PoseStack ms, int mouseX, int mouseY, float partialTicks) {
+	protected void beforeRender(PoseStack ms, int mouseX, int mouseY, float partialTicks) {
 		super.beforeRender(ms, mouseX, mouseY, partialTicks);
 
 		if (isHovered != wasHovered) {
@@ -121,7 +119,7 @@ public class BoxWidget extends ElementWidget {
 	}
 
 	@Override
-	public void renderButton(@Nonnull PoseStack ms, int mouseX, int mouseY, float partialTicks) {
+	public void doRender(PoseStack ms, int mouseX, int mouseY, float partialTicks) {
 		float fadeValue = fade.getValue(partialTicks);
 		if (fadeValue < .1f)
 			return;
@@ -129,11 +127,11 @@ public class BoxWidget extends ElementWidget {
 		box.withAlpha(fadeValue);
 		box.withBackground(customBackground != null ? customBackground : Theme.c(Theme.Key.PONDER_BACKGROUND_TRANSPARENT))
 				.gradientBorder(gradientColor1, gradientColor2)
-				.at(x, y, z)
+				.at(getX(), getY(), z)
 				.withBounds(width, height)
 				.render(ms);
 
-		super.renderButton(ms, mouseX, mouseY, partialTicks);
+		super.doRender(ms, mouseX, mouseY, partialTicks);
 
 		wasHovered = isHovered;
 	}
@@ -146,7 +144,7 @@ public class BoxWidget extends ElementWidget {
 		float padX = 2 + paddingX;
 		float padY = 2 + paddingY;
 
-		return x - padX <= mX && y - padY <= mY && mX < x + padX + width && mY < y + padY + height;
+		return getX() - padX <= mX && getY() - padY <= mY && mX < getX() + padX + width && mY < getY() + padY + height;
 	}
 
 	@Override
@@ -209,19 +207,19 @@ public class BoxWidget extends ElementWidget {
 			return customBorderBot != null ? customBorderBot : Theme.c(getIdleTheme(), false);
 	}
 
-	public Key getDisabledTheme() {
+	public Theme.Key getDisabledTheme() {
 		return Theme.Key.BUTTON_DISABLE;
 	}
 
-	public Key getIdleTheme() {
+	public Theme.Key getIdleTheme() {
 		return Theme.Key.BUTTON_IDLE;
 	}
 
-	public Key getHoverTheme() {
+	public Theme.Key getHoverTheme() {
 		return Theme.Key.BUTTON_HOVER;
 	}
 
-	public Key getClickTheme() {
+	public Theme.Key getClickTheme() {
 		return Theme.Key.BUTTON_CLICK;
 	}
 

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

@@ -5,7 +5,6 @@ import nl.requios.effortlessbuilding.create.foundation.gui.element.RenderElement
 import nl.requios.effortlessbuilding.create.foundation.gui.element.ScreenElement;
 import nl.requios.effortlessbuilding.create.foundation.utility.animation.LerpedFloat;
 
-import javax.annotation.Nonnull;
 import java.util.function.Consumer;
 import java.util.function.UnaryOperator;
 
@@ -117,7 +116,7 @@ public class ElementWidget extends AbstractSimiWidget {
 	}
 
 	@Override
-	protected void beforeRender(@Nonnull PoseStack ms, int mouseX, int mouseY, float partialTicks) {
+	protected void beforeRender(PoseStack ms, int mouseX, int mouseY, float partialTicks) {
 		super.beforeRender(ms, mouseX, mouseY, partialTicks);
 		isHovered = isMouseOver(mouseX, mouseY);
 
@@ -129,9 +128,9 @@ public class ElementWidget extends AbstractSimiWidget {
 	}
 
 	@Override
-	public void renderButton(@Nonnull PoseStack ms, int mouseX, int mouseY, float partialTicks) {
+	public void doRender(PoseStack ms, int mouseX, int mouseY, float partialTicks) {
 		ms.pushPose();
-		ms.translate(x + paddingX, y + paddingY, z);
+		ms.translate(getX() + paddingX, getY() + paddingY, z);
 		float innerWidth = width - 2 * paddingX;
 		float innerHeight = height - 2 * paddingY;
 		float eX = element.getX(), eY = element.getY();

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

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

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

@@ -2,10 +2,8 @@ package nl.requios.effortlessbuilding.create.foundation.gui.widget;
 
 import com.google.common.collect.ImmutableList;
 import com.mojang.blaze3d.vertex.PoseStack;
-import nl.requios.effortlessbuilding.create.foundation.gui.AllGuiTextures;
 import net.minecraft.network.chat.Component;
-
+import nl.requios.effortlessbuilding.create.foundation.gui.AllGuiTextures;
-import javax.annotation.Nonnull;
 
 public class Indicator extends AbstractSimiWidget {
 
@@ -13,12 +11,12 @@ public class Indicator extends AbstractSimiWidget {
 
 	public Indicator(int x, int y, Component tooltip) {
 		super(x, y, AllGuiTextures.INDICATOR.width, AllGuiTextures.INDICATOR.height);
-		this.toolTip = ImmutableList.of(tooltip);
+		this.toolTip = toolTip.isEmpty() ? ImmutableList.of() : ImmutableList.of(tooltip);
 		this.state = State.OFF;
 	}
 
 	@Override
-	public void render(@Nonnull PoseStack matrixStack, int mouseX, int mouseY, float partialTicks ) {
+	public void render(PoseStack ms, int mouseX, int mouseY, float partialTicks ) {
 		if (!visible)
 			return;
 		AllGuiTextures toDraw;
@@ -30,7 +28,7 @@ public class Indicator extends AbstractSimiWidget {
 			case GREEN: toDraw = AllGuiTextures.INDICATOR_GREEN; break;
 			default: toDraw = AllGuiTextures.INDICATOR; break;
 		}
-		toDraw.render(matrixStack, x, y, this);
+		toDraw.render(ms, getX(), getY());
 	}
 
 	public enum State {

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

@@ -2,11 +2,11 @@ package nl.requios.effortlessbuilding.create.foundation.gui.widget;
 
 import com.mojang.blaze3d.systems.RenderSystem;
 import com.mojang.blaze3d.vertex.PoseStack;
-import nl.requios.effortlessbuilding.create.foundation.utility.Components;
 import net.minecraft.client.Minecraft;
 import net.minecraft.client.gui.Font;
 import net.minecraft.network.chat.Component;
 import net.minecraft.network.chat.MutableComponent;
+import nl.requios.effortlessbuilding.create.foundation.utility.Components;
 
 import javax.annotation.Nonnull;
 
@@ -70,7 +70,7 @@ public class Label extends AbstractSimiWidget {
 	}
 
 	@Override
-	public void renderButton(@Nonnull PoseStack matrixStack, int mouseX, int mouseY, float partialTicks) {
+	protected void doRender(@Nonnull PoseStack ms, int mouseX, int mouseY, float partialTicks) {
 		if (text == null || text.getString().isEmpty())
 			return;
 
@@ -80,9 +80,9 @@ public class Label extends AbstractSimiWidget {
 			copy.append(suffix);
 
 		if (hasShadow)
-			font.drawShadow(matrixStack, copy, x, y, color);
+			font.drawShadow(ms, copy, getX(), getY(), color);
 		else
-			font.draw(matrixStack, copy, x, y, color);
+			font.draw(ms, copy, getX(), getY(), color);
 	}
 
 }

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

@@ -1,14 +1,11 @@
 package nl.requios.effortlessbuilding.create.foundation.gui.widget;
 
-import nl.requios.effortlessbuilding.create.AllKeys;
-//import nl.requios.effortlessbuilding.create.AllSoundEvents;
-import nl.requios.effortlessbuilding.create.foundation.utility.Components;
-import nl.requios.effortlessbuilding.create.foundation.utility.Lang;
 import net.minecraft.ChatFormatting;
-import net.minecraft.client.Minecraft;
-//import net.minecraft.client.resources.sounds.SimpleSoundInstance;
 import net.minecraft.network.chat.Component;
 import net.minecraft.network.chat.MutableComponent;
+import nl.requios.effortlessbuilding.create.AllKeys;
+import nl.requios.effortlessbuilding.create.foundation.utility.Components;
+import nl.requios.effortlessbuilding.create.foundation.utility.Lang;
 
 import java.util.function.Consumer;
 import java.util.function.Function;
@@ -20,8 +17,10 @@ public class ScrollInput extends AbstractSimiWidget {
 	protected Component title = Lang.translateDirect("gui.scrollInput.defaultTitle");
 	protected final Component scrollToModify = Lang.translateDirect("gui.scrollInput.scrollToModify");
 	protected final Component shiftScrollsFaster = Lang.translateDirect("gui.scrollInput.shiftScrollsFaster");
+	protected Component hint = null;
 	protected Label displayLabel;
 	protected boolean inverted;
+	protected boolean soundPlayed;
 	protected Function<Integer, Component> formatter;
 
 	protected int min, max;
@@ -36,6 +35,7 @@ public class ScrollInput extends AbstractSimiWidget {
 		shiftStep = 5;
 		step = standardStep();
 		formatter = i -> Components.literal(String.valueOf(i));
+		soundPlayed = false;
 	}
 
 	public Function<StepContext, Integer> standardStep() {
@@ -74,6 +74,12 @@ public class ScrollInput extends AbstractSimiWidget {
 		return this;
 	}
 
+	public ScrollInput addHint(MutableComponent hint) {
+		this.hint = hint;
+		updateTooltip();
+		return this;
+	}
+
 	public ScrollInput withStepFunction(Function<StepContext, Integer> step) {
 		this.step = step;
 		return this;
@@ -86,6 +92,12 @@ public class ScrollInput extends AbstractSimiWidget {
 		return this;
 	}
 	
+	@Override
+	public void tick() {
+		super.tick();
+		soundPlayed = false;
+	}
+
 	public int getState() {
 		return state;
 	}
@@ -128,7 +140,12 @@ public class ScrollInput extends AbstractSimiWidget {
 		clampState();
 
 		if (priorState != state) {
-//			Minecraft.getInstance().getSoundManager().play(SimpleSoundInstance.forUI(AllSoundEvents.SCROLL_VALUE.getMainEvent(), 1.5f + 0.1f * (state-min)/(max-min)));
+//			if (!soundPlayed)
+//				Minecraft.getInstance()
+//					.getSoundManager()
+//					.play(SimpleSoundInstance.forUI(AllSoundEvents.SCROLL_VALUE.getMainEvent(),
+//						1.5f + 0.1f * (state - min) / (max - min)));
+//			soundPlayed = true;
 			onChanged();
 		}
 
@@ -161,6 +178,9 @@ public class ScrollInput extends AbstractSimiWidget {
 			return;
 		toolTip.add(title.plainCopy()
 			.withStyle(s -> s.withColor(HEADER_RGB)));
+		if (hint != null)
+			toolTip.add(hint.plainCopy()
+				.withStyle(s -> s.withColor(HINT_RGB)));
 		toolTip.add(scrollToModify.plainCopy()
 			.withStyle(ChatFormatting.ITALIC, ChatFormatting.DARK_GRAY));
 		toolTip.add(shiftScrollsFaster.plainCopy()

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

@@ -1,10 +1,10 @@
 package nl.requios.effortlessbuilding.create.foundation.gui.widget;
 
-import nl.requios.effortlessbuilding.create.foundation.utility.Components;
-import nl.requios.effortlessbuilding.create.foundation.utility.Lang;
 import net.minecraft.ChatFormatting;
 import net.minecraft.network.chat.Component;
 import net.minecraft.network.chat.MutableComponent;
+import nl.requios.effortlessbuilding.create.foundation.utility.Components;
+import nl.requios.effortlessbuilding.create.foundation.utility.Lang;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -42,7 +42,8 @@ public class SelectionScrollInput extends ScrollInput {
 		if (this.min + 1 == min)
 			min--;
 		if (min > this.min)
-			toolTip.add(Components.literal("> ...").withStyle(ChatFormatting.GRAY));
+			toolTip.add(Components.literal("> ...")
+				.withStyle(ChatFormatting.GRAY));
 		if (this.max - 1 == max)
 			max++;
 		for (int i = min; i < max; i++) {
@@ -58,8 +59,12 @@ public class SelectionScrollInput extends ScrollInput {
 					.withStyle(ChatFormatting.GRAY));
 		}
 		if (max < this.max)
-			toolTip.add(Components.literal("> ...").withStyle(ChatFormatting.GRAY));
+			toolTip.add(Components.literal("> ...")
+				.withStyle(ChatFormatting.GRAY));
 
+		if (hint != null)
+			toolTip.add(hint.plainCopy()
+				.withStyle(s -> s.withColor(HINT_RGB)));
 		toolTip.add(scrollToSelect.plainCopy()
 			.withStyle(ChatFormatting.DARK_GRAY, ChatFormatting.ITALIC));
 	}

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

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

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

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

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

@@ -1,32 +1,33 @@
 package nl.requios.effortlessbuilding.create.foundation.item;
 
 import com.google.common.base.Strings;
-import com.mojang.bridge.game.Language;
-import nl.requios.effortlessbuilding.create.foundation.item.ItemDescription.Palette;
-import nl.requios.effortlessbuilding.create.foundation.utility.Components;
-import nl.requios.effortlessbuilding.create.foundation.utility.Couple;
-import nl.requios.effortlessbuilding.create.foundation.utility.FontHelper;
-import nl.requios.effortlessbuilding.create.foundation.utility.Lang;
 import net.minecraft.ChatFormatting;
 import net.minecraft.client.Minecraft;
 import net.minecraft.client.gui.Font;
 import net.minecraft.client.resources.language.I18n;
 import net.minecraft.network.chat.Component;
 import net.minecraft.network.chat.MutableComponent;
-import net.minecraft.world.entity.player.Player;
 import net.minecraft.world.item.Item;
 import net.minecraft.world.item.ItemStack;
 import net.minecraft.world.level.ItemLike;
+import nl.requios.effortlessbuilding.create.foundation.item.ItemDescription.Palette;
+import nl.requios.effortlessbuilding.create.foundation.utility.Components;
+import nl.requios.effortlessbuilding.create.foundation.utility.Couple;
+import nl.requios.effortlessbuilding.create.foundation.utility.FontHelper;
+import nl.requios.effortlessbuilding.create.foundation.utility.Lang;
 
 import java.text.BreakIterator;
-import java.util.*;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.LinkedList;
+import java.util.List;
+import java.util.Map;
 import java.util.function.Supplier;
 
 public class TooltipHelper {
 
 	public static final int maxWidthPerLine = 200;
 	public static final Map<String, ItemDescription> cachedTooltips = new HashMap<>();
-	public static Language cachedLanguage;
 	private static boolean gogglesMode;
 	private static final Map<Item, Supplier<String>> tooltipReferrals = new HashMap<>();
 
@@ -212,36 +213,6 @@ public class TooltipHelper {
 //		return lines;
 //	}
 
-	private static void checkLocale() {
-		Language currentLanguage = Minecraft.getInstance()
-			.getLanguageManager()
-			.getSelected();
-		if (cachedLanguage != currentLanguage) {
-			cachedTooltips.clear();
-			cachedLanguage = currentLanguage;
-		}
-	}
-
-	public static boolean hasTooltip(ItemStack stack, Player player) {
-		checkLocale();
-
-		String key = getTooltipTranslationKey(stack);
-		if (cachedTooltips.containsKey(key))
-			return cachedTooltips.get(key) != ItemDescription.MISSING;
-		return findTooltip(stack);
-	}
-
-	public static ItemDescription getTooltip(ItemStack stack) {
-		checkLocale();
-		String key = getTooltipTranslationKey(stack);
-		if (cachedTooltips.containsKey(key)) {
-			ItemDescription itemDescription = cachedTooltips.get(key);
-			if (itemDescription != ItemDescription.MISSING)
-				return itemDescription;
-		}
-		return null;
-	}
-
 	private static boolean findTooltip(ItemStack stack) {
 		String key = getTooltipTranslationKey(stack);
 		if (I18n.exists(key)) {

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

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

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

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

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

@@ -2,19 +2,19 @@ package nl.requios.effortlessbuilding.create.foundation.item.render;
 
 import com.mojang.blaze3d.vertex.PoseStack;
 import com.mojang.blaze3d.vertex.VertexConsumer;
-import nl.requios.effortlessbuilding.create.foundation.render.RenderTypes;
-import nl.requios.effortlessbuilding.create.foundation.utility.Iterate;
 import net.minecraft.client.Minecraft;
 import net.minecraft.client.renderer.MultiBufferSource;
 import net.minecraft.client.renderer.RenderType;
-import net.minecraft.client.renderer.block.model.ItemTransforms;
 import net.minecraft.client.renderer.entity.ItemRenderer;
 import net.minecraft.client.resources.model.BakedModel;
 import net.minecraft.core.Direction;
 import net.minecraft.util.RandomSource;
+import net.minecraft.world.item.ItemDisplayContext;
 import net.minecraft.world.item.ItemStack;
 import net.minecraftforge.client.extensions.common.IClientItemExtensions;
 import net.minecraftforge.client.model.data.ModelData;
+import nl.requios.effortlessbuilding.create.foundation.render.RenderTypes;
+import nl.requios.effortlessbuilding.create.foundation.utility.Iterate;
 
 public class PartialItemModelRenderer {
 
@@ -23,12 +23,12 @@ public class PartialItemModelRenderer {
 	private final RandomSource random = RandomSource.create();
 
 	private ItemStack stack;
-	private ItemTransforms.TransformType transformType;
+	private ItemDisplayContext transformType;
 	private PoseStack ms;
 	private MultiBufferSource buffer;
 	private int overlay;
 
-	public static PartialItemModelRenderer of(ItemStack stack, ItemTransforms.TransformType transformType,
+	public static PartialItemModelRenderer of(ItemStack stack, ItemDisplayContext transformType,
 		PoseStack ms, MultiBufferSource buffer, int overlay) {
 		PartialItemModelRenderer instance = INSTANCE;
 		instance.stack = stack;

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

@@ -5,10 +5,8 @@ import net.minecraft.nbt.CompoundTag;
 import net.minecraft.network.FriendlyByteBuf;
 import net.minecraft.world.entity.Entity;
 import net.minecraftforge.network.NetworkEvent.Context;
-import net.minecraftforge.network.PacketDistributor;
 
 import java.util.HashSet;
-import java.util.function.Supplier;
 
 public interface ISyncPersistentData {
 
@@ -37,19 +35,17 @@ public interface ISyncPersistentData {
 		}
 
 		@Override
-		public void handle(Supplier<Context> context) {
+		public boolean handle(Context context) {
-			context.get()
+			context.enqueueWork(() -> {
-				.enqueueWork(() -> {
+				Entity entityByID = Minecraft.getInstance().level.getEntity(entityId);
-					Entity entityByID = Minecraft.getInstance().level.getEntity(entityId);
+				CompoundTag data = entityByID.getPersistentData();
-					CompoundTag data = entityByID.getPersistentData();
+				new HashSet<>(data.getAllKeys()).forEach(data::remove);
-					new HashSet<>(data.getAllKeys()).forEach(data::remove);
+				data.merge(readData);
-					data.merge(readData);
+				if (!(entityByID instanceof ISyncPersistentData))
-					if (!(entityByID instanceof ISyncPersistentData))
+					return;
-						return;
+				((ISyncPersistentData) entityByID).onPersistentDataUpdated();
-					((ISyncPersistentData) entityByID).onPersistentDataUpdated();
+			});
-				});
+			return true;
-			context.get()
-				.setPacketHandled(true);
 		}
 
 	}

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

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

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

@@ -1,9 +1,8 @@
 package nl.requios.effortlessbuilding.create.foundation.render;
 
 import com.jozufozu.flywheel.core.model.ModelUtil;
-import com.jozufozu.flywheel.core.model.ShadeSeparatedBufferedData;
 import com.jozufozu.flywheel.util.Pair;
-import com.mojang.blaze3d.vertex.BufferBuilder.RenderedBuffer;
+import com.mojang.blaze3d.vertex.BufferBuilder;
 import com.mojang.blaze3d.vertex.PoseStack;
 import net.minecraft.client.Minecraft;
 import net.minecraft.client.renderer.block.BlockRenderDispatcher;
@@ -14,7 +13,7 @@ public class BakedModelRenderHelper {
 
 	public static SuperByteBuffer standardBlockRender(BlockState renderedState) {
 		BlockRenderDispatcher dispatcher = Minecraft.getInstance()
-			.getBlockRenderer();
+				.getBlockRenderer();
 		return standardModelRender(dispatcher.getBlockModel(renderedState), renderedState);
 	}
 
@@ -23,10 +22,7 @@ public class BakedModelRenderHelper {
 	}
 
 	public static SuperByteBuffer standardModelRender(BakedModel model, BlockState referenceState, PoseStack ms) {
-		ShadeSeparatedBufferedData data = ModelUtil.getBufferedData(model, referenceState, ms);
+		Pair<BufferBuilder.RenderedBuffer, Integer> pair = ModelUtil.getBufferBuilder(model, referenceState, ms);
-		SuperByteBuffer sbb = new SuperByteBuffer(data);
+		return new SuperByteBuffer(pair.first(), pair.second());
-		data.release();
-		return sbb;
 	}
-
 }

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

@@ -3,7 +3,6 @@ package nl.requios.effortlessbuilding.create.foundation.render;
 import com.jozufozu.flywheel.core.PartialModel;
 import com.jozufozu.flywheel.util.transform.TransformStack;
 import com.mojang.blaze3d.vertex.PoseStack;
-import nl.requios.effortlessbuilding.EffortlessBuildingClient;
 import nl.requios.effortlessbuilding.create.CreateClient;
 import nl.requios.effortlessbuilding.create.foundation.render.SuperByteBufferCache.Compartment;
 import nl.requios.effortlessbuilding.create.foundation.utility.AngleHelper;

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

@@ -6,16 +6,8 @@ import nl.requios.effortlessbuilding.create.AllSpecialTextures;
 import nl.requios.effortlessbuilding.create.Create;
 import net.minecraft.client.renderer.RenderStateShard;
 import net.minecraft.client.renderer.RenderType;
-import net.minecraft.client.renderer.ShaderInstance;
 import net.minecraft.resources.ResourceLocation;
-import net.minecraft.server.packs.resources.ResourceManager;
 import net.minecraft.world.inventory.InventoryMenu;
-import net.minecraftforge.api.distmarker.Dist;
-import net.minecraftforge.client.event.RegisterShadersEvent;
-import net.minecraftforge.eventbus.api.SubscribeEvent;
-import net.minecraftforge.fml.common.Mod.EventBusSubscriber;
-
-import java.io.IOException;
 
 // TODO 1.17: use custom shaders instead of vanilla ones
 public class RenderTypes extends RenderStateShard {
@@ -79,7 +71,7 @@ public class RenderTypes extends RenderStateShard {
 
 	private static final RenderType ADDITIVE = RenderType.create(createLayerName("additive"), DefaultVertexFormat.BLOCK,
 		VertexFormat.Mode.QUADS, 256, true, true, RenderType.CompositeState.builder()
-			.setShaderState(BLOCK_SHADER)
+			.setShaderState(RENDERTYPE_SOLID_SHADER)
 			.setTextureState(new TextureStateShard(InventoryMenu.BLOCK_ATLAS, false, false))
 			.setTransparencyState(ADDITIVE_TRANSPARENCY)
 			.setCullState(NO_CULL)

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

@@ -2,6 +2,7 @@ package nl.requios.effortlessbuilding.create.foundation.render;
 
 import com.mojang.blaze3d.vertex.PoseStack;
 import com.mojang.blaze3d.vertex.VertexConsumer;
+
 import net.minecraft.client.renderer.LightTexture;
 import net.minecraft.client.renderer.MultiBufferSource;
 import net.minecraft.client.renderer.RenderType;

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

@@ -1,26 +1,23 @@
 package nl.requios.effortlessbuilding.create.foundation.render;
 
-import java.nio.ByteBuffer;
+import com.jozufozu.flywheel.util.Color;
-import java.util.function.IntPredicate;
+import nl.requios.effortlessbuilding.create.foundation.block.render.SpriteShiftEntry;
+import org.joml.Matrix3f;
+import org.joml.Matrix4f;
+import org.joml.Quaternionf;
+import org.joml.Vector3f;
+import org.joml.Vector4f;
 
 import com.jozufozu.flywheel.api.vertex.ShadedVertexList;
-import com.jozufozu.flywheel.api.vertex.VertexList;
 import com.jozufozu.flywheel.backend.ShadersModHandler;
-import com.jozufozu.flywheel.core.model.ShadeSeparatedBufferedData;
 import com.jozufozu.flywheel.core.vertex.BlockVertexList;
 import com.jozufozu.flywheel.util.DiffuseLightCalculator;
 import com.jozufozu.flywheel.util.transform.TStack;
 import com.jozufozu.flywheel.util.transform.Transform;
-import com.mojang.blaze3d.vertex.BufferBuilder;
+import com.mojang.blaze3d.vertex.BufferBuilder.DrawState;
+import com.mojang.blaze3d.vertex.BufferBuilder.RenderedBuffer;
 import com.mojang.blaze3d.vertex.PoseStack;
 import com.mojang.blaze3d.vertex.VertexConsumer;
-import com.mojang.math.Matrix3f;
-import com.mojang.math.Matrix4f;
-import com.mojang.math.Quaternion;
-import com.mojang.math.Vector3f;
-import com.mojang.math.Vector4f;
-import nl.requios.effortlessbuilding.create.foundation.block.render.SpriteShiftEntry;
-import nl.requios.effortlessbuilding.create.foundation.utility.Color;
 
 import it.unimi.dsi.fastutil.longs.Long2IntMap;
 import it.unimi.dsi.fastutil.longs.Long2IntOpenHashMap;
@@ -35,11 +32,10 @@ import net.minecraft.world.level.Level;
 
 public class SuperByteBuffer implements Transform<SuperByteBuffer>, TStack<SuperByteBuffer> {
 
-	private final VertexList template;
+	private final ShadedVertexList template;
-	private final IntPredicate shadedPredicate;
 
 	// Vertex Position
-	private final PoseStack transforms = new PoseStack();
+	private final PoseStack transforms;
 
 	// Vertex Coloring
 	private boolean shouldColor;
@@ -67,28 +63,11 @@ public class SuperByteBuffer implements Transform<SuperByteBuffer>, TStack<Super
 	// Temporary
 	private static final Long2IntMap WORLD_LIGHT_CACHE = new Long2IntOpenHashMap();
 
-	public SuperByteBuffer(ByteBuffer vertexBuffer, BufferBuilder.DrawState drawState, int unshadedStartVertex) {
+	public SuperByteBuffer(RenderedBuffer buf, int unshadedStartVertex) {
-		int vertexCount = drawState.vertexCount();
+		DrawState drawState = buf.drawState();
-		int stride = drawState.format().getVertexSize();
+		template = new BlockVertexList.Shaded(buf.vertexBuffer(), drawState.vertexCount(), drawState.format().getVertexSize(), unshadedStartVertex);
-
-		ShadedVertexList template = new BlockVertexList.Shaded(vertexBuffer, vertexCount, stride, unshadedStartVertex);
-		shadedPredicate = template::isShaded;
-		this.template = template;
-
-		transforms.pushPose();
-	}
-
-	public SuperByteBuffer(ShadeSeparatedBufferedData data) {
-		this(data.vertexBuffer(), data.drawState(), data.unshadedStartVertex());
-	}
-
-	public SuperByteBuffer(ByteBuffer vertexBuffer, BufferBuilder.DrawState drawState) {
-		int vertexCount = drawState.vertexCount();
-		int stride = drawState.format().getVertexSize();
-
-		template = new BlockVertexList(vertexBuffer, vertexCount, stride);
-		shadedPredicate = index -> true;
 
+		transforms = new PoseStack();
 		transforms.pushPose();
 	}
 
@@ -96,25 +75,22 @@ public class SuperByteBuffer implements Transform<SuperByteBuffer>, TStack<Super
 		if (isEmpty())
 			return;
 
-		Matrix4f modelMat = input.last()
+		Matrix4f modelMat = new Matrix4f(input.last()
-				.pose()
+				.pose());
-				.copy();
 		Matrix4f localTransforms = transforms.last()
 				.pose();
-		modelMat.multiply(localTransforms);
+		modelMat.mul(localTransforms);
 
 		Matrix3f normalMat;
 		if (fullNormalTransform) {
-			normalMat = input.last()
+			normalMat = new Matrix3f(input.last()
-					.normal()
+					.normal());
-					.copy();
 			Matrix3f localNormalTransforms = transforms.last()
 					.normal();
 			normalMat.mul(localNormalTransforms);
 		} else {
-			normalMat = transforms.last()
+			normalMat = new Matrix3f(transforms.last()
-					.normal()
+					.normal());
-					.copy();
 		}
 
 		if (useWorldLight) {
@@ -142,7 +118,7 @@ public class SuperByteBuffer implements Transform<SuperByteBuffer>, TStack<Super
 			float z = template.getZ(i);
 
 			pos.set(x, y, z, 1F);
-			pos.transform(modelMat);
+			pos.mul(modelMat);
 			builder.vertex(pos.x(), pos.y(), pos.z());
 
 			float normalX = template.getNX(i);
@@ -150,7 +126,7 @@ public class SuperByteBuffer implements Transform<SuperByteBuffer>, TStack<Super
 			float normalZ = template.getNZ(i);
 
 			normal.set(normalX, normalY, normalZ);
-			normal.transform(normalMat);
+			normal.mul(normalMat);
 			float nx = normal.x();
 			float ny = normal.y();
 			float nz = normal.z();
@@ -170,7 +146,7 @@ public class SuperByteBuffer implements Transform<SuperByteBuffer>, TStack<Super
 			if (disableDiffuseMult) {
 				builder.color(r, g, b, a);
 			} else {
-				float instanceDiffuse = diffuseCalculator.getDiffuse(nx, ny, nz, shadedPredicate.test(i));
+				float instanceDiffuse = diffuseCalculator.getDiffuse(nx, ny, nz, template.isShaded(i));
 				int colorR = transformColor(r, instanceDiffuse);
 				int colorG = transformColor(g, instanceDiffuse);
 				int colorB = transformColor(b, instanceDiffuse);
@@ -192,9 +168,9 @@ public class SuperByteBuffer implements Transform<SuperByteBuffer>, TStack<Super
 			int light;
 			if (useWorldLight) {
 				lightPos.set(((x - .5f) * 15 / 16f) + .5f, (y - .5f) * 15 / 16f + .5f, (z - .5f) * 15 / 16f + .5f, 1f);
-				lightPos.transform(localTransforms);
+				lightPos.mul(localTransforms);
 				if (lightTransform != null) {
-					lightPos.transform(lightTransform);
+					lightPos.mul(lightTransform);
 				}
 
 				light = getLight(Minecraft.getInstance().level, lightPos);
@@ -249,10 +225,6 @@ public class SuperByteBuffer implements Transform<SuperByteBuffer>, TStack<Super
 		return template.isEmpty();
 	}
 
-	public void delete() {
-		template.delete();
-	}
-
 	public PoseStack getTransforms() {
 		return transforms;
 	}
@@ -264,7 +236,7 @@ public class SuperByteBuffer implements Transform<SuperByteBuffer>, TStack<Super
 	}
 
 	@Override
-	public SuperByteBuffer multiply(Quaternion quaternion) {
+	public SuperByteBuffer multiply(Quaternionf quaternion) {
 		transforms.mulPose(quaternion);
 		return this;
 	}
@@ -291,7 +263,7 @@ public class SuperByteBuffer implements Transform<SuperByteBuffer>, TStack<Super
 	public SuperByteBuffer mulPose(Matrix4f pose) {
 		transforms.last()
 				.pose()
-				.multiply(pose);
+				.mul(pose);
 		return this;
 	}
 
@@ -306,7 +278,7 @@ public class SuperByteBuffer implements Transform<SuperByteBuffer>, TStack<Super
 	public SuperByteBuffer transform(PoseStack stack) {
 		transforms.last()
 				.pose()
-				.multiply(stack.last()
+				.mul(stack.last()
 						.pose());
 		transforms.last()
 				.normal()
@@ -321,7 +293,7 @@ public class SuperByteBuffer implements Transform<SuperByteBuffer>, TStack<Super
 		return this;
 	}
 
-	public SuperByteBuffer rotateCentered(Quaternion q) {
+	public SuperByteBuffer rotateCentered(Quaternionf q) {
 		translate(.5f, .5f, .5f).multiply(q)
 				.translate(-.5f, -.5f, -.5f);
 		return this;
@@ -379,12 +351,12 @@ public class SuperByteBuffer implements Transform<SuperByteBuffer>, TStack<Super
 		this.spriteShiftFunc = (builder, u, v) -> {
 			float targetU = u - entry.getOriginal()
 					.getU0() + entry.getTarget()
-									.getU0()
+					.getU0()
-							+ scrollU;
+					+ scrollU;
 			float targetV = v - entry.getOriginal()
 					.getV0() + entry.getTarget()
-									.getV0()
+					.getV0()
-							+ scrollV;
+					+ scrollV;
 			builder.uv(targetU, targetV);
 		};
 		return this;
@@ -478,7 +450,7 @@ public class SuperByteBuffer implements Transform<SuperByteBuffer>, TStack<Super
 	}
 
 	private static int getLight(Level world, Vector4f lightPos) {
-		BlockPos pos = new BlockPos(lightPos.x(), lightPos.y(), lightPos.z());
+		BlockPos pos = BlockPos.containing(lightPos.x(), lightPos.y(), lightPos.z());
 		return WORLD_LIGHT_CACHE.computeIfAbsent(pos.asLong(), $ -> LevelRenderer.getLightColor(world, pos));
 	}
 

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

@@ -1,27 +1,27 @@
 package nl.requios.effortlessbuilding.create.foundation.render;
 
-import com.google.common.cache.Cache;
-import com.google.common.cache.CacheBuilder;
-
 import java.util.HashMap;
 import java.util.Map;
 import java.util.concurrent.Callable;
 import java.util.concurrent.ExecutionException;
 import java.util.concurrent.TimeUnit;
 
+import com.google.common.cache.Cache;
+import com.google.common.cache.CacheBuilder;
+
 public class SuperByteBufferCache {
 
 	protected final Map<Compartment<?>, Cache<Object, SuperByteBuffer>> caches = new HashMap<>();
 
 	public synchronized void registerCompartment(Compartment<?> compartment) {
 		caches.put(compartment, CacheBuilder.newBuilder()
-			.build());
+				.build());
 	}
 
 	public synchronized void registerCompartment(Compartment<?> compartment, long ticksUntilExpired) {
 		caches.put(compartment, CacheBuilder.newBuilder()
-			.expireAfterAccess(ticksUntilExpired * 50, TimeUnit.MILLISECONDS)
+				.expireAfterAccess(ticksUntilExpired * 50, TimeUnit.MILLISECONDS)
-			.build());
+				.build());
 	}
 
 	public <T> SuperByteBuffer get(Compartment<T> compartment, T key, Callable<SuperByteBuffer> callable) {

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

@@ -1,7 +1,10 @@
 package nl.requios.effortlessbuilding.create.foundation.render;
 
+import java.util.SortedMap;
+
 import com.mojang.blaze3d.vertex.BufferBuilder;
 import com.mojang.blaze3d.vertex.VertexConsumer;
+
 import it.unimi.dsi.fastutil.objects.Object2ObjectLinkedOpenHashMap;
 import net.minecraft.Util;
 import net.minecraft.client.renderer.ChunkBufferBuilderPack;
@@ -10,8 +13,6 @@ import net.minecraft.client.renderer.RenderType;
 import net.minecraft.client.renderer.Sheets;
 import net.minecraft.client.resources.model.ModelBakery;
 
-import java.util.SortedMap;
-
 public class SuperRenderTypeBuffer implements MultiBufferSource {
 
 	private static final SuperRenderTypeBuffer INSTANCE = new SuperRenderTypeBuffer();

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

@@ -6,11 +6,6 @@ import com.jozufozu.flywheel.config.BackendType;
 import com.jozufozu.flywheel.core.virtual.VirtualRenderWorld;
 import com.jozufozu.flywheel.util.transform.TransformStack;
 import com.mojang.blaze3d.vertex.PoseStack;
-import com.mojang.math.Matrix4f;
-import com.mojang.math.Vector4f;
-import nl.requios.effortlessbuilding.create.Create;
-import nl.requios.effortlessbuilding.create.foundation.utility.AnimationTickHolder;
-import nl.requios.effortlessbuilding.create.foundation.utility.RegisteredObjects;
 import net.minecraft.client.Minecraft;
 import net.minecraft.client.renderer.LevelRenderer;
 import net.minecraft.client.renderer.MultiBufferSource;
@@ -19,6 +14,11 @@ import net.minecraft.client.renderer.texture.OverlayTexture;
 import net.minecraft.core.BlockPos;
 import net.minecraft.world.level.Level;
 import net.minecraft.world.level.block.entity.BlockEntity;
+import nl.requios.effortlessbuilding.create.Create;
+import nl.requios.effortlessbuilding.create.foundation.utility.AnimationTickHolder;
+import nl.requios.effortlessbuilding.create.foundation.utility.RegisteredObjects;
+import org.joml.Matrix4f;
+import org.joml.Vector4f;
 
 import javax.annotation.Nullable;
 import java.util.Iterator;
@@ -36,7 +36,7 @@ public class TileEntityRenderHelper {
 	}
 
 	public static void renderTileEntities(Level world, @Nullable VirtualRenderWorld renderWorld,
-			Iterable<BlockEntity> customRenderTEs, PoseStack ms, @Nullable Matrix4f lightTransform, MultiBufferSource buffer) {
+										  Iterable<BlockEntity> customRenderTEs, PoseStack ms, @Nullable Matrix4f lightTransform, MultiBufferSource buffer) {
 		renderTileEntities(world, renderWorld, customRenderTEs, ms, lightTransform, buffer,
 			AnimationTickHolder.getPartialTicks());
 	}
@@ -91,8 +91,8 @@ public class TileEntityRenderHelper {
 	private static BlockPos getLightPos(@Nullable Matrix4f lightTransform, BlockPos contraptionPos) {
 		if (lightTransform != null) {
 			Vector4f lightVec = new Vector4f(contraptionPos.getX() + .5f, contraptionPos.getY() + .5f, contraptionPos.getZ() + .5f, 1);
-			lightVec.transform(lightTransform);
+			lightVec.mul(lightTransform);
-			return new BlockPos(lightVec.x(), lightVec.y(), lightVec.z());
+			return BlockPos.containing(lightVec.x(), lightVec.y(), lightVec.z());
 		} else {
 			return contraptionPos;
 		}

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

@@ -2,9 +2,9 @@ package nl.requios.effortlessbuilding.create.foundation.utility;
 
 import net.minecraft.core.BlockPos;
 import net.minecraft.core.Direction;
-import net.minecraft.core.Registry;
 import net.minecraft.core.SectionPos;
 import net.minecraft.core.particles.ParticleTypes;
+import net.minecraft.core.registries.Registries;
 import net.minecraft.nbt.CompoundTag;
 import net.minecraft.server.level.ServerLevel;
 import net.minecraft.sounds.SoundEvents;
@@ -20,7 +20,12 @@ import net.minecraft.world.item.enchantment.Enchantments;
 import net.minecraft.world.level.BlockGetter;
 import net.minecraft.world.level.GameRules;
 import net.minecraft.world.level.Level;
-import net.minecraft.world.level.block.*;
+import net.minecraft.world.level.block.BaseRailBlock;
+import net.minecraft.world.level.block.BedBlock;
+import net.minecraft.world.level.block.Block;
+import net.minecraft.world.level.block.Blocks;
+import net.minecraft.world.level.block.IceBlock;
+import net.minecraft.world.level.block.SlimeBlock;
 import net.minecraft.world.level.block.entity.BlockEntity;
 import net.minecraft.world.level.block.state.BlockState;
 import net.minecraft.world.level.block.state.properties.BlockStateProperties;
@@ -29,10 +34,8 @@ import net.minecraft.world.level.block.state.properties.SlabType;
 import net.minecraft.world.level.chunk.LevelChunk;
 import net.minecraft.world.level.chunk.LevelChunkSection;
 import net.minecraft.world.level.material.FluidState;
-import net.minecraft.world.level.material.Material;
 import net.minecraftforge.common.IPlantable;
 import net.minecraftforge.common.MinecraftForge;
-import net.minecraftforge.common.util.BlockSnapshot;
 import net.minecraftforge.event.level.BlockEvent;
 
 import javax.annotation.Nullable;
@@ -181,9 +184,8 @@ public class BlockHelper {
 					.ultraWarm())
 					return false;
 
-				Material material = world.getBlockState(pos.below())
+				BlockState belowState = world.getBlockState(pos.below());
-					.getMaterial();
+				if (belowState.getMaterial().blocksMotion() || belowState.getMaterial().isLiquid())
-				if (material.blocksMotion() || material.isLiquid())
 					world.setBlockAndUpdate(pos, Blocks.WATER.defaultBlockState());
 				return true;
 			}
@@ -212,7 +214,7 @@ public class BlockHelper {
 		LevelChunkSection chunksection = chunk.getSection(idx);
 		if (chunksection == null) {
 			chunksection = new LevelChunkSection(chunk.getSectionYFromSectionIndex(idx), world.registryAccess()
-				.registryOrThrow(Registry.BIOME_REGISTRY));
+					.registryOrThrow(Registries.BIOME));
 			chunk.getSections()[idx] = chunksection;
 		}
 		BlockState old = chunksection.setBlockState(SectionPos.sectionRelative(target.getX()),

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

@@ -1,9 +1,9 @@
 package nl.requios.effortlessbuilding.create.foundation.utility;
 
 import com.google.common.hash.Hashing;
-import com.mojang.math.Vector3f;
 import net.minecraft.util.Mth;
 import net.minecraft.world.phys.Vec3;
+import org.joml.Vector3f;
 
 import javax.annotation.Nonnull;
 import java.util.function.UnaryOperator;

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

@@ -2,7 +2,6 @@ package nl.requios.effortlessbuilding.create.foundation.utility;
 
 import net.minecraft.resources.ResourceLocation;
 import net.minecraftforge.registries.IForgeRegistry;
-import nl.requios.effortlessbuilding.EffortlessBuilding;
 import nl.requios.effortlessbuilding.create.Create;
 import org.jetbrains.annotations.Nullable;
 

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

@@ -2,11 +2,11 @@ package nl.requios.effortlessbuilding.create.foundation.utility;
 
 import com.mojang.blaze3d.vertex.PoseStack;
 import com.mojang.blaze3d.vertex.Tesselator;
-import com.mojang.math.Matrix4f;
 import net.minecraft.client.Minecraft;
 import net.minecraft.client.gui.Font;
 import net.minecraft.client.renderer.LightTexture;
 import net.minecraft.client.renderer.MultiBufferSource;
+import org.joml.Matrix4f;
 
 import java.text.BreakIterator;
 import java.util.LinkedList;
@@ -71,14 +71,14 @@ public final class FontHelper {
 	}
 
 	private static int draw(Font font, String p_228078_1_, float p_228078_2_, float p_228078_3_,
-		int p_228078_4_, Matrix4f p_228078_5_, boolean p_228078_6_) {
+							int p_228078_4_, Matrix4f p_228078_5_, boolean p_228078_6_) {
 		if (p_228078_1_ == null) {
 			return 0;
 		} else {
 			MultiBufferSource.BufferSource irendertypebuffer$impl = MultiBufferSource.immediate(Tesselator.getInstance()
 				.getBuilder());
 			int i = font.drawInBatch(p_228078_1_, p_228078_2_, p_228078_3_, p_228078_4_, p_228078_6_, p_228078_5_,
-				irendertypebuffer$impl, false, 0, LightTexture.FULL_BRIGHT);
+				irendertypebuffer$impl, Font.DisplayMode.NORMAL, 0, LightTexture.FULL_BRIGHT);
 			irendertypebuffer$impl.endBatch();
 			return i;
 		}

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

@@ -17,7 +17,6 @@ public class LangNumberFormat {
 	public void update() {
 		format = NumberFormat.getInstance(Minecraft.getInstance()
 			.getLanguageManager()
-			.getSelected()
 			.getJavaLocale());
 		format.setMaximumFractionDigits(2);
 		format.setMinimumFractionDigits(0);

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

@@ -1,7 +1,5 @@
 package nl.requios.effortlessbuilding.create.foundation.utility;
 
-import com.mojang.math.Quaternion;
-import com.mojang.math.Vector3f;
 import net.minecraft.client.Camera;
 import net.minecraft.client.Minecraft;
 import net.minecraft.core.BlockPos;
@@ -19,6 +17,8 @@ import net.minecraft.world.entity.Entity;
 import net.minecraft.world.entity.player.Player;
 import net.minecraft.world.level.block.Mirror;
 import net.minecraft.world.phys.Vec3;
+import org.joml.Quaternionf;
+import org.joml.Vector3f;
 
 import javax.annotation.Nullable;
 
@@ -237,13 +237,12 @@ public class VecHelper {
 		 */
 		Camera ari = Minecraft.getInstance().gameRenderer.getMainCamera();
 		Vec3 camera_pos = ari.getPosition();
-		Quaternion camera_rotation_conj = ari.rotation()
+		Quaternionf camera_rotation_conj = new Quaternionf(ari.rotation());
-			.copy();
+		camera_rotation_conj.conjugate();
-		camera_rotation_conj.conj();
 
 		Vector3f result3f = new Vector3f((float) (camera_pos.x - target.x), (float) (camera_pos.y - target.y),
 			(float) (camera_pos.z - target.z));
-		result3f.transform(camera_rotation_conj);
+		result3f.rotate(camera_rotation_conj);
 
 		// ----- compensate for view bobbing (if active) -----
 		// the following code adapted from GameRenderer::applyBobbing (to invert it)
@@ -257,18 +256,18 @@ public class VecHelper {
 				float f = distwalked_modified - playerentity.walkDistO;
 				float f1 = -(distwalked_modified + f * partialTicks);
 				float f2 = Mth.lerp(partialTicks, playerentity.oBob, playerentity.bob);
-				Quaternion q2 =
+				Quaternionf q2 =
-					new Quaternion(Vector3f.XP, Math.abs(Mth.cos(f1 * (float) Math.PI - 0.2F) * f2) * 5.0F, true);
+						com.mojang.math.Axis.XP.rotationDegrees(Math.abs(Mth.cos(f1 * (float) Math.PI - 0.2F) * f2) * 5.0F);
-				q2.conj();
+				q2.conjugate();
-				result3f.transform(q2);
+				result3f.rotate(q2);
 
-				Quaternion q1 = new Quaternion(Vector3f.ZP, Mth.sin(f1 * (float) Math.PI) * f2 * 3.0F, true);
+				Quaternionf q1 = com.mojang.math.Axis.ZP.rotationDegrees(Mth.sin(f1 * (float) Math.PI) * f2 * 3.0F);
-				q1.conj();
+				q1.conjugate();
-				result3f.transform(q1);
+				result3f.rotate(q1);
 
 				Vector3f bob_translation = new Vector3f((Mth.sin(f1 * (float) Math.PI) * f2 * 0.5F),
 					(-Math.abs(Mth.cos(f1 * (float) Math.PI) * f2)), 0.0f);
-				bob_translation.setY(-bob_translation.y()); // this is weird but hey, if it works
+				bob_translation.y = -bob_translation.y(); // this is weird but hey, if it works
 				result3f.add(bob_translation);
 			}
 		}

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

@@ -1,13 +1,13 @@
 package nl.requios.effortlessbuilding.create.foundation.utility;
 
-import net.minecraft.core.Registry;
+import net.minecraft.core.registries.Registries;
 import net.minecraft.resources.ResourceLocation;
 import net.minecraft.world.level.LevelAccessor;
 
 public class WorldHelper {
 	public static ResourceLocation getDimensionID(LevelAccessor world) {
 		return world.registryAccess()
-			.registryOrThrow(Registry.DIMENSION_TYPE_REGISTRY)
+			.registryOrThrow(Registries.DIMENSION_TYPE)
 			.getKey(world.dimensionType());
 	}
 }

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

@@ -4,7 +4,6 @@ import net.minecraft.core.BlockPos;
 import net.minecraft.world.level.block.Block;
 import net.minecraft.world.level.block.state.BlockState;
 import nl.requios.effortlessbuilding.create.foundation.utility.Color;
-import nl.requios.effortlessbuilding.create.foundation.utility.outliner.Outline;
 
 import java.util.function.Supplier;
 

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

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

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

@@ -3,7 +3,6 @@ package nl.requios.effortlessbuilding.create.foundation.utility.outliner;
 import com.jozufozu.flywheel.util.transform.TransformStack;
 import com.mojang.blaze3d.vertex.PoseStack;
 import com.mojang.blaze3d.vertex.VertexConsumer;
-import com.mojang.math.Matrix3f;
 import nl.requios.effortlessbuilding.create.AllSpecialTextures;
 import nl.requios.effortlessbuilding.create.foundation.render.RenderTypes;
 import nl.requios.effortlessbuilding.create.foundation.render.SuperRenderTypeBuffer;
@@ -16,6 +15,7 @@ import net.minecraft.core.Direction;
 import net.minecraft.core.Direction.Axis;
 import net.minecraft.util.Mth;
 import net.minecraft.world.phys.Vec3;
+import org.joml.Matrix3f;
 
 import javax.annotation.Nullable;
 import java.util.Optional;

src/main/java/nl/requios/effortlessbuilding/create/foundation/utility/worldWrappers/DummyLevelEntityGetter.java

@@ -1,5 +1,6 @@
 package nl.requios.effortlessbuilding.create.foundation.utility.worldWrappers;
 
+import net.minecraft.util.AbortableIterationConsumer;
 import net.minecraft.world.level.entity.EntityAccess;
 import net.minecraft.world.level.entity.EntityTypeTest;
 import net.minecraft.world.level.entity.LevelEntityGetter;
@@ -27,7 +28,7 @@ public class DummyLevelEntityGetter<T extends EntityAccess> implements LevelEnti
 	}
 
 	@Override
-	public <U extends T> void get(EntityTypeTest<T, U> p_156935_, Consumer<U> p_156936_) {
+	public <U extends T> void get(EntityTypeTest<T, U> p_156935_, AbortableIterationConsumer<U> p_156936_) {
 	}
 
 	@Override
@@ -35,7 +36,7 @@ public class DummyLevelEntityGetter<T extends EntityAccess> implements LevelEnti
 	}
 
 	@Override
-	public <U extends T> void get(EntityTypeTest<T, U> p_156932_, AABB p_156933_, Consumer<U> p_156934_) {
+	public <U extends T> void get(EntityTypeTest<T, U> p_156932_, AABB p_156933_, AbortableIterationConsumer<U> p_156934_) {
 	}
 
 }

src/main/java/nl/requios/effortlessbuilding/create/foundation/utility/worldWrappers/WrappedServerWorld.java

@@ -32,10 +32,10 @@ public class WrappedServerWorld extends ServerLevel {
 
 	public WrappedServerWorld(ServerLevel world) {
 		super(world.getServer(), Util.backgroundExecutor(), world.getServer().storageSource,
-			(ServerLevelData) world.getLevelData(), world.dimension(),
+				(ServerLevelData) world.getLevelData(), world.dimension(),
-			new LevelStem(world.dimensionTypeRegistration(), world.getChunkSource().getGenerator()),
+				new LevelStem(world.dimensionTypeRegistration(), world.getChunkSource().getGenerator()),
-			new DummyStatusListener(), world.isDebug(), world.getBiomeManager().biomeZoomSeed,
+				new DummyStatusListener(), world.isDebug(), world.getBiomeManager().biomeZoomSeed,
-			Collections.emptyList(), false);
+				Collections.emptyList(), false);
 		this.world = world;
 	}
 

src/main/java/nl/requios/effortlessbuilding/create/foundation/utility/worldWrappers/WrappedWorld.java

@@ -5,6 +5,7 @@ import net.minecraft.sounds.SoundEvent;
 import net.minecraft.sounds.SoundSource;
 import net.minecraft.world.entity.Entity;
 import net.minecraft.world.entity.player.Player;
+import net.minecraft.world.flag.FeatureFlagSet;
 import net.minecraft.world.item.crafting.RecipeManager;
 import net.minecraft.world.level.Level;
 import net.minecraft.world.level.biome.Biome;
@@ -36,8 +37,8 @@ public class WrappedWorld extends Level {
 	protected LevelEntityGetter<Entity> entityGetter = new DummyLevelEntityGetter<>();
 
 	public WrappedWorld(Level world) {
-		super((WritableLevelData) world.getLevelData(), world.dimension(), world.dimensionTypeRegistration(),
+		super((WritableLevelData) world.getLevelData(), world.dimension(), world.registryAccess(), world.dimensionTypeRegistration(),
-			world::getProfiler, world.isClientSide, world.isDebug(), 0, 0);
+				world::getProfiler, world.isClientSide, world.isDebug(), 0, 0);
 		this.world = world;
 	}
 
@@ -110,19 +111,23 @@ public class WrappedWorld extends Level {
 
 	@Override
 	public void playSeededSound(Player p_220363_, double p_220364_, double p_220365_, double p_220366_,
-			SoundEvent p_220367_, SoundSource p_220368_, float p_220369_, float p_220370_, long p_220371_) {}
+								SoundEvent p_220367_, SoundSource p_220368_, float p_220369_, float p_220370_, long p_220371_) {}
 
 	@Override
-	public void playSeededSound(Player p_220372_, Entity p_220373_, SoundEvent p_220374_, SoundSource p_220375_,
+	public void playSeededSound(Player pPlayer, double pX, double pY, double pZ, Holder<SoundEvent> pSound,
-			float p_220376_, float p_220377_, long p_220378_) {}
+								SoundSource pSource, float pVolume, float pPitch, long pSeed) {}
+
+	@Override
+	public void playSeededSound(Player pPlayer, Entity pEntity, Holder<SoundEvent> pSound, SoundSource pCategory,
+								float pVolume, float pPitch, long pSeed) {}
 
 	@Override
 	public void playSound(@Nullable Player player, double x, double y, double z, SoundEvent soundIn,
-		SoundSource category, float volume, float pitch) {}
+						  SoundSource category, float volume, float pitch) {}
 
 	@Override
 	public void playSound(@Nullable Player p_217384_1_, Entity p_217384_2_, SoundEvent p_217384_3_,
-		SoundSource p_217384_4_, float p_217384_5_, float p_217384_6_) {}
+						  SoundSource p_217384_4_, float p_217384_5_, float p_217384_6_) {}
 
 	@Override
 	public Entity getEntity(int id) {
@@ -247,4 +252,10 @@ public class WrappedWorld extends Level {
 	public int getSectionYFromSectionIndex(int sectionIndex) {
 		return sectionIndex + this.getMinSection();
 	}
+
+	@Override
+	public FeatureFlagSet enabledFeatures() {
+		return world.enabledFeatures();
+	}
+
 }

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

@@ -1,14 +1,14 @@
 package nl.requios.effortlessbuilding.gui;
 
-import net.minecraft.world.entity.player.Player;
+import net.minecraft.network.FriendlyByteBuf;
+import net.minecraft.world.InteractionHand;
 import net.minecraft.world.entity.player.Inventory;
-import net.minecraft.world.inventory.ClickType;
+import net.minecraft.world.entity.player.Player;
 import net.minecraft.world.inventory.AbstractContainerMenu;
+import net.minecraft.world.inventory.ClickType;
 import net.minecraft.world.inventory.MenuType;
 import net.minecraft.world.inventory.Slot;
 import net.minecraft.world.item.ItemStack;
-import net.minecraft.network.FriendlyByteBuf;
-import net.minecraft.world.InteractionHand;
 import net.minecraftforge.items.IItemHandler;
 import net.minecraftforge.items.ItemStackHandler;
 import net.minecraftforge.items.SlotItemHandler;

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

@@ -1,11 +1,11 @@
 package nl.requios.effortlessbuilding.gui;
 
-import com.mojang.blaze3d.vertex.PoseStack;
 import com.mojang.blaze3d.systems.RenderSystem;
+import com.mojang.blaze3d.vertex.PoseStack;
 import net.minecraft.client.gui.screens.inventory.AbstractContainerScreen;
-import net.minecraft.world.entity.player.Inventory;
-import net.minecraft.resources.ResourceLocation;
 import net.minecraft.network.chat.Component;
+import net.minecraft.resources.ResourceLocation;
+import net.minecraft.world.entity.player.Inventory;
 import net.minecraftforge.api.distmarker.Dist;
 import net.minecraftforge.api.distmarker.OnlyIn;
 import nl.requios.effortlessbuilding.EffortlessBuilding;

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

@@ -5,6 +5,7 @@ import com.mojang.blaze3d.platform.GlStateManager;
 import com.mojang.blaze3d.systems.RenderSystem;
 import net.minecraft.MethodsReturnNonnullByDefault;
 import net.minecraft.client.Minecraft;
+import net.minecraft.client.renderer.GameRenderer;
 import net.minecraft.client.resources.sounds.SimpleSoundInstance;
 import net.minecraft.client.gui.screens.Screen;
 import net.minecraft.client.gui.components.Button;
@@ -178,7 +179,7 @@ public class PlayerSettingsGui extends Screen {
 			return super.isMouseOver(p_isMouseOver_1_, p_isMouseOver_3_);
 		}
 
-		protected boolean isFocused() {
+		public boolean isFocused() {
 			return PlayerSettingsGui.this.getFocused() == this;
 		}
 
@@ -189,8 +190,8 @@ public class PlayerSettingsGui extends Screen {
 
 		//From AbstractSelectionList, disabled parts
 		@Override
-		public void render(PoseStack ms, int p_render_1_, int p_render_2_, float p_render_3_) {
+		public void render(PoseStack guiGraphics, int p_render_1_, int p_render_2_, float p_render_3_) {
-			this.renderBackground(ms);
+			this.renderBackground(guiGraphics);
 			int i = this.getScrollbarPosition();
 			int j = i + 6;
 			Tesselator tessellator = Tesselator.getInstance();
@@ -209,16 +210,17 @@ public class PlayerSettingsGui extends Screen {
 			int k = this.getRowLeft();
 			int l = this.y0 + 4 - (int) this.getScrollAmount();
 			if (this.renderHeader) {
-				this.renderHeader(ms, k, l, tessellator);
+				this.renderHeader(guiGraphics, k, l);
 			}
 
-			this.renderList(ms, p_render_1_, p_render_2_, p_render_3_);
+			this.renderList(guiGraphics, p_render_1_, p_render_2_, p_render_3_);
 			RenderSystem.disableDepthTest();
 //            this.renderHoleBackground(0, this.y0, 255, 255);
 //            this.renderHoleBackground(this.y1, this.height, 255, 255);
 			RenderSystem.enableBlend();
 			RenderSystem.blendFuncSeparate(GlStateManager.SourceFactor.SRC_ALPHA, GlStateManager.DestFactor.ONE_MINUS_SRC_ALPHA, GlStateManager.SourceFactor.ZERO, GlStateManager.DestFactor.ONE);
-			RenderSystem.disableTexture();
+//			RenderSystem.disableTexture();
+			RenderSystem.setShader(GameRenderer::getPositionColorShader);
 //            int i1 = 4;
 //            bufferbuilder.begin(7, DefaultVertexFormats.POSITION_TEX_COLOR);
 //            bufferbuilder.pos((double)this.x0, (double)(this.y0 + 4), 0.0D).tex(0.0F, 1.0F).color(0, 0, 0, 0).endVertex();
@@ -264,7 +266,7 @@ public class PlayerSettingsGui extends Screen {
 			}
 
 //            this.renderDecorations(p_render_1_, p_render_2_);
-			RenderSystem.enableTexture();
+//			RenderSystem.enableTexture();
 			RenderSystem.disableBlend();
 		}
 
@@ -283,7 +285,7 @@ public class PlayerSettingsGui extends Screen {
 			@Override
 			public void render(PoseStack ms, int itemIndex, int rowTop, int rowLeft, int rowWidth, int rowHeight, int mouseX, int mouseY, boolean hovered, float partialTicks) {
 				if (rowTop + 10 > ShaderTypeList.this.y0 && rowTop + rowHeight - 5 < ShaderTypeList.this.y1)
-					drawString(ms, font, shaderType.name, ShaderTypeList.this.x0 + 8, rowTop + 4, 0xFFFFFF);
+					font.draw(ms, shaderType.name, ShaderTypeList.this.x0 + 8, rowTop + 4, 0xFFFFFF);
 			}
 
 			@Override

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

@@ -1,39 +1,46 @@
 package nl.requios.effortlessbuilding.gui.buildmode;
 
-import com.mojang.blaze3d.vertex.*;
 import com.mojang.blaze3d.systems.RenderSystem;
-import com.mojang.math.Vector4f;
+import com.mojang.blaze3d.vertex.BufferBuilder;
+import com.mojang.blaze3d.vertex.DefaultVertexFormat;
+import com.mojang.blaze3d.vertex.PoseStack;
+import com.mojang.blaze3d.vertex.Tesselator;
+import com.mojang.blaze3d.vertex.VertexFormat;
+import net.minecraft.ChatFormatting;
+import net.minecraft.client.KeyMapping;
 import net.minecraft.client.Minecraft;
+import com.mojang.blaze3d.vertex.PoseStack;
 import net.minecraft.client.gui.screens.Screen;
 import net.minecraft.client.renderer.GameRenderer;
 import net.minecraft.client.resources.language.I18n;
-import net.minecraft.client.KeyMapping;
 import net.minecraft.client.resources.sounds.SimpleSoundInstance;
 import net.minecraft.core.Direction;
-import net.minecraft.ChatFormatting;
 import net.minecraft.network.chat.Component;
 import net.minecraft.network.chat.MutableComponent;
 import net.minecraft.sounds.SoundEvents;
 import net.minecraft.sounds.SoundSource;
 import net.minecraft.util.RandomSource;
-import net.minecraftforge.server.command.TextComponentHelper;
 import nl.requios.effortlessbuilding.ClientEvents;
 import nl.requios.effortlessbuilding.EffortlessBuildingClient;
+import nl.requios.effortlessbuilding.buildmode.BuildModeEnum;
 import nl.requios.effortlessbuilding.buildmode.ModeOptions;
+import nl.requios.effortlessbuilding.buildmode.ModeOptions.ActionEnum;
+import nl.requios.effortlessbuilding.buildmode.ModeOptions.OptionEnum;
 import nl.requios.effortlessbuilding.create.foundation.item.ItemDescription;
 import nl.requios.effortlessbuilding.create.foundation.item.TooltipHelper;
+import nl.requios.effortlessbuilding.create.foundation.utility.Color;
 import nl.requios.effortlessbuilding.create.foundation.utility.Components;
 import nl.requios.effortlessbuilding.create.foundation.utility.Lang;
 import org.lwjgl.opengl.GL11;
 
 import java.util.ArrayList;
-import java.util.List;
 
-import static nl.requios.effortlessbuilding.buildmode.ModeOptions.*;
+import static nl.requios.effortlessbuilding.buildmode.ModeOptions.getBuildSpeed;
-
+import static nl.requios.effortlessbuilding.buildmode.ModeOptions.getCircleStart;
-import nl.requios.effortlessbuilding.buildmode.BuildModeEnum;
+import static nl.requios.effortlessbuilding.buildmode.ModeOptions.getCubeFill;
-import nl.requios.effortlessbuilding.buildmode.ModeOptions.ActionEnum;
+import static nl.requios.effortlessbuilding.buildmode.ModeOptions.getFill;
-import nl.requios.effortlessbuilding.buildmode.ModeOptions.OptionEnum;
+import static nl.requios.effortlessbuilding.buildmode.ModeOptions.getLineThickness;
+import static nl.requios.effortlessbuilding.buildmode.ModeOptions.getRaisedEdge;
 
 /**
  * Initially from Chisels and Bits by AlgorithmX2
@@ -44,11 +51,11 @@ public class RadialMenu extends Screen {
 
 	public static final RadialMenu instance = new RadialMenu();
 
-	private final Vector4f radialButtonColor = new Vector4f(0f, 0f, 0f, .5f);
+	private final Color radialButtonColor = new Color(0f, 0f, 0f, .5f);
-	private final Vector4f sideButtonColor = new Vector4f(.5f, .5f, .5f, .5f);
+	private final Color sideButtonColor = new Color(.5f, .5f, .5f, .5f);
-	private final Vector4f highlightColor = new Vector4f(.6f, .8f, 1f, .6f);
+	private final Color highlightColor = new Color(.6f, .8f, 1f, .6f);
-	private final Vector4f selectedColor = new Vector4f(0f, .5f, 1f, .5f);
+	private final Color selectedColor = new Color(0f, .5f, 1f, .5f);
-	private final Vector4f highlightSelectedColor = new Vector4f(0.2f, .7f, 1f, .7f);
+	private final Color highlightSelectedColor = new Color(0.2f, .7f, 1f, .7f);
 
 	private final int whiteTextColor = 0xffffffff;
 	private final int watermarkTextColor = 0x88888888;
@@ -109,9 +116,9 @@ public class RadialMenu extends Screen {
 
 		fillGradient(ms, 0, 0, width, height, startColor, endColor);
 
-		RenderSystem.disableTexture();
 		RenderSystem.enableBlend();
 		RenderSystem.blendFuncSeparate(GL11.GL_SRC_ALPHA, GL11.GL_ONE_MINUS_SRC_ALPHA, 1, 0);
+		RenderSystem.setShader(GameRenderer::getPositionColorShader);
 		final Tesselator tessellator = Tesselator.getInstance();
 		final BufferBuilder buffer = tessellator.getBuilder();
 
@@ -182,7 +189,6 @@ public class RadialMenu extends Screen {
 
 		tessellator.end();
 		RenderSystem.disableBlend();
-		RenderSystem.enableTexture();
 
 		drawIcons(ms, middleX, middleY, modes, buttons);
 
@@ -221,10 +227,10 @@ public class RadialMenu extends Screen {
 
 				final boolean isSelected = currentBuildMode.ordinal() == i;
 				final boolean isMouseInQuad = inTriangle(x1m1, y1m1, x2m2, y2m2, x2m1, y2m1, mouseXCenter, mouseYCenter)
-											  || inTriangle(x1m1, y1m1, x1m2, y1m2, x2m2, y2m2, mouseXCenter, mouseYCenter);
+						|| inTriangle(x1m1, y1m1, x1m2, y1m2, x2m2, y2m2, mouseXCenter, mouseYCenter);
 				final boolean isHighlighted = beginRadians <= mouseRadians && mouseRadians <= endRadians && isMouseInQuad;
 
-				Vector4f color = radialButtonColor;
+				Color color = radialButtonColor;
 				if (isSelected) color = selectedColor;
 				if (isHighlighted) color = highlightColor;
 				if (isSelected && isHighlighted) color = highlightSelectedColor;
@@ -234,10 +240,10 @@ public class RadialMenu extends Screen {
 					switchTo = menuRegion.mode;
 				}
 
-				buffer.vertex(middleX + x1m1, middleY + y1m1, getBlitOffset()).color(color.x(), color.y(), color.z(), color.w()).endVertex();
+				buffer.vertex(middleX + x1m1, middleY + y1m1, 200).color(color.getRed(), color.getGreen(), color.getBlue(), color.getAlpha()).endVertex();
-				buffer.vertex(middleX + x2m1, middleY + y2m1, getBlitOffset()).color(color.x(), color.y(), color.z(), color.w()).endVertex();
+				buffer.vertex(middleX + x2m1, middleY + y2m1, 200).color(color.getRed(), color.getGreen(), color.getBlue(), color.getAlpha()).endVertex();
-				buffer.vertex(middleX + x2m2, middleY + y2m2, getBlitOffset()).color(color.x(), color.y(), color.z(), color.w()).endVertex();
+				buffer.vertex(middleX + x2m2, middleY + y2m2, 200).color(color.getRed(), color.getGreen(), color.getBlue(), color.getAlpha()).endVertex();
-				buffer.vertex(middleX + x1m2, middleY + y1m2, getBlitOffset()).color(color.x(), color.y(), color.z(), color.w()).endVertex();
+				buffer.vertex(middleX + x1m2, middleY + y1m2, 200).color(color.getRed(), color.getGreen(), color.getBlue(), color.getAlpha()).endVertex();
 
 				//Category line
 				color = menuRegion.mode.category.color;
@@ -248,10 +254,10 @@ public class RadialMenu extends Screen {
 				final double y1m3 = Math.sin(beginRadians + fragment) * categoryLineOuterEdge;
 				final double y2m3 = Math.sin(endRadians - fragment) * categoryLineOuterEdge;
 
-				buffer.vertex(middleX + x1m1, middleY + y1m1, getBlitOffset()).color(color.x(), color.y(), color.z(), color.w()).endVertex();
+				buffer.vertex(middleX + x1m1, middleY + y1m1, 200).color(color.getRed(), color.getGreen(), color.getBlue(), color.getAlpha()).endVertex();
-				buffer.vertex(middleX + x2m1, middleY + y2m1, getBlitOffset()).color(color.x(), color.y(), color.z(), color.w()).endVertex();
+				buffer.vertex(middleX + x2m1, middleY + y2m1, 200).color(color.getRed(), color.getGreen(), color.getBlue(), color.getAlpha()).endVertex();
-				buffer.vertex(middleX + x2m3, middleY + y2m3, getBlitOffset()).color(color.x(), color.y(), color.z(), color.w()).endVertex();
+				buffer.vertex(middleX + x2m3, middleY + y2m3, 200).color(color.getRed(), color.getGreen(), color.getBlue(), color.getAlpha()).endVertex();
-				buffer.vertex(middleX + x1m3, middleY + y1m3, getBlitOffset()).color(color.x(), color.y(), color.z(), color.w()).endVertex();
+				buffer.vertex(middleX + x1m3, middleY + y1m3, 200).color(color.getRed(), color.getGreen(), color.getBlue(), color.getAlpha()).endVertex();
 			}
 		}
 	}
@@ -263,15 +269,15 @@ public class RadialMenu extends Screen {
 
 			boolean isSelected =
 					btn.action == getBuildSpeed() ||
-					btn.action == getFill() ||
+							btn.action == getFill() ||
-					btn.action == getCubeFill() ||
+							btn.action == getCubeFill() ||
-					btn.action == getRaisedEdge() ||
+							btn.action == getRaisedEdge() ||
-					btn.action == getLineThickness() ||
+							btn.action == getLineThickness() ||
-					btn.action == getCircleStart() ||
+							btn.action == getCircleStart() ||
-					btn.action == EffortlessBuildingClient.BUILD_SETTINGS.getReplaceModeActionEnum() ||
+							btn.action == EffortlessBuildingClient.BUILD_SETTINGS.getReplaceModeActionEnum() ||
-					btn.action == ActionEnum.TOGGLE_PROTECT_TILE_ENTITIES && EffortlessBuildingClient.BUILD_SETTINGS.shouldProtectTileEntities();
+							btn.action == ActionEnum.TOGGLE_PROTECT_TILE_ENTITIES && EffortlessBuildingClient.BUILD_SETTINGS.shouldProtectTileEntities();
 
-			Vector4f color = sideButtonColor;
+			Color color = sideButtonColor;
 			if (isSelected) color = selectedColor;
 			if (isHighlighted) color = highlightColor;
 			if (isSelected && isHighlighted) color = highlightSelectedColor;
@@ -281,19 +287,16 @@ public class RadialMenu extends Screen {
 				doAction = btn.action;
 			}
 
-			buffer.vertex(middleX + btn.x1, middleY + btn.y1, getBlitOffset()).color(color.x(), color.y(), color.z(), color.w()).endVertex();
+			buffer.vertex(middleX + btn.x1, middleY + btn.y1, 200).color(color.getRed(), color.getGreen(), color.getBlue(), color.getAlpha()).endVertex();
-			buffer.vertex(middleX + btn.x1, middleY + btn.y2, getBlitOffset()).color(color.x(), color.y(), color.z(), color.w()).endVertex();
+			buffer.vertex(middleX + btn.x1, middleY + btn.y2, 200).color(color.getRed(), color.getGreen(), color.getBlue(), color.getAlpha()).endVertex();
-			buffer.vertex(middleX + btn.x2, middleY + btn.y2, getBlitOffset()).color(color.x(), color.y(), color.z(), color.w()).endVertex();
+			buffer.vertex(middleX + btn.x2, middleY + btn.y2, 200).color(color.getRed(), color.getGreen(), color.getBlue(), color.getAlpha()).endVertex();
-			buffer.vertex(middleX + btn.x2, middleY + btn.y1, getBlitOffset()).color(color.x(), color.y(), color.z(), color.w()).endVertex();
+			buffer.vertex(middleX + btn.x2, middleY + btn.y1, 200).color(color.getRed(), color.getGreen(), color.getBlue(), color.getAlpha()).endVertex();
 		}
 	}
 
 	private void drawIcons(PoseStack ms, double middleX, double middleY,
 						   ArrayList<MenuRegion> modes, ArrayList<MenuButton> buttons) {
 		ms.pushPose();
-		RenderSystem.enableTexture();
-		RenderSystem.setShader(GameRenderer::getPositionColorTexShader);
-		RenderSystem.setShaderColor(1f, 1f, 1f, 1f);
 
 		//Draw buildmode icons
 		for (final MenuRegion menuRegion : modes) {
@@ -322,16 +325,16 @@ public class RadialMenu extends Screen {
 		//Draw option strings
 		for (int i = 0; i < currentBuildMode.options.length; i++) {
 			OptionEnum option = options[i];
-			font.drawShadow(ms, I18n.get(option.name), (int) (middleX + buttonDistance - 9), (int) middleY - 37 + i * 39, optionTextColor);
+			font.draw(ms, I18n.get(option.name), (int) (middleX + buttonDistance - 9), (int) middleY - 37 + i * 39, optionTextColor);
 		}
 
 		String credits = "Effortless Building";
-		font.drawShadow(ms, credits, width - font.width(credits) - 4, height - 10, watermarkTextColor);
+		font.draw(ms, credits, width - font.width(credits) - 4, height - 10, watermarkTextColor);
 
 		//Draw power level info
 		String powerLevelValue = minecraft.player.isCreative() ? "Creative" : String.valueOf(EffortlessBuildingClient.POWER_LEVEL.getPowerLevel());
 		String powerLevelText = I18n.get("key.effortlessbuilding.power_level") + ": " + powerLevelValue;
-		font.drawShadow(ms, powerLevelText, width - font.width(powerLevelText) - 4, height - 22, minecraft.player.isCreative() ? watermarkTextColor : ChatFormatting.DARK_PURPLE.getColor());
+		font.draw(ms, powerLevelText, width - font.width(powerLevelText) - 4, height - 22, minecraft.player.isCreative() ? watermarkTextColor : ChatFormatting.DARK_PURPLE.getColor());
 
 		//if hover over power level info, show tooltip
 		if (mouseX >= width - font.width(powerLevelText) - 14 && mouseX <= width && mouseY >= height - 24 && mouseY <= height) {
@@ -375,11 +378,11 @@ public class RadialMenu extends Screen {
 					fixed_x -= font.width(text) / 2;
 				}
 
-				font.drawShadow(ms, text, (int) middleX + fixed_x, (int) middleY + fixed_y, whiteTextColor);
+				font.draw(ms, text, (int) middleX + fixed_x, (int) middleY + fixed_y, whiteTextColor);
 
 				//Draw description
 				text = I18n.get(menuRegion.mode.getDescriptionKey());
-				font.drawShadow(ms, text, (int) middleX - font.width(text) / 2f, (int) middleY + buildModeDescriptionHeight, descriptionTextColor);
+				font.draw(ms, text, (int) ((int) middleX - font.width(text) / 2f), (int) middleY + buildModeDescriptionHeight, descriptionTextColor);
 			}
 		}
 
@@ -400,13 +403,14 @@ public class RadialMenu extends Screen {
 
 				//Add keybind in brackets
 				var keybind = findKeybind(button);
-				if (keybind != null) tooltip.add(Lang.translateDirect("tooltip.keybind", keybind.withStyle(ChatFormatting.GRAY)).withStyle(ChatFormatting.DARK_GRAY));
+				if (keybind != null)
+					tooltip.add(Lang.translateDirect("tooltip.keybind", keybind.withStyle(ChatFormatting.GRAY)).withStyle(ChatFormatting.DARK_GRAY));
 				renderComponentTooltip(ms, tooltip, mouseX, mouseY);
 			}
 		}
 	}
 
-	private MutableComponent findKeybind(MenuButton button){
+	private MutableComponent findKeybind(MenuButton button) {
 
 		int keybindingIndex = -1;
 		if (button.action == ActionEnum.OPEN_MODIFIER_SETTINGS) keybindingIndex = 1;
@@ -476,7 +480,7 @@ 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,
+			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);
 		}

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

@@ -13,7 +13,6 @@ import nl.requios.effortlessbuilding.buildmodifier.BaseModifier;
 import nl.requios.effortlessbuilding.create.foundation.gui.widget.ScrollInput;
 import nl.requios.effortlessbuilding.gui.elements.LabeledScrollInput;
 import nl.requios.effortlessbuilding.utilities.MathHelper;
-import nl.requios.effortlessbuilding.systems.PowerLevel;
 
 import java.util.Vector;
 
@@ -65,19 +64,19 @@ public class ArrayEntry extends BaseModifierEntry<Array> {
 
 		//draw offset inputs
 		for (int i = 0; i < 3; i++) {
-			offsetInputs.get(i).x = left + 49 + 20 * i;
+			offsetInputs.get(i).setX(left + 49 + 20 * i);
-			offsetInputs.get(i).y = top + 19;
+			offsetInputs.get(i).setY(top + 19);
 			offsetInputs.get(i).render(ms, mouseX, mouseY, partialTicks);
 		}
 		
 		//draw count input
-		countInput.x = left + 49;
+		countInput.setX(left + 49);
-		countInput.y = top + 41;
+		countInput.setY(top + 41);
 		countInput.render(ms, mouseX, mouseY, partialTicks);
 		
 		//draw reach label
-		reachLabel.x = right - 8 - getFont().width(reachLabel.text);
+		reachLabel.setX(right - 8 - getFont().width(reachLabel.text));
-		reachLabel.y = top + 24;
+		reachLabel.setY(top + 24);
 		reachLabel.render(ms, mouseX, mouseY, partialTicks);
 	}
 

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

@@ -3,16 +3,9 @@ package nl.requios.effortlessbuilding.gui.buildmodifier;
 import com.mojang.blaze3d.vertex.PoseStack;
 import net.minecraft.network.chat.Component;
 import nl.requios.effortlessbuilding.AllGuiTextures;
-import nl.requios.effortlessbuilding.AllIcons;
 import nl.requios.effortlessbuilding.buildmodifier.BaseModifier;
-import nl.requios.effortlessbuilding.create.foundation.gui.AbstractSimiScreen;
-import nl.requios.effortlessbuilding.create.foundation.gui.widget.BoxWidget;
-import nl.requios.effortlessbuilding.create.foundation.gui.widget.ElementWidget;
-import nl.requios.effortlessbuilding.create.foundation.gui.widget.IconButton;
 import nl.requios.effortlessbuilding.create.foundation.gui.widget.Label;
 import nl.requios.effortlessbuilding.create.foundation.utility.Components;
-import nl.requios.effortlessbuilding.gui.elements.GuiCollapsibleScrollEntry;
-import nl.requios.effortlessbuilding.gui.elements.GuiScrollPane;
 import nl.requios.effortlessbuilding.gui.elements.MiniButton;
 
 public abstract class BaseModifierEntry<T extends BaseModifier> extends ModifiersScreenList.Entry {
@@ -94,34 +87,32 @@ public abstract class BaseModifierEntry<T extends BaseModifier> extends Modifier
         top = y;
         bottom = y + BACKGROUND_HEIGHT;
         
-        background.render(ms, left, top, screen);
+        background.render(ms, left, top);
         
-        enableButton.x = left + 4;
+        enableButton.setX(left + 4);
-        enableButton.y = top + 3;
+        enableButton.setY(top + 3);
         enableButton.render(ms, mouseX, mouseY, partialTicks);
         if (modifier.enabled)
-            AllGuiTextures.CHECKMARK.render(ms, left + 5, top + 3, screen);
+            AllGuiTextures.CHECKMARK.render(ms, left + 5, top + 3);
         
-        nameLabel.x = left + 18;
+        nameLabel.setX(left + 18);
-        nameLabel.y = top + 4;
+        nameLabel.setY(top + 4);
         nameLabel.render(ms, mouseX, mouseY, partialTicks);
     
         moveUpButton.visible = screen.canMoveUp(this);
         moveDownButton.visible = screen.canMoveDown(this);
         
-        moveUpButton.x = right - 31;
+        moveUpButton.setX(right - 31);
-        moveUpButton.y = top + 3;
+        moveUpButton.setY(top + 3);
         moveUpButton.render(ms, mouseX, mouseY, partialTicks);
         
-        moveDownButton.x = right - 22;
+        moveDownButton.setX(right - 22);
-        moveDownButton.y = top + 3;
+        moveDownButton.setY(top + 3);
         moveDownButton.render(ms, mouseX, mouseY, partialTicks);
         
-        removeButton.x = right - 13;
+        removeButton.setX(right - 13);
-        removeButton.y = top + 3;
+        removeButton.setY(top + 3);
         removeButton.render(ms, mouseX, mouseY, partialTicks);
-        
-        super.render(ms, index, y, x, width, height, mouseX, mouseY, p_230432_9_, partialTicks);
     }
 
     public void onValueChanged() {

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

@@ -16,7 +16,6 @@ import nl.requios.effortlessbuilding.create.foundation.gui.widget.ScrollInput;
 import nl.requios.effortlessbuilding.create.foundation.utility.Components;
 import nl.requios.effortlessbuilding.gui.elements.LabeledScrollInput;
 import nl.requios.effortlessbuilding.utilities.MathHelper;
-import nl.requios.effortlessbuilding.systems.PowerLevel;
 
 import java.text.DecimalFormat;
 import java.util.Vector;
@@ -142,42 +141,42 @@ public class MirrorEntry extends BaseModifierEntry<Mirror> {
 		//draw position inputs
 		for (int i = 0; i < 3; i++) {
 			ScrollInput input = positionInputs.get(i);
-			input.x = left + 49 + 38 * i;
+			input.setX(left + 49 + 38 * i);
-			input.y = top + 19;
+			input.setY(top + 19);
 			input.render(ms, mouseX, mouseY, partialTicks);
 		}
 		
 		//draw player position button
-		playerPositionButton.x = left + 163;
+		playerPositionButton.setX(left + 163);
-		playerPositionButton.y = top + 19;
+		playerPositionButton.setY(top + 19);
 		playerPositionButton.render(ms, mouseX, mouseY, partialTicks);
 		
 		//draw toggle offset button
-		toggleOffsetButton.x = left + 183;
+		toggleOffsetButton.setX(left + 183);
-		toggleOffsetButton.y = top + 19;
+		toggleOffsetButton.setY(top + 19);
 		toggleOffsetButton.render(ms, mouseX, mouseY, partialTicks);
 		
 		//draw axis buttons
 		for (int i = 0; i < 3; i++) {
 			IconButton button = axisButtons.get(i);
-			button.x = left + 49 + 18 * i;
+			button.setX(left + 49 + 18 * i);
-			button.y = top + 41;
+			button.setY(top + 41);
 			button.render(ms, mouseX, mouseY, partialTicks);
 		}
 		
 		//draw radius input
-		radiusInput.x = left + 134;
+		radiusInput.setX(left + 134);
-		radiusInput.y = top + 41;
+		radiusInput.setY(top + 41);
 		radiusInput.render(ms, mouseX, mouseY, partialTicks);
 		
 		//draw show lines button
-		showLinesButton.x = left + 163;
+		showLinesButton.setX(left + 163);
-		showLinesButton.y = top + 41;
+		showLinesButton.setY(top + 41);
 		showLinesButton.render(ms, mouseX, mouseY, partialTicks);
 		
 		//draw show areas button
-		showAreasButton.x = left + 183;
+		showAreasButton.setX(left + 183);
-		showAreasButton.y = top + 41;
+		showAreasButton.setY(top + 41);
 		showAreasButton.render(ms, mouseX, mouseY, partialTicks);
 	}
 	

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

@@ -2,12 +2,10 @@ package nl.requios.effortlessbuilding.gui.buildmodifier;
 
 import com.mojang.blaze3d.vertex.PoseStack;
 import net.minecraft.client.Minecraft;
-import net.minecraft.client.gui.components.Button;
 import net.minecraft.network.chat.Component;
 import net.minecraftforge.api.distmarker.Dist;
 import net.minecraftforge.api.distmarker.OnlyIn;
 import nl.requios.effortlessbuilding.ClientEvents;
-import nl.requios.effortlessbuilding.EffortlessBuilding;
 import nl.requios.effortlessbuilding.EffortlessBuildingClient;
 import nl.requios.effortlessbuilding.buildmodifier.Array;
 import nl.requios.effortlessbuilding.buildmodifier.BaseModifier;
@@ -17,14 +15,9 @@ import nl.requios.effortlessbuilding.create.foundation.gui.AbstractSimiScreen;
 import nl.requios.effortlessbuilding.create.foundation.gui.AllIcons;
 import nl.requios.effortlessbuilding.create.foundation.gui.widget.BoxWidget;
 import nl.requios.effortlessbuilding.create.foundation.utility.Components;
-import nl.requios.effortlessbuilding.gui.elements.GuiScrollPane;
-import nl.requios.effortlessbuilding.network.PacketHandler;
 
 import javax.annotation.Nonnull;
 import java.util.Collections;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
 
 @OnlyIn(Dist.CLIENT)
 public class ModifiersScreen extends AbstractSimiScreen {

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

@@ -41,11 +41,11 @@ public class ModifiersScreenList extends ObjectSelectionList<ModifiersScreenList
     }
 
     @Override
-    protected void renderList(PoseStack p_239228_, int p_239229_, int p_239230_, float p_239231_) {
+    protected void renderList(PoseStack ms, int p_239229_, int p_239230_, float p_239231_) {
         Window window = minecraft.getWindow();
         double d0 = window.getGuiScale();
         RenderSystem.enableScissor((int) (this.x0 * d0), (int) (window.getHeight() - (this.y1 * d0)), (int) (this.width * d0), (int) (this.height * d0));
-        super.renderList(p_239228_, p_239229_, p_239230_, p_239231_);
+        super.renderList(ms, p_239229_, p_239230_, p_239231_);
         RenderSystem.disableScissor();
     }
     
@@ -53,7 +53,7 @@ public class ModifiersScreenList extends ObjectSelectionList<ModifiersScreenList
         renderListForeground(ms, mouseX, mouseY, partialTicks);
     }
     
-    protected void renderListForeground(PoseStack pPoseStack, int pMouseX, int pMouseY, float pPartialTick) {
+    protected void renderListForeground(PoseStack ms, int pMouseX, int pMouseY, float pPartialTick) {
         int i = this.getRowLeft();
         int j = this.getRowWidth();
         int k = this.itemHeight - 4;
@@ -63,14 +63,14 @@ public class ModifiersScreenList extends ObjectSelectionList<ModifiersScreenList
             int j1 = this.getRowTop(i1);
             int k1 = j1 + itemHeight;
             if (k1 >= this.y0 && j1 <= this.y1) {
-                renderItemForeground(pPoseStack, pMouseX, pMouseY, pPartialTick, i1, i, j1, j, k);
+                renderItemForeground(ms, pMouseX, pMouseY, pPartialTick, i1, i, j1, j, k);
             }
         }
     }
     
-    protected void renderItemForeground(PoseStack pPoseStack, int pMouseX, int pMouseY, float pPartialTick, int pIndex, int pLeft, int pTop, int pWidth, int pHeight) {
+    protected void renderItemForeground(PoseStack ms, int pMouseX, int pMouseY, float pPartialTick, int pIndex, int pLeft, int pTop, int pWidth, int pHeight) {
         Entry e = this.getEntry(pIndex);
-        e.renderForeground(pPoseStack, pIndex, pTop, pLeft, pWidth, pHeight, pMouseX, pMouseY, Objects.equals(this.getHovered(), e), pPartialTick);
+        e.renderForeground(ms, pIndex, pTop, pLeft, pWidth, pHeight, pMouseX, pMouseY, Objects.equals(this.getHovered(), e), pPartialTick);
     }
 
     @Override
@@ -147,10 +147,8 @@ public class ModifiersScreenList extends ObjectSelectionList<ModifiersScreenList
     
         @Override
         public void render(PoseStack ms, int index, int y, int x, int width, int height, int mouseX, int mouseY, boolean p_230432_9_, float partialTicks) {
-    
 //            UIRenderHelper.streak(ms, 0, x - 10, y + height / 2, height - 6, width, 0xdd_000000);
 //            UIRenderHelper.streak(ms, 180, x + (int) (width * 1.35f) + 10, y + height / 2, height - 6, width / 8 * 7, 0xdd_000000);
-    
         }
         
         public void renderForeground(PoseStack ms, int index, int y, int x, int width, int height, int mouseX, int mouseY, boolean p_230432_9_, float partialTicks) {
@@ -161,8 +159,8 @@ public class ModifiersScreenList extends ObjectSelectionList<ModifiersScreenList
                     List<Component> tooltip = simiWidget.getToolTip();
                     if (tooltip.isEmpty())
                         continue;
-                    int ttx = simiWidget.lockedTooltipX == -1 ? mouseX : simiWidget.lockedTooltipX + simiWidget.x;
+                    int ttx = simiWidget.lockedTooltipX == -1 ? mouseX : simiWidget.lockedTooltipX + simiWidget.getX();
-                    int tty = simiWidget.lockedTooltipY == -1 ? mouseY : simiWidget.lockedTooltipY + simiWidget.y;
+                    int tty = simiWidget.lockedTooltipY == -1 ? mouseY : simiWidget.lockedTooltipY + simiWidget.getY();
                     screen.renderComponentTooltip(ms, tooltip, ttx, tty);
                 }
             }

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

@@ -16,7 +16,6 @@ import nl.requios.effortlessbuilding.create.foundation.gui.widget.ScrollInput;
 import nl.requios.effortlessbuilding.create.foundation.utility.Components;
 import nl.requios.effortlessbuilding.gui.elements.LabeledScrollInput;
 import nl.requios.effortlessbuilding.utilities.MathHelper;
-import nl.requios.effortlessbuilding.systems.PowerLevel;
 
 import java.text.DecimalFormat;
 import java.util.Vector;
@@ -148,44 +147,44 @@ public class RadialMirrorEntry extends BaseModifierEntry<RadialMirror> {
 		//draw position inputs
 		for (int i = 0; i < 3; i++) {
 			ScrollInput input = positionInputs.get(i);
-			input.x = left + 49 + 38 * i;
+			input.setX(left + 49 + 38 * i);
-			input.y = top + 19;
+			input.setY(top + 19);
 			input.render(ms, mouseX, mouseY, partialTicks);
 		}
 
 		//draw player position button
-		playerPositionButton.x = left + 163;
+		playerPositionButton.setX(left + 163);
-		playerPositionButton.y = top + 19;
+		playerPositionButton.setY(top + 19);
 		playerPositionButton.render(ms, mouseX, mouseY, partialTicks);
 
 		//draw toggle offset button
-		toggleOffsetButton.x = left + 183;
+		toggleOffsetButton.setX(left + 183);
-		toggleOffsetButton.y = top + 19;
+		toggleOffsetButton.setY(top + 19);
 		toggleOffsetButton.render(ms, mouseX, mouseY, partialTicks);
 
 		//draw slices input
-		slicesInput.x = left + 49;
+		slicesInput.setX(left + 49);
-		slicesInput.y = top + 41;
+		slicesInput.setY(top + 41);
 		slicesInput.render(ms, mouseX, mouseY, partialTicks);
 
 		//draw alternate button
-		alternateButton.x = left + 78;
+		alternateButton.setX(left + 78);
-		alternateButton.y = top + 41;
+		alternateButton.setY(top + 41);
 		alternateButton.render(ms, mouseX, mouseY, partialTicks);
 
 		//draw radius input
-		radiusInput.x = left + 134;
+		radiusInput.setX(left + 134);
-		radiusInput.y = top + 41;
+		radiusInput.setY(top + 41);
 		radiusInput.render(ms, mouseX, mouseY, partialTicks);
 
 		//draw show lines button
-		showLinesButton.x = left + 163;
+		showLinesButton.setX(left + 163);
-		showLinesButton.y = top + 41;
+		showLinesButton.setY(top + 41);
 		showLinesButton.render(ms, mouseX, mouseY, partialTicks);
 
 		//draw show areas button
-		showAreasButton.x = left + 183;
+		showAreasButton.setX(left + 183);
-		showAreasButton.y = top + 41;
+		showAreasButton.setY(top + 41);
 		showAreasButton.render(ms, mouseX, mouseY, partialTicks);
 	}
 

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

@@ -1,8 +1,11 @@
 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.Font;
 import net.minecraft.client.gui.components.Button;
+import net.minecraft.client.renderer.GameRenderer;
 import net.minecraft.network.chat.Component;
 import net.minecraftforge.client.gui.ScreenUtils;
 
@@ -18,7 +21,7 @@ public class GuiCheckBoxFixed extends Button {
 
 	public GuiCheckBoxFixed(int xPos, int yPos, String displayString, boolean isChecked) {
 		super(xPos, yPos, Minecraft.getInstance().font.width(displayString) + 2 + 11, 11, Component.literal(displayString), b -> {
-		});
+		}, DEFAULT_NARRATION);
 		this.isChecked = isChecked;
 		this.boxWidth = 11;
 		this.height = 11;
@@ -26,25 +29,25 @@ public class GuiCheckBoxFixed extends Button {
 	}
 
 	@Override
-	public void renderButton(PoseStack ms, int mouseX, int mouseY, float partial) {
+	public void renderWidget(PoseStack ms, int mouseX, int mouseY, float partial) {
-		if (this.visible) {
+		RenderSystem.setShader(GameRenderer::getPositionTexShader);
-			Minecraft mc = Minecraft.getInstance();
+		RenderSystem.setShaderTexture(0, WIDGETS_LOCATION);
-			this.isHovered = mouseX >= this.x && mouseY >= this.y && mouseX < this.x + this.boxWidth && mouseY < this.y + this.height;
+		//Is deprecated but still works
-			ScreenUtils.blitWithBorder(ms, WIDGETS_LOCATION, this.x, this.y, 0, 46, this.boxWidth, this.height, 200, 20, 2, 3, 2, 2, this.getBlitOffset());
+		ScreenUtils.blitWithBorder(ms, this.getX(), this.getY(), 0, 46, this.boxWidth, this.height, 200, 20, 2, 3, 2, 2, 0);
-			this.renderBg(ms, mc, mouseX, mouseY);
+		int color = 14737632;
-			int color = 14737632;
 
-			if (packedFGColor != 0) {
+		if (packedFGColor != 0) {
-				color = packedFGColor;
+			color = packedFGColor;
-			} else if (!this.active) {
+		} else if (!this.active) {
-				color = 10526880;
+			color = 10526880;
-			}
-
-			if (this.isChecked)
-				drawCenteredString(ms, mc.font, "x", this.x + this.boxWidth / 2 + 1, this.y + 1, 14737632);
-
-			drawString(ms, mc.font, getMessage(), this.x + this.boxWidth + 2, this.y + 2, color);
 		}
+
+		Font font = Minecraft.getInstance().font;
+
+		if (this.isChecked)
+			drawCenteredString(ms, font, "x", this.getX() + this.boxWidth / 2 + 1, this.getY() + 1, 14737632);
+
+		font.draw(ms, getMessage(), this.getX() + this.boxWidth + 2, this.getY() + 2, color);
 	}
 
 	@Override

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

@@ -3,9 +3,8 @@ 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;
 import net.minecraftforge.api.distmarker.OnlyIn;
 
@@ -28,7 +27,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;

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

@@ -28,7 +28,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, Component.empty(), onPress);
+		super(x, y, width, height, Component.empty(), onPress, DEFAULT_NARRATION);
 		this.iconX = iconX;
 		this.iconY = iconY;
 		this.iconWidth = iconWidth;
@@ -51,26 +51,23 @@ public class GuiIconButton extends Button {
 	}
 
 	@Override
-	public void render(PoseStack ms, int mouseX, int mouseY, float partialTicks) {
+	public void renderWidget(PoseStack ms, int mouseX, int mouseY, float partialTicks) {
-		super.render(ms, mouseX, mouseY, partialTicks);
+		RenderSystem.setShaderTexture(0, this.resourceLocation);
-		if (this.visible) {
-			this.isHovered = mouseX >= this.x && mouseY >= this.y && mouseX < this.x + this.width && mouseY < this.y + this.height;
-			RenderSystem.setShaderTexture(0, this.resourceLocation);
-			int currentIconX = this.iconX;
-			int currentIconY = this.iconY;
 
-			if (useAltIcon) {
+		int currentIconX = this.iconX;
-				currentIconX += iconAltX;
+		int currentIconY = this.iconY;
-				currentIconY += iconAltY;
-			}
 
-			//Draws a textured rectangle at the current z-value. Used to be drawTexturedModalRect in Gui.
+		if (useAltIcon) {
-			this.blit(ms, this.x, this.y, currentIconX, currentIconY, this.iconWidth, this.iconHeight);
+			currentIconX += iconAltX;
+			currentIconY += iconAltY;
 		}
+
+		//Draws a textured rectangle at the current z-value. Used to be drawTexturedModalRect in Gui.
+		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 >= getX() && mouseX < getX() + width && mouseY >= getY() && mouseY < getY() + height;
 
 		if (flag) {
 			screen.renderComponentTooltip(ms, tooltip, mouseX - 10, mouseY + 25);