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

config 1.1, better version system & fixing config soft locking

Browse source
This commit is contained in:
Oth3r 2023-11-21 23:21:00 -06:00
commit 614fddb6bd
2 changed files with 90 additions and 75 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -24,47 +24,31 @@ public class config {
public static boolean fullBlocksOn = defaults.fullBlocksOn; public static boolean fullBlocksOn = defaults.fullBlocksOn;
public static boolean customOn = defaults.customOn; public static boolean customOn = defaults.customOn;
public static List<String> customBlocks = defaults.customBlocks; public static List<String> customBlocks = defaults.customBlocks;
enum HandRequirements { enum HandRequirement {
empty, empty,
restrictive, restrictive,
none none;
public static HandRequirement get(String s) {
try {
return HandRequirement.valueOf(s);
} catch (IllegalArgumentException e) {
return empty;
}
}
} }
public static HandRequirements mainReq = defaults.mainReq; public static HandRequirement mainReq = defaults.mainReq;
public static boolean mainBlock = defaults.mainBlock; public static boolean mainBlock = defaults.mainBlock;
public static boolean mainFood = defaults.mainFood; public static boolean mainFood = defaults.mainFood;
public static boolean mainUsable = defaults.mainUsable; public static boolean mainUsable = defaults.mainUsable;
public static List<String> mainWhitelist = defaults.mainWhitelist; public static List<String> mainWhitelist = defaults.mainWhitelist;
public static List<String> mainBlacklist = defaults.mainBlacklist; public static List<String> mainBlacklist = defaults.mainBlacklist;
public static HandRequirements offReq = defaults.offReq; public static HandRequirement offReq = defaults.offReq;
public static boolean offBlock = defaults.offBlock; public static boolean offBlock = defaults.offBlock;
public static boolean offFood = defaults.offFood; public static boolean offFood = defaults.offFood;
public static boolean offUsable = defaults.offUsable; public static boolean offUsable = defaults.offUsable;
public static List<String> offWhitelist = defaults.offWhitelist; public static List<String> offWhitelist = defaults.offWhitelist;
public static List<String> offBlacklist = defaults.offBlacklist; public static List<String> offBlacklist = defaults.offBlacklist;
public static void resetDefaults() {
lang = defaults.lang;
keepActive = defaults.keepActive;
sitWhileSeated = defaults.sitWhileSeated;
stairsOn = defaults.stairsOn;
slabsOn = defaults.slabsOn;
carpetsOn = defaults.carpetsOn;
fullBlocksOn = defaults.fullBlocksOn;
customOn = defaults.customOn;
customBlocks = defaults.customBlocks;
mainReq = defaults.mainReq;
mainBlock = defaults.mainBlock;
mainFood = defaults.mainFood;
mainUsable = defaults.mainUsable;
mainWhitelist = defaults.mainWhitelist;
mainBlacklist = defaults.mainBlacklist;
offReq = defaults.offReq;
offBlock = defaults.offBlock;
offFood = defaults.offFood;
offUsable = defaults.offUsable;
offWhitelist = defaults.offWhitelist;
offBlacklist = defaults.offBlacklist;
save();
}
public static File configFile() { public static File configFile() {
return new File(FabricLoader.getInstance().getConfigDir().toFile()+"/Sit!.properties"); return new File(FabricLoader.getInstance().getConfigDir().toFile()+"/Sit!.properties");
} }
@ -77,43 +61,70 @@ public class config {
try (FileInputStream fileStream = new FileInputStream(configFile())) { try (FileInputStream fileStream = new FileInputStream(configFile())) {
Properties properties = new Properties(); Properties properties = new Properties();
properties.load(fileStream); properties.load(fileStream);
loadVersion(properties,(String) properties.computeIfAbsent("version", a -> defaults.version)); String ver = (String) properties.computeIfAbsent("version", a -> String.valueOf(defaults.version));
// if the old version system (v1.0) remove "v:
if (ver.contains("v")) ver = ver.substring(1);
loadVersion(properties,Double.parseDouble(ver));
save(); save();
} catch (Exception f) { } catch (Exception f) {
//read fail //read fail
f.printStackTrace(); f.printStackTrace();
resetDefaults(); save();
} }
} }
public static void loadVersion(Properties properties, String version) { public static void loadVersion(Properties properties, double version) {
Type mapType = new TypeToken<ArrayList<String>>() {}.getType(); try {
lang = (String) properties.computeIfAbsent("lang", a -> defaults.lang); Gson gson = new GsonBuilder().disableHtmlEscaping().create();
//CONFIG Type listType = new TypeToken<ArrayList<String>>() {}.getType();
keepActive = Boolean.parseBoolean((String) properties.computeIfAbsent("keep-active", a -> String.valueOf(defaults.keepActive))); lang = (String) properties.computeIfAbsent("lang", a -> defaults.lang);
sitWhileSeated = Boolean.parseBoolean((String) properties.computeIfAbsent("sit-while-seated", a -> String.valueOf(defaults.sitWhileSeated))); //CONFIG
stairsOn = Boolean.parseBoolean((String) properties.computeIfAbsent("stairs", a -> String.valueOf(defaults.stairsOn))); keepActive = Boolean.parseBoolean((String) properties.computeIfAbsent("keep-active", a -> String.valueOf(defaults.keepActive)));
slabsOn = Boolean.parseBoolean((String) properties.computeIfAbsent("slabs", a -> String.valueOf(defaults.slabsOn))); sitWhileSeated = Boolean.parseBoolean((String) properties.computeIfAbsent("sit-while-seated", a -> String.valueOf(defaults.sitWhileSeated)));
carpetsOn = Boolean.parseBoolean((String) properties.computeIfAbsent("carpets", a -> String.valueOf(defaults.carpetsOn))); stairsOn = Boolean.parseBoolean((String) properties.computeIfAbsent("stairs", a -> String.valueOf(defaults.stairsOn)));
fullBlocksOn = Boolean.parseBoolean((String) properties.computeIfAbsent("full-blocks", a -> String.valueOf(defaults.fullBlocksOn))); slabsOn = Boolean.parseBoolean((String) properties.computeIfAbsent("slabs", a -> String.valueOf(defaults.slabsOn)));
customOn = Boolean.parseBoolean((String) properties.computeIfAbsent("custom", a -> String.valueOf(defaults.customOn))); carpetsOn = Boolean.parseBoolean((String) properties.computeIfAbsent("carpets", a -> String.valueOf(defaults.carpetsOn)));
customBlocks = new Gson().fromJson((String) fullBlocksOn = Boolean.parseBoolean((String) properties.computeIfAbsent("full-blocks", a -> String.valueOf(defaults.fullBlocksOn)));
properties.computeIfAbsent("custom-blocks", a -> String.valueOf(defaults.customBlocks)),mapType); customOn = Boolean.parseBoolean((String) properties.computeIfAbsent("custom", a -> String.valueOf(defaults.customOn)));
mainReq = HandRequirements.valueOf((String) properties.computeIfAbsent("main-hand-requirement", a -> String.valueOf(defaults.mainReq))); customBlocks = new Gson().fromJson((String)
mainBlock = Boolean.parseBoolean((String) properties.computeIfAbsent("main-hand-block", a -> String.valueOf(defaults.mainBlock))); properties.computeIfAbsent("custom-blocks", a -> gson.toJson(defaults.customBlocks)), listType);
mainFood = Boolean.parseBoolean((String) properties.computeIfAbsent("main-hand-food", a -> String.valueOf(defaults.mainFood))); mainReq = HandRequirement.valueOf((String) properties.computeIfAbsent("hand.main.requirement", a -> String.valueOf(defaults.mainReq)));
mainUsable = Boolean.parseBoolean((String) properties.computeIfAbsent("main-hand-usable", a -> String.valueOf(defaults.mainUsable))); mainBlock = Boolean.parseBoolean((String) properties.computeIfAbsent("hand.main.block", a -> String.valueOf(defaults.mainBlock)));
mainWhitelist = new Gson().fromJson((String) mainFood = Boolean.parseBoolean((String) properties.computeIfAbsent("hand.main.food", a -> String.valueOf(defaults.mainFood)));
properties.computeIfAbsent("main-hand-whitelist", a -> String.valueOf(defaults.mainWhitelist)),mapType); mainUsable = Boolean.parseBoolean((String) properties.computeIfAbsent("hand.main.usable", a -> String.valueOf(defaults.mainUsable)));
mainBlacklist = new Gson().fromJson((String) mainWhitelist = new Gson().fromJson((String)
properties.computeIfAbsent("main-hand-blacklist", a -> String.valueOf(defaults.mainBlacklist)),mapType); properties.computeIfAbsent("hand.main.whitelist", a -> gson.toJson(defaults.mainWhitelist)), listType);
offReq = HandRequirements.valueOf((String) properties.computeIfAbsent("off-hand-requirement", a -> String.valueOf(defaults.offReq))); mainBlacklist = new Gson().fromJson((String)
offBlock = Boolean.parseBoolean((String) properties.computeIfAbsent("off-hand-block", a -> String.valueOf(defaults.offBlock))); properties.computeIfAbsent("hand.main.blacklist", a -> gson.toJson(defaults.mainBlacklist)), listType);
offFood = Boolean.parseBoolean((String) properties.computeIfAbsent("off-hand-food", a -> String.valueOf(defaults.offFood))); offReq = HandRequirement.valueOf((String) properties.computeIfAbsent("hand.off.requirement", a -> String.valueOf(defaults.offReq)));
offUsable = Boolean.parseBoolean((String) properties.computeIfAbsent("off-hand-usable", a -> String.valueOf(defaults.offUsable))); offBlock = Boolean.parseBoolean((String) properties.computeIfAbsent("hand.off.block", a -> String.valueOf(defaults.offBlock)));
offWhitelist = new Gson().fromJson((String) offFood = Boolean.parseBoolean((String) properties.computeIfAbsent("hand.off.food", a -> String.valueOf(defaults.offFood)));
properties.computeIfAbsent("off-hand-whitelist", a -> String.valueOf(defaults.offWhitelist)),mapType); offUsable = Boolean.parseBoolean((String) properties.computeIfAbsent("hand.off.usable", a -> String.valueOf(defaults.offUsable)));
offBlacklist = new Gson().fromJson((String) offWhitelist = new Gson().fromJson((String)
properties.computeIfAbsent("off-hand-blacklist", a -> String.valueOf(defaults.offBlacklist)),mapType); properties.computeIfAbsent("hand.off.whitelist", a -> gson.toJson(defaults.offWhitelist)), listType);
offBlacklist = new Gson().fromJson((String)
properties.computeIfAbsent("hand.off.blacklist", a -> gson.toJson(defaults.offBlacklist)), listType);
if (version == 1.0) {
mainReq = HandRequirement.valueOf((String) properties.computeIfAbsent("main-hand-requirement", a -> String.valueOf(defaults.mainReq)));
mainBlock = Boolean.parseBoolean((String) properties.computeIfAbsent("main-hand-block", a -> String.valueOf(defaults.mainBlock)));
mainFood = Boolean.parseBoolean((String) properties.computeIfAbsent("main-hand-food", a -> String.valueOf(defaults.mainFood)));
mainUsable = Boolean.parseBoolean((String) properties.computeIfAbsent("main-hand-usable", a -> String.valueOf(defaults.mainUsable)));
mainWhitelist = new Gson().fromJson((String)
properties.computeIfAbsent("main-hand-whitelist", a -> gson.toJson(defaults.mainWhitelist)), listType);
mainBlacklist = new Gson().fromJson((String)
properties.computeIfAbsent("main-hand-blacklist", a -> gson.toJson(defaults.mainBlacklist)), listType);
offReq = HandRequirement.valueOf((String) properties.computeIfAbsent("off-hand-requirement", a -> String.valueOf(defaults.offReq)));
offBlock = Boolean.parseBoolean((String) properties.computeIfAbsent("off-hand-block", a -> String.valueOf(defaults.offBlock)));
offFood = Boolean.parseBoolean((String) properties.computeIfAbsent("off-hand-food", a -> String.valueOf(defaults.offFood)));
offUsable = Boolean.parseBoolean((String) properties.computeIfAbsent("off-hand-usable", a -> String.valueOf(defaults.offUsable)));
offWhitelist = new Gson().fromJson((String)
properties.computeIfAbsent("off-hand-whitelist", a -> gson.toJson(defaults.offWhitelist)), listType);
offBlacklist = new Gson().fromJson((String)
properties.computeIfAbsent("off-hand-blacklist", a -> gson.toJson(defaults.offBlacklist)), listType);
}
} catch (Exception e) {
Sit.LOGGER.info("ERROR LOADING CONFIG - PLEASE REPORT WITH THE ERROR LOG");
e.printStackTrace();
}
} }
public static MutableText lang(String key, Object... args) { public static MutableText lang(String key, Object... args) {
LangReader.loadLanguageFile(); LangReader.loadLanguageFile();
@ -149,28 +160,31 @@ public class config {
.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")).getString()).getBytes()); .append("\n# ").append(lang("general.sittable_blocks.description_8")).getString()).getBytes());
file.write(("\ncustom-blocks="+gson.toJson(customBlocks)).getBytes()); file.write(("\ncustom-blocks="+gson.toJson(customBlocks)).getBytes());
file.write(("\n\n# "+lang("hand.requirements.description") file.write(("\n\n# "+lang("hand")).getBytes());
file.write(("\n# "+lang("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")).getString()).getBytes()); .append("\n# ").append(lang("hand.requirements.description_4")).getString()).getBytes());
file.write(("\nmain-hand-requirement=" + mainReq).getBytes()); file.write(("\nhand.main.requirement=" + mainReq).getBytes());
file.write(("\nmain-hand-block=" + mainBlock).getBytes()); file.write(("\nhand.main.block=" + mainBlock).getBytes());
file.write(("\nmain-hand-food=" + mainFood).getBytes()); file.write(("\nhand.main.food=" + mainFood).getBytes());
file.write(("\nmain-hand-usable=" + mainUsable).getBytes()); file.write(("\nhand.main.usable=" + mainUsable).getBytes());
file.write(("\nmain-hand-whitelist="+gson.toJson(mainWhitelist)).getBytes()); file.write(("\nhand.main.whitelist="+gson.toJson(mainWhitelist)).getBytes());
file.write(("\nmain-hand-blacklist="+gson.toJson(mainBlacklist)).getBytes()); file.write(("\nhand.main.blacklist="+gson.toJson(mainBlacklist)).getBytes());
file.write(("\noff-hand-requirement=" + offReq).getBytes()); file.write(("\nhand.off.requirement=" + offReq).getBytes());
file.write(("\noff-hand-block=" + offBlock).getBytes()); file.write(("\nhand.off.block=" + offBlock).getBytes());
file.write(("\noff-hand-food=" + offFood).getBytes()); file.write(("\nhand.off.food=" + offFood).getBytes());
file.write(("\noff-hand-usable=" + offUsable).getBytes()); file.write(("\nhand.off.usable=" + offUsable).getBytes());
file.write(("\noff-hand-whitelist="+gson.toJson(offWhitelist)).getBytes()); file.write(("\nhand.off.whitelist="+gson.toJson(offWhitelist)).getBytes());
file.write(("\noff-hand-blacklist="+gson.toJson(offBlacklist)).getBytes()); file.write(("\nhand.off.blacklist="+gson.toJson(offBlacklist)).getBytes());
// send packets to update the settings on the server
if (SitClient.inGame) SitClient.sendPackets();
} catch (Exception e) { } catch (Exception e) {
e.printStackTrace(); e.printStackTrace();
} }
} }
public static class defaults { public static class defaults {
public static String version = "v1.0"; public static double version = 1.1;
public static String lang = "en_us"; public static String lang = "en_us";
public static boolean keepActive = true; public static boolean keepActive = true;
public static boolean sitWhileSeated = true; public static boolean sitWhileSeated = true;
@ -180,13 +194,13 @@ public class config {
public static boolean fullBlocksOn = false; public static boolean fullBlocksOn = false;
public static boolean customOn = false; public static boolean customOn = false;
public static List<String> customBlocks = List.of("minecraft:campfire|.46|1|lit=false","minecraft:soul_campfire|.46|1|lit=false"); public static List<String> customBlocks = List.of("minecraft:campfire|.46|1|lit=false","minecraft:soul_campfire|.46|1|lit=false");
public static HandRequirements mainReq = HandRequirements.empty; public static HandRequirement mainReq = HandRequirement.empty;
public static boolean mainBlock = false; public static boolean mainBlock = false;
public static boolean mainFood = false; public static boolean mainFood = false;
public static boolean mainUsable = false; public static boolean mainUsable = false;
public static List<String> mainWhitelist = new ArrayList<>(); public static List<String> mainWhitelist = new ArrayList<>();
public static List<String> mainBlacklist = new ArrayList<>(); public static List<String> mainBlacklist = new ArrayList<>();
public static HandRequirements offReq = HandRequirements.restrictive; public static HandRequirement offReq = HandRequirement.restrictive;
public static boolean offBlock = true; public static boolean offBlock = true;
public static boolean offFood = false; public static boolean offFood = false;
public static boolean offUsable = true; public static boolean offUsable = true;

1
src/main/resources/assets/sit/lang/en_us.json
View file

@ -33,6 +33,7 @@
"config.sit.general.sittable_blocks.description_6": "Third entry: hitbox size (where the player spawns above the entity when dismounting)", "config.sit.general.sittable_blocks.description_6": "Third entry: hitbox size (where the player spawns above the entity when dismounting)",
"config.sit.general.sittable_blocks.description_7": "Fourth entry (optional): required blockstate to sit (Put a \"!\" to exclude blockstates)", "config.sit.general.sittable_blocks.description_7": "Fourth entry (optional): required blockstate to sit (Put a \"!\" to exclude blockstates)",
"config.sit.general.sittable_blocks.description_8": "Separate different entries with \"|\"!", "config.sit.general.sittable_blocks.description_8": "Separate different entries with \"|\"!",
"config.sit.hand": "Hand Settings",
"config.sit.hand.requirements": "Requirements", "config.sit.hand.requirements": "Requirements",
"config.sit.hand.requirements.description": "Hand requirements for sitting.", "config.sit.hand.requirements.description": "Hand requirements for sitting.",
"config.sit.hand.requirements.description_2": "Empty = hand has to be empty", "config.sit.hand.requirements.description_2": "Empty = hand has to be empty",