diff --git a/public/.github/ISSUE_TEMPLATE/1-bug_report.yml b/.github/ISSUE_TEMPLATE/1-bug_report.yml
similarity index 100%
rename from public/.github/ISSUE_TEMPLATE/1-bug_report.yml
rename to .github/ISSUE_TEMPLATE/1-bug_report.yml
diff --git a/public/.github/ISSUE_TEMPLATE/2-crash_report.yml b/.github/ISSUE_TEMPLATE/2-crash_report.yml
similarity index 100%
rename from public/.github/ISSUE_TEMPLATE/2-crash_report.yml
rename to .github/ISSUE_TEMPLATE/2-crash_report.yml
diff --git a/public/.github/ISSUE_TEMPLATE/3-feature_request.yml b/.github/ISSUE_TEMPLATE/3-feature_request.yml
similarity index 100%
rename from public/.github/ISSUE_TEMPLATE/3-feature_request.yml
rename to .github/ISSUE_TEMPLATE/3-feature_request.yml
diff --git a/public/.github/ISSUE_TEMPLATE/config.yml b/.github/ISSUE_TEMPLATE/config.yml
similarity index 100%
rename from public/.github/ISSUE_TEMPLATE/config.yml
rename to .github/ISSUE_TEMPLATE/config.yml
diff --git a/.github/workflows/gradle-publish.yml b/.github/workflows/gradle-publish.yml
new file mode 100644
index 00000000..30b3b4ce
--- /dev/null
+++ b/.github/workflows/gradle-publish.yml
@@ -0,0 +1,43 @@
+name: Publish
+on:
+  workflow_dispatch:
+  push:
+jobs:
+  build:
+    runs-on: ubuntu-latest
+    permissions:
+      contents: read
+      packages: write
+    steps:
+    - name: "Checkout"
+      uses: actions/checkout@v4
+      with:
+        fetch-depth: 0
+        fetch-tags: true
+    - name: Set up JDK 17
+      uses: actions/setup-java@v3
+      with:
+        java-version: '17'
+        distribution: 'oracle'
+        server-id: github # Value of the distributionManagement/repository/id field of the pom.xml
+        settings-path: ${{ github.workspace }} # location for the settings.xml file
+    - name: Setup Gradle
+      uses: gradle/gradle-build-action@v2
+    - name: Publish
+      run: ./gradlew publish
+      env:
+        MAVEN_USER: ${{ secrets.MAVEN_USER }}
+        MAVEN_PASSWORD: ${{ secrets.MAVEN_PASSWORD }}
+        BUILD_NUMBER: ${{ github.run_number }}
+    - name: CurseForge Publish
+      run: ./gradlew curseforge -PcurseApiKey=${CURSE_API_KEY}
+      env:
+        CURSE_API_KEY: ${{ secrets.CURSE_API_KEY }}
+        BUILD_NUMBER: ${{ github.run_number }}
+      continue-on-error: true
+    - name: Modrinth Publish
+      run: ./gradlew modrinth -PmodrinthToken=${MODRINTH_TOKEN}
+      env:
+        MODRINTH_TOKEN: ${{ secrets.MODRINTH_TOKEN }}
+        BUILD_NUMBER: ${{ github.run_number }}
+      continue-on-error: true
diff --git a/build.gradle b/build.gradle
index 4ddf08f9..eb8bd639 100644
--- a/build.gradle
+++ b/build.gradle
@@ -1,31 +1,47 @@
-buildscript {
-    repositories {
-        maven { url = 'https://maven.minecraftforge.net/' }
-        maven { url = 'https://repo.spongepowered.org/repository/maven-public/' }
-        mavenCentral()
-    }
-    dependencies {
-        classpath group: 'net.minecraftforge.gradle', name: 'ForgeGradle', version: '5.+', changing: true
-        classpath 'org.spongepowered:mixingradle:0.7-SNAPSHOT'
-    }
-}
-
 plugins {
+    id "net.minecraftforge.gradle" version "6.0.+"
+    id "org.spongepowered.mixin" version "0.7-SNAPSHOT"
     id "com.matthewprenger.cursegradle" version "1.4.0"
+    id "com.modrinth.minotaur" version "2.+"
+    id 'net.minecraftforge.gradleutils' version '2.2.0'
 }
 
-apply plugin: 'maven-publish'
-apply plugin: 'net.minecraftforge.gradle'
+apply plugin: 'java'
 apply plugin: 'idea'
-apply plugin: 'org.spongepowered.mixin'
+apply plugin: 'maven-publish'
+
+ext {
+    mod_version = gradleutils.getTagOffsetVersion()
+    changelog_file = project.file("build/changelog.txt")
+}
+
+changelog {
+    fromTag '9.2.0'
+}
 
-repositories { mavenLocal() }
+def trimChangelog(String text) {
+    def m = text =~ /(?s) - (?:[0-9.]+) (.+?)(?=( - )|$)/
+    return '```\n' + m[0][1].replaceAll(/(?m)^ */, '')
+}
 
 group = "com.github.glitchfiend"
-archivesBaseName = "${mod_name}"
-version = "${minecraft_version}-${mod_version}.${System.getenv().BUILD_NUMBER}"
+base.archivesName = mod_name
+version = "${minecraft_version}-${mod_version}"
 
 java.toolchain.languageVersion = JavaLanguageVersion.of(17)
+java.withSourcesJar()
+
+tasks.withType(JavaCompile).configureEach {
+    it.options.encoding = 'UTF-8'
+    it.options.release.set(17)
+}
+
+// Disables Gradle's custom module metadata from being published to maven. The
+// metadata includes mapped dependencies which are not reasonably consumable by
+// other mod developers.
+tasks.withType(GenerateModuleMetadata) {
+    enabled = false
+}
 
 minecraft {
     mappings channel: 'official', version: minecraft_version
@@ -34,39 +50,55 @@ minecraft {
     runs {
         client = {
             workingDirectory = project.file("run")
-            source sourceSets.main
+            args "-mixin.config=${mod_id}.mixins.json"
+            ideaModule "${project.name}.main"
+            taskName 'Client'
+            mods {
+                modClientRun {
+                    source sourceSets.main
+                }
+            }
         }
-        server = {
-            workingDirectory = project.file("run")
-            source sourceSets.main
+        server {
+            workingDirectory project.file('run')
+            args "-mixin.config=${mod_id}.mixins.json"
+            ideaModule "${project.name}.main"
+            taskName 'Server'
+            mods {
+                modServerRun {
+                    source sourceSets.main
+                }
+            }
         }
         data {
-            workingDirectory = project.file("run")
-            source sourceSets.main
-            args '--mod', mod_id, '--all', '--output', file('src/generated/resources/'), '--existing', file('src/main/resources/'), '--existing', file('src/generated/resources/')
+            workingDirectory project.file('run')
+            ideaModule "${project.name}.main"
+            args '--mod', mod_id, '--all', '--output', file('src/generated/resources/'), '--existing', file('src/main/resources/'), "-mixin.config=${mod_id}.mixins.json"
+            taskName 'Data'
+            mods {
+                modDataRun {
+                    source sourceSets.main
+                }
+            }
         }
     }
 }
 
-// Configure  the source folders
 sourceSets {
-    main {
+    api {
         java {
-            srcDir "src/main/java"
-            srcDir "public/src/main/java"
+            compileClasspath += main.compileClasspath
+            srcDirs main.java.srcDirs
+            include "${mod_id}/api/**"
         }
+    }
+    main {
         resources {
-            srcDir 'src/main/resources'
             srcDir 'src/generated/resources'
-            srcDir 'public/src/main/resources'
         }
     }
 }
 
-processResources {
-    duplicatesStrategy = DuplicatesStrategy.INCLUDE
-}
-
 dependencies {
     minecraft 'net.minecraftforge:forge:' + minecraft_version + '-' + forge_version
     implementation fg.deobf("com.github.glitchfiend:SereneSeasons:${serene_seasons_version}")
@@ -78,30 +110,21 @@ mixin {
     config "${mod_id}.mixins.json"
 }
 
-task deobfJar(type: Jar) {
-    from sourceSets.main.output
-    classifier = 'deobf'
-}
-
 task apiJar(type: Jar) {
-    from(sourceSets.main.allJava) {
-        include "${mod_id}/api/**"
-    }
-    from (sourceSets.main.output) {
-        include 'LICENSE.txt'
-        include "${mod_id}/api/**"
-    }
+    from sourceSets.api.allJava, sourceSets.api.output
+    archiveClassifier = 'api'
+}
 
-    duplicatesStrategy = DuplicatesStrategy.INCLUDE
-    classifier = 'api'
+task deobfJar(type: Jar) {
+    from sourceSets.main.output
+    archiveClassifier = 'deobf'
 }
 
-def changelog_file = rootProject.file("build/${mod_name}-${version}-changelog.txt")
+build.dependsOn apiJar
+build.dependsOn deobfJar
 
 curseforge {
-    if (project.hasProperty('curseApiKey')) {
-        apiKey = project.getProperty('curseApiKey')
-    }
+    apiKey = project.findProperty('curseApiKey') ?: 'unset'
     project {
         id = mod_curseforge_id
 
@@ -121,13 +144,19 @@ curseforge {
     }
 }
 
-artifacts {
+modrinth {
+    token = project.findProperty('modrinthToken')
+    projectId = mod_modrinth_id
+    versionNumber = mod_version
+    versionName = version + " for Forge " + minecraft_version
+    versionType = 'beta' // can be release, beta, or alpha
+    uploadFile = jar
+    gameVersions = [minecraft_version]
+    loaders = ['forge']
+
     if (changelog_file.exists()) {
-        archives changelog_file
+        changelog = trimChangelog(changelog_file.text)
     }
-    archives jar
-    archives deobfJar
-    archives apiJar
 }
 
 publishing {
@@ -135,8 +164,8 @@ publishing {
         mavenJava(MavenPublication) {
             // We must use artifact jar to ensure the Forge dependency is excluded from the pom, breaking fg.deobf()
             artifact jar
-            artifact deobfJar
             artifact apiJar
+            artifact deobfJar
             groupId project.group
             artifactId project.archivesBaseName
             version project.version
@@ -174,13 +203,10 @@ publishing {
     }
     repositories {
         maven {
-            url "https://maven.minecraftforge.net/releases/"
-            authentication {
-                basic(BasicAuthentication)
-            }
+            url = "https://maven.minecraftforge.net/releases/"
             credentials {
-                username = System.env.MAVEN_USER ?:'fake'
-                password = System.env.MAVEN_PASSWORD ?:'news'
+                username = System.getenv("MAVEN_USER")
+                password = System.getenv("MAVEN_PASSWORD")
             }
         }
     }
diff --git a/gradle.properties b/gradle.properties
index 0b6f941a..ee264423 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -4,7 +4,6 @@ org.gradle.jvmargs=-Xmx3G
 org.gradle.daemon=false
 
 # Project
-mod_version=9.1.0
 mod_id=toughasnails
 mod_name=ToughAsNails
 mod_display_name=Tough As Nails
@@ -14,6 +13,7 @@ mod_issues_url=https://github.com/Glitchfiend/ToughAsNails/issues
 mod_git_url=https://github.com/Glitchfiend/ToughAsNails
 mod_scm_url=scm:git:git@github.com:Glitchfiend/ToughAsNails.git
 mod_curseforge_id=246391
+mod_modrinth_id=tough-as-nails
 
 # Dependencies
 minecraft_version=1.20.2
diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar
index 7454180f..c1962a79 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 e750102e..744c64d1 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-7.3-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.4-bin.zip
+networkTimeout=10000
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
diff --git a/gradlew b/gradlew
index c53aefaa..aeb74cbb 100755
--- a/gradlew
+++ b/gradlew
@@ -1,7 +1,7 @@
 #!/bin/sh
 
 #
-# Copyright © 2015-2021 the original authors.
+# Copyright © 2015-2021 the original authors.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -32,10 +32,10 @@
 #       Busybox and similar reduced shells will NOT work, because this script
 #       requires all of these POSIX shell features:
 #         * functions;
-#         * expansions «$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».
+#         * 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:
 #
@@ -55,7 +55,7 @@
 #       Darwin, MinGW, and NonStop.
 #
 #   (3) This script is generated from the Groovy template
-#       https://github.com/gradle/gradle/blob/master/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
+#       https://github.com/gradle/gradle/blob/HEAD/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt
 #       within the Gradle project.
 #
 #       You can find Gradle at https://github.com/gradle/gradle/.
@@ -80,13 +80,10 @@ do
     esac
 done
 
-APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit
-
-APP_NAME="Gradle"
+# This is normally unused
+# shellcheck disable=SC2034
 APP_BASE_NAME=${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"'
+APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit
 
 # Use the maximum available, or set MAX_FD != -1 to use that value.
 MAX_FD=maximum
@@ -143,12 +140,16 @@ fi
 if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then
     case $MAX_FD in #(
       max*)
+        # In POSIX sh, ulimit -H is undefined. That's why the result is checked to see if it worked.
+        # shellcheck disable=SC3045
         MAX_FD=$( ulimit -H -n ) ||
             warn "Could not query maximum file descriptor limit"
     esac
     case $MAX_FD in  #(
       '' | soft) :;; #(
       *)
+        # In POSIX sh, ulimit -n is undefined. That's why the result is checked to see if it worked.
+        # shellcheck disable=SC3045
         ulimit -n "$MAX_FD" ||
             warn "Could not set maximum file descriptor limit to $MAX_FD"
     esac
@@ -193,6 +194,10 @@ if "$cygwin" || "$msys" ; then
     done
 fi
 
+
+# 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 $GRADLE_OPTS can contain fragments of
 #     shell script including quotes and variable substitutions, so put them in
@@ -205,6 +210,12 @@ set -- \
         org.gradle.wrapper.GradleWrapperMain \
         "$@"
 
+# Stop when "xargs" is not available.
+if ! command -v xargs >/dev/null 2>&1
+then
+    die "xargs is not available"
+fi
+
 # Use "xargs" to parse quoted args.
 #
 # With -n1 it outputs one arg per line, with the quotes and backslashes removed.
diff --git a/gradlew.bat b/gradlew.bat
index 107acd32..93e3f59f 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 execute
+if %ERRORLEVEL% equ 0 goto execute
 
 echo.
 echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
@@ -75,13 +76,15 @@ set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
 
 :end
 @rem End local scope for the variables with windows NT shell
-if "%ERRORLEVEL%"=="0" goto mainEnd
+if %ERRORLEVEL% equ 0 goto mainEnd
 
 :fail
 rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of
 rem the _cmd.exe /c_ return code!
-if  not "" == "%GRADLE_EXIT_CONSOLE%" exit 1
-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/public/.gitignore b/public/.gitignore
deleted file mode 100644
index 97399b3a..00000000
--- a/public/.gitignore
+++ /dev/null
@@ -1,20 +0,0 @@
-/build/
-/bin/
-/out/
-/repo/
-/run/
-/logs/
-.idea/*
-/.gradle/
-/.settings/
-/.classpath
-/.project
-
-# OS generated files
-*.DS_Store
-
-# IntelliJ project files
-*.iml
-*.ipr
-*.iws
-*.launch
\ No newline at end of file
diff --git a/public/.gitrepo b/public/.gitrepo
deleted file mode 100644
index 709b7930..00000000
--- a/public/.gitrepo
+++ /dev/null
@@ -1,12 +0,0 @@
-; DO NOT EDIT (unless you know what you are doing)
-;
-; This subdirectory is a git "subrepo", and this file is maintained by the
-; git-subrepo command. See https://github.com/git-commands/git-subrepo#readme
-;
-[subrepo]
-	remote = https://github.com/Glitchfiend/ToughAsNails.git
-	branch = TAN-public
-	commit = d2a94e111f3449a60b4b0863da035ba5eca62231
-	parent = 650861a00ee18090c46c7d311ddc779e82a8947d
-	method = merge
-	cmdver = 0.4.3
diff --git a/public/README.md b/public/README.md
deleted file mode 100644
index 8c31d693..00000000
--- a/public/README.md
+++ /dev/null
@@ -1,19 +0,0 @@
-<p align="center"><img src="https://i.imgur.com/uNgjobq.png"></p>
-
-<p align="center"><img src="https://i.imgur.com/CYxKg5M.png"></p>
-
-<p align="center">https://discord.gg/GyyzU6T</p>
-
-**Tough As Nails** is a **Minecraft mod** that adds features to enhance survival mode and increase the game's difficulty. For more information, please see our [wiki](https://github.com/Glitchfiend/ToughAsNails/wiki).
-
-This repository contains the mod's API and language files. Issues can also be reported on the issue tracker.
-
------------------
-
-## Source access
-
-If you are a reputable modder, or we know you well, please reach out to us on Discord if you require source access.
-
------------------
-
-© 2021 Glitchfiend. All rights reserved.
diff --git a/settings.gradle b/settings.gradle
new file mode 100644
index 00000000..80c183a2
--- /dev/null
+++ b/settings.gradle
@@ -0,0 +1,19 @@
+pluginManagement.repositories {
+    gradlePluginPortal()
+    maven {
+        name = "Fabric"
+        url = "https://maven.fabricmc.net/"
+    }
+    maven {
+        name = "NeoForge"
+        url = "https://maven.neoforged.net/releases"
+    }
+    maven {
+        name = "Forge"
+        url = "https://maven.minecraftforge.net"
+    }
+    maven {
+        name = "Sponge Snapshots"
+        url = "https://repo.spongepowered.org/repository/maven-public/"
+    }
+}
diff --git a/public/src/main/java/toughasnails/api/block/TANBlocks.java b/src/main/java/toughasnails/api/block/TANBlocks.java
similarity index 100%
rename from public/src/main/java/toughasnails/api/block/TANBlocks.java
rename to src/main/java/toughasnails/api/block/TANBlocks.java
diff --git a/public/src/main/java/toughasnails/api/blockentity/TANBlockEntityTypes.java b/src/main/java/toughasnails/api/blockentity/TANBlockEntityTypes.java
similarity index 100%
rename from public/src/main/java/toughasnails/api/blockentity/TANBlockEntityTypes.java
rename to src/main/java/toughasnails/api/blockentity/TANBlockEntityTypes.java
diff --git a/public/src/main/java/toughasnails/api/capability/TANCapabilities.java b/src/main/java/toughasnails/api/capability/TANCapabilities.java
similarity index 100%
rename from public/src/main/java/toughasnails/api/capability/TANCapabilities.java
rename to src/main/java/toughasnails/api/capability/TANCapabilities.java
diff --git a/public/src/main/java/toughasnails/api/crafting/TANRecipeSerializers.java b/src/main/java/toughasnails/api/crafting/TANRecipeSerializers.java
similarity index 100%
rename from public/src/main/java/toughasnails/api/crafting/TANRecipeSerializers.java
rename to src/main/java/toughasnails/api/crafting/TANRecipeSerializers.java
diff --git a/public/src/main/java/toughasnails/api/crafting/TANRecipeTypes.java b/src/main/java/toughasnails/api/crafting/TANRecipeTypes.java
similarity index 100%
rename from public/src/main/java/toughasnails/api/crafting/TANRecipeTypes.java
rename to src/main/java/toughasnails/api/crafting/TANRecipeTypes.java
diff --git a/public/src/main/java/toughasnails/api/damagesource/TANDamageTypes.java b/src/main/java/toughasnails/api/damagesource/TANDamageTypes.java
similarity index 89%
rename from public/src/main/java/toughasnails/api/damagesource/TANDamageTypes.java
rename to src/main/java/toughasnails/api/damagesource/TANDamageTypes.java
index bb711bb8..d93f7c5f 100644
--- a/public/src/main/java/toughasnails/api/damagesource/TANDamageTypes.java
+++ b/src/main/java/toughasnails/api/damagesource/TANDamageTypes.java
@@ -8,7 +8,6 @@
 import net.minecraft.resources.ResourceKey;
 import net.minecraft.resources.ResourceLocation;
 import net.minecraft.world.damagesource.DamageType;
-import toughasnails.core.ToughAsNails;
 
 public class TANDamageTypes
 {
@@ -16,6 +15,6 @@ public class TANDamageTypes
 
     private static ResourceKey<DamageType> register(String name)
     {
-        return ResourceKey.create(Registries.DAMAGE_TYPE, new ResourceLocation(ToughAsNails.MOD_ID, name));
+        return ResourceKey.create(Registries.DAMAGE_TYPE, new ResourceLocation("toughasnails", name));
     }
 }
diff --git a/public/src/main/java/toughasnails/api/enchantment/TANEnchantments.java b/src/main/java/toughasnails/api/enchantment/TANEnchantments.java
similarity index 100%
rename from public/src/main/java/toughasnails/api/enchantment/TANEnchantments.java
rename to src/main/java/toughasnails/api/enchantment/TANEnchantments.java
diff --git a/public/src/main/java/toughasnails/api/inventory/container/TANContainerTypes.java b/src/main/java/toughasnails/api/inventory/container/TANContainerTypes.java
similarity index 100%
rename from public/src/main/java/toughasnails/api/inventory/container/TANContainerTypes.java
rename to src/main/java/toughasnails/api/inventory/container/TANContainerTypes.java
diff --git a/public/src/main/java/toughasnails/api/item/TANItems.java b/src/main/java/toughasnails/api/item/TANItems.java
similarity index 100%
rename from public/src/main/java/toughasnails/api/item/TANItems.java
rename to src/main/java/toughasnails/api/item/TANItems.java
diff --git a/public/src/main/java/toughasnails/api/potion/TANEffects.java b/src/main/java/toughasnails/api/potion/TANEffects.java
similarity index 100%
rename from public/src/main/java/toughasnails/api/potion/TANEffects.java
rename to src/main/java/toughasnails/api/potion/TANEffects.java
diff --git a/public/src/main/java/toughasnails/api/potion/TANPotions.java b/src/main/java/toughasnails/api/potion/TANPotions.java
similarity index 100%
rename from public/src/main/java/toughasnails/api/potion/TANPotions.java
rename to src/main/java/toughasnails/api/potion/TANPotions.java
diff --git a/public/src/main/java/toughasnails/api/temperature/IPlayerTemperatureModifier.java b/src/main/java/toughasnails/api/temperature/IPlayerTemperatureModifier.java
similarity index 100%
rename from public/src/main/java/toughasnails/api/temperature/IPlayerTemperatureModifier.java
rename to src/main/java/toughasnails/api/temperature/IPlayerTemperatureModifier.java
diff --git a/public/src/main/java/toughasnails/api/temperature/IPositionalTemperatureModifier.java b/src/main/java/toughasnails/api/temperature/IPositionalTemperatureModifier.java
similarity index 100%
rename from public/src/main/java/toughasnails/api/temperature/IPositionalTemperatureModifier.java
rename to src/main/java/toughasnails/api/temperature/IPositionalTemperatureModifier.java
diff --git a/public/src/main/java/toughasnails/api/temperature/IProximityBlockModifier.java b/src/main/java/toughasnails/api/temperature/IProximityBlockModifier.java
similarity index 100%
rename from public/src/main/java/toughasnails/api/temperature/IProximityBlockModifier.java
rename to src/main/java/toughasnails/api/temperature/IProximityBlockModifier.java
diff --git a/public/src/main/java/toughasnails/api/temperature/ITemperature.java b/src/main/java/toughasnails/api/temperature/ITemperature.java
similarity index 100%
rename from public/src/main/java/toughasnails/api/temperature/ITemperature.java
rename to src/main/java/toughasnails/api/temperature/ITemperature.java
diff --git a/public/src/main/java/toughasnails/api/temperature/TemperatureHelper.java b/src/main/java/toughasnails/api/temperature/TemperatureHelper.java
similarity index 100%
rename from public/src/main/java/toughasnails/api/temperature/TemperatureHelper.java
rename to src/main/java/toughasnails/api/temperature/TemperatureHelper.java
diff --git a/public/src/main/java/toughasnails/api/temperature/TemperatureLevel.java b/src/main/java/toughasnails/api/temperature/TemperatureLevel.java
similarity index 100%
rename from public/src/main/java/toughasnails/api/temperature/TemperatureLevel.java
rename to src/main/java/toughasnails/api/temperature/TemperatureLevel.java
diff --git a/public/src/main/java/toughasnails/api/thirst/IThirst.java b/src/main/java/toughasnails/api/thirst/IThirst.java
similarity index 98%
rename from public/src/main/java/toughasnails/api/thirst/IThirst.java
rename to src/main/java/toughasnails/api/thirst/IThirst.java
index 3cfacd50..f467b817 100644
--- a/public/src/main/java/toughasnails/api/thirst/IThirst.java
+++ b/src/main/java/toughasnails/api/thirst/IThirst.java
@@ -80,7 +80,7 @@ public interface IThirst
 
     /**
      * Set whether the last hydration value was zero.
-     * @param val value.
+     * @param value value.
      */
     void setLastHydrationZero(boolean value);
 
diff --git a/public/src/main/java/toughasnails/api/thirst/ThirstHelper.java b/src/main/java/toughasnails/api/thirst/ThirstHelper.java
similarity index 100%
rename from public/src/main/java/toughasnails/api/thirst/ThirstHelper.java
rename to src/main/java/toughasnails/api/thirst/ThirstHelper.java
diff --git a/public/src/main/java/toughasnails/api/thirst/WaterType.java b/src/main/java/toughasnails/api/thirst/WaterType.java
similarity index 100%
rename from public/src/main/java/toughasnails/api/thirst/WaterType.java
rename to src/main/java/toughasnails/api/thirst/WaterType.java
diff --git a/src/main/java/toughasnails/config/ThirstConfig.java b/src/main/java/toughasnails/config/ThirstConfig.java
index 4b0723f4..e206fe3a 100644
--- a/src/main/java/toughasnails/config/ThirstConfig.java
+++ b/src/main/java/toughasnails/config/ThirstConfig.java
@@ -4,27 +4,12 @@
  ******************************************************************************/
 package toughasnails.config;
 
-import com.electronwill.nightconfig.core.Config;
-import com.electronwill.nightconfig.core.InMemoryFormat;
-import com.google.common.collect.ImmutableMap;
-import com.google.common.collect.Lists;
-import com.google.common.collect.Maps;
 import net.minecraft.core.Holder;
-import net.minecraft.resources.ResourceKey;
-import net.minecraft.resources.ResourceLocation;
 import net.minecraft.world.level.biome.Biome;
 import net.minecraftforge.common.ForgeConfigSpec;
-import net.minecraftforge.registries.ForgeRegistries;
 import toughasnails.api.thirst.WaterType;
 import toughasnails.init.ModTags;
 
-import javax.annotation.Nullable;
-import java.util.LinkedHashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.function.Predicate;
-import java.util.stream.Collectors;
-
 public class ThirstConfig
 {
     public static final ForgeConfigSpec.Builder BUILDER = new ForgeConfigSpec.Builder();
diff --git a/src/main/java/toughasnails/init/ModBlockEntities.java b/src/main/java/toughasnails/init/ModBlockEntities.java
index e6a2daca..44876da7 100644
--- a/src/main/java/toughasnails/init/ModBlockEntities.java
+++ b/src/main/java/toughasnails/init/ModBlockEntities.java
@@ -9,7 +9,6 @@
 import net.minecraft.util.datafix.fixes.References;
 import net.minecraft.world.level.block.entity.BlockEntity;
 import net.minecraft.world.level.block.entity.BlockEntityType;
-import net.minecraftforge.registries.ForgeRegistries;
 import net.minecraftforge.registries.RegistryObject;
 import toughasnails.api.block.TANBlocks;
 import toughasnails.api.blockentity.TANBlockEntityTypes;
diff --git a/src/main/java/toughasnails/init/ModEnchantments.java b/src/main/java/toughasnails/init/ModEnchantments.java
index 0d9ecc20..10372050 100644
--- a/src/main/java/toughasnails/init/ModEnchantments.java
+++ b/src/main/java/toughasnails/init/ModEnchantments.java
@@ -5,7 +5,6 @@
 package toughasnails.init;
 
 import net.minecraft.world.item.enchantment.Enchantment;
-import net.minecraftforge.fml.common.Mod;
 import net.minecraftforge.registries.RegistryObject;
 import toughasnails.api.enchantment.TANEnchantments;
 import toughasnails.core.ToughAsNails;
diff --git a/src/main/java/toughasnails/init/ModItems.java b/src/main/java/toughasnails/init/ModItems.java
index 0368d454..287288e0 100644
--- a/src/main/java/toughasnails/init/ModItems.java
+++ b/src/main/java/toughasnails/init/ModItems.java
@@ -4,7 +4,6 @@
  ******************************************************************************/
 package toughasnails.init;
 
-import net.minecraft.world.entity.EquipmentSlot;
 import net.minecraft.world.item.ArmorItem;
 import net.minecraft.world.item.Item;
 import net.minecraftforge.registries.RegistryObject;
diff --git a/src/main/java/toughasnails/item/EmptyCanteenItem.java b/src/main/java/toughasnails/item/EmptyCanteenItem.java
index c8dfeef5..3cd2c194 100644
--- a/src/main/java/toughasnails/item/EmptyCanteenItem.java
+++ b/src/main/java/toughasnails/item/EmptyCanteenItem.java
@@ -6,7 +6,6 @@
 
 import net.minecraft.core.BlockPos;
 import net.minecraft.core.Holder;
-import net.minecraft.resources.ResourceKey;
 import net.minecraft.sounds.SoundEvents;
 import net.minecraft.sounds.SoundSource;
 import net.minecraft.stats.Stats;
@@ -17,20 +16,15 @@
 import net.minecraft.world.item.Item;
 import net.minecraft.world.item.ItemStack;
 import net.minecraft.world.item.ItemUtils;
-import net.minecraft.world.item.Items;
-import net.minecraft.world.item.alchemy.PotionUtils;
-import net.minecraft.world.item.alchemy.Potions;
 import net.minecraft.world.level.ClipContext;
 import net.minecraft.world.level.Level;
 import net.minecraft.world.level.biome.Biome;
-import net.minecraft.world.level.biome.Biomes;
 import net.minecraft.world.level.block.state.BlockState;
 import net.minecraft.world.phys.BlockHitResult;
 import net.minecraft.world.phys.HitResult;
 import toughasnails.api.block.TANBlocks;
 import toughasnails.api.item.TANItems;
 import toughasnails.block.RainCollectorBlock;
-import toughasnails.config.ThirstConfig;
 import toughasnails.init.ModTags;
 
 public class EmptyCanteenItem extends Item
diff --git a/src/main/java/toughasnails/network/MessageDrinkInWorld.java b/src/main/java/toughasnails/network/MessageDrinkInWorld.java
index 4489216c..38c0d9ed 100644
--- a/src/main/java/toughasnails/network/MessageDrinkInWorld.java
+++ b/src/main/java/toughasnails/network/MessageDrinkInWorld.java
@@ -7,13 +7,11 @@
 import net.minecraft.core.BlockPos;
 import net.minecraft.core.Holder;
 import net.minecraft.network.FriendlyByteBuf;
-import net.minecraft.resources.ResourceKey;
 import net.minecraft.server.level.ServerPlayer;
 import net.minecraft.tags.FluidTags;
 import net.minecraft.world.effect.MobEffectInstance;
 import net.minecraft.world.level.Level;
 import net.minecraft.world.level.biome.Biome;
-import net.minecraft.world.level.biome.Biomes;
 import net.minecraftforge.event.network.CustomPayloadEvent;
 import toughasnails.api.potion.TANEffects;
 import toughasnails.api.thirst.IThirst;
diff --git a/src/main/java/toughasnails/network/MessageUpdateTemperature.java b/src/main/java/toughasnails/network/MessageUpdateTemperature.java
index de4e31ca..edb740be 100644
--- a/src/main/java/toughasnails/network/MessageUpdateTemperature.java
+++ b/src/main/java/toughasnails/network/MessageUpdateTemperature.java
@@ -15,8 +15,6 @@
 import toughasnails.api.temperature.TemperatureHelper;
 import toughasnails.api.temperature.TemperatureLevel;
 
-import java.util.function.Supplier;
-
 public class MessageUpdateTemperature
 {
     public TemperatureLevel temperatureLevel;
diff --git a/src/main/java/toughasnails/potion/ThirstEffect.java b/src/main/java/toughasnails/potion/ThirstEffect.java
index b6a05d13..e47bcd77 100644
--- a/src/main/java/toughasnails/potion/ThirstEffect.java
+++ b/src/main/java/toughasnails/potion/ThirstEffect.java
@@ -10,7 +10,6 @@
 import net.minecraft.world.effect.MobEffectCategory;
 import toughasnails.api.thirst.IThirst;
 import toughasnails.api.thirst.ThirstHelper;
-import toughasnails.core.ToughAsNails;
 
 public class ThirstEffect extends MobEffect
 {
diff --git a/src/main/java/toughasnails/temperature/TemperatureHooks.java b/src/main/java/toughasnails/temperature/TemperatureHooks.java
index 951ce245..379eb518 100644
--- a/src/main/java/toughasnails/temperature/TemperatureHooks.java
+++ b/src/main/java/toughasnails/temperature/TemperatureHooks.java
@@ -4,7 +4,6 @@
  ******************************************************************************/
 package toughasnails.temperature;
 
-import com.mojang.blaze3d.vertex.PoseStack;
 import net.minecraft.client.Minecraft;
 import net.minecraft.client.gui.Gui;
 import net.minecraft.client.gui.GuiGraphics;
diff --git a/src/main/java/toughasnails/temperature/TemperatureOverlayHandler.java b/src/main/java/toughasnails/temperature/TemperatureOverlayHandler.java
index f7f9b844..159ba841 100644
--- a/src/main/java/toughasnails/temperature/TemperatureOverlayHandler.java
+++ b/src/main/java/toughasnails/temperature/TemperatureOverlayHandler.java
@@ -4,15 +4,12 @@
  ******************************************************************************/
 package toughasnails.temperature;
 
-import com.mojang.blaze3d.systems.RenderSystem;
-import com.mojang.blaze3d.vertex.PoseStack;
 import net.minecraft.client.Minecraft;
 import net.minecraft.client.gui.GuiGraphics;
 import net.minecraft.resources.ResourceLocation;
 import net.minecraft.world.entity.player.Player;
 import net.minecraftforge.api.distmarker.Dist;
 import net.minecraftforge.client.event.RegisterGuiOverlaysEvent;
-import net.minecraftforge.client.gui.ScreenUtils;
 import net.minecraftforge.client.gui.overlay.ForgeGui;
 import net.minecraftforge.client.gui.overlay.VanillaGuiOverlay;
 import net.minecraftforge.event.TickEvent;
diff --git a/src/main/java/toughasnails/thirst/ThirstCapabilityProvider.java b/src/main/java/toughasnails/thirst/ThirstCapabilityProvider.java
index f4b6afdd..805f108d 100644
--- a/src/main/java/toughasnails/thirst/ThirstCapabilityProvider.java
+++ b/src/main/java/toughasnails/thirst/ThirstCapabilityProvider.java
@@ -12,7 +12,6 @@
 import net.minecraftforge.common.util.LazyOptional;
 import toughasnails.api.thirst.IThirst;
 import toughasnails.config.ServerConfig;
-import toughasnails.thirst.ThirstData;
 
 import javax.annotation.Nonnull;
 import javax.annotation.Nullable;
diff --git a/src/main/java/toughasnails/thirst/ThirstHandler.java b/src/main/java/toughasnails/thirst/ThirstHandler.java
index ccaf33fe..43e8d9be 100644
--- a/src/main/java/toughasnails/thirst/ThirstHandler.java
+++ b/src/main/java/toughasnails/thirst/ThirstHandler.java
@@ -24,7 +24,6 @@
 import net.minecraft.world.level.GameRules;
 import net.minecraft.world.level.Level;
 import net.minecraft.world.level.biome.Biome;
-import net.minecraft.world.level.biome.Biomes;
 import net.minecraftforge.event.AttachCapabilitiesEvent;
 import net.minecraftforge.event.ForgeEventFactory;
 import net.minecraftforge.event.TickEvent;
@@ -46,13 +45,11 @@
 import toughasnails.network.MessageUpdateThirst;
 import toughasnails.network.PacketHandler;
 
-import net.minecraft.resources.ResourceKey;
 import net.minecraft.resources.ResourceLocation;
 import net.minecraft.sounds.SoundEvents;
 import net.minecraft.sounds.SoundSource;
 import net.minecraft.world.InteractionHand;
 import net.minecraft.world.InteractionResultHolder;
-import net.minecraft.world.damagesource.DamageSource;
 import net.minecraft.world.item.ItemUtils;
 
 public class ThirstHandler
diff --git a/src/main/java/toughasnails/thirst/ThirstHooks.java b/src/main/java/toughasnails/thirst/ThirstHooks.java
index 04c3f8b6..a21c7df0 100644
--- a/src/main/java/toughasnails/thirst/ThirstHooks.java
+++ b/src/main/java/toughasnails/thirst/ThirstHooks.java
@@ -2,7 +2,6 @@
 
 import net.minecraft.client.player.LocalPlayer;
 import net.minecraft.world.Difficulty;
-import net.minecraft.world.damagesource.DamageSource;
 import net.minecraft.world.entity.player.Player;
 import net.minecraft.world.food.FoodData;
 import net.minecraft.world.level.GameRules;
diff --git a/public/src/main/resources/assets/toughasnails/lang/cs_cz.json b/src/main/resources/assets/toughasnails/lang/cs_cz.json
similarity index 100%
rename from public/src/main/resources/assets/toughasnails/lang/cs_cz.json
rename to src/main/resources/assets/toughasnails/lang/cs_cz.json
diff --git a/public/src/main/resources/assets/toughasnails/lang/en_us.json b/src/main/resources/assets/toughasnails/lang/en_us.json
similarity index 100%
rename from public/src/main/resources/assets/toughasnails/lang/en_us.json
rename to src/main/resources/assets/toughasnails/lang/en_us.json
diff --git a/public/src/main/resources/assets/toughasnails/lang/es_es.json b/src/main/resources/assets/toughasnails/lang/es_es.json
similarity index 100%
rename from public/src/main/resources/assets/toughasnails/lang/es_es.json
rename to src/main/resources/assets/toughasnails/lang/es_es.json
diff --git a/public/src/main/resources/assets/toughasnails/lang/fr_fr.json b/src/main/resources/assets/toughasnails/lang/fr_fr.json
similarity index 100%
rename from public/src/main/resources/assets/toughasnails/lang/fr_fr.json
rename to src/main/resources/assets/toughasnails/lang/fr_fr.json
diff --git a/public/src/main/resources/assets/toughasnails/lang/it_it.json b/src/main/resources/assets/toughasnails/lang/it_it.json
similarity index 100%
rename from public/src/main/resources/assets/toughasnails/lang/it_it.json
rename to src/main/resources/assets/toughasnails/lang/it_it.json
diff --git a/public/src/main/resources/assets/toughasnails/lang/ja_jp.json b/src/main/resources/assets/toughasnails/lang/ja_jp.json
similarity index 100%
rename from public/src/main/resources/assets/toughasnails/lang/ja_jp.json
rename to src/main/resources/assets/toughasnails/lang/ja_jp.json
diff --git a/public/src/main/resources/assets/toughasnails/lang/ko_kr.json b/src/main/resources/assets/toughasnails/lang/ko_kr.json
similarity index 100%
rename from public/src/main/resources/assets/toughasnails/lang/ko_kr.json
rename to src/main/resources/assets/toughasnails/lang/ko_kr.json
diff --git a/public/src/main/resources/assets/toughasnails/lang/lol_us.json b/src/main/resources/assets/toughasnails/lang/lol_us.json
similarity index 100%
rename from public/src/main/resources/assets/toughasnails/lang/lol_us.json
rename to src/main/resources/assets/toughasnails/lang/lol_us.json
diff --git a/public/src/main/resources/assets/toughasnails/lang/pl_pl.json b/src/main/resources/assets/toughasnails/lang/pl_pl.json
similarity index 100%
rename from public/src/main/resources/assets/toughasnails/lang/pl_pl.json
rename to src/main/resources/assets/toughasnails/lang/pl_pl.json
diff --git a/public/src/main/resources/assets/toughasnails/lang/ru_ru.json b/src/main/resources/assets/toughasnails/lang/ru_ru.json
similarity index 100%
rename from public/src/main/resources/assets/toughasnails/lang/ru_ru.json
rename to src/main/resources/assets/toughasnails/lang/ru_ru.json
diff --git a/public/src/main/resources/assets/toughasnails/lang/tr_tr.json b/src/main/resources/assets/toughasnails/lang/tr_tr.json
similarity index 100%
rename from public/src/main/resources/assets/toughasnails/lang/tr_tr.json
rename to src/main/resources/assets/toughasnails/lang/tr_tr.json
diff --git a/public/src/main/resources/assets/toughasnails/lang/uk_ua.json b/src/main/resources/assets/toughasnails/lang/uk_ua.json
similarity index 100%
rename from public/src/main/resources/assets/toughasnails/lang/uk_ua.json
rename to src/main/resources/assets/toughasnails/lang/uk_ua.json
diff --git a/public/src/main/resources/assets/toughasnails/lang/zh_cn.json b/src/main/resources/assets/toughasnails/lang/zh_cn.json
similarity index 100%
rename from public/src/main/resources/assets/toughasnails/lang/zh_cn.json
rename to src/main/resources/assets/toughasnails/lang/zh_cn.json
diff --git a/public/src/main/resources/assets/toughasnails/lang/zh_tw.json b/src/main/resources/assets/toughasnails/lang/zh_tw.json
similarity index 100%
rename from public/src/main/resources/assets/toughasnails/lang/zh_tw.json
rename to src/main/resources/assets/toughasnails/lang/zh_tw.json