diff --git a/build.gradle b/build.gradle
index f1905d1..52f3d35 100644
--- a/build.gradle
+++ b/build.gradle
@@ -1,81 +1,95 @@
 plugins {
-    id 'fabric-loom' version '0.5-SNAPSHOT'
+    id 'fabric-loom' version '1.0-SNAPSHOT'
     id 'maven-publish'
-    id 'org.jetbrains.kotlin.jvm' version '1.4.21'
+    id "org.jetbrains.kotlin.jvm" version "1.8.0"
 }
 
-sourceCompatibility = JavaVersion.VERSION_1_8
-targetCompatibility = JavaVersion.VERSION_1_8
+sourceCompatibility = JavaVersion.VERSION_17
+targetCompatibility = JavaVersion.VERSION_17
 
 archivesBaseName = project.archives_base_name
 version = project.mod_version
 group = project.maven_group
 
+repositories {
+    // Add repositories to retrieve artifacts from in here.
+    // You should only use this when depending on other mods because
+    // Loom adds the essential maven repositories to download Minecraft and libraries from automatically.
+    // See https://docs.gradle.org/current/userguide/declaring_repositories.html
+    // for more information about repositories.
+}
+
+loom {
+    splitEnvironmentSourceSets()
+
+    mods {
+        modid {
+            sourceSet sourceSets.main
+            sourceSet sourceSets.client
+        }
+    }
+
+}
+
 dependencies {
-    //to change the versions see the gradle.properties file
+    // To change the versions see the gradle.properties file
     minecraft "com.mojang:minecraft:${project.minecraft_version}"
     mappings "net.fabricmc:yarn:${project.yarn_mappings}:v2"
     modImplementation "net.fabricmc:fabric-loader:${project.loader_version}"
 
     // Fabric API. This is technically optional, but you probably want it anyway.
     modImplementation "net.fabricmc.fabric-api:fabric-api:${project.fabric_version}"
-
-    // Kotlin
     modImplementation "net.fabricmc:fabric-language-kotlin:${project.fabric_kotlin_version}"
+    // Uncomment the following line to enable the deprecated Fabric API modules.
+    // These are included in the Fabric API production distribution and allow you to update your mod to the latest modules at a later more convenient time.
 
-    // PSA: Some older mods, compiled on Loom 0.2.1, might have outdated Maven POMs.
-    // You may need to force-disable transitiveness on them.
+    // modImplementation "net.fabricmc.fabric-api:fabric-api-deprecated:${project.fabric_version}"
 }
 
 processResources {
     inputs.property "version", project.version
 
-    from(sourceSets.main.resources.srcDirs) {
-        include "fabric.mod.json"
+    filesMatching("fabric.mod.json") {
         expand "version": project.version
     }
+}
 
-    from(sourceSets.main.resources.srcDirs) {
-        exclude "fabric.mod.json"
-    }
+tasks.withType(JavaCompile).configureEach {
+    it.options.release = 17
 }
 
-// ensure that the encoding is set to UTF-8, no matter what the system default is
-// this fixes some edge cases with special characters not displaying correctly
-// see http://yodaconditions.net/blog/fix-for-java-file-encoding-problems-with-gradle.html
-tasks.withType(JavaCompile) {
-    options.encoding = "UTF-8"
+tasks.withType(org.jetbrains.kotlin.gradle.tasks.KotlinCompile).all {
+    kotlinOptions {
+        jvmTarget = 17
+    }
 }
 
-// Loom will automatically attach sourcesJar to a RemapSourcesJar task and to the "build" task
-// if it is present.
-// If you remove this task, sources will not be generated.
-task sourcesJar(type: Jar, dependsOn: classes) {
-    classifier = "sources"
-    from sourceSets.main.allSource
+java {
+    // 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.
+    withSourcesJar()
 }
 
 jar {
-    from "LICENSE"
+    from("LICENSE") {
+        rename { "${it}_${project.archivesBaseName}"}
+    }
 }
 
 // configure the maven publication
 publishing {
     publications {
         mavenJava(MavenPublication) {
-            // add all the jars that should be included when publishing to maven
-            artifact(remapJar) {
-                builtBy remapJar
-            }
-            artifact(sourcesJar) {
-                builtBy remapSourcesJar
-            }
+            from components.java
         }
     }
 
-    // select the repositories you want to publish to
+    // See https://docs.gradle.org/current/userguide/publishing_maven.html for information on how to set up publishing.
     repositories {
-        // uncomment to publish to the local maven
-        // mavenLocal()
+        // Add repositories to publish to here.
+        // Notice: This block does NOT have the same function as the block in the top level.
+        // The repositories here will be used for publishing your artifact, not for
+        // retrieving dependencies.
     }
 }
diff --git a/gradle.properties b/gradle.properties
index 6d0d152..48185f1 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -1,15 +1,18 @@
 # Done to increase the memory available to gradle.
 org.gradle.jvmargs=-Xmx1G
+org.gradle.parallel=true
+
 # Fabric Properties
-# check these on https://modmuss50.me/fabric.html
-minecraft_version=1.16.4
-yarn_mappings=1.16.4+build.7
-loader_version=0.10.8
+# check these on https://fabricmc.net/develop
+minecraft_version=1.19.3
+yarn_mappings=1.19.3+build.5
+loader_version=0.14.13
+fabric_kotlin_version=1.9.0+kotlin.1.8.0
+
 # Mod Properties
 mod_version=1.0-SNAPSHOT
 maven_group=org.yttr
 archives_base_name=deja
+
 # Dependencies
-# check this on https://modmuss50.me/fabric.html
-fabric_version=0.25.1+build.416-1.16
-fabric_kotlin_version=1.4.21+build.1
+fabric_version=0.73.0+1.19.3
diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar
index 62d4c05..943f0cb 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 bb8b2fc..f398c33 100644
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -1,5 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-6.5.1-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.6-bin.zip
+networkTimeout=10000
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
diff --git a/gradlew b/gradlew
index fbd7c51..65dcd68 100644
--- 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.
@@ -17,67 +17,101 @@
 #
 
 ##############################################################################
-##
-##  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/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/.
+#
 ##############################################################################
 
 # 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"`
+# This is normally unused
+# shellcheck disable=SC2034
+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"'
 
 # 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,7 +132,7 @@ Please set the JAVA_HOME variable in your environment to match the
 location of your Java installation."
     fi
 else
-    JAVACMD="java"
+    JAVACMD=java
     which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
 
 Please set the JAVA_HOME variable in your environment to match the
@@ -106,80 +140,105 @@ location of your Java installation."
 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=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
 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;
+#   * $DEFAULT_JVM_OPTS, $JAVA_OPTS, and $GRADLE_OPTS can contain fragments of
+#     shell script including quotes and variable substitutions, so put them in
+#     double quotes to make sure that they get re-expanded; and
+#   * put everything else in single quotes, so that it's not re-expanded.
+
+set -- \
+        "-Dorg.gradle.appname=$APP_BASE_NAME" \
+        -classpath "$CLASSPATH" \
+        org.gradle.wrapper.GradleWrapperMain \
+        "$@"
+
+# 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.
+#
 
-# 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"
+eval "set -- $(
+        printf '%s\n' "$DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS" |
+        xargs -n1 |
+        sed ' s~[^-[:alnum:]+,./:=@_]~\\&~g; ' |
+        tr '\n' ' '
+    )" '"$@"'
 
 exec "$JAVACMD" "$@"
diff --git a/gradlew.bat b/gradlew.bat
index 5093609..93e3f59 100644
--- a/gradlew.bat
+++ b/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 init
+if %ERRORLEVEL% equ 0 goto execute
 
 echo.
 echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
@@ -54,7 +55,7 @@ goto fail
 set JAVA_HOME=%JAVA_HOME:"=%
 set JAVA_EXE=%JAVA_HOME%/bin/java.exe
 
-if exist "%JAVA_EXE%" goto init
+if exist "%JAVA_EXE%" goto execute
 
 echo.
 echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME%
@@ -64,21 +65,6 @@ echo location of your Java installation.
 
 goto fail
 
-:init
-@rem Get command-line arguments, handling Windows variants
-
-if not "%OS%" == "Windows_NT" goto win9xME_args
-
-:win9xME_args
-@rem Slurp the command line arguments.
-set CMD_LINE_ARGS=
-set _SKIP=2
-
-:win9xME_args_slurp
-if "x%~1" == "x" goto execute
-
-set CMD_LINE_ARGS=%*
-
 :execute
 @rem Setup the command line
 
@@ -86,17 +72,19 @@ set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
 
 
 @rem Execute Gradle
-"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %CMD_LINE_ARGS%
+"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %*
 
 :end
 @rem End local scope for the variables with windows NT shell
-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
diff --git a/settings.gradle b/settings.gradle
index 5b60df3..b02216b 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -1,10 +1,10 @@
 pluginManagement {
     repositories {
-        jcenter()
         maven {
             name = 'Fabric'
             url = 'https://maven.fabricmc.net/'
         }
+        mavenCentral()
         gradlePluginPortal()
     }
 }
diff --git a/src/main/kotlin/deja/client/DejaFabricClient.kt b/src/client/kotlin/org/yttr/deja/client/DejaFabricClient.kt
similarity index 83%
rename from src/main/kotlin/deja/client/DejaFabricClient.kt
rename to src/client/kotlin/org/yttr/deja/client/DejaFabricClient.kt
index e553edf..9fe8aac 100644
--- a/src/main/kotlin/deja/client/DejaFabricClient.kt
+++ b/src/client/kotlin/org/yttr/deja/client/DejaFabricClient.kt
@@ -1,11 +1,11 @@
-package deja.client
+package org.yttr.deja.client
 
-import deja.TimeloopController
-import deja.client.flashback.FlashbackController
 import net.fabricmc.api.ClientModInitializer
 import net.fabricmc.api.EnvType
 import net.fabricmc.api.Environment
 import net.fabricmc.fabric.api.client.event.lifecycle.v1.ClientTickEvents
+import org.yttr.deja.TimeloopController
+import org.yttr.deja.client.flashback.FlashbackController
 
 /**
  * Entry point for the Deja client mod
diff --git a/src/main/kotlin/deja/client/PacketRegistrar.kt b/src/client/kotlin/org/yttr/deja/client/PacketRegistrar.kt
similarity index 98%
rename from src/main/kotlin/deja/client/PacketRegistrar.kt
rename to src/client/kotlin/org/yttr/deja/client/PacketRegistrar.kt
index c3bc3ee..5070aad 100644
--- a/src/main/kotlin/deja/client/PacketRegistrar.kt
+++ b/src/client/kotlin/org/yttr/deja/client/PacketRegistrar.kt
@@ -1,4 +1,4 @@
-package deja.client
+package org.yttr.deja.client
 
 import net.fabricmc.fabric.api.network.ClientSidePacketRegistry
 import net.fabricmc.fabric.api.network.PacketContext
diff --git a/src/main/kotlin/deja/client/animation/Animation.kt b/src/client/kotlin/org/yttr/deja/client/animation/Animation.kt
similarity index 80%
rename from src/main/kotlin/deja/client/animation/Animation.kt
rename to src/client/kotlin/org/yttr/deja/client/animation/Animation.kt
index 1b69dd1..07f0b9c 100644
--- a/src/main/kotlin/deja/client/animation/Animation.kt
+++ b/src/client/kotlin/org/yttr/deja/client/animation/Animation.kt
@@ -1,4 +1,4 @@
-package deja.client.animation
+package org.yttr.deja.client.animation
 
 /**
  * Constants regarding animations
diff --git a/src/main/kotlin/deja/client/animation/AnimationScreen.kt b/src/client/kotlin/org/yttr/deja/client/animation/AnimationScreen.kt
similarity index 98%
rename from src/main/kotlin/deja/client/animation/AnimationScreen.kt
rename to src/client/kotlin/org/yttr/deja/client/animation/AnimationScreen.kt
index 54b19f6..ed2cc21 100644
--- a/src/main/kotlin/deja/client/animation/AnimationScreen.kt
+++ b/src/client/kotlin/org/yttr/deja/client/animation/AnimationScreen.kt
@@ -1,4 +1,4 @@
-package deja.client.animation
+package org.yttr.deja.client.animation
 
 import net.minecraft.client.MinecraftClient
 import net.minecraft.client.gui.screen.Screen
diff --git a/src/main/kotlin/deja/client/animation/FramedAnimationComponent.kt b/src/client/kotlin/org/yttr/deja/client/animation/FramedAnimationComponent.kt
similarity index 99%
rename from src/main/kotlin/deja/client/animation/FramedAnimationComponent.kt
rename to src/client/kotlin/org/yttr/deja/client/animation/FramedAnimationComponent.kt
index b23145a..8730169 100644
--- a/src/main/kotlin/deja/client/animation/FramedAnimationComponent.kt
+++ b/src/client/kotlin/org/yttr/deja/client/animation/FramedAnimationComponent.kt
@@ -1,4 +1,4 @@
-package deja.client.animation
+package org.yttr.deja.client.animation
 
 import net.minecraft.client.MinecraftClient
 import net.minecraft.client.render.BufferRenderer
diff --git a/src/main/kotlin/deja/client/animation/Spread.kt b/src/client/kotlin/org/yttr/deja/client/animation/Spread.kt
similarity index 95%
rename from src/main/kotlin/deja/client/animation/Spread.kt
rename to src/client/kotlin/org/yttr/deja/client/animation/Spread.kt
index 9e8bcbb..eaf0744 100644
--- a/src/main/kotlin/deja/client/animation/Spread.kt
+++ b/src/client/kotlin/org/yttr/deja/client/animation/Spread.kt
@@ -1,4 +1,4 @@
-package deja.client.animation
+package org.yttr.deja.client.animation
 
 /**
  * Defines a spread of items
diff --git a/src/main/kotlin/deja/client/flashback/FadeBlack.kt b/src/client/kotlin/org/yttr/deja/client/flashback/FadeBlack.kt
similarity index 82%
rename from src/main/kotlin/deja/client/flashback/FadeBlack.kt
rename to src/client/kotlin/org/yttr/deja/client/flashback/FadeBlack.kt
index 8f0b048..836bfe7 100644
--- a/src/main/kotlin/deja/client/flashback/FadeBlack.kt
+++ b/src/client/kotlin/org/yttr/deja/client/flashback/FadeBlack.kt
@@ -1,9 +1,9 @@
-package deja.client.flashback
+package org.yttr.deja.client.flashback
 
-import deja.client.animation.AnimationScreen
-import deja.client.animation.FramedAnimationComponent
 import net.minecraft.client.gui.DrawableHelper
 import net.minecraft.client.util.math.MatrixStack
+import org.yttr.deja.client.animation.AnimationScreen
+import org.yttr.deja.client.animation.FramedAnimationComponent
 import java.awt.Color
 
 /**
diff --git a/src/main/kotlin/deja/client/flashback/FlashbackController.kt b/src/client/kotlin/org/yttr/deja/client/flashback/FlashbackController.kt
similarity index 96%
rename from src/main/kotlin/deja/client/flashback/FlashbackController.kt
rename to src/client/kotlin/org/yttr/deja/client/flashback/FlashbackController.kt
index 2e55ff5..d8c30d9 100644
--- a/src/main/kotlin/deja/client/flashback/FlashbackController.kt
+++ b/src/client/kotlin/org/yttr/deja/client/flashback/FlashbackController.kt
@@ -1,11 +1,11 @@
-package deja.client.flashback
+package org.yttr.deja.client.flashback
 
 import com.mojang.blaze3d.systems.RenderSystem
-import deja.Controller
 import net.fabricmc.fabric.api.client.event.lifecycle.v1.ClientTickEvents
 import net.minecraft.client.MinecraftClient
 import net.minecraft.client.texture.NativeImage
 import net.minecraft.client.util.ScreenshotUtils
+import org.yttr.deja.Controller
 import java.time.Duration
 
 /**
diff --git a/src/main/kotlin/deja/client/flashback/FlashbackPlayer.kt b/src/client/kotlin/org/yttr/deja/client/flashback/FlashbackPlayer.kt
similarity index 91%
rename from src/main/kotlin/deja/client/flashback/FlashbackPlayer.kt
rename to src/client/kotlin/org/yttr/deja/client/flashback/FlashbackPlayer.kt
index bcad2bd..413224f 100644
--- a/src/main/kotlin/deja/client/flashback/FlashbackPlayer.kt
+++ b/src/client/kotlin/org/yttr/deja/client/flashback/FlashbackPlayer.kt
@@ -1,12 +1,12 @@
-package deja.client.flashback
+package org.yttr.deja.client.flashback
 
-import deja.client.animation.Animation.TICKS_PER_SECOND
-import deja.client.animation.AnimationScreen
-import deja.client.animation.Spread
 import net.minecraft.client.gui.DrawableHelper
 import net.minecraft.client.texture.NativeImage
 import net.minecraft.client.util.math.MatrixStack
 import net.minecraft.text.LiteralText
+import org.yttr.deja.client.animation.Animation.TICKS_PER_SECOND
+import org.yttr.deja.client.animation.AnimationScreen
+import org.yttr.deja.client.animation.Spread
 import java.awt.Color
 
 /**
diff --git a/src/main/kotlin/deja/client/flashback/GlyphTrail.kt b/src/client/kotlin/org/yttr/deja/client/flashback/GlyphTrail.kt
similarity index 93%
rename from src/main/kotlin/deja/client/flashback/GlyphTrail.kt
rename to src/client/kotlin/org/yttr/deja/client/flashback/GlyphTrail.kt
index b023b6e..51b917b 100644
--- a/src/main/kotlin/deja/client/flashback/GlyphTrail.kt
+++ b/src/client/kotlin/org/yttr/deja/client/flashback/GlyphTrail.kt
@@ -1,14 +1,14 @@
-package deja.client.flashback
+package org.yttr.deja.client.flashback
 
-import deja.client.animation.Animation.TICKS_PER_SECOND
-import deja.client.animation.AnimationScreen
-import deja.client.animation.FramedAnimationComponent
-import deja.client.animation.Spread
 import net.fabricmc.fabric.mixin.client.particle.ParticleManagerAccessor
 import net.minecraft.client.MinecraftClient
 import net.minecraft.client.util.math.MatrixStack
 import net.minecraft.particle.ParticleTypes
 import net.minecraft.util.registry.Registry
+import org.yttr.deja.client.animation.Animation.TICKS_PER_SECOND
+import org.yttr.deja.client.animation.AnimationScreen
+import org.yttr.deja.client.animation.FramedAnimationComponent
+import org.yttr.deja.client.animation.Spread
 import kotlin.math.absoluteValue
 import kotlin.math.ceil
 import kotlin.random.Random
diff --git a/src/main/kotlin/deja/client/flashback/Mask.kt b/src/client/kotlin/org/yttr/deja/client/flashback/Mask.kt
similarity index 78%
rename from src/main/kotlin/deja/client/flashback/Mask.kt
rename to src/client/kotlin/org/yttr/deja/client/flashback/Mask.kt
index dc3c787..4ef4c10 100644
--- a/src/main/kotlin/deja/client/flashback/Mask.kt
+++ b/src/client/kotlin/org/yttr/deja/client/flashback/Mask.kt
@@ -1,9 +1,9 @@
-package deja.client.flashback
+package org.yttr.deja.client.flashback
 
-import deja.client.animation.AnimationScreen
-import deja.client.animation.FramedAnimationComponent
 import net.minecraft.client.util.math.MatrixStack
 import net.minecraft.util.Identifier
+import org.yttr.deja.client.animation.AnimationScreen
+import org.yttr.deja.client.animation.FramedAnimationComponent
 
 /**
  * The Minecraft-y equivalent of the memory mask that the camera flies through
@@ -20,7 +20,7 @@ class Mask(screen: AnimationScreen, startTime: Int, private val duration: Int) :
     }
 
     companion object {
-        private val MASK_TEXTURE = Identifier("deja", "textures/gui/mask.png")
+        private val MASK_TEXTURE = Identifier("org/yttr/deja", "textures/gui/mask.png")
 
         /**
          * Starting Z position of the mask
diff --git a/src/main/kotlin/deja/client/flashback/Memories.kt b/src/client/kotlin/org/yttr/deja/client/flashback/Memories.kt
similarity index 87%
rename from src/main/kotlin/deja/client/flashback/Memories.kt
rename to src/client/kotlin/org/yttr/deja/client/flashback/Memories.kt
index 0c9aa59..4ecfb39 100644
--- a/src/main/kotlin/deja/client/flashback/Memories.kt
+++ b/src/client/kotlin/org/yttr/deja/client/flashback/Memories.kt
@@ -1,10 +1,10 @@
-package deja.client.flashback
+package org.yttr.deja.client.flashback
 
-import deja.client.animation.Animation.TICKS_PER_SECOND
-import deja.client.animation.AnimationScreen
-import deja.client.animation.FramedAnimationComponent
 import net.minecraft.client.util.math.MatrixStack
 import net.minecraft.util.Identifier
+import org.yttr.deja.client.animation.Animation.TICKS_PER_SECOND
+import org.yttr.deja.client.animation.AnimationScreen
+import org.yttr.deja.client.animation.FramedAnimationComponent
 import kotlin.math.pow
 
 /**
diff --git a/src/main/kotlin/deja/CommandRegistrar.kt b/src/main/kotlin/org/yttr/deja/CommandRegistrar.kt
similarity index 98%
rename from src/main/kotlin/deja/CommandRegistrar.kt
rename to src/main/kotlin/org/yttr/deja/CommandRegistrar.kt
index 5bb7efd..7478709 100644
--- a/src/main/kotlin/deja/CommandRegistrar.kt
+++ b/src/main/kotlin/org/yttr/deja/CommandRegistrar.kt
@@ -1,4 +1,4 @@
-package deja
+package org.yttr.deja
 
 import com.mojang.brigadier.Command
 import com.mojang.brigadier.builder.LiteralArgumentBuilder
diff --git a/src/main/kotlin/deja/Controller.kt b/src/main/kotlin/org/yttr/deja/Controller.kt
similarity index 98%
rename from src/main/kotlin/deja/Controller.kt
rename to src/main/kotlin/org/yttr/deja/Controller.kt
index e5bff5c..5e641cc 100644
--- a/src/main/kotlin/deja/Controller.kt
+++ b/src/main/kotlin/org/yttr/deja/Controller.kt
@@ -1,4 +1,4 @@
-package deja
+package org.yttr.deja
 
 import com.mojang.brigadier.builder.LiteralArgumentBuilder
 import io.netty.buffer.Unpooled
diff --git a/src/main/kotlin/deja/DejaFabric.kt b/src/main/kotlin/org/yttr/deja/DejaFabric.kt
similarity index 87%
rename from src/main/kotlin/deja/DejaFabric.kt
rename to src/main/kotlin/org/yttr/deja/DejaFabric.kt
index e87fea6..74618b1 100644
--- a/src/main/kotlin/deja/DejaFabric.kt
+++ b/src/main/kotlin/org/yttr/deja/DejaFabric.kt
@@ -1,4 +1,4 @@
-package deja
+package org.yttr.deja
 
 import net.fabricmc.api.ModInitializer
 import net.fabricmc.fabric.api.event.lifecycle.v1.ServerTickEvents
@@ -13,7 +13,7 @@ object DejaFabric : ModInitializer, CommandRegistrar {
     override fun onInitialize() {
         ServerTickEvents.START_SERVER_TICK.register(TimeloopController.ServerTick)
 
-        registerCommands("deja") {
+        registerCommands("org/yttr/deja") {
             does { respond("DejaFabric") }
 
             add(TimeloopController)
diff --git a/src/main/kotlin/deja/TimeloopController.kt b/src/main/kotlin/org/yttr/deja/TimeloopController.kt
similarity index 93%
rename from src/main/kotlin/deja/TimeloopController.kt
rename to src/main/kotlin/org/yttr/deja/TimeloopController.kt
index fabe309..dbee6f8 100644
--- a/src/main/kotlin/deja/TimeloopController.kt
+++ b/src/main/kotlin/org/yttr/deja/TimeloopController.kt
@@ -1,4 +1,4 @@
-package deja
+package org.yttr.deja
 
 import net.fabricmc.fabric.api.event.lifecycle.v1.ServerTickEvents
 import net.minecraft.server.MinecraftServer
@@ -13,7 +13,7 @@ object TimeloopController : Controller("timeloop") {
     /**
      * Packet for requesting clients play their flashback
      */
-    val REPLAY_PACKET = Identifier("deja", "flashback.replay")
+    val REPLAY_PACKET = Identifier("org/yttr/deja", "flashback.replay")
     private val TIMELOOP_DURATION = Duration.ofMinutes(22).toTicks()
     private var lastLoop = 0
 
diff --git a/src/main/resources/deja.mixins.json b/src/main/resources/deja.mixins.json
deleted file mode 100644
index bdf55a6..0000000
--- a/src/main/resources/deja.mixins.json
+++ /dev/null
@@ -1,13 +0,0 @@
-{
-  "required": true,
-  "minVersion": "0.8",
-  "package": "deja.mixin",
-  "compatibilityLevel": "JAVA_8",
-  "mixins": [
-  ],
-  "client": [
-  ],
-  "injectors": {
-    "defaultRequire": 1
-  }
-}
diff --git a/src/main/resources/fabric.mod.json b/src/main/resources/fabric.mod.json
index 1e1be0a..254daa5 100644
--- a/src/main/resources/fabric.mod.json
+++ b/src/main/resources/fabric.mod.json
@@ -2,7 +2,7 @@
   "schemaVersion": 1,
   "id": "deja",
   "version": "${version}",
-  "name": "Deja",
+  "name": "deja",
   "description": "Outer Wilds inspired timeloop",
   "authors": [
     "Throudin"
@@ -12,29 +12,26 @@
     "repo": "https://github.com/yttrian/deja"
   },
   "license": "MIT",
-  "icon": "assets/deja/icon.png",
   "environment": "*",
   "entrypoints": {
     "client": [
       {
-        "adapter": "kotlin",
-        "value": "deja.client.DejaFabricClient"
+        "value": "org.yttr.deja.client.DejaFabricClient",
+        "adapter": "kotlin"
       }
     ],
     "main": [
       {
-        "adapter": "kotlin",
-        "value": "deja.DejaFabric"
+        "value": "org.yttr.deja.DejaFabric",
+        "adapter": "kotlin"
       }
     ]
   },
-  "mixins": [
-    "deja.mixins.json"
-  ],
   "depends": {
-    "fabricloader": ">=0.10.8",
-    "fabric": "*",
-    "fabric-language-kotlin": ">=1.4.21",
-    "minecraft": "1.16.4"
+    "fabricloader": ">=0.14.13",
+    "minecraft": "~1.19.3",
+    "java": ">=17",
+    "fabric-api": "*",
+    "fabric-language-kotlin": ">=1.8.0"
   }
 }