virt/Sit
1
0
Fork 0
forked from virt-mirrors/Sit
Code Pull requests Activity

Merge branch 'master' into dev

Browse source 
# Conflicts:
#	gradle.properties
#	src/main/resources/fabric.mod.json
This commit is contained in:
Oth3r 2023-12-05 14:27:24 -06:00
commit 2003fdb206
3 changed files with 39 additions and 39 deletions
Download patch file Download diff file Expand all files Collapse all files

14
gradle.properties
View file

@ -4,16 +4,16 @@ org.gradle.parallel=true
# Fabric Properties # Fabric Properties
# check these on https://fabricmc.net/develop # check these on https://fabricmc.net/develop
minecraft_version=1.20.1 minecraft_version=1.20.3
yarn_mappings=1.20.1+build.10 yarn_mappings=1.20.3+build.1
loader_version=0.14.24 loader_version=0.15.0
# Mod Properties # Mod Properties
mod_version=1.1.0+1.20-1.20.1 mod_version=1.1.1+1.20.2-1.20.3
maven_group=one.oth3r maven_group=one.oth3r
archives_base_name=sit! archives_base_name=sit!
# Dependencies # Dependencies
fabric_version=0.91.0+1.20.1 fabric_version=0.91.1+1.20.3
modmenu_version=7.0.0 modmenu_version=8.0.0
yacl_version=3.2.1+1.20 yacl_version=3.2.1+1.20.2

62
src/main/java/one/oth3r/sit/config.java
View file

@ -134,20 +134,20 @@ public class config {
try (var file = Files.newBufferedWriter(configFile().toPath(), StandardCharsets.UTF_8)) { try (var file = Files.newBufferedWriter(configFile().toPath(), StandardCharsets.UTF_8)) {
Gson gson = new GsonBuilder().disableHtmlEscaping().create(); Gson gson = new GsonBuilder().disableHtmlEscaping().create();
file.write("# Sit! Config\n"); file.write("# Sit! Config\n");
file.write(("\nversion="+defaults.version)); file.write("\nversion="+defaults.version);
file.write(("\n# all available languages: en_us, ru_ru")); file.write("\n# all available languages: en_us, ru_ru");
file.write(("\nlang=" + lang)); file.write("\nlang=" + lang);
file.write(("\n\n# "+lang("general.keep_active.description"))); file.write("\n\n# "+lang("general.keep_active.description"));
file.write(("\nkeep-active=" + keepActive)); file.write("\nkeep-active=" + keepActive);
file.write(("\n# "+lang("general.sit_while_seated.description"))); file.write("\n# "+lang("general.sit_while_seated.description"));
file.write(("\nsit-while-seated=" + sitWhileSeated)); file.write("\nsit-while-seated=" + sitWhileSeated);
file.write(("\n# "+lang("general.sittable.description"))); file.write("\n# "+lang("general.sittable.description"));
file.write(("\nstairs=" + stairsOn)); file.write("\nstairs=" + stairsOn);
file.write(("\nslabs=" + slabsOn)); file.write("\nslabs=" + slabsOn);
file.write(("\ncarpets=" + carpetsOn)); file.write("\ncarpets=" + carpetsOn);
file.write(("\nfull-blocks=" + fullBlocksOn)); file.write("\nfull-blocks=" + fullBlocksOn);
file.write(("\ncustom=" + customOn)); file.write("\ncustom=" + customOn);
file.write(("\n# "+Sit.lang("config.sit."+ file.write("\n# "+Sit.lang("config.sit."+
"general.sittable_blocks.description") "general.sittable_blocks.description")
.append("\n# ").append(lang("general.sittable_blocks.description_2")) .append("\n# ").append(lang("general.sittable_blocks.description_2"))
.append(lang("general.sittable_blocks.description_3", .append(lang("general.sittable_blocks.description_3",
@ -159,26 +159,26 @@ public class config {
.append("\n# ").append(lang("general.sittable_blocks.description_5")) .append("\n# ").append(lang("general.sittable_blocks.description_5"))
.append("\n# ").append(lang("general.sittable_blocks.description_6")) .append("\n# ").append(lang("general.sittable_blocks.description_6"))
.append("\n# ").append(lang("general.sittable_blocks.description_7")) .append("\n# ").append(lang("general.sittable_blocks.description_7"))
.append("\n# ").append(lang("general.sittable_blocks.description_8")))); .append("\n# ").append(lang("general.sittable_blocks.description_8")).getString());
file.write(("\ncustom-blocks="+gson.toJson(customBlocks))); file.write("\ncustom-blocks="+gson.toJson(customBlocks));
file.write(("\n\n# "+lang("hand"))); file.write("\n\n# "+lang("hand"));
file.write(("\n# "+Sit.lang("config.sit."+ file.write("\n# "+Sit.lang("config.sit."+
"hand.requirements.description") "hand.requirements.description")
.append("\n# ").append(lang("hand.requirements.description_2")) .append("\n# ").append(lang("hand.requirements.description_2"))
.append("\n# ").append(lang("hand.requirements.description_3")) .append("\n# ").append(lang("hand.requirements.description_3"))
.append("\n# ").append(lang("hand.requirements.description_4")))); .append("\n# ").append(lang("hand.requirements.description_4")).getString());
file.write(("\nhand.main.requirement=" + mainReq)); file.write("\nhand.main.requirement=" + mainReq);
file.write(("\nhand.main.block=" + mainBlock)); file.write("\nhand.main.block=" + mainBlock);
file.write(("\nhand.main.food=" + mainFood)); file.write("\nhand.main.food=" + mainFood);
file.write(("\nhand.main.usable=" + mainUsable)); file.write("\nhand.main.usable=" + mainUsable);
file.write(("\nhand.main.whitelist="+gson.toJson(mainWhitelist))); file.write("\nhand.main.whitelist="+gson.toJson(mainWhitelist));
file.write(("\nhand.main.blacklist="+gson.toJson(mainBlacklist))); file.write("\nhand.main.blacklist="+gson.toJson(mainBlacklist));
file.write(("\nhand.off.requirement=" + offReq)); file.write("\nhand.off.requirement=" + offReq);
file.write(("\nhand.off.block=" + offBlock)); file.write("\nhand.off.block=" + offBlock);
file.write(("\nhand.off.food=" + offFood)); file.write("\nhand.off.food=" + offFood);
file.write(("\nhand.off.usable=" + offUsable)); file.write("\nhand.off.usable=" + offUsable);
file.write(("\nhand.off.whitelist="+gson.toJson(offWhitelist))); file.write("\nhand.off.whitelist="+gson.toJson(offWhitelist));
file.write(("\nhand.off.blacklist="+gson.toJson(offBlacklist))); file.write("\nhand.off.blacklist="+gson.toJson(offBlacklist));
// send packets to update the settings on the server // send packets to update the settings on the server
if (SitClient.inGame) SitClient.sendPackets(); if (SitClient.inGame) SitClient.sendPackets();
} catch (Exception e) { } catch (Exception e) {

2
src/main/resources/fabric.mod.json
View file

@ -27,7 +27,7 @@
}, },
"depends": { "depends": {
"fabricloader": ">=0.14.21", "fabricloader": ">=0.14.21",
"minecraft": ">=1.20 <=1.20.1", "minecraft": ">=1.20.2 <=1.20.3",
"java": ">=17", "java": ">=17",
"fabric-api": "*" "fabric-api": "*"
}, },