diff --git a/.github/workflows/build_jar.yml b/.github/workflows/build_jar.yml
index 5d9a365..5ba2c39 100644
--- a/.github/workflows/build_jar.yml
+++ b/.github/workflows/build_jar.yml
@@ -10,12 +10,12 @@ jobs:
   build:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
       - name: 🪛 Set up JDK
-        uses: actions/setup-java@v3
+        uses: actions/setup-java@v4
         with:
-          java-version: 21
           distribution: 'microsoft'
+          java-version: 21
       - name: 🏗️ Build jars
         run: |
           chmod u+x gradlew
diff --git a/.github/workflows/compile_jar_pr.yml b/.github/workflows/compile_jar_pr.yml
index 261c922..6c1fea5 100644
--- a/.github/workflows/compile_jar_pr.yml
+++ b/.github/workflows/compile_jar_pr.yml
@@ -10,9 +10,9 @@ jobs:
   build:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v4
       - name: 🪛 Set up JDK
-        uses: actions/setup-java@v3
+        uses: actions/setup-java@v4
         with:
           java-version: 21
           distribution: 'microsoft'
diff --git a/build.gradle b/build.gradle
index 6f109c0..66e6e27 100644
--- a/build.gradle
+++ b/build.gradle
@@ -1,34 +1,31 @@
 plugins {
 	id 'maven-publish'
-	id 'fabric-loom' version '1.7-SNAPSHOT'
+	id 'fabric-loom' version "${loom_version}"
 }
 
-sourceCompatibility = JavaVersion.VERSION_21
-targetCompatibility = JavaVersion.VERSION_21
-
-archivesBaseName = project.archives_base_name
-version = project.mod_version
-group = project.maven_group
+base {
+	archivesName = archives_base_name
+}
 
-project.ext.groupId = project.maven_group
-project.ext.projectVersion = "${version}-fabric-${project.minecraft_version}"
+version = "${mod_version}-fabric-${minecraft_version}"
+group = maven_group
 
 repositories {
 }
 
 dependencies {
-	minecraft "com.mojang:minecraft:${project.minecraft_version}"
-	mappings "net.fabricmc:yarn:${project.yarn_mappings}:v2"
-	modImplementation "net.fabricmc:fabric-loader:${project.loader_version}"
+	minecraft "com.mojang:minecraft:${minecraft_version}"
+	mappings "net.fabricmc:yarn:${yarn_mappings}:v2"
+	modImplementation "net.fabricmc:fabric-loader:${loader_version}"
 
-	modImplementation "net.fabricmc.fabric-api:fabric-api:${project.fabric_version}"
+	modImplementation "net.fabricmc.fabric-api:fabric-api:${fabric_version}"
 }
 
 processResources {
-	inputs.property "version", project.version
+	inputs.property "version", mod_version
 
 	filesMatching("fabric.mod.json") {
-		expand "version": project.version
+		expand "version": mod_version
 	}
 }
 
@@ -44,6 +41,8 @@ tasks.withType(JavaCompile).configureEach {
 }
 
 java {
+	sourceCompatibility = JavaVersion.VERSION_21
+	targetCompatibility = JavaVersion.VERSION_21
 	// Loom will automatically attach sourcesJar to a RemapSourcesJar task and to the "build" task
 	// if it is present.
 	// If you remove this line, sources will not be generated.
@@ -58,9 +57,9 @@ jar {
 publishing {
 	publications {
 		mavenJava(MavenPublication) {
-			groupId project.ext.groupId
-			artifactId project.artifactId
-			version project.ext.projectVersion
+			groupId = project.group
+			artifactId = project.artifactId
+			version = project.version
 			// add all the jars that should be included when publishing to maven
 			artifact(remapJar) {
 				builtBy remapJar
@@ -82,4 +81,4 @@ publishing {
             }
         }
 	}
-}
\ No newline at end of file
+}
diff --git a/gradle.properties b/gradle.properties
index 3fddfad..736d895 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -4,17 +4,18 @@ org.gradle.jvmargs=-Xmx3G
 org.gradle.daemon=false
 
 # Fabric Properties
-# check these on https://fabricmc.net/use
-minecraft_version=1.21
-yarn_mappings=1.21+build.9
-loader_version=0.15.11
+# check these on https://fabricmc.net/develop/
+minecraft_version=1.21.4
+yarn_mappings=1.21.4+build.8
+loader_version=0.16.14
+loom_version=1.10-SNAPSHOT
 
 # Mod Properties
-mod_version = 2.3.2
+mod_version = 2.3.3
 maven_group = fr.atesab.xray
 archives_base_name = XrayMod
 artifactId = xray
 
 # Dependencies
 # currently not on the main fabric site, check on the maven: https://maven.fabricmc.net/net/fabricmc/fabric-api/fabric-api
-fabric_version=0.100.6+1.21
\ No newline at end of file
+fabric_version=0.119.2+1.21.4
diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar
index e708b1c..9bbc975 100644
Binary files a/gradle/wrapper/gradle-wrapper.jar and b/gradle/wrapper/gradle-wrapper.jar differ
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index db4c326..c3f6c76 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,5 +1,7 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.8-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.13-bin.zip
+networkTimeout=10000
+validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
\ No newline at end of file
diff --git a/gradlew b/gradlew
index 3a163de..faf9300 100755
--- a/gradlew
+++ b/gradlew
@@ -1,7 +1,7 @@
-#!/usr/bin/env sh
+#!/bin/sh
 
 #
-# Copyright 2015 the original author or 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.
@@ -15,69 +15,103 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 #
+# SPDX-License-Identifier: Apache-2.0
+#
 
 ##############################################################################
-##
-##  Gradle start up script for UN*X
-##
+#
+#   Gradle start up script for POSIX generated by Gradle.
+#
+#   Important for running:
+#
+#   (1) You need a POSIX-compliant shell to run this script. If your /bin/sh is
+#       noncompliant, but you have some other compliant shell such as ksh or
+#       bash, then to run this script, type that shell name before the whole
+#       command line, like:
+#
+#           ksh Gradle
+#
+#       Busybox and similar reduced shells will NOT work, because this script
+#       requires all of these POSIX shell features:
+#         * functions;
+#         * expansions «$var», «${var}», «${var:-default}», «${var+SET}»,
+#           «${var#prefix}», «${var%suffix}», and «$( cmd )»;
+#         * compound commands having a testable exit status, especially «case»;
+#         * various built-in commands including «command», «set», and «ulimit».
+#
+#   Important for patching:
+#
+#   (2) This script targets any POSIX shell, so it avoids extensions provided
+#       by Bash, Ksh, etc; in particular arrays are avoided.
+#
+#       The "traditional" practice of packing multiple parameters into a
+#       space-separated string is a well documented source of bugs and security
+#       problems, so this is (mostly) avoided, by progressively accumulating
+#       options in "$@", and eventually passing that to Java.
+#
+#       Where the inherited environment variables (DEFAULT_JVM_OPTS, JAVA_OPTS,
+#       and GRADLE_OPTS) rely on word-splitting, this is performed explicitly;
+#       see the in-line comments for details.
+#
+#       There are tweaks for specific operating systems such as AIX, CygWin,
+#       Darwin, MinGW, and NonStop.
+#
+#   (3) This script is generated from the Groovy template
+#       https://github.com/gradle/gradle/blob/HEAD/platforms/jvm/plugins-application/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
+#       within the Gradle project.
+#
+#       You can find Gradle at https://github.com/gradle/gradle/.
+#
 ##############################################################################
 
 # Attempt to set APP_HOME
+
 # Resolve links: $0 may be a link
-PRG="$0"
-# Need this for relative symlinks.
-while [ -h "$PRG" ] ; do
-    ls=`ls -ld "$PRG"`
-    link=`expr "$ls" : '.*-> \(.*\)$'`
-    if expr "$link" : '/.*' > /dev/null; then
-        PRG="$link"
-    else
-        PRG=`dirname "$PRG"`"/$link"
-    fi
+app_path=$0
+
+# Need this for daisy-chained symlinks.
+while
+    APP_HOME=${app_path%"${app_path##*/}"}  # leaves a trailing /; empty if no leading path
+    [ -h "$app_path" ]
+do
+    ls=$( ls -ld "$app_path" )
+    link=${ls#*' -> '}
+    case $link in             #(
+      /*)   app_path=$link ;; #(
+      *)    app_path=$APP_HOME$link ;;
+    esac
 done
-SAVED="`pwd`"
-cd "`dirname \"$PRG\"`/" >/dev/null
-APP_HOME="`pwd -P`"
-cd "$SAVED" >/dev/null
 
-APP_NAME="Gradle"
-APP_BASE_NAME=`basename "$0"`
-
-# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
-DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"'
+# This is normally unused
+# shellcheck disable=SC2034
+APP_BASE_NAME=${0##*/}
+# Discard cd standard output in case $CDPATH is set (https://github.com/gradle/gradle/issues/25036)
+APP_HOME=$( cd -P "${APP_HOME:-./}" > /dev/null && printf '%s\n' "$PWD" ) || exit
 
 # Use the maximum available, or set MAX_FD != -1 to use that value.
-MAX_FD="maximum"
+MAX_FD=maximum
 
 warn () {
     echo "$*"
-}
+} >&2
 
 die () {
     echo
     echo "$*"
     echo
     exit 1
-}
+} >&2
 
 # OS specific support (must be 'true' or 'false').
 cygwin=false
 msys=false
 darwin=false
 nonstop=false
-case "`uname`" in
-  CYGWIN* )
-    cygwin=true
-    ;;
-  Darwin* )
-    darwin=true
-    ;;
-  MINGW* )
-    msys=true
-    ;;
-  NONSTOP* )
-    nonstop=true
-    ;;
+case "$( uname )" in                #(
+  CYGWIN* )         cygwin=true  ;; #(
+  Darwin* )         darwin=true  ;; #(
+  MSYS* | MINGW* )  msys=true    ;; #(
+  NONSTOP* )        nonstop=true ;;
 esac
 
 CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar
@@ -87,9 +121,9 @@ CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar
 if [ -n "$JAVA_HOME" ] ; then
     if [ -x "$JAVA_HOME/jre/sh/java" ] ; then
         # IBM's JDK on AIX uses strange locations for the executables
-        JAVACMD="$JAVA_HOME/jre/sh/java"
+        JAVACMD=$JAVA_HOME/jre/sh/java
     else
-        JAVACMD="$JAVA_HOME/bin/java"
+        JAVACMD=$JAVA_HOME/bin/java
     fi
     if [ ! -x "$JAVACMD" ] ; then
         die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME
@@ -98,88 +132,120 @@ Please set the JAVA_HOME variable in your environment to match the
 location of your Java installation."
     fi
 else
-    JAVACMD="java"
-    which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
+    JAVACMD=java
+    if ! command -v java >/dev/null 2>&1
+    then
+        die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
 
 Please set the JAVA_HOME variable in your environment to match the
 location of your Java installation."
+    fi
 fi
 
 # Increase the maximum file descriptors if we can.
-if [ "$cygwin" = "false" -a "$darwin" = "false" -a "$nonstop" = "false" ] ; then
-    MAX_FD_LIMIT=`ulimit -H -n`
-    if [ $? -eq 0 ] ; then
-        if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ] ; then
-            MAX_FD="$MAX_FD_LIMIT"
-        fi
-        ulimit -n $MAX_FD
-        if [ $? -ne 0 ] ; then
-            warn "Could not set maximum file descriptor limit: $MAX_FD"
-        fi
-    else
-        warn "Could not query maximum file descriptor limit: $MAX_FD_LIMIT"
-    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=SC2039,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=SC2039,SC3045
+        ulimit -n "$MAX_FD" ||
+            warn "Could not set maximum file descriptor limit to $MAX_FD"
+    esac
 fi
 
-# For Darwin, add options to specify how the application appears in the dock
-if $darwin; then
-    GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\""
-fi
+# Collect all arguments for the java command, stacking in reverse order:
+#   * args from the command line
+#   * the main class name
+#   * -classpath
+#   * -D...appname settings
+#   * --module-path (only if needed)
+#   * DEFAULT_JVM_OPTS, JAVA_OPTS, and GRADLE_OPTS environment variables.
 
 # For Cygwin or MSYS, switch paths to Windows format before running java
-if [ "$cygwin" = "true" -o "$msys" = "true" ] ; then
-    APP_HOME=`cygpath --path --mixed "$APP_HOME"`
-    CLASSPATH=`cygpath --path --mixed "$CLASSPATH"`
-
-    JAVACMD=`cygpath --unix "$JAVACMD"`
-
-    # We build the pattern for arguments to be converted via cygpath
-    ROOTDIRSRAW=`find -L / -maxdepth 1 -mindepth 1 -type d 2>/dev/null`
-    SEP=""
-    for dir in $ROOTDIRSRAW ; do
-        ROOTDIRS="$ROOTDIRS$SEP$dir"
-        SEP="|"
-    done
-    OURCYGPATTERN="(^($ROOTDIRS))"
-    # Add a user-defined pattern to the cygpath arguments
-    if [ "$GRADLE_CYGPATTERN" != "" ] ; then
-        OURCYGPATTERN="$OURCYGPATTERN|($GRADLE_CYGPATTERN)"
-    fi
+if "$cygwin" || "$msys" ; then
+    APP_HOME=$( cygpath --path --mixed "$APP_HOME" )
+    CLASSPATH=$( cygpath --path --mixed "$CLASSPATH" )
+
+    JAVACMD=$( cygpath --unix "$JAVACMD" )
+
     # Now convert the arguments - kludge to limit ourselves to /bin/sh
-    i=0
-    for arg in "$@" ; do
-        CHECK=`echo "$arg"|egrep -c "$OURCYGPATTERN" -`
-        CHECK2=`echo "$arg"|egrep -c "^-"`                                 ### Determine if an option
-
-        if [ $CHECK -ne 0 ] && [ $CHECK2 -eq 0 ] ; then                    ### Added a condition
-            eval `echo args$i`=`cygpath --path --ignore --mixed "$arg"`
-        else
-            eval `echo args$i`="\"$arg\""
+    for arg do
+        if
+            case $arg in                                #(
+              -*)   false ;;                            # don't mess with options #(
+              /?*)  t=${arg#/} t=/${t%%/*}              # looks like a POSIX filepath
+                    [ -e "$t" ] ;;                      #(
+              *)    false ;;
+            esac
+        then
+            arg=$( cygpath --path --ignore --mixed "$arg" )
         fi
-        i=`expr $i + 1`
+        # Roll the args list around exactly as many times as the number of
+        # args, so each arg winds up back in the position where it started, but
+        # possibly modified.
+        #
+        # NB: a `for` loop captures its iteration list before it begins, so
+        # changing the positional parameters here affects neither the number of
+        # iterations, nor the values presented in `arg`.
+        shift                   # remove old arg
+        set -- "$@" "$arg"      # push replacement arg
     done
-    case $i in
-        0) set -- ;;
-        1) set -- "$args0" ;;
-        2) set -- "$args0" "$args1" ;;
-        3) set -- "$args0" "$args1" "$args2" ;;
-        4) set -- "$args0" "$args1" "$args2" "$args3" ;;
-        5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;;
-        6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;;
-        7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;;
-        8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;;
-        9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;;
-    esac
 fi
 
-# Escape application args
-save () {
-    for i do printf %s\\n "$i" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/" ; done
-    echo " "
-}
-APP_ARGS=`save "$@"`
 
-# Collect all arguments for the java command, following the shell quoting and substitution rules
-eval set -- $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS "\"-Dorg.gradle.appname=$APP_BASE_NAME\"" -classpath "\"$CLASSPATH\"" org.gradle.wrapper.GradleWrapperMain "$APP_ARGS"
+# 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"'
+
+# Collect all arguments for the java command:
+#   * DEFAULT_JVM_OPTS, JAVA_OPTS, and optsEnvironmentVar are not allowed to contain shell fragments,
+#     and any embedded shellness will be escaped.
+#   * For example: A user cannot expect ${Hostname} to be expanded, as it is an environment variable and will be
+#     treated as '${Hostname}' itself on the command line.
+
+set -- \
+        "-Dorg.gradle.appname=$APP_BASE_NAME" \
+        -classpath "$CLASSPATH" \
+        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.
+#
+# In Bash we could simply go:
+#
+#   readarray ARGS < <( xargs -n1 <<<"$var" ) &&
+#   set -- "${ARGS[@]}" "$@"
+#
+# but POSIX shell has neither arrays nor command substitution, so instead we
+# post-process each arg (as a line of input to sed) to backslash-escape any
+# character that might be a shell metacharacter, then use eval to reverse
+# that process (while maintaining the separation between arguments), and wrap
+# the whole thing up as a single "set" statement.
+#
+# This will of course break if any of these variables contains a newline or
+# an unmatched quote.
+#
+
+eval "set -- $(
+        printf '%s\n' "$DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS" |
+        xargs -n1 |
+        sed ' s~[^-[:alnum:]+,./:=@_]~\\&~g; ' |
+        tr '\n' ' '
+    )" '"$@"'
 
-exec "$JAVACMD" "$@"
\ No newline at end of file
+exec "$JAVACMD" "$@"
diff --git a/gradlew.bat b/gradlew.bat
index 28690fe..9b42019 100644
--- a/gradlew.bat
+++ b/gradlew.bat
@@ -13,8 +13,10 @@
 @rem See the License for the specific language governing permissions and
 @rem limitations under the License.
 @rem
+@rem SPDX-License-Identifier: Apache-2.0
+@rem
 
-@if "%DEBUG%" == "" @echo off
+@if "%DEBUG%"=="" @echo off
 @rem ##########################################################################
 @rem
 @rem  Gradle startup script for Windows
@@ -25,7 +27,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,13 +43,13 @@ 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.
-echo.
-echo Please set the JAVA_HOME variable in your environment to match the
-echo location of your Java installation.
+echo. 1>&2
+echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. 1>&2
+echo. 1>&2
+echo Please set the JAVA_HOME variable in your environment to match the 1>&2
+echo location of your Java installation. 1>&2
 
 goto fail
 
@@ -56,11 +59,11 @@ set JAVA_EXE=%JAVA_HOME%/bin/java.exe
 
 if exist "%JAVA_EXE%" goto execute
 
-echo.
-echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME%
-echo.
-echo Please set the JAVA_HOME variable in your environment to match the
-echo location of your Java installation.
+echo. 1>&2
+echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% 1>&2
+echo. 1>&2
+echo Please set the JAVA_HOME variable in your environment to match the 1>&2
+echo location of your Java installation. 1>&2
 
 goto fail
 
@@ -75,15 +78,17 @@ 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
-exit /b 1
+set EXIT_CODE=%ERRORLEVEL%
+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
 
-:omega
\ No newline at end of file
+:omega
diff --git a/settings.gradle b/settings.gradle
index 89fa615..7e86088 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -1,6 +1,6 @@
 pluginManagement {
     repositories {
-        jcenter()
+        mavenCentral()
         maven {
             name = 'Fabric'
             url = 'https://maven.fabricmc.net/'
diff --git a/src/main/java/fr/atesab/xray/SideRenderer.java b/src/main/java/fr/atesab/xray/SideRenderer.java
index 83384f7..f26262c 100644
--- a/src/main/java/fr/atesab/xray/SideRenderer.java
+++ b/src/main/java/fr/atesab/xray/SideRenderer.java
@@ -9,7 +9,5 @@
 
 @FunctionalInterface
 public interface SideRenderer {
-	public void shouldSideBeRendered(
-			BlockState adjacentState, BlockView blockState, BlockPos blockAccess,
-			Direction pos, CallbackInfoReturnable<Boolean> ci);
+	public void shouldSideBeRendered(BlockState state, BlockState adjacentState, CallbackInfoReturnable<Boolean> ci);
 }
diff --git a/src/main/java/fr/atesab/xray/XrayMain.java b/src/main/java/fr/atesab/xray/XrayMain.java
index 68d79f5..ec2845a 100644
--- a/src/main/java/fr/atesab/xray/XrayMain.java
+++ b/src/main/java/fr/atesab/xray/XrayMain.java
@@ -26,6 +26,7 @@
 import net.minecraft.block.entity.BlockEntityType;
 import net.minecraft.client.MinecraftClient;
 import net.minecraft.client.font.TextRenderer;
+import net.minecraft.client.gl.ShaderProgramKeys;
 import net.minecraft.client.gui.DrawContext;
 import net.minecraft.client.network.ClientPlayerEntity;
 import net.minecraft.client.option.KeyBinding;
@@ -194,13 +195,12 @@ public XrayMain modules() {
         return this;
     }
 
-    public void shouldSideBeRendered(BlockState adjacentState, BlockView blockState, BlockPos blockAccess,
-                                     Direction pos, CallbackInfoReturnable<Boolean> ci) {
+    public void shouldSideBeRendered(BlockState state, BlockState adjacentState, CallbackInfoReturnable<Boolean> ci) {
         if (ci == null)
             ci = new CallbackInfoReturnable<>("shouldSideBeRendered", true);
 
         for (BlockConfig mode : getConfig().getBlockConfigs()) {
-            mode.shouldSideBeRendered(adjacentState, blockState, blockAccess, pos, ci);
+            mode.shouldSideBeRendered(state, adjacentState, ci);
         }
     }
 
@@ -343,7 +343,7 @@ public void afterEntities(WorldRenderContext context) {
             return;
         }
 
-        RenderSystem.setShader(GameRenderer::getPositionColorProgram);
+        RenderSystem.setShader(ShaderProgramKeys.POSITION_COLOR);
         RenderSystem.setShaderColor(1f, 1f, 1f, 1f);
         // RenderSystem.depthMask(false);
         RenderSystem.enableBlend();
@@ -352,7 +352,7 @@ public void afterEntities(WorldRenderContext context) {
 			return;
 		}
 
-		RenderSystem.setShader(GameRenderer::getPositionColorProgram);
+		RenderSystem.setShader(ShaderProgramKeys.POSITION_COLOR);
 		RenderSystem.setShaderColor(1f, 1f, 1f, 1f);
 		// RenderSystem.depthMask(false);
 		RenderSystem.disableDepthTest();
@@ -368,7 +368,6 @@ public void afterEntities(WorldRenderContext context) {
 
 		stack.push();
 
-		RenderSystem.applyModelViewMatrix();
 		stack.translate(-camera.x, -camera.y, -camera.z);
 		Vector3f look = mainCamera.getHorizontalPlane();
 		float px = (float) (player.prevX + (player.getX() - player.prevX) * delta) + look.x();
@@ -422,7 +421,7 @@ public void afterEntities(WorldRenderContext context) {
 										blockPos.getX() + 1, blockPos.getY() + 1, blockPos.getZ() + 1
 								);
 
-								WorldRenderer.drawBox(stack, buffer, aabb, r, g, b, a);
+								VertexRendering.drawBox(stack, buffer, aabb, r, g, b, a);
 
 								if (esp.hasTracer()) {
 									Vec3d center = aabb.getCenter();
@@ -467,7 +466,7 @@ public void afterEntities(WorldRenderContext context) {
 
                 Box aabb = type.getSpawnBox(x, y, z);
 
-                WorldRenderer.drawBox(stack, buffer, aabb, r, g, b, a);
+                VertexRendering.drawBox(stack, buffer, aabb, r, g, b, a);
 
                 if (esp.hasTracer()) {
                     Vec3d center = aabb.getCenter();
@@ -479,7 +478,6 @@ public void afterEntities(WorldRenderContext context) {
         try { BufferRenderer.drawWithGlobalProgram(buffer.end()); } catch(IllegalStateException state) { System.out.println(state.getMessage());}
         stack.pop();
         RenderSystem.disableBlend();
-        RenderSystem.applyModelViewMatrix();
         RenderSystem.setShaderColor(1, 1, 1, 1);
 		RenderSystem.enableDepthTest();
 		RenderSystem.depthMask(true);
diff --git a/src/main/java/fr/atesab/xray/color/EntityTypeIcon.java b/src/main/java/fr/atesab/xray/color/EntityTypeIcon.java
index 6799627..ca4cc50 100644
--- a/src/main/java/fr/atesab/xray/color/EntityTypeIcon.java
+++ b/src/main/java/fr/atesab/xray/color/EntityTypeIcon.java
@@ -48,7 +48,7 @@ public record EntityTypeIcon(EntityType<?> entity, ItemStack icon) {
     public static final EntityTypeIcon FALLING_BLOCK = register(EntityType.FALLING_BLOCK, Blocks.SAND);
     public static final EntityTypeIcon FIREBALL = register(EntityType.FIREBALL, Items.FIRE_CHARGE);
     public static final EntityTypeIcon FIREWORK_ROCKET = register(EntityType.FIREWORK_ROCKET, Items.FIREWORK_ROCKET);
-    public static final EntityTypeIcon BOAT = register(EntityType.BOAT, Items.OAK_BOAT);
+    public static final EntityTypeIcon BOAT = register(EntityType.OAK_BOAT, Items.OAK_BOAT);
     public static final EntityTypeIcon SPIDER = register(EntityType.SPIDER, Items.SPIDER_EYE);
     public static final EntityTypeIcon POTION = register(EntityType.POTION, Items.POTION);
     public static final EntityTypeIcon PUFFERFISH = register(EntityType.PUFFERFISH, Items.PUFFERFISH);
diff --git a/src/main/java/fr/atesab/xray/config/BlockConfig.java b/src/main/java/fr/atesab/xray/config/BlockConfig.java
index 72ad8a6..1048803 100644
--- a/src/main/java/fr/atesab/xray/config/BlockConfig.java
+++ b/src/main/java/fr/atesab/xray/config/BlockConfig.java
@@ -206,16 +206,13 @@ public SyncedBlockList getBlocks() {
     }
 
     @Override
-    @SuppressWarnings("deprecation")
-    public void shouldSideBeRendered(BlockState adjacentState, BlockView blockState, BlockPos blockAccess,
-            Direction pos, CallbackInfoReturnable<Boolean> ci) {
+    public void shouldSideBeRendered(BlockState state, BlockState adjacentState, CallbackInfoReturnable<Boolean> ci) {
         if (!isEnabled())
             return;
 
-        String name = Registries.BLOCK.getId(adjacentState.getBlock()).toString();
+        String name = Registries.BLOCK.getId(state.getBlock()).toString();
         boolean present = blocks.contains(name);
-        boolean shouldRender = viewMode.getViewer().shouldRenderSide(present, adjacentState, blockState,
-                blockAccess, pos);
+        boolean shouldRender = viewMode.getViewer().shouldRenderSide(present, state, adjacentState);
         ci.setReturnValue(shouldRender);
     }
 
diff --git a/src/main/java/fr/atesab/xray/mixins/MixinBlock.java b/src/main/java/fr/atesab/xray/mixins/MixinBlock.java
index 3b39e26..9153fc8 100644
--- a/src/main/java/fr/atesab/xray/mixins/MixinBlock.java
+++ b/src/main/java/fr/atesab/xray/mixins/MixinBlock.java
@@ -3,9 +3,7 @@
 import fr.atesab.xray.XrayMain;
 import net.minecraft.block.Block;
 import net.minecraft.block.BlockState;
-import net.minecraft.util.math.BlockPos;
 import net.minecraft.util.math.Direction;
-import net.minecraft.world.BlockView;
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.injection.At;
 import org.spongepowered.asm.mixin.injection.Inject;
@@ -14,15 +12,13 @@
 @Mixin(value = Block.class)
 public class MixinBlock {
 	@Inject(at = @At("RETURN"), method = "shouldDrawSide(" + "Lnet/minecraft/block/BlockState;" + // state
-			"Lnet/minecraft/world/BlockView;" + // reader
-			"Lnet/minecraft/util/math/BlockPos;" + // pos
-			"Lnet/minecraft/util/math/Direction;" + // face
-			"Lnet/minecraft/util/math/BlockPos;" + // blockPosaaa
+			"Lnet/minecraft/block/BlockState;" + // adjacentState
+			"Lnet/minecraft/util/math/Direction;" + // side (unused)
 			")Z", // ci
 			cancellable = true)
-	private static void shouldDrawSide(BlockState state, BlockView reader, BlockPos pos, Direction face,
-			BlockPos blockPos, CallbackInfoReturnable<Boolean> ci) {
-		XrayMain.getMod().shouldSideBeRendered(state, reader, pos, face, ci);
+	private static void shouldDrawSide(BlockState state, BlockState adjacentState, Direction side,
+			CallbackInfoReturnable<Boolean> ci) {
+		XrayMain.getMod().shouldSideBeRendered(state, adjacentState, ci);
 	}
 
 	private MixinBlock() {
diff --git a/src/main/java/fr/atesab/xray/mixins/MixinBlockOcclusionCache.java b/src/main/java/fr/atesab/xray/mixins/MixinBlockOcclusionCache.java
index 3f9a104..64cf91e 100644
--- a/src/main/java/fr/atesab/xray/mixins/MixinBlockOcclusionCache.java
+++ b/src/main/java/fr/atesab/xray/mixins/MixinBlockOcclusionCache.java
@@ -12,11 +12,12 @@
 import org.spongepowered.asm.mixin.injection.callback.CallbackInfoReturnable;
 
 @Pseudo
-@Mixin(targets = "me.jellysquid.mods.sodium.client.render.chunk.compile.pipeline.BlockOcclusionCache")
+@Mixin(targets = "net.caffeinemc.mods.sodium.client.render.chunk.compile.pipeline.BlockOcclusionCache")
 public class MixinBlockOcclusionCache {
     @Inject(at = @At("HEAD"), method = "shouldDrawSide", cancellable = true, remap = false)
-    private void shouldDrawSide(BlockState state, BlockView reader, BlockPos pos, Direction face,
-            CallbackInfoReturnable<Boolean> ci) {
-        XrayMain.getMod().shouldSideBeRendered(state, reader, pos, face, ci);
+    private void shouldDrawSide(BlockState selfBlockstate, BlockView view, BlockPos selfPos, Direction facing,
+                                CallbackInfoReturnable<Boolean> ci) {
+        BlockState adjacentState = view.getBlockState(selfPos.offset(facing));
+        XrayMain.getMod().shouldSideBeRendered(selfBlockstate, adjacentState, ci);
     }
 }
\ No newline at end of file
diff --git a/src/main/java/fr/atesab/xray/screen/BlockSelector.java b/src/main/java/fr/atesab/xray/screen/BlockSelector.java
index b11afc1..6d64b9f 100644
--- a/src/main/java/fr/atesab/xray/screen/BlockSelector.java
+++ b/src/main/java/fr/atesab/xray/screen/BlockSelector.java
@@ -194,7 +194,7 @@ public boolean mouseClicked(double mouseX, double mouseY, int button) {
     protected abstract void save(Block selection);
 
     @Override
-    public void applyBlur(float delta){
+    public void applyBlur(){
 
     }
 }
diff --git a/src/main/java/fr/atesab/xray/screen/ColorSelector.java b/src/main/java/fr/atesab/xray/screen/ColorSelector.java
index 85d6dab..2f3e730 100644
--- a/src/main/java/fr/atesab/xray/screen/ColorSelector.java
+++ b/src/main/java/fr/atesab/xray/screen/ColorSelector.java
@@ -6,6 +6,7 @@
 import fr.atesab.xray.utils.GuiUtils.HSLResult;
 import fr.atesab.xray.widget.XrayButton;
 import net.minecraft.client.MinecraftClient;
+import net.minecraft.client.gl.ShaderProgramKeys;
 import net.minecraft.client.gui.DrawContext;
 import net.minecraft.client.gui.screen.Screen;
 import net.minecraft.client.gui.widget.ButtonWidget;
@@ -89,7 +90,7 @@ private static void setPickerState(int hue, int saturation, int lightness) {
             for (int y = 0; y < pixels.getHeight(); y++) { // saturation
                 int color = GuiUtils.fromHSL(hue, y * 100 / pixels.getHeight(), lightness);
                 for (int x = 0; x < pixels.getWidth(); x++)
-                    pixels.setColor(x, y, GuiUtils.blueToRed(color));
+                    pixels.setColorArgb(x, y, GuiUtils.blueToRed(color));
             }
 
             PICKER_IMAGE_S.upload();
@@ -104,7 +105,7 @@ private static void setPickerState(int hue, int saturation, int lightness) {
 
             for (int x = 0; x < pixels.getWidth(); x++) // hue
                 for (int y = 0; y < pixels.getHeight(); y++) // lightness
-                    pixels.setColor(x, y, GuiUtils.blueToRed(
+                    pixels.setColorArgb(x, y, GuiUtils.blueToRed(
                             GuiUtils.fromHSL(x * 360 / pixels.getWidth(), saturation, y * 100 / pixels.getHeight())));
 
             PICKER_IMAGE_HL.upload();
@@ -178,7 +179,7 @@ public void render(DrawContext context, int mouseX, int mouseY, float partialTic
 
         if (!advanced) {
             // S PICKER
-            RenderSystem.setShader(GameRenderer::getPositionTexProgram);
+            RenderSystem.setShader(ShaderProgramKeys.POSITION_TEX);
             RenderSystem.setShaderColor(1.0F, 1.0F, 1.0F, 1.0F);
             RenderSystem.setShaderTexture(0, getPickerSResource());
             GuiUtils.drawScaledCustomSizeModalRect(width / 2 + 180, height / 2 - 76 - getShiftY(), 0, 0, PICKER_S_SIZE_X,
@@ -192,7 +193,7 @@ public void render(DrawContext context, int mouseX, int mouseY, float partialTic
                     height / 2 - 76 + saturationDelta + 1 - getShiftY(), 0xff999999);
 
             // HL Picker
-            RenderSystem.setShader(GameRenderer::getPositionTexProgram);
+            RenderSystem.setShader(ShaderProgramKeys.POSITION_TEX);
             RenderSystem.setShaderColor(1.0F, 1.0F, 1.0F, 1.0F);
             RenderSystem.setShaderTexture(0, getPickerHlResource());
             GuiUtils.drawScaledCustomSizeModalRect(width / 2 - 158, height / 2 - 76 - getShiftY(), 0, 0, PICKER_HL_SIZE_X,
diff --git a/src/main/java/fr/atesab/xray/screen/XrayBlockMenu.java b/src/main/java/fr/atesab/xray/screen/XrayBlockMenu.java
index 0a8d58c..aad2491 100644
--- a/src/main/java/fr/atesab/xray/screen/XrayBlockMenu.java
+++ b/src/main/java/fr/atesab/xray/screen/XrayBlockMenu.java
@@ -250,7 +250,7 @@ protected void save(Block selection) {
     }
 
     @Override
-    public void applyBlur(float delta){
+    public void applyBlur(){
 
     }
 }
diff --git a/src/main/java/fr/atesab/xray/screen/XrayEntityMenu.java b/src/main/java/fr/atesab/xray/screen/XrayEntityMenu.java
index a9db03d..191b1b8 100644
--- a/src/main/java/fr/atesab/xray/screen/XrayEntityMenu.java
+++ b/src/main/java/fr/atesab/xray/screen/XrayEntityMenu.java
@@ -295,7 +295,7 @@ protected void select(EntityUnion selection) {
     }
 
     @Override
-    public void applyBlur(float delta){
+    public void applyBlur(){
 
     }
 }
diff --git a/src/main/java/fr/atesab/xray/utils/GuiUtils.java b/src/main/java/fr/atesab/xray/utils/GuiUtils.java
index f854803..31e3c07 100644
--- a/src/main/java/fr/atesab/xray/utils/GuiUtils.java
+++ b/src/main/java/fr/atesab/xray/utils/GuiUtils.java
@@ -4,12 +4,12 @@
 import com.mojang.blaze3d.systems.RenderSystem;
 import net.minecraft.client.MinecraftClient;
 import net.minecraft.client.font.TextRenderer;
+import net.minecraft.client.gl.ShaderProgramKeys;
 import net.minecraft.client.gui.DrawContext;
 import net.minecraft.client.gui.screen.Screen;
 import net.minecraft.client.gui.widget.ClickableWidget;
 import net.minecraft.client.render.BufferBuilder;
 import net.minecraft.client.render.BufferRenderer;
-import net.minecraft.client.render.GameRenderer;
 import net.minecraft.client.render.Tessellator;
 import net.minecraft.client.render.VertexFormat.DrawMode;
 import net.minecraft.client.render.VertexFormats;
@@ -283,7 +283,7 @@ public static void drawItemStack(DrawContext graphics, ItemStack itemstack, int
             return;
         RenderSystem.enableDepthTest();
         graphics.drawItem(itemstack, x, y);
-        graphics.drawItemInSlot(MinecraftClient.getInstance().textRenderer, itemstack, x, y);
+        graphics.drawStackOverlay(MinecraftClient.getInstance().textRenderer, itemstack, x, y);
         RenderSystem.disableBlend();
     }
 
@@ -633,7 +633,7 @@ public static void renderItemDecorationIdentity(DrawContext graphics, TextRender
         MatrixStack pose = graphics.getMatrices();
         pose.push();
         pose.loadIdentity();
-        graphics.drawItemInSlot(font, stack, x, y);
+        graphics.drawStackOverlay(font, stack, x, y);
         pose.pop();
     }
 
@@ -693,7 +693,7 @@ public static void drawGradientRect(MatrixStack stack, int left, int top, int ri
         float blueRightBottom = (float) (rightBottomColor & 255) / 255.0F;
         RenderSystem.enableBlend();
         RenderSystem.defaultBlendFunc();
-        RenderSystem.setShader(GameRenderer::getPositionColorProgram);
+        RenderSystem.setShader(ShaderProgramKeys.POSITION_COLOR);
         RenderSystem.blendFuncSeparate(GlStateManager.SrcFactor.SRC_ALPHA,
                 GlStateManager.DstFactor.ONE_MINUS_SRC_ALPHA, GlStateManager.SrcFactor.ONE,
                 GlStateManager.DstFactor.ZERO);
diff --git a/src/main/java/fr/atesab/xray/view/ViewMode.java b/src/main/java/fr/atesab/xray/view/ViewMode.java
index 507dc60..8000a7f 100644
--- a/src/main/java/fr/atesab/xray/view/ViewMode.java
+++ b/src/main/java/fr/atesab/xray/view/ViewMode.java
@@ -10,12 +10,11 @@ public enum ViewMode implements EnumElement {
     /**
      * Default mode, like in Xray and Redstone mode
      */
-    EXCLUSIVE("x13.mod.mode.view.exclusive", new ItemStack(Blocks.DIAMOND_ORE), (il, v1, v2, v3, v4) -> il),
+    EXCLUSIVE("x13.mod.mode.view.exclusive", new ItemStack(Blocks.DIAMOND_ORE), (inList, state, adjacentState) -> inList),
     /**
      * Inclusive mode, like in Cave Mode
      */
-    INCLUSIVE("x13.mod.mode.view.inclusive", new ItemStack(Blocks.STONE), (il, v1, reader, pos, face) -> !il
-            && reader.getBlockState(pos.add(face.getOffsetX(), face.getOffsetY(), face.getOffsetZ())).isAir());
+    INCLUSIVE("x13.mod.mode.view.inclusive", new ItemStack(Blocks.STONE), (inList, state, adjacentState) -> !inList && adjacentState.isAir());
 
     private Viewer viewer;
     private Text title;
diff --git a/src/main/java/fr/atesab/xray/view/Viewer.java b/src/main/java/fr/atesab/xray/view/Viewer.java
index 8afcb22..1c2448d 100644
--- a/src/main/java/fr/atesab/xray/view/Viewer.java
+++ b/src/main/java/fr/atesab/xray/view/Viewer.java
@@ -7,6 +7,5 @@
 
 @FunctionalInterface
 public interface Viewer {
-    public boolean shouldRenderSide(boolean blockInList, BlockState adjacentState, BlockView blockState,
-            BlockPos blockAccess, Direction pos);
+    public boolean shouldRenderSide(boolean blockInList, BlockState state, BlockState adjacentState);
 }
diff --git a/src/main/java/fr/atesab/xray/widget/MenuWidget.java b/src/main/java/fr/atesab/xray/widget/MenuWidget.java
index 8c858cf..e922ad1 100644
--- a/src/main/java/fr/atesab/xray/widget/MenuWidget.java
+++ b/src/main/java/fr/atesab/xray/widget/MenuWidget.java
@@ -54,10 +54,8 @@ public void renderWidget(DrawContext graphics, int mouseX, int mouseY, float del
         float scaleX = getWidth() * 3 / 4f / 16f;
         float scaleY = getHeight() * 3 / 4f / 16f;
         modelStack.scale(scaleX, scaleY, 1);
-        RenderSystem.applyModelViewMatrix();
         GuiUtils.renderItemIdentity(graphics, itemStack, -8, -8);
         modelStack.popMatrix();
-        RenderSystem.applyModelViewMatrix();
 
         MatrixStack stack = graphics.getMatrices();
         stack.push();