virt-mirrors/Sit
1
0
Fork 1
mirror of https://github.com/Oth3r/Sit.git synced 2025-09-19 16:03:22 +02:00
Code Issues Projects Releases Packages Wiki Activity

Merge branch 'master' into dev

Browse source
This commit is contained in:
Oth3r 2025-08-14 11:41:11 -05:00
commit b52b96608d
Failed to generate hash of commit
5 changed files with 22 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

2
README.md
View file

@ -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) ![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 ### ⌨️ 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) ![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)

2
build.gradle
View file

@ -1,5 +1,5 @@
plugins { plugins {
id 'fabric-loom' version "1.10-SNAPSHOT" id 'fabric-loom' version "1.11-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'

6
changelog.md
View file

@ -1,3 +1,9 @@
# 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

18
gradle.properties
View file

@ -4,23 +4,23 @@ org.gradle.parallel=true
# Fabric Properties # Fabric Properties
# check these on https://fabricmc.net/develop # check these on https://fabricmc.net/develop
min_minecraft_version=1.21.7 min_minecraft_version=1.21.8
max_minecraft_version=1.21.7 max_minecraft_version=1.21.8
minecraft_versions=1.21.7 minecraft_versions=1.21.8
minecraft_version=1.21.7 minecraft_version=1.21.8
yarn_mappings=1.21.7+build.1 yarn_mappings=1.21.8+build.1
loader_version=0.16.14 loader_version=0.16.14
# Mod Properties # Mod Properties
mod_version=1.2.4.5+1.21.7 mod_version=1.2.4.7+1.21.8
maven_group=one.oth3r maven_group=one.oth3r
file_name=sit! file_name=sit!
# Dependencies # Dependencies
fabric_version=0.128.1+1.21.7 fabric_version=0.129.0+1.21.8
otterlib_version=0.2.1.0+1.21.7-fabric 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 modmenu_version=15.0.0-beta.1
devauth_version=1.2.1 devauth_version=1.2.1

7
src/main/java/one/oth3r/sit/file/ServerConfig.java
View file

@ -345,6 +345,11 @@ 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...
} }
/** /**
@ -494,8 +499,6 @@ 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());
} }