From 65f0a77cfc6e2dc85732d857c38b3cdd89aa7784 Mon Sep 17 00:00:00 2001 From: Oth3r <68134921+oth3r@users.noreply.github.com> Date: Thu, 17 Jul 2025 10:14:30 -0500 Subject: [PATCH 1/6] updated readme; new badges --- README.md | 28 +++++++++++++++------------- 1 file changed, 15 insertions(+), 13 deletions(-) diff --git a/README.md b/README.md index 47fbea2..22fec77 100644 --- a/README.md +++ b/README.md @@ -1,9 +1,10 @@ - +![banner](https://media.oth3r.one/-bQHprrBRYY/sit!%20banner%20480x270.png) -[![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) +[![issues](https://github.com/intergrav/devins-badges/blob/c7fd18efdadd1c3f12ae56b49afd834640d2d797/assets/cozy/documentation/issues_64h.png?raw=true)](https://github.com/Oth3r/Sit/issues) +[![localization](https://github.com/intergrav/devins-badges/blob/c7fd18efdadd1c3f12ae56b49afd834640d2d797/assets/cozy/translate/crowdin_64h.png?raw=true)](https://crowdin.com/project/oth3r-sit) +[![discord](https://github.com/intergrav/devins-badges/blob/v3/assets/cozy/social/discord-singular_64h.png?raw=true)](https://www.oth3r.one/discord) +[![otterlib_dep](https://media.oth3r.one/-a7bWaVAVW5/requires_otterlib.png)](https://modrinth.com/plugin/otterlib) ### **Sit!** is a vanilla+ mod that adds sitting in minecraft. * Sit on **stairs**, **slabs**, **carpets** by default, and sit on everything else by tweaking the config! @@ -41,28 +42,29 @@ Don't want to accidentally sit down? Set custom restrictions for each hand in th \ Use **player unique** hand restrictions when connecting to a `Sit!` server on a `Sit!` Client! -per player hand restriction showcase +![per player hand restriction showcase](https://github.com/Oth3r/oth3r.github.io/blob/main/mod_data/Sit!/media/desc/hand_restrictions.gif?raw=true) ### 🟩 Custom Blocks Want to sit on _**EVERY**_ block? With the config you can add more sitting options! \ With the new config system, block tags and custom blockstates can be used to mass select blocks at ease. -players sitting on a vast range of blocks +![players sitting on a vast range of blocks](https://github.com/Oth3r/oth3r.github.io/blob/main/mod_data/Sit!/media/desc/custom_blocks.gif?raw=true) ### ⌨️ Keybinds Don't want to sit with the **just** the hand? Use a keybind or type a command to sit instead! -setting keybinds for the sit mod, and sitting by using them +![setting keybinds for the sit mod, and sitting by using them](https://github.com/Oth3r/oth3r.github.io/blob/main/mod_data/Sit!/media/desc/keybinds.gif?raw=true) ### 📃 Customizable Config Don't like the default settings? Go wild in the config for yourself or your players! -the Sit! config wiki page -## Future Goals +![the Sit! config wiki page](https://github.com/Oth3r/oth3r.github.io/blob/main/mod_data/Sit!/media/desc/config.gif?raw=true) + +## 🎯 Future Goals * NeoForge Port * Full config via [OtterLib](https://modrinth.com/mod/otterlib) + +## 🔗 Where to download +[![modrinth](https://github.com/intergrav/devins-badges/blob/c7fd18efdadd1c3f12ae56b49afd834640d2d797/assets/cozy/available/modrinth_64h.png?raw=true)](https://modrinth.com/mod/sit!) +[![curseforge](https://github.com/intergrav/devins-badges/blob/c7fd18efdadd1c3f12ae56b49afd834640d2d797/assets/cozy/available/curseforge_64h.png?raw=true)](https://www.curseforge.com/minecraft/mc-mods/Sit1) \ No newline at end of file From c7875aa9ea151f35836a0fdd575c4c636efcb29d Mon Sep 17 00:00:00 2001 From: Oth3r <68134921+oth3r@users.noreply.github.com> Date: Thu, 17 Jul 2025 10:21:16 -0500 Subject: [PATCH 2/6] 1.21.8 bump --- build.gradle | 2 +- gradle.properties | 16 ++++++++-------- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/build.gradle b/build.gradle index ba352c7..f77bf8c 100644 --- a/build.gradle +++ b/build.gradle @@ -1,5 +1,5 @@ plugins { - id 'fabric-loom' version "1.10-SNAPSHOT" + id 'fabric-loom' version "1.11-SNAPSHOT" id 'maven-publish' id "me.modmuss50.mod-publish-plugin" version "0.8.4" id 'co.uzzu.dotenv.gradle' version '4.0.0' diff --git a/gradle.properties b/gradle.properties index fda1a3e..5e40d89 100644 --- a/gradle.properties +++ b/gradle.properties @@ -4,22 +4,22 @@ org.gradle.parallel=true # Fabric Properties # check these on https://fabricmc.net/develop -min_minecraft_version=1.21.7 -max_minecraft_version=1.21.7 -minecraft_versions=1.21.7 +min_minecraft_version=1.21.8 +max_minecraft_version=1.21.8 +minecraft_versions=1.21.8 -minecraft_version=1.21.7 -yarn_mappings=1.21.7+build.1 +minecraft_version=1.21.8 +yarn_mappings=1.21.8+build.1 loader_version=0.16.14 # Mod Properties -mod_version=1.2.4.5+1.21.7 +mod_version=1.2.4.5+1.21.8 maven_group=one.oth3r file_name=sit! # Dependencies -fabric_version=0.128.1+1.21.7 -otterlib_version=0.2.1.0+1.21.7-fabric +fabric_version=0.129.0+1.21.8 +otterlib_version=0.2.2.0+1.21.8-fabric otterlib_max_version=0.3.0.0+1.21.7-fabric modmenu_version=15.0.0-beta.1 From e43273b172b3e77776afdf493104eea0f4645a01 Mon Sep 17 00:00:00 2001 From: Oth3r <68134921+oth3r@users.noreply.github.com> Date: Thu, 17 Jul 2025 10:28:16 -0500 Subject: [PATCH 3/6] 1.2.4.6 hotfix --- changelog.md | 3 +++ gradle.properties | 4 ++-- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/changelog.md b/changelog.md index 1601ba7..7fac970 100644 --- a/changelog.md +++ b/changelog.md @@ -1,3 +1,6 @@ +# v1.2.4.6 +* fixed max otterlib version (1.21.8) + # v1.2.4.5 * bumped OtterLib version to `0.2.1.0` * fixed default languages files not being able to be loaded diff --git a/gradle.properties b/gradle.properties index 5e40d89..ff05bfd 100644 --- a/gradle.properties +++ b/gradle.properties @@ -13,14 +13,14 @@ yarn_mappings=1.21.8+build.1 loader_version=0.16.14 # Mod Properties -mod_version=1.2.4.5+1.21.8 +mod_version=1.2.4.6+1.21.8 maven_group=one.oth3r file_name=sit! # Dependencies fabric_version=0.129.0+1.21.8 otterlib_version=0.2.2.0+1.21.8-fabric -otterlib_max_version=0.3.0.0+1.21.7-fabric +otterlib_max_version=0.3.0.0+1.21.8-fabric modmenu_version=15.0.0-beta.1 devauth_version=1.2.1 From 1bb8409931d525214f7dadbe579917a774c6e947 Mon Sep 17 00:00:00 2001 From: Oth3r <68134921+oth3r@users.noreply.github.com> Date: Sat, 19 Jul 2025 20:53:00 -0500 Subject: [PATCH 4/6] grammer fix --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 22fec77..fb8170b 100644 --- a/README.md +++ b/README.md @@ -52,7 +52,7 @@ With the new config system, block tags and custom blockstates can be used to mas ![players sitting on a vast range of blocks](https://github.com/Oth3r/oth3r.github.io/blob/main/mod_data/Sit!/media/desc/custom_blocks.gif?raw=true) ### ⌨️ Keybinds -Don't want to sit with the **just** the hand? Use a keybind or type a command to sit instead! +Don't want to sit with **just** the hand? Use a keybind or type a command to sit instead! ![setting keybinds for the sit mod, and sitting by using them](https://github.com/Oth3r/oth3r.github.io/blob/main/mod_data/Sit!/media/desc/keybinds.gif?raw=true) From 89536e307071007808e0fa8a0e653d3c1b10fd34 Mon Sep 17 00:00:00 2001 From: Oth3r <68134921+oth3r@users.noreply.github.com> Date: Sat, 19 Jul 2025 20:53:37 -0500 Subject: [PATCH 5/6] fix legacy file updater causing a stack overflow crash --- src/main/java/one/oth3r/sit/file/ServerConfig.java | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/src/main/java/one/oth3r/sit/file/ServerConfig.java b/src/main/java/one/oth3r/sit/file/ServerConfig.java index 8a36ad3..660c14c 100644 --- a/src/main/java/one/oth3r/sit/file/ServerConfig.java +++ b/src/main/java/one/oth3r/sit/file/ServerConfig.java @@ -345,6 +345,11 @@ public class ServerConfig implements CustomFile { } catch (Exception e) { Data.LOGGER.error("Failed to delete the old Sit! config."); } + + // save the updated configs + FileData.saveFiles(); + + // continue loading as normal... } /** @@ -494,8 +499,6 @@ public class ServerConfig implements CustomFile { FileData.setServerConfig(serverConfig); FileData.setSittingConfig(sittingConfig); - serverConfig.save(); - sittingConfig.save(); } catch (Exception e) { Data.LOGGER.error("Error loading legacy config: %s", e.getMessage()); } From ce9a88d56de90390370530764bdd325d966da936 Mon Sep 17 00:00:00 2001 From: Oth3r <68134921+oth3r@users.noreply.github.com> Date: Sat, 19 Jul 2025 20:54:26 -0500 Subject: [PATCH 6/6] v1.2.4.7 --- changelog.md | 3 +++ gradle.properties | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/changelog.md b/changelog.md index 7fac970..6c48664 100644 --- a/changelog.md +++ b/changelog.md @@ -1,3 +1,6 @@ +# v1.2.4.7 +* fixed legacy file updater causing a stack overflow crash + # v1.2.4.6 * fixed max otterlib version (1.21.8) diff --git a/gradle.properties b/gradle.properties index ff05bfd..9fcfc73 100644 --- a/gradle.properties +++ b/gradle.properties @@ -13,7 +13,7 @@ yarn_mappings=1.21.8+build.1 loader_version=0.16.14 # Mod Properties -mod_version=1.2.4.6+1.21.8 +mod_version=1.2.4.7+1.21.8 maven_group=one.oth3r file_name=sit!