diff --git a/.gitignore b/.gitignore
index fbdaebf..2e594f8 100644
--- a/.gitignore
+++ b/.gitignore
@@ -20,4 +20,6 @@ build
 # other
 eclipse
 run
-*.psd
\ No newline at end of file
+runServer
+*.psd
+compilerOutput
diff --git a/build.gradle b/build.gradle
index 3b8559c..a6abd79 100644
--- a/build.gradle
+++ b/build.gradle
@@ -1,211 +1,98 @@
-/*buildscript {
-    repositories {
-        maven { url = 'https://maven.minecraftforge.net' }
-        mavenCentral()
-    }
-    dependencies {
-        classpath group: 'net.minecraftforge.gradle', name: 'ForgeGradle', version: '5.1.+', changing: true
-    }
-}*/
-
 plugins {
-    id "eclipse"
-    id "maven-publish"
-    id "net.minecraftforge.gradle" version "5.1.+"
+	id 'fabric-loom' version '1.5-SNAPSHOT'
+	id 'maven-publish'
+}
+
+version = project.mod_version
+group = project.maven_group
+
+base {
+	archivesName = project.archives_base_name
 }
 
-version = '1.5.0'
-group = 'de.ricobrase.chatcalculator'
-archivesBaseName = 'ChatCalculator'
-
-java.toolchain.languageVersion = JavaLanguageVersion.of(17) // Mojang ships Java 8 to end users, so your mod should target Java 8.
-
-println('Java: ' + System.getProperty('java.version') + ' JVM: ' + System.getProperty('java.vm.version') + '(' + System.getProperty('java.vendor') + ') Arch: ' + System.getProperty('os.arch'))
-minecraft {
-    // The mappings can be changed at any time, and must be in the following format.
-    // Channel:   Version:
-    // snapshot   YYYYMMDD   Snapshot are built nightly.
-    // stable     #          Stables are built at the discretion of the MCP team.
-    // official   MCVersion  Official field/method names from Mojang mapping files
-    //
-    // You must be aware of the Mojang license when using the 'official' mappings.
-    // See more information here: https://github.com/MinecraftForge/MCPConfig/blob/master/Mojang.md
-    //
-    // Use non-default mappings at your own risk. they may not always work.
-    // Simply re-run your setup task after changing the mappings to update your workspace.
-    mappings channel: 'official', version: '1.19.2'
-    // makeObfSourceJar = false // an Srg named sources jar is made by default. uncomment this to disable.
-
-    accessTransformer = file('src/main/resources/META-INF/accesstransformer.cfg')
-
-    // Default run configurations.
-    // These can be tweaked, removed, or duplicated as needed.
-    runs {
-        client {
-            workingDirectory project.file('run')
-
-            // Recommended logging data for a userdev environment
-            // The markers can be changed as needed.
-            // "SCAN": For mods scan.
-            // "REGISTRIES": For firing of registry events.
-            // "REGISTRYDUMP": For getting the contents of all registries.
-            property 'forge.logging.markers', 'REGISTRIES'
-
-            // Recommended logging level for the console
-            // You can set various levels here.
-            // Please read: https://stackoverflow.com/questions/2031163/when-to-use-the-different-log-levels
-            property 'forge.logging.console.level', 'debug'
-
-            property "forge.enabledGameTestNamespaces", "ChatCalculator"
-
-            mods {
-                ChatCalculator {
-                    source sourceSets.main
-                }
-            }
-        }
-
-        server {
-            workingDirectory project.file('run')
-
-            // Recommended logging data for a userdev environment
-            // The markers can be changed as needed.
-            // "SCAN": For mods scan.
-            // "REGISTRIES": For firing of registry events.
-            // "REGISTRYDUMP": For getting the contents of all registries.
-            property 'forge.logging.markers', 'REGISTRIES'
-
-            // Recommended logging level for the console
-            // You can set various levels here.
-            // Please read: https://stackoverflow.com/questions/2031163/when-to-use-the-different-log-levels
-            property 'forge.logging.console.level', 'debug'
-
-            property "forge.enabledGameTestNamespaces", "ChatCalculator"
-
-            mods {
-                ChatCalculator {
-                    source sourceSets.main
-                }
-            }
-        }
-
-        gameTestServer {
-            workingDirectory project.file('run')
-
-            property 'forge.logging.markers', 'REGISTRIES'
-
-            property 'forge.logging.console.level', 'debug'
-
-            property 'forge.enabledGameTestNamespaces', 'ChatCalculator'
-
-            mods {
-                ChatCalculator {
-                    source sourceSets.main
-                }
-            }
-        }
-
-        data {
-            workingDirectory project.file('run')
-
-            // Recommended logging data for a userdev environment
-            // The markers can be changed as needed.
-            // "SCAN": For mods scan.
-            // "REGISTRIES": For firing of registry events.
-            // "REGISTRYDUMP": For getting the contents of all registries.
-            property 'forge.logging.markers', 'REGISTRIES'
-
-            // Recommended logging level for the console
-            // You can set various levels here.
-            // Please read: https://stackoverflow.com/questions/2031163/when-to-use-the-different-log-levels
-            property 'forge.logging.console.level', 'debug'
-
-            // Specify the modid for data generation, where to output the resulting resource, and where to look for existing resources.
-            args '--mod', 'examplemod', '--all', '--output', file('src/generated/resources/'), '--existing', file('src/main/resources/')
-
-            mods {
-                ChatCalculator {
-                    source sourceSets.main
-                }
-            }
-        }
-    }
+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.
 }
 
-// Include resources generated by data generators.
-sourceSets.main.resources { srcDir 'src/generated/resources' }
+loom {
+    splitEnvironmentSourceSets()
+
+	mods {
+		"chatcalculator" {
+			sourceSet sourceSets.main
+			sourceSet sourceSets.client
+		}
+	}
 
-dependencies {
-    // Specify the version of Minecraft to use, If this is any group other then 'net.minecraft' it is assumed
-    // that the dep is a ForgeGradle 'patcher' dependency. And it's patches will be applied.
-    // The userdev artifact is a special name and will get all sorts of transformations applied to it.
-    minecraft 'net.minecraftforge:forge:1.19.2-43.2.0'
-
-    // You may put jars on which you depend on in ./libs or you may define them like so..
-    // compile "some.group:artifact:version:classifier"
-    // compile "some.group:artifact:version"
-
-    // Real examples
-    // compile 'com.mod-buildcraft:buildcraft:6.0.8:dev'  // adds buildcraft to the dev env
-    // compile 'com.googlecode.efficient-java-matrix-library:ejml:0.24' // adds ejml to the dev env
-
-    // The 'provided' configuration is for optional dependencies that exist at compile-time but might not at runtime.
-    // provided 'com.mod-buildcraft:buildcraft:6.0.8:dev'
-
-    // These dependencies get remapped to your current MCP mappings
-    // deobf 'com.mod-buildcraft:buildcraft:6.0.8:dev'
-
-    // For more info...
-    // http://www.gradle.org/docs/current/userguide/artifact_dependencies_tutorial.html
-    // http://www.gradle.org/docs/current/userguide/dependency_management.html
-    testImplementation 'org.junit.jupiter:junit-jupiter-api:5.8.2'
-    testRuntimeOnly 'org.junit.jupiter:junit-jupiter-engine:5.8.2'
 }
 
-// Example for how to get properties into the manifest for reading by the runtime..
-jar {
-    manifest {
-        attributes([
-                "Specification-Title": "ChatCalculator",
-                "Specification-Vendor": "RicoBrassers",
-                "Specification-Version": "1", // We are version 1 of ourselves
-                "Implementation-Title": project.name,
-                "Implementation-Version": project.version,
-                "Implementation-Vendor" :"RicoBrassers",
-                "Implementation-Timestamp": new Date().format("yyyy-MM-dd'T'HH:mm:ssZ")
-        ])
-    }
+dependencies {
+	// 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}"
+	
+	// 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.
+
+	// modImplementation "net.fabricmc.fabric-api:fabric-api-deprecated:${project.fabric_version}"
+
+	testImplementation 'org.junit.jupiter:junit-jupiter-api:5.8.2'
+	testRuntimeOnly 'org.junit.jupiter:junit-jupiter-engine:5.8.2'
 }
 
-// Example configuration to allow publishing using the maven-publish task
-// This is the preferred method to reobfuscate your jar file
-jar.finalizedBy('reobfJar')
-// However if you are in a multi-project build, dev time needs unobfed jar files, so you can delay the obfuscation until publishing by doing
-//publish.dependsOn('reobfJar')
+processResources {
+	inputs.property "version", project.version
 
-publishing {
-    publications {
-        mavenJava(MavenPublication) {
-            artifact jar
-        }
-    }
-    repositories {
-        maven {
-            url "file:///${project.projectDir}/mcmodsrepo"
-        }
-    }
+	filesMatching("fabric.mod.json") {
+		expand "version": project.version
+	}
 }
 
-test {
-    useJUnitPlatform()
+tasks.withType(JavaCompile).configureEach {
+	it.options.release = 17
 }
 
-repositories {
-    mavenCentral()
+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()
+
+	sourceCompatibility = JavaVersion.VERSION_17
+	targetCompatibility = JavaVersion.VERSION_17
 }
 
-tasks.withType(JavaCompile).configureEach {
-    options.encoding = "UTF-8"
+jar {
+	from("LICENSE") {
+		rename { "${it}_${project.base.archivesName.get()}"}
+	}
 }
 
-apply from: "https://moddingtutorials.org/applesilicon.gradle"
\ No newline at end of file
+// configure the maven publication
+publishing {
+	publications {
+		mavenJava(MavenPublication) {
+			from components.java
+		}
+	}
+
+	// See https://docs.gradle.org/current/userguide/publishing_maven.html for information on how to set up publishing.
+	repositories {
+		// 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.
+	}
+}
+
+test {
+	useJUnitPlatform()
+}
\ No newline at end of file
diff --git a/gradle.properties b/gradle.properties
index 8a7bb8d..0158ad6 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -1,4 +1,17 @@
-# Sets default memory used for gradle commands. Can be overridden by user or command line properties.
-# This is required to provide enough memory for the Minecraft decompilation process.
-org.gradle.daemon=false
-mc_version=1.19.2
+# Done to increase the memory available to gradle.
+org.gradle.jvmargs=-Xmx1G
+org.gradle.parallel=true
+
+# Fabric Properties
+# check these on https://fabricmc.net/develop
+minecraft_version=1.20.1
+yarn_mappings=1.20.1+build.10
+loader_version=0.15.7
+
+# Mod Properties
+mod_version=1.6.0
+maven_group=dev.ricobrase.chatcalculator
+archives_base_name=ChatCalculator
+
+# Dependencies
+fabric_version=0.92.0+1.20.1
\ No newline at end of file
diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar
index e708b1c..d64cd49 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 2e6e589..a80b22c 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-7.3.3-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.6-bin.zip
+networkTimeout=10000
+validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
diff --git a/gradlew b/gradlew
index 4f906e0..1aa94a4 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.
@@ -17,67 +17,99 @@
 #
 
 ##############################################################################
-##
-##  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"`
-
-# 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 "${APP_HOME:-./}" > /dev/null && pwd -P ) || 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 +119,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 +130,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, 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" "$@"
diff --git a/gradlew.bat b/gradlew.bat
index 107acd3..25da30d 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,13 +41,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 +57,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,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
-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/lib/hamcrest-core-1.3.jar b/lib/hamcrest-core-1.3.jar
deleted file mode 100644
index 9d5fe16..0000000
Binary files a/lib/hamcrest-core-1.3.jar and /dev/null differ
diff --git a/lib/junit-4.12.jar b/lib/junit-4.12.jar
deleted file mode 100644
index 3a7fc26..0000000
Binary files a/lib/junit-4.12.jar and /dev/null differ
diff --git a/settings.gradle b/settings.gradle
index 0490a0a..75c4d72 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -1,6 +1,10 @@
 pluginManagement {
-    repositories {
-        gradlePluginPortal()
-        maven { url = "https://maven.minecraftforge.net/" }
-    }
+	repositories {
+		maven {
+			name = 'Fabric'
+			url = 'https://maven.fabricmc.net/'
+		}
+		mavenCentral()
+		gradlePluginPortal()
+	}
 }
\ No newline at end of file
diff --git a/src/client/java/dev/ricobrase/chatcalculator/ChatCalculatorClientMod.java b/src/client/java/dev/ricobrase/chatcalculator/ChatCalculatorClientMod.java
new file mode 100644
index 0000000..3f4fefd
--- /dev/null
+++ b/src/client/java/dev/ricobrase/chatcalculator/ChatCalculatorClientMod.java
@@ -0,0 +1,16 @@
+package dev.ricobrase.chatcalculator;
+
+import dev.ricobrase.chatcalculator.events.ClientChatEventListener;
+import net.fabricmc.api.ClientModInitializer;
+import net.fabricmc.fabric.api.client.message.v1.ClientSendMessageEvents;
+
+public class ChatCalculatorClientMod implements ClientModInitializer
+{
+
+    @Override
+    public void onInitializeClient() {
+        ChatCalculatorMod.LOGGER.info(ChatCalculatorMod.NAME + " - client code is initializing...");
+        ClientSendMessageEvents.ALLOW_CHAT.register(ClientChatEventListener::onChatEventListener);
+        ClientSendMessageEvents.MODIFY_CHAT.register(ClientChatEventListener::onChatModifyListener);
+    }
+}
diff --git a/src/client/java/dev/ricobrase/chatcalculator/events/ClientChatEventListener.java b/src/client/java/dev/ricobrase/chatcalculator/events/ClientChatEventListener.java
new file mode 100644
index 0000000..f15eb04
--- /dev/null
+++ b/src/client/java/dev/ricobrase/chatcalculator/events/ClientChatEventListener.java
@@ -0,0 +1,69 @@
+package dev.ricobrase.chatcalculator.events;
+
+import dev.ricobrase.chatcalculator.TranslationMessages;
+import dev.ricobrase.chatcalculator.Util;
+import dev.ricobrase.chatcalculator.termsolver.TermSolver;
+import net.minecraft.client.MinecraftClient;
+import net.minecraft.entity.player.PlayerEntity;
+import net.minecraft.text.Style;
+import net.minecraft.text.Text;
+import net.minecraft.util.Formatting;
+
+import java.util.Optional;
+
+public class ClientChatEventListener {
+
+    public static boolean onChatEventListener(String chatMessage) {
+        // private calculation (=)
+        if(chatMessage.matches("=[^=]*")) {
+            return processPrivateCalculation(chatMessage);
+        }
+
+        return true;
+    }
+
+    public static String onChatModifyListener(String chatMessage) {
+
+        // Double equals (==) escaping
+        if(chatMessage.matches("={2}[^=]*")) {
+            return chatMessage.substring(1);
+        }
+
+        return chatMessage;
+    }
+
+    private static boolean processPrivateCalculation(String chatMessage) {
+        PlayerEntity sender = MinecraftClient.getInstance().player;
+
+        if(sender == null) {
+            return true;
+        }
+
+        String termToCalculate = chatMessage.substring(1);
+
+        Optional<String> postfix = TermSolver.transformInfixToPostfix(termToCalculate);
+        if(postfix.isEmpty()) {
+            printTranslatedErrorMessage(sender, TranslationMessages.INVALID_CHARACTERS);
+            return false;
+        }
+
+        try {
+            double result = TermSolver.solvePostfix(postfix.get());
+            String resultString = "= " + Util.convertDoubleToString(result);
+
+            sender.sendMessage(Text.literal(termToCalculate));
+            sender.sendMessage(Text.literal(resultString));
+        }catch (NumberFormatException ex) {
+            printTranslatedErrorMessage(sender, TranslationMessages.INVALID_CHARACTERS);
+        }
+
+        return false;
+    }
+
+    @SuppressWarnings("SameParameterValue")
+    private static void printTranslatedErrorMessage(PlayerEntity player, TranslationMessages message) {
+        Style redColor = Style.EMPTY.withColor(Formatting.RED);
+        player.sendMessage(Text.translatable(message.getTranslationKey()).setStyle(redColor));
+    }
+
+}
diff --git a/src/main/java/dev/ricobrase/chatcalculator/ChatCalculatorMod.java b/src/main/java/dev/ricobrase/chatcalculator/ChatCalculatorMod.java
index e59d9ed..a66f380 100644
--- a/src/main/java/dev/ricobrase/chatcalculator/ChatCalculatorMod.java
+++ b/src/main/java/dev/ricobrase/chatcalculator/ChatCalculatorMod.java
@@ -1,20 +1,21 @@
 package dev.ricobrase.chatcalculator;
 
-import net.minecraftforge.fml.common.Mod;
-import net.minecraftforge.fml.event.lifecycle.FMLCommonSetupEvent;
-import org.apache.logging.log4j.LogManager;
-import org.apache.logging.log4j.Logger;
+import dev.ricobrase.chatcalculator.events.ServerChatEventListener;
+import net.fabricmc.api.ModInitializer;
+import net.fabricmc.fabric.api.message.v1.ServerMessageEvents;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
-@Mod(ChatCalculatorMod.MODID)
-public class ChatCalculatorMod {
+public class ChatCalculatorMod implements ModInitializer {
 
     public static final String NAME = "ChatCalculator";
     public static final String MODID = "chatcalculator";
-    public static final Logger LOGGER = LogManager.getLogger();
+    public static final Logger LOGGER = LoggerFactory.getLogger(MODID);
 
-    @SuppressWarnings("unused")
-    private void setup(final FMLCommonSetupEvent ignoredEvent) {
-        LOGGER.info(ChatCalculatorMod.NAME + " is initializing...");
+    @Override
+    public void onInitialize() {
+        LOGGER.info(NAME + " - common code is initializing...");
+        ServerMessageEvents.ALLOW_CHAT_MESSAGE.register(ServerChatEventListener::allowChatMessage);
     }
 
 }
diff --git a/src/main/java/dev/ricobrase/chatcalculator/Util.java b/src/main/java/dev/ricobrase/chatcalculator/Util.java
index e4beb62..0421a24 100644
--- a/src/main/java/dev/ricobrase/chatcalculator/Util.java
+++ b/src/main/java/dev/ricobrase/chatcalculator/Util.java
@@ -4,6 +4,14 @@ public final class Util {
     private Util() {
     }
 
+    /**
+     * This function will convert a double to a string, stripping the decimals if the input is a whole number.
+     * e.g.:
+     * 30.0 => 30
+     * 30.5 => 30.5
+     * @param input The input double to convert to string.
+     * @return The input converted to string, removing decimals if input is a whole number.
+     */
     public static String convertDoubleToString(double input) {
         if (input == Math.floor(input) && !Double.isInfinite(input) && input <= Integer.MAX_VALUE && input >= Integer.MIN_VALUE) {
             return String.format("%d", (int)Math.floor(input));
diff --git a/src/main/java/dev/ricobrase/chatcalculator/events/ClientChatEventListener.java b/src/main/java/dev/ricobrase/chatcalculator/events/ClientChatEventListener.java
deleted file mode 100644
index b6cf3a6..0000000
--- a/src/main/java/dev/ricobrase/chatcalculator/events/ClientChatEventListener.java
+++ /dev/null
@@ -1,75 +0,0 @@
-package dev.ricobrase.chatcalculator.events;
-
-import dev.ricobrase.chatcalculator.TranslationMessages;
-import dev.ricobrase.chatcalculator.Util;
-import dev.ricobrase.chatcalculator.termsolver.TermSolver;
-import net.minecraft.ChatFormatting;
-import net.minecraft.client.Minecraft;
-import net.minecraft.network.chat.Component;
-import net.minecraft.network.chat.Style;
-import net.minecraftforge.client.event.ClientChatEvent;
-import net.minecraftforge.eventbus.api.SubscribeEvent;
-import net.minecraftforge.fml.common.Mod;
-
-import java.util.Optional;
-
-@Mod.EventBusSubscriber(bus = Mod.EventBusSubscriber.Bus.FORGE)
-public class ClientChatEventListener {
-
-    @SubscribeEvent
-    public static void onClientChatEvent(final ClientChatEvent event) {
-
-        String chatMessage = event.getMessage();
-
-        // Double equals (==) escaping
-        if(chatMessage.matches("={2}[^=]*")) {
-            event.originalMessage = chatMessage.substring(1);
-            return;
-        }
-
-        if(!chatMessage.matches("=[^=]*")) {
-            return;
-        }
-
-        processChatCalculationMessage(event);
-    }
-
-    private static void processChatCalculationMessage(final ClientChatEvent clientChatEvent) {
-        if(Minecraft.getInstance().player == null) {
-            return;
-        }
-
-        String termToCalculate = clientChatEvent.getMessage().substring(1);
-
-        Optional<String> postfix = TermSolver.transformInfixToPostfix(termToCalculate);
-        if(postfix.isEmpty()) {
-            printTranslatedErrorMessage(TranslationMessages.INVALID_CHARACTERS);
-            clientChatEvent.setCanceled(true);
-            return;
-        }
-
-        try {
-            double result = TermSolver.solvePostfix(postfix.get());
-
-            Minecraft.getInstance().player.sendSystemMessage(Component.literal(termToCalculate));
-
-            String resultString = String.format("= %s", Util.convertDoubleToString(result));
-            Minecraft.getInstance().player.sendSystemMessage(Component.literal(resultString));
-
-        }catch (NumberFormatException ex) {
-            printTranslatedErrorMessage(TranslationMessages.INVALID_CHARACTERS);
-        }
-
-        clientChatEvent.setCanceled(true);
-    }
-
-    private static void printTranslatedErrorMessage(TranslationMessages message) {
-        if(Minecraft.getInstance().player == null) return;
-
-        Style redColor = Style.EMPTY.withColor(ChatFormatting.RED);
-        Minecraft.getInstance().player.sendSystemMessage(Component.translatable(message.getTranslationKey()).setStyle(redColor));
-    }
-
-
-
-}
diff --git a/src/main/java/dev/ricobrase/chatcalculator/events/ServerChatEventListener.java b/src/main/java/dev/ricobrase/chatcalculator/events/ServerChatEventListener.java
index f0a92ee..4e8e23f 100644
--- a/src/main/java/dev/ricobrase/chatcalculator/events/ServerChatEventListener.java
+++ b/src/main/java/dev/ricobrase/chatcalculator/events/ServerChatEventListener.java
@@ -3,56 +3,58 @@
 import dev.ricobrase.chatcalculator.TranslationMessages;
 import dev.ricobrase.chatcalculator.Util;
 import dev.ricobrase.chatcalculator.termsolver.TermSolver;
-import net.minecraft.ChatFormatting;
-import net.minecraft.network.chat.Component;
-import net.minecraft.network.chat.Style;
-import net.minecraft.server.MinecraftServer;
-import net.minecraft.server.level.ServerPlayer;
-import net.minecraftforge.event.ServerChatEvent;
-import net.minecraftforge.eventbus.api.SubscribeEvent;
-import net.minecraftforge.fml.common.Mod;
-import org.jetbrains.annotations.NotNull;
+import net.minecraft.network.message.MessageType;
+import net.minecraft.network.message.SignedMessage;
+import net.minecraft.server.network.ServerPlayerEntity;
+import net.minecraft.text.Style;
+import net.minecraft.text.Text;
+import net.minecraft.util.Formatting;
 
 import java.util.Optional;
 
-@Mod.EventBusSubscriber(bus = Mod.EventBusSubscriber.Bus.FORGE)
 public class ServerChatEventListener {
 
-    @SubscribeEvent
-    public static void onServerChatEvent(ServerChatEvent event) {
-        MinecraftServer server = event.getPlayer().getServer();
+    public static boolean allowChatMessage(SignedMessage message, ServerPlayerEntity sender, MessageType.Parameters ignoredParams) {
 
-        if(server == null) {
-            return;
+        String chatMessage = message.getContent().getString();
+
+        // global calculation (@=)
+        if(chatMessage.matches("@=[^=]*")) {
+            return processGlobalCalculation(chatMessage, sender);
         }
 
-        String chatMessage = event.getMessage().getString();
-        ServerPlayer player = event.getPlayer();
+        return true;
+    }
+
 
-        if(chatMessage.matches("@=[^=]*")) {
-            Optional<String> postfix = TermSolver.transformInfixToPostfix(chatMessage.substring(2));
-            if(postfix.isPresent()) {
-                try {
-                    double result = TermSolver.solvePostfix(postfix.get());
-                    server.getPlayerList().broadcastSystemMessage(Component.translatable(TranslationMessages.GLOBAL_CALC.getTranslationKey(), player.getDisplayName(), chatMessage.substring(2)), false);
-
-                    String resultString = String.format("= %s", Util.convertDoubleToString(result));
-                    server.getPlayerList().broadcastSystemMessage(Component.literal(resultString), false);
-
-                }catch (NumberFormatException ex) {
-                    printTranslatedErrorMessage(player, TranslationMessages.INVALID_CHARACTERS);
-                }
-            }else{
-                printTranslatedErrorMessage(player, TranslationMessages.INVALID_CHARACTERS);
+
+    private static boolean processGlobalCalculation(String chatMessage, ServerPlayerEntity sender) {
+
+        String termToCalculate = chatMessage.substring(2);
+
+        Optional<String> postfix = TermSolver.transformInfixToPostfix(termToCalculate);
+        if(postfix.isPresent()) {
+            try {
+                double result = TermSolver.solvePostfix(postfix.get());
+                sender.server.getPlayerManager().broadcast(Text.translatable(TranslationMessages.GLOBAL_CALC.getTranslationKey(), sender.getDisplayName(), termToCalculate), false);
+
+                String resultString = String.format("= %s", Util.convertDoubleToString(result));
+                sender.server.getPlayerManager().broadcast(Text.literal(resultString), false);
+
+            }catch (NumberFormatException ex) {
+                printTranslatedErrorMessage(sender, TranslationMessages.INVALID_CHARACTERS);
             }
-            event.setCanceled(true);
+        }else{
+            printTranslatedErrorMessage(sender, TranslationMessages.INVALID_CHARACTERS);
         }
+
+        return false;
     }
 
     @SuppressWarnings("SameParameterValue")
-    private static void printTranslatedErrorMessage(@NotNull ServerPlayer player, @NotNull TranslationMessages message) {
-        Style redColor = Style.EMPTY.withColor(ChatFormatting.RED);
-        player.sendSystemMessage(Component.translatable(message.getTranslationKey(), redColor));
+    private static void printTranslatedErrorMessage(ServerPlayerEntity player, TranslationMessages message) {
+        Style redColor = Style.EMPTY.withColor(Formatting.RED);
+        player.sendMessage(Text.translatable(message.getTranslationKey()).setStyle(redColor));
     }
 
 }
diff --git a/src/main/resources/META-INF/accesstransformer.cfg b/src/main/resources/META-INF/accesstransformer.cfg
deleted file mode 100644
index 9eea037..0000000
--- a/src/main/resources/META-INF/accesstransformer.cfg
+++ /dev/null
@@ -1 +0,0 @@
-public-f net.minecraftforge.client.event.ClientChatEvent originalMessage
\ No newline at end of file
diff --git a/src/main/resources/META-INF/mods.toml b/src/main/resources/META-INF/mods.toml
deleted file mode 100644
index 0cf03b9..0000000
--- a/src/main/resources/META-INF/mods.toml
+++ /dev/null
@@ -1,27 +0,0 @@
-modLoader="javafml"
-loaderVersion="[41,)"
-license="MIT"
-issueTrackerURL="https://github.com/RicoBrase/ChatCalculator/issues"
-[[mods]]
-modId="chatcalculator"
-version="${file.jarVersion}"
-displayName="ChatCalculator"
-displayURL="https://github.com/RicoBrase/ChatCalculator"
-logoFile="logo.png"
-credits="Dennis0712 for the mod idea."
-authors="RicoBrassers"
-description='''
-Calculate from ingame chat.
-'''
-[[dependencies.chatcalculator]]
-modId="forge"
-mandatory=true
-versionRange="[41,)"
-ordering="NONE"
-side="BOTH"
-[[dependencies.chatcalculator]]
-modId="minecraft"
-mandatory=true
-versionRange="[1.19,2)"
-ordering="NONE"
-side="BOTH"
diff --git a/src/main/resources/fabric.mod.json b/src/main/resources/fabric.mod.json
new file mode 100644
index 0000000..aba93ad
--- /dev/null
+++ b/src/main/resources/fabric.mod.json
@@ -0,0 +1,36 @@
+{
+  "schemaVersion": 1,
+  "id": "chatcalculator",
+  "version": "${version}",
+  "name": "ChatCalculator",
+  "description": "Calculate from ingame chat.",
+  "authors": [
+    "RicoBrassers"
+  ],
+  "contact": {
+    "homepage": "https://github.com/RicoBrase/ChatCalculator",
+    "sources": "https://github.com/RicoBrase/ChatCalculator"
+  },
+  "license": "MIT",
+  "icon": "logo.png",
+  "environment": "*",
+  "entrypoints": {
+    "main": [
+      "dev.ricobrase.chatcalculator.ChatCalculatorMod"
+    ],
+    "client": [
+      "dev.ricobrase.chatcalculator.ChatCalculatorClientMod"
+    ]
+  },
+  "mixins": [
+  ],
+  "depends": {
+    "fabricloader": ">=0.15.7",
+    "minecraft": "~1.20.1",
+    "java": ">=17",
+    "fabric-api": "*"
+  },
+  "suggests": {
+    "another-mod": "*"
+  }
+}
\ No newline at end of file