From 7459d832c7377c3406ea0289516afdf9044aac0b Mon Sep 17 00:00:00 2001
From: Oth3r <68134921+Oth3r@users.noreply.github.com>
Date: Thu, 13 Mar 2025 17:47:43 -0500
Subject: [PATCH 01/22] update loom and gradle statements

---
 build.gradle | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/build.gradle b/build.gradle
index 44ebae0..c23d6f0 100644
--- a/build.gradle
+++ b/build.gradle
@@ -1,5 +1,5 @@
 plugins {
-	id 'fabric-loom' version '1.8-SNAPSHOT'
+	id 'fabric-loom' version '1.10-SNAPSHOT'
 	id 'maven-publish'
 	id 'com.modrinth.minotaur' version '2.+'
 	id 'net.darkhax.curseforgegradle' version '1.1.+'
@@ -14,8 +14,8 @@ base {
 }
 
 repositories {
-	maven { url "https://maven.terraformersmc.com/releases/" }
-	maven { url "https://maven.isxander.dev/releases" }
+	maven { url = "https://maven.terraformersmc.com/releases/" }
+	maven { url = "https://maven.isxander.dev/releases" }
 }
 
 loom {
@@ -33,7 +33,7 @@ dependencies {
 }
 
 processResources {
-	filteringCharset "UTF-8"
+	filteringCharset = "UTF-8"
 
 	var replaceProperties = [
 			version                : project.version,

From 242f107ffbdcd4e7c98a9a13cfba21416cf8cc21 Mon Sep 17 00:00:00 2001
From: Oth3r <68134921+Oth3r@users.noreply.github.com>
Date: Fri, 14 Mar 2025 14:10:12 -0500
Subject: [PATCH 02/22] real fix for #17

---
 src/main/java/one/oth3r/sit/utl/Utl.java | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/main/java/one/oth3r/sit/utl/Utl.java b/src/main/java/one/oth3r/sit/utl/Utl.java
index 88e86b7..99c0a72 100644
--- a/src/main/java/one/oth3r/sit/utl/Utl.java
+++ b/src/main/java/one/oth3r/sit/utl/Utl.java
@@ -227,9 +227,9 @@ public class Utl {
         public static BlockPos getBlockPos(DisplayEntity.TextDisplayEntity entity) {
             // the entity Y level, adjusted
             // the adjustment - is the opposite of the offset applied in Entity.create()
-            double entityY = entity.getBlockY() + (Y_ADJUSTMENT*-1);
+            int entityBlockY = (int) (Math.floor(entity.getY() + (Y_ADJUSTMENT*-1)));
             // get the block pos
-            BlockPos pos = new BlockPos(entity.getBlockX(),(int)entityY,entity.getBlockZ());
+            BlockPos pos = new BlockPos(entity.getBlockX(),entityBlockY,entity.getBlockZ());
             // if above the block, subtract 1
             if (isAboveBlockHeight(entity)) {
                 pos = pos.add(0,-1,0);

From 284930b1b68082404f722629a7366582854d5f46 Mon Sep 17 00:00:00 2001
From: Oth3r <68134921+Oth3r@users.noreply.github.com>
Date: Fri, 14 Mar 2025 14:22:28 -0500
Subject: [PATCH 03/22] update checkPlayerSitAbility() with the entity
 Y-adjustment in mind

---
 src/main/java/one/oth3r/sit/utl/Logic.java | 2 +-
 src/main/java/one/oth3r/sit/utl/Utl.java   | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/main/java/one/oth3r/sit/utl/Logic.java b/src/main/java/one/oth3r/sit/utl/Logic.java
index 2708393..874dc38 100644
--- a/src/main/java/one/oth3r/sit/utl/Logic.java
+++ b/src/main/java/one/oth3r/sit/utl/Logic.java
@@ -155,7 +155,7 @@ public class Logic {
         // get the poses to check above the block
         BlockPos pos1 = new BlockPos(pos).add(0,1,0), pos2 = new BlockPos(pos).add(0,2,0), posBelow = new BlockPos(pos);
         // doesn't check 2 blocks above if not sitting above .80 of the block
-        if (pos.getY() > entity.getY() - .80) {
+        if (pos.getY() > (entity.getY()-Utl.Entity.Y_ADJUSTMENT) - .80) {
             pos2 = pos2.add(0,-1,0);
             posBelow = posBelow.add(0,-1,0);
         }
diff --git a/src/main/java/one/oth3r/sit/utl/Utl.java b/src/main/java/one/oth3r/sit/utl/Utl.java
index 99c0a72..5dd760d 100644
--- a/src/main/java/one/oth3r/sit/utl/Utl.java
+++ b/src/main/java/one/oth3r/sit/utl/Utl.java
@@ -208,7 +208,7 @@ public class Utl {
         /**
          * the customizable y height of the entity, as some versions have different sitting heights on the entity
          */
-        private static final double Y_ADJUSTMENT = 0;
+        public static final double Y_ADJUSTMENT = -0.2;
 
         /**
          * checks if the entity's block is still there, & is valid

From 3d8922284098483b4031d0f73cd0673a2f226687 Mon Sep 17 00:00:00 2001
From: Oth3r <68134921+Oth3r@users.noreply.github.com>
Date: Wed, 12 Mar 2025 18:44:28 -0500
Subject: [PATCH 04/22] add max minecraft version

---
 gradle.properties                  | 1 +
 src/main/resources/fabric.mod.json | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/gradle.properties b/gradle.properties
index ccbdc14..a9e9a32 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -5,6 +5,7 @@ org.gradle.parallel=true
 # Fabric Properties
 # check these on https://fabricmc.net/develop
 min_minecraft_version=1.21.4
+max_minecraft_version=1.21.5
 minecraft_version=1.21.4
 yarn_mappings=1.21.4+build.8
 loader_version=0.16.10
diff --git a/src/main/resources/fabric.mod.json b/src/main/resources/fabric.mod.json
index dd81d2b..46715b8 100644
--- a/src/main/resources/fabric.mod.json
+++ b/src/main/resources/fabric.mod.json
@@ -27,7 +27,7 @@
 	},
 	"depends": {
 		"fabricloader": ">=0.14.21",
-		"minecraft": ">=${min_minecraft_version} <=${minecraft_version}",
+		"minecraft": ">=${min_minecraft_version} <=${max_minecraft_version}",
 		"fabric": "*"
 	},
 	"suggests": {

From 83fda90948ea1ba5599e89e465365266ce9caf93 Mon Sep 17 00:00:00 2001
From: Oth3r <68134921+Oth3r@users.noreply.github.com>
Date: Tue, 25 Mar 2025 12:00:44 -0500
Subject: [PATCH 05/22] add minecraft_versions

---
 gradle.properties | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/gradle.properties b/gradle.properties
index a9e9a32..5a5fa71 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -5,7 +5,9 @@ org.gradle.parallel=true
 # Fabric Properties
 # check these on https://fabricmc.net/develop
 min_minecraft_version=1.21.4
-max_minecraft_version=1.21.5
+max_minecraft_version=1.21.4
+minecraft_versions=1.21.4
+
 minecraft_version=1.21.4
 yarn_mappings=1.21.4+build.8
 loader_version=0.16.10

From 78c689413578a8e6e61742c44f62a9baab706f83 Mon Sep 17 00:00:00 2001
From: Oth3r <68134921+Oth3r@users.noreply.github.com>
Date: Wed, 12 Mar 2025 18:43:43 -0500
Subject: [PATCH 06/22] 1.20.5 port

---
 src/main/java/one/oth3r/sit/screen/ClickableImageWidget.java | 2 --
 src/main/java/one/oth3r/sit/screen/ConfigScreen.java         | 4 ----
 2 files changed, 6 deletions(-)

diff --git a/src/main/java/one/oth3r/sit/screen/ClickableImageWidget.java b/src/main/java/one/oth3r/sit/screen/ClickableImageWidget.java
index fb14e4f..a101281 100644
--- a/src/main/java/one/oth3r/sit/screen/ClickableImageWidget.java
+++ b/src/main/java/one/oth3r/sit/screen/ClickableImageWidget.java
@@ -21,8 +21,6 @@ public class ClickableImageWidget extends ButtonWidget {
 
     @Override
     protected void renderWidget(DrawContext context, int mouseX, int mouseY, float delta) {
-        RenderSystem.enableBlend();
-        RenderSystem.enableDepthTest();
         context.drawTexture(RenderLayer::getGuiTextured, image,
                 this.getX(), this.getY(), 0.0f, 0.0f, this.getWidth(), this.getHeight(), this.getWidth(), this.getHeight());
     }
diff --git a/src/main/java/one/oth3r/sit/screen/ConfigScreen.java b/src/main/java/one/oth3r/sit/screen/ConfigScreen.java
index b64eb60..c95b492 100644
--- a/src/main/java/one/oth3r/sit/screen/ConfigScreen.java
+++ b/src/main/java/one/oth3r/sit/screen/ConfigScreen.java
@@ -71,11 +71,7 @@ public class ConfigScreen extends Screen {
     }
 
     private void renderBanner(DrawContext context, int x, int y, float alpha) {
-        RenderSystem.enableBlend();
-
         context.drawTexture(RenderLayer::getGuiTextured,Identifier.of(Data.MOD_ID, "textures/gui/banner.png"),
                 x, y, 0.0f, 0.0f, 128, 72, 128, 72, ColorHelper.getWhite(alpha));
-
-        RenderSystem.disableBlend();
     }
 }

From 7b8cefb1c5e26800509651f9312987a2cc6f6ec9 Mon Sep 17 00:00:00 2001
From: Oth3r <68134921+Oth3r@users.noreply.github.com>
Date: Tue, 25 Mar 2025 12:13:02 -0500
Subject: [PATCH 07/22] remove unused imports

---
 src/main/java/one/oth3r/sit/screen/ClickableImageWidget.java | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/main/java/one/oth3r/sit/screen/ClickableImageWidget.java b/src/main/java/one/oth3r/sit/screen/ClickableImageWidget.java
index a101281..c663036 100644
--- a/src/main/java/one/oth3r/sit/screen/ClickableImageWidget.java
+++ b/src/main/java/one/oth3r/sit/screen/ClickableImageWidget.java
@@ -1,6 +1,5 @@
 package one.oth3r.sit.screen;
 
-import com.mojang.blaze3d.systems.RenderSystem;
 import net.minecraft.client.gui.DrawContext;
 import net.minecraft.client.gui.tooltip.Tooltip;
 import net.minecraft.client.gui.widget.ButtonWidget;

From 36602a444bf5587863f21a9ee3e03ea74118d2cc Mon Sep 17 00:00:00 2001
From: Oth3r <68134921+Oth3r@users.noreply.github.com>
Date: Tue, 25 Mar 2025 12:13:17 -0500
Subject: [PATCH 08/22] add missing max mc version

---
 build.gradle | 1 +
 1 file changed, 1 insertion(+)

diff --git a/build.gradle b/build.gradle
index c23d6f0..2c444b2 100644
--- a/build.gradle
+++ b/build.gradle
@@ -39,6 +39,7 @@ processResources {
 			version                : project.version,
 			minecraft_version      : minecraft_version,
 			min_minecraft_version  : min_minecraft_version,
+			max_minecraft_version  : max_minecraft_version,
 			loader_version         : loader_version
 	]
 

From 12573bbd889b92613c27aac02f3d36ccbc37b3f8 Mon Sep 17 00:00:00 2001
From: Oth3r <68134921+Oth3r@users.noreply.github.com>
Date: Tue, 25 Mar 2025 12:16:03 -0500
Subject: [PATCH 09/22] 1.21.5 port

---
 gradle.properties | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/gradle.properties b/gradle.properties
index 5a5fa71..14c97d5 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -4,19 +4,19 @@ org.gradle.parallel=true
 
 # Fabric Properties
 # check these on https://fabricmc.net/develop
-min_minecraft_version=1.21.4
-max_minecraft_version=1.21.4
-minecraft_versions=1.21.4
+min_minecraft_version=1.21.5
+max_minecraft_version=1.21.5
+minecraft_versions=1.21.5
 
-minecraft_version=1.21.4
-yarn_mappings=1.21.4+build.8
+minecraft_version=1.21.5
+yarn_mappings=1.21.5+build.1
 loader_version=0.16.10
 
 # Mod Properties
-mod_version=1.2.3+1.21.4
+mod_version=1.2.3+1.21.5
 maven_group=one.oth3r
 file_name=sit!
 
 # Dependencies
-fabric_version=0.116.1+1.21.4
-modmenu_version=13.0.0-beta.1
+fabric_version=0.119.5+1.21.5
+modmenu_version=14.0.0-beta.2

From 0d90b1b85d18ff009ad1a4d86c99bdf457dd5039 Mon Sep 17 00:00:00 2001
From: Oth3r <68134921+Oth3r@users.noreply.github.com>
Date: Tue, 25 Mar 2025 12:17:57 -0500
Subject: [PATCH 10/22] use the minecraft versions var

---
 build.gradle | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/build.gradle b/build.gradle
index 2c444b2..7a6061b 100644
--- a/build.gradle
+++ b/build.gradle
@@ -95,7 +95,7 @@ modrinth {
 	versionName = "v${project.mod_version} [Fabric]"
 	versionType = "release"
 	uploadFile = remapJar
-	gameVersions = [project.minecraft_version]
+	gameVersions = project.minecraft_versions.split(",").toList()
 	loaders = ['fabric', 'quilt']
 	dependencies = [
 			new ModDependency('P7dR8mSH', 'required'),

From 85732506a2e9388a8e7b1900fc7877bf551063d1 Mon Sep 17 00:00:00 2001
From: Oth3r <68134921+Oth3r@users.noreply.github.com>
Date: Tue, 8 Apr 2025 14:02:09 -0500
Subject: [PATCH 11/22] bump dependencies

---
 gradle.properties | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gradle.properties b/gradle.properties
index 14c97d5..dabffbe 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -19,4 +19,4 @@ file_name=sit!
 
 # Dependencies
 fabric_version=0.119.5+1.21.5
-modmenu_version=14.0.0-beta.2
+modmenu_version=14.0.0-rc.2

From 1fc549c51e9a2e33096a231952d0c1c7c8643216 Mon Sep 17 00:00:00 2001
From: Oth3r <68134921+Oth3r@users.noreply.github.com>
Date: Tue, 8 Apr 2025 14:03:46 -0500
Subject: [PATCH 12/22] fix sitting level being off

---
 src/main/java/one/oth3r/sit/utl/Utl.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/main/java/one/oth3r/sit/utl/Utl.java b/src/main/java/one/oth3r/sit/utl/Utl.java
index 5dd760d..909ccfc 100644
--- a/src/main/java/one/oth3r/sit/utl/Utl.java
+++ b/src/main/java/one/oth3r/sit/utl/Utl.java
@@ -208,7 +208,7 @@ public class Utl {
         /**
          * the customizable y height of the entity, as some versions have different sitting heights on the entity
          */
-        public static final double Y_ADJUSTMENT = -0.2;
+        public static final double Y_ADJUSTMENT = 0;
 
         /**
          * checks if the entity's block is still there, & is valid

From 884a3f639b48502171d30ad2740294c947a03235 Mon Sep 17 00:00:00 2001
From: Oth3r <68134921+Oth3r@users.noreply.github.com>
Date: Tue, 8 Apr 2025 14:04:49 -0500
Subject: [PATCH 13/22] v1.2.3.1

---
 changelog.md      | 3 +++
 gradle.properties | 2 +-
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/changelog.md b/changelog.md
index 05b85df..45c6735 100644
--- a/changelog.md
+++ b/changelog.md
@@ -1,2 +1,5 @@
+# v1.2.3.1
+* added a version position for quick patches
+* fixed sitting height being off by .2
 # v1.2.3
 * fixed not being able to sit when the Y level was below 0
\ No newline at end of file
diff --git a/gradle.properties b/gradle.properties
index dabffbe..30341c4 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -13,7 +13,7 @@ yarn_mappings=1.21.5+build.1
 loader_version=0.16.10
 
 # Mod Properties
-mod_version=1.2.3+1.21.5
+mod_version=1.2.3.1+1.21.5
 maven_group=one.oth3r
 file_name=sit!
 

From b13f78d45c95608a57ae7b86d76408d294d018eb Mon Sep 17 00:00:00 2001
From: Oth3r <68134921+Oth3r@users.noreply.github.com>
Date: Sat, 19 Apr 2025 19:38:55 -0500
Subject: [PATCH 14/22] make extra sure that packets can be sent to the server

---
 src/main/java/one/oth3r/sit/utl/Utl.java | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/main/java/one/oth3r/sit/utl/Utl.java b/src/main/java/one/oth3r/sit/utl/Utl.java
index 909ccfc..ef9f0ff 100644
--- a/src/main/java/one/oth3r/sit/utl/Utl.java
+++ b/src/main/java/one/oth3r/sit/utl/Utl.java
@@ -369,7 +369,8 @@ public class Utl {
      * sends the settings packets to the server, if client & in game
      */
     public static void sendSettingsPackets() {
-        if (Data.isClient() && Data.isInGame()) {
+        if (Data.isClient() && Data.isInGame() &&
+                ClientPlayNetworking.canSend(SitPayloads.SettingsPayload.ID)) {
             ClientPlayNetworking.send(new SitPayloads.SettingsPayload(Utl.getGson().toJson(FileData.getSittingConfig())));
         }
     }

From 699280f0054d8f4c349a0c9b9caa23bb3ee485cc Mon Sep 17 00:00:00 2001
From: Oth3r <68134921+Oth3r@users.noreply.github.com>
Date: Sat, 19 Apr 2025 19:42:04 -0500
Subject: [PATCH 15/22] v1.2.3.2

---
 changelog.md      | 2 ++
 gradle.properties | 2 +-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/changelog.md b/changelog.md
index 45c6735..d33a263 100644
--- a/changelog.md
+++ b/changelog.md
@@ -1,3 +1,5 @@
+# v1.2.3.2
+* added an extra check before sending packets to the server from the client
 # v1.2.3.1
 * added a version position for quick patches
 * fixed sitting height being off by .2
diff --git a/gradle.properties b/gradle.properties
index 30341c4..516481d 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -13,7 +13,7 @@ yarn_mappings=1.21.5+build.1
 loader_version=0.16.10
 
 # Mod Properties
-mod_version=1.2.3.1+1.21.5
+mod_version=1.2.3.2+1.21.5
 maven_group=one.oth3r
 file_name=sit!
 

From 5e3e18db0932cfc64dcfcecbeff28770e7bd4bc7 Mon Sep 17 00:00:00 2001
From: Oth3r <68134921+Oth3r@users.noreply.github.com>
Date: Sat, 19 Apr 2025 19:43:53 -0500
Subject: [PATCH 16/22] update discord link

---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index 4f01e02..b851d3a 100644
--- a/README.md
+++ b/README.md
@@ -1,5 +1,5 @@
 # Sit!
-[![github](https://img.shields.io/github/issues/oth3r/Sit?logo=github?label=Issues)](https://github.com/Oth3r/Sit/releases) [![Crowdin](https://badges.crowdin.net/oth3r-sit/localized.svg)](https://crowdin.com/project/oth3r-sit)  [![discord](https://dcbadge.vercel.app/api/server/Mec6yNQ9B7?style=flat)](https://discord.gg/Mec6yNQ9B7) 
+[![github](https://img.shields.io/github/issues/oth3r/Sit?logo=github?label=Issues)](https://github.com/Oth3r/Sit/releases) [![Crowdin](https://badges.crowdin.net/oth3r-sit/localized.svg)](https://crowdin.com/project/oth3r-sit)  [![discord](https://dcbadge.vercel.app/api/server/https://discord.gg/AVSTHCAUvn?style=flat)](https://www.oth3r.one/discord)
 
 [![modrinth](https://img.shields.io/modrinth/dt/sit!?label=Modrinth&logo=modrinth)](https://modrinth.com/mod/sit!) [![curseforge](https://cf.way2muchnoise.eu/892424.svg)](https://www.curseforge.com/minecraft/mc-mods/Sit1) 
 

From 5d8c7cf5608d3de40bede9dff6816816fb354d7a Mon Sep 17 00:00:00 2001
From: Oth3r <68134921+Oth3r@users.noreply.github.com>
Date: Sat, 3 May 2025 12:58:39 -0500
Subject: [PATCH 17/22] add feature request template

---
 .../feature_request_template.yml              | 26 +++++++++++++++++++
 1 file changed, 26 insertions(+)
 create mode 100644 .github/ISSUE_TEMPLATE/feature_request_template.yml

diff --git a/.github/ISSUE_TEMPLATE/feature_request_template.yml b/.github/ISSUE_TEMPLATE/feature_request_template.yml
new file mode 100644
index 0000000..c1b507e
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/feature_request_template.yml
@@ -0,0 +1,26 @@
+name: Feature Request
+description: Suggest a new feature for Sit!
+title: '[Feature Request]: '
+body:
+  - type: textarea
+    id: description
+    attributes:
+      label: Description
+      description: A description of the problem or missing capability
+    validations:
+      required: true
+  - type: textarea
+    id: solution
+    attributes:
+      label: Describe a solution
+      description: If you have a solution in mind, please describe it.
+  - type: textarea
+    id: alternatives
+    attributes:
+      label: Describe alternatives
+      description: Have you considered any alternative solutions or workarounds?
+  - type: markdown
+    attributes:
+      value: >-
+        This template was generated with [Issue Forms
+        Creator](https://issue-forms-creator.netlify.app)
\ No newline at end of file

From fbfde6c8ffbfd621dd9bef9bea7fecf47b13415a Mon Sep 17 00:00:00 2001
From: Oth3r <68134921+Oth3r@users.noreply.github.com>
Date: Sat, 3 May 2025 12:58:42 -0500
Subject: [PATCH 18/22] grammer

---
 .github/ISSUE_TEMPLATE/bug_report.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/ISSUE_TEMPLATE/bug_report.yml b/.github/ISSUE_TEMPLATE/bug_report.yml
index 08a7feb..920dbe0 100644
--- a/.github/ISSUE_TEMPLATE/bug_report.yml
+++ b/.github/ISSUE_TEMPLATE/bug_report.yml
@@ -5,7 +5,7 @@ body:
   - type: markdown
     attributes:
       value: |
-        Please fill out the sections below to help identify and fix the bug
+        Please fill out the sections below to help identify and fix the bug.
   - type: textarea
     id: description
     attributes:

From 63a8db389ce1618ca699cf2d3c92eea98b9a1ebe Mon Sep 17 00:00:00 2001
From: Oth3r <68134921+Oth3r@users.noreply.github.com>
Date: Sat, 3 May 2025 13:08:50 -0500
Subject: [PATCH 19/22] add crowdin actions

---
 .../workflows/crowdin-download-workflow.yml   | 33 +++++++++++++++++++
 .github/workflows/crowdin-upload-workflow.yml | 24 ++++++++++++++
 crowdin.yml                                   | 12 +++++++
 3 files changed, 69 insertions(+)
 create mode 100644 .github/workflows/crowdin-download-workflow.yml
 create mode 100644 .github/workflows/crowdin-upload-workflow.yml
 create mode 100644 crowdin.yml

diff --git a/.github/workflows/crowdin-download-workflow.yml b/.github/workflows/crowdin-download-workflow.yml
new file mode 100644
index 0000000..ddaec73
--- /dev/null
+++ b/.github/workflows/crowdin-download-workflow.yml
@@ -0,0 +1,33 @@
+name: Crowdin Download Action
+
+permissions:
+  contents: write
+  pull-requests: write
+  actions: read
+
+on:
+  workflow_dispatch:
+
+jobs:
+  crowdin:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v4
+
+      - name: Synchronize with Crowdin
+        uses: crowdin/github-action@v2
+        with:
+          upload_sources: false
+          upload_translations: false
+          download_translations: true
+          localization_branch_name: crowdin_translations
+
+          create_pull_request: true
+          pull_request_title: 'Updated Crowdin translations'
+          pull_request_body: 'New Crowdin pull request with translations'
+          pull_request_base_branch_name: 'dev'
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+          CROWDIN_PROJECT_ID: ${{ secrets.CROWDIN_PROJECT_ID }}
+          CROWDIN_PERSONAL_TOKEN: ${{ secrets.CROWDIN_PERSONAL_TOKEN }}
\ No newline at end of file
diff --git a/.github/workflows/crowdin-upload-workflow.yml b/.github/workflows/crowdin-upload-workflow.yml
new file mode 100644
index 0000000..a2bf048
--- /dev/null
+++ b/.github/workflows/crowdin-upload-workflow.yml
@@ -0,0 +1,24 @@
+name: Crowdin Upload Action
+
+on:
+  push:
+    paths: [ 'common/src/main/resources/assets/directionhud/lang/en_US.json']
+    branches: [ dev ]
+  workflow_dispatch:
+
+jobs:
+  crowdin-upload:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v4
+
+      - name: Crowdin push
+        uses: crowdin/github-action@v2
+        with:
+          upload_sources: true
+          upload_translations: false
+          download_translations: false
+        env:
+          CROWDIN_PROJECT_ID: ${{ secrets.CROWDIN_PROJECT_ID }}
+          CROWDIN_PERSONAL_TOKEN: ${{ secrets.CROWDIN_PERSONAL_TOKEN }}
\ No newline at end of file
diff --git a/crowdin.yml b/crowdin.yml
new file mode 100644
index 0000000..352acbc
--- /dev/null
+++ b/crowdin.yml
@@ -0,0 +1,12 @@
+"project_id_env": "CROWDIN_PROJECT_ID"
+"api_token_env": "CROWDIN_PERSONAL_TOKEN"
+"base_path": "."
+"base_url": "https://api.crowdin.com"
+"preserve_hierarchy": true
+
+files: [
+    {
+        "source": "src/main/resources/assets/sit-oth3r/lang/en_US.json",
+        "translation": "src/main/resources/assets/sit-oth3r/lang/%locale_with_underscore%.json",
+    }
+]
\ No newline at end of file

From 6d2c052100d0e1dd4884671a852292be8ad3597b Mon Sep 17 00:00:00 2001
From: Oth3r <68134921+Oth3r@users.noreply.github.com>
Date: Sat, 3 May 2025 13:17:40 -0500
Subject: [PATCH 20/22] use the reload method instead of loading the files
 directly

---
 src/main/java/one/oth3r/sit/mixin/ReloadCommandMixin.java | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/main/java/one/oth3r/sit/mixin/ReloadCommandMixin.java b/src/main/java/one/oth3r/sit/mixin/ReloadCommandMixin.java
index aefbbe3..bcf1f6f 100644
--- a/src/main/java/one/oth3r/sit/mixin/ReloadCommandMixin.java
+++ b/src/main/java/one/oth3r/sit/mixin/ReloadCommandMixin.java
@@ -6,8 +6,8 @@ import net.minecraft.server.command.ReloadCommand;
 import net.minecraft.server.command.ServerCommandSource;
 import net.minecraft.server.network.ServerPlayerEntity;
 import net.minecraft.util.Formatting;
-import one.oth3r.sit.file.FileData;
 import one.oth3r.sit.utl.Data;
+import one.oth3r.sit.utl.Logic;
 import one.oth3r.sit.utl.Utl;
 import org.spongepowered.asm.mixin.Mixin;
 import org.spongepowered.asm.mixin.injection.At;
@@ -18,7 +18,7 @@ import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
 public class ReloadCommandMixin {
     @Inject(at = @At("TAIL"), method = "register")
     private static void register(CommandDispatcher<ServerCommandSource> dispatcher, CallbackInfo ci) {
-        FileData.loadFiles();
+        Logic.reload();
 
         // make sure the server isn't null
         MinecraftServer server = Data.getServer();

From aa3b25442d1e39b119da58628823840f73c5a221 Mon Sep 17 00:00:00 2001
From: Oth3r <68134921+Oth3r@users.noreply.github.com>
Date: Sat, 3 May 2025 13:18:21 -0500
Subject: [PATCH 21/22] fix the reload method not loading the langreader

---
 src/main/java/one/oth3r/sit/utl/Logic.java | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/src/main/java/one/oth3r/sit/utl/Logic.java b/src/main/java/one/oth3r/sit/utl/Logic.java
index 874dc38..c0e1312 100644
--- a/src/main/java/one/oth3r/sit/utl/Logic.java
+++ b/src/main/java/one/oth3r/sit/utl/Logic.java
@@ -9,10 +9,7 @@ import net.minecraft.util.Formatting;
 import net.minecraft.util.Hand;
 import net.minecraft.util.hit.BlockHitResult;
 import net.minecraft.util.math.BlockPos;
-import one.oth3r.sit.file.FileData;
-import one.oth3r.sit.file.ServerConfig;
-import one.oth3r.sit.file.SittingConfig;
-import one.oth3r.sit.file.HandSetting;
+import one.oth3r.sit.file.*;
 import org.jetbrains.annotations.Nullable;
 
 public class Logic {
@@ -172,6 +169,7 @@ public class Logic {
     public static void reload() {
         FileData.loadFiles();
         FileData.saveFiles();
+        LangReader.loadLanguageFile();
     }
 
     /**

From 31fff71539723d2c31e27b00bf68825e88e41eeb Mon Sep 17 00:00:00 2001
From: Oth3r <68134921+Oth3r@users.noreply.github.com>
Date: Sat, 3 May 2025 13:20:35 -0500
Subject: [PATCH 22/22] update all languages for the new naming system

---
 src/main/java/one/oth3r/sit/file/ServerConfig.java            | 4 ++--
 .../assets/sit-oth3r/lang/{de_de.json => de_DE.json}          | 0
 .../assets/sit-oth3r/lang/{en_us.json => en_US.json}          | 0
 .../assets/sit-oth3r/lang/{it_it.json => it_IT.json}          | 0
 .../assets/sit-oth3r/lang/{pt_br.json => pt_BR.json}          | 0
 .../assets/sit-oth3r/lang/{tr_tr.json => tr_TR.json}          | 0
 .../assets/sit-oth3r/lang/{zh_cn.json => zh_CN.json}          | 0
 .../assets/sit-oth3r/lang/{zh_tw.json => zh_TW.json}          | 0
 8 files changed, 2 insertions(+), 2 deletions(-)
 rename src/main/resources/assets/sit-oth3r/lang/{de_de.json => de_DE.json} (100%)
 rename src/main/resources/assets/sit-oth3r/lang/{en_us.json => en_US.json} (100%)
 rename src/main/resources/assets/sit-oth3r/lang/{it_it.json => it_IT.json} (100%)
 rename src/main/resources/assets/sit-oth3r/lang/{pt_br.json => pt_BR.json} (100%)
 rename src/main/resources/assets/sit-oth3r/lang/{tr_tr.json => tr_TR.json} (100%)
 rename src/main/resources/assets/sit-oth3r/lang/{zh_cn.json => zh_CN.json} (100%)
 rename src/main/resources/assets/sit-oth3r/lang/{zh_tw.json => zh_TW.json} (100%)

diff --git a/src/main/java/one/oth3r/sit/file/ServerConfig.java b/src/main/java/one/oth3r/sit/file/ServerConfig.java
index dd183c5..ed337fc 100644
--- a/src/main/java/one/oth3r/sit/file/ServerConfig.java
+++ b/src/main/java/one/oth3r/sit/file/ServerConfig.java
@@ -24,9 +24,9 @@ public class ServerConfig implements CustomFile<ServerConfig> {
     private Double version = 2.2;
 
     @SerializedName("lang")
-    private String lang = "en_us";
+    private String lang = "en_US";
     @SerializedName("lang-options")
-    private final String langOptions = "en_us, it_it, pt_br, tr_tr, zh_tw, zh_ch, de_de";
+    private final String langOptions = "en_US, it_IT, pt_BR, tr_TR, zh_TW, zh_CH, de_DE";
 
     @SerializedName("keep-active")
     private Boolean keepActive = true;
diff --git a/src/main/resources/assets/sit-oth3r/lang/de_de.json b/src/main/resources/assets/sit-oth3r/lang/de_DE.json
similarity index 100%
rename from src/main/resources/assets/sit-oth3r/lang/de_de.json
rename to src/main/resources/assets/sit-oth3r/lang/de_DE.json
diff --git a/src/main/resources/assets/sit-oth3r/lang/en_us.json b/src/main/resources/assets/sit-oth3r/lang/en_US.json
similarity index 100%
rename from src/main/resources/assets/sit-oth3r/lang/en_us.json
rename to src/main/resources/assets/sit-oth3r/lang/en_US.json
diff --git a/src/main/resources/assets/sit-oth3r/lang/it_it.json b/src/main/resources/assets/sit-oth3r/lang/it_IT.json
similarity index 100%
rename from src/main/resources/assets/sit-oth3r/lang/it_it.json
rename to src/main/resources/assets/sit-oth3r/lang/it_IT.json
diff --git a/src/main/resources/assets/sit-oth3r/lang/pt_br.json b/src/main/resources/assets/sit-oth3r/lang/pt_BR.json
similarity index 100%
rename from src/main/resources/assets/sit-oth3r/lang/pt_br.json
rename to src/main/resources/assets/sit-oth3r/lang/pt_BR.json
diff --git a/src/main/resources/assets/sit-oth3r/lang/tr_tr.json b/src/main/resources/assets/sit-oth3r/lang/tr_TR.json
similarity index 100%
rename from src/main/resources/assets/sit-oth3r/lang/tr_tr.json
rename to src/main/resources/assets/sit-oth3r/lang/tr_TR.json
diff --git a/src/main/resources/assets/sit-oth3r/lang/zh_cn.json b/src/main/resources/assets/sit-oth3r/lang/zh_CN.json
similarity index 100%
rename from src/main/resources/assets/sit-oth3r/lang/zh_cn.json
rename to src/main/resources/assets/sit-oth3r/lang/zh_CN.json
diff --git a/src/main/resources/assets/sit-oth3r/lang/zh_tw.json b/src/main/resources/assets/sit-oth3r/lang/zh_TW.json
similarity index 100%
rename from src/main/resources/assets/sit-oth3r/lang/zh_tw.json
rename to src/main/resources/assets/sit-oth3r/lang/zh_TW.json