Compare commits

..

No commits in common. "b52651b0d15c551b564d8fc5cd4edb2062c8e3e3" and "6eeb5b36983bd946cefe1fb7016f4b19c7fcdef4" have entirely different histories.

5 changed files with 19 additions and 30 deletions

View file

@ -1,10 +1,9 @@
![banner](https://media.oth3r.one/-bQHprrBRYY/sit!%20banner%20480x270.png) <img src="https://github.com/Oth3r/oth3r.github.io/blob/main/mod_data/Sit!/media/banner.png?raw=true" width="50%" style="margin-bottom: 10px; max-width:400px;">
[![issues](https://github.com/intergrav/devins-badges/blob/c7fd18efdadd1c3f12ae56b49afd834640d2d797/assets/cozy/documentation/issues_64h.png?raw=true)](https://github.com/Oth3r/Sit/issues) [![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)
[![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) [![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)
[![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!** 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! * Sit on **stairs**, **slabs**, **carpets** by default, and sit on everything else by tweaking the config!
@ -42,29 +41,28 @@ 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! Use **player unique** hand restrictions when connecting to a `Sit!` server on a `Sit!` Client!
![per player hand restriction showcase](https://github.com/Oth3r/oth3r.github.io/blob/main/mod_data/Sit!/media/desc/hand_restrictions.gif?raw=true) <img src="https://github.com/Oth3r/oth3r.github.io/blob/main/mod_data/Sit!/media/desc/hand_restrictions.gif?raw=true" width="100%" style="margin-bottom: 10px;max-width:600px;"
alt="per player hand restriction showcase">
### 🟩 Custom Blocks ### 🟩 Custom Blocks
Want to sit on _**EVERY**_ block? With the config you can add more sitting options! 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. 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](https://github.com/Oth3r/oth3r.github.io/blob/main/mod_data/Sit!/media/desc/custom_blocks.gif?raw=true) <img src="https://github.com/Oth3r/oth3r.github.io/blob/main/mod_data/Sit!/media/desc/custom_blocks.gif?raw=true" width="100%" style="margin-bottom: 10px; max-width:600px;"
alt="players sitting on a vast range of blocks">
### ⌨️ Keybinds ### ⌨️ Keybinds
Don't want to sit with **just** the hand? Use a keybind or type a command to sit instead! 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](https://github.com/Oth3r/oth3r.github.io/blob/main/mod_data/Sit!/media/desc/keybinds.gif?raw=true) <img src="https://github.com/Oth3r/oth3r.github.io/blob/main/mod_data/Sit!/media/desc/keybinds.gif?raw=true" width="100%" style="margin-bottom: 10px; max-width:600px;"
alt="setting keybinds for the sit mod, and sitting by using them">
### 📃 Customizable Config ### 📃 Customizable Config
Don't like the default settings? Go wild in the config for yourself or your players! Don't like the default settings? Go wild in the config for yourself or your players!
<img src="https://github.com/Oth3r/oth3r.github.io/blob/main/mod_data/Sit!/media/desc/config.gif?raw=true" width="100%" style="margin-bottom: 10px; max-width:600px;"
alt="the Sit! config wiki page">
![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
## 🎯 Future Goals
* NeoForge Port * NeoForge Port
* Full config via [OtterLib](https://modrinth.com/mod/otterlib) * 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)

View file

@ -1,5 +1,5 @@
plugins { plugins {
id 'fabric-loom' version "1.11-SNAPSHOT" id 'fabric-loom' version "1.10-SNAPSHOT"
id 'maven-publish' id 'maven-publish'
id "me.modmuss50.mod-publish-plugin" version "0.8.4" id "me.modmuss50.mod-publish-plugin" version "0.8.4"
id 'co.uzzu.dotenv.gradle' version '4.0.0' id 'co.uzzu.dotenv.gradle' version '4.0.0'

View file

@ -1,9 +1,3 @@
# v1.2.4.7
* fixed legacy file updater causing a stack overflow crash
# v1.2.4.6
* fixed max otterlib version (1.21.8)
# v1.2.4.5 # v1.2.4.5
* bumped OtterLib version to `0.2.1.0` * bumped OtterLib version to `0.2.1.0`
* fixed default languages files not being able to be loaded * fixed default languages files not being able to be loaded

View file

@ -13,7 +13,7 @@ yarn_mappings=1.20.4+build.3
loader_version=0.16.14 loader_version=0.16.14
# Mod Properties # Mod Properties
mod_version=1.2.4.7+1.20.4 mod_version=1.2.4.5+1.20.4
maven_group=one.oth3r maven_group=one.oth3r
file_name=sit! file_name=sit!
@ -23,4 +23,4 @@ otterlib_version=0.2.1.0+1.20.4-fabric
otterlib_max_version=0.3.0.0+1.20.4-fabric otterlib_max_version=0.3.0.0+1.20.4-fabric
modmenu_version=9.0.0 modmenu_version=9.0.0
devauth_version=1.2.1 devauth_version=1.2.1

View file

@ -345,11 +345,6 @@ public class ServerConfig implements CustomFile<ServerConfig> {
} catch (Exception e) { } catch (Exception e) {
Data.LOGGER.error("Failed to delete the old Sit! config."); Data.LOGGER.error("Failed to delete the old Sit! config.");
} }
// save the updated configs
FileData.saveFiles();
// continue loading as normal...
} }
/** /**
@ -499,6 +494,8 @@ public class ServerConfig implements CustomFile<ServerConfig> {
FileData.setServerConfig(serverConfig); FileData.setServerConfig(serverConfig);
FileData.setSittingConfig(sittingConfig); FileData.setSittingConfig(sittingConfig);
serverConfig.save();
sittingConfig.save();
} catch (Exception e) { } catch (Exception e) {
Data.LOGGER.error("Error loading legacy config: %s", e.getMessage()); Data.LOGGER.error("Error loading legacy config: %s", e.getMessage());
} }