From ccab3bb0e2154c6cd1c158a23bb12a1d1c2a6a29 Mon Sep 17 00:00:00 2001 From: Oth3r Date: Wed, 2 Aug 2023 23:05:02 -0500 Subject: [PATCH] code optimization --- src/main/java/one/oth3r/sit/Events.java | 10 ++-- src/main/java/one/oth3r/sit/ModMenu.java | 8 +-- src/main/java/one/oth3r/sit/SitCommand.java | 3 -- src/main/java/one/oth3r/sit/config.java | 59 ++++++++++----------- 4 files changed, 36 insertions(+), 44 deletions(-) diff --git a/src/main/java/one/oth3r/sit/Events.java b/src/main/java/one/oth3r/sit/Events.java index 512cd2a..78ed95a 100644 --- a/src/main/java/one/oth3r/sit/Events.java +++ b/src/main/java/one/oth3r/sit/Events.java @@ -39,8 +39,8 @@ public class Events { Item mainItem = player.getMainHandStack().getItem(); Item offItem = player.getOffHandStack().getItem(); if (player.isSneaking()) return false; - if (config.mainReq.equals(config.MainReq.empty) && !player.getMainHandStack().isEmpty()) return false; - if (config.mainReq.equals(config.MainReq.restrictive)) { + if (config.mainReq.equals(config.HandRequirements.empty) && !player.getMainHandStack().isEmpty()) return false; + if (config.mainReq.equals(config.HandRequirements.restrictive)) { if (checkList(config.mainBlacklist,mainItem)) return false; if (!checkList(config.mainWhitelist,mainItem)) { if (config.mainBlock && (mainItem instanceof BlockItem)) return false; @@ -48,8 +48,8 @@ public class Events { if (config.mainUsable && !notUsable.contains(player.getMainHandStack().getUseAction())) return false; } } - if (config.offReq.equals(config.OffReq.empty) && !player.getOffHandStack().isEmpty()) return false; - if (config.offReq.equals(config.OffReq.restrictive)) { + if (config.offReq.equals(config.HandRequirements.empty) && !player.getOffHandStack().isEmpty()) return false; + if (config.offReq.equals(config.HandRequirements.restrictive)) { if (checkList(config.offBlacklist,offItem)) return false; if (!checkList(config.offWhitelist,offItem)) { if (config.offBlock && (offItem instanceof BlockItem)) return false; @@ -73,7 +73,7 @@ public class Events { data.put("height",split[1]); data.put("hitbox",split[2]); if (split.length==4) data.put("state",split[3]); - map.put(i+"",data); + map.put(String.valueOf(i),data); i++; } return map; diff --git a/src/main/java/one/oth3r/sit/ModMenu.java b/src/main/java/one/oth3r/sit/ModMenu.java index 9623bcf..1ee4e27 100644 --- a/src/main/java/one/oth3r/sit/ModMenu.java +++ b/src/main/java/one/oth3r/sit/ModMenu.java @@ -90,14 +90,14 @@ public class ModMenu implements ModMenuApi { .category(ConfigCategory.createBuilder() .name(lang("category.main_hand")) .tooltip(lang("category.main_hand.tooltip")) - .option(Option.createBuilder() + .option(Option.createBuilder() .name(lang("hand.requirements")) .description(OptionDescription.of(lang("hand.requirements.description") .append("\n\n").append(lang("hand.requirements.description_2").styled(style -> style.withColor(TextColor.fromFormatting(Formatting.AQUA)))) .append("\n").append(lang("hand.requirements.description_3").styled(style -> style.withColor(TextColor.fromFormatting(Formatting.GREEN)))) .append("\n").append(lang("hand.requirements.description_4").styled(style -> style.withColor(TextColor.fromFormatting(Formatting.RED)))))) .binding(config.defaults.mainReq, () -> config.mainReq, n -> config.mainReq = n) - .controller(opt -> EnumControllerBuilder.create(opt).enumClass(config.MainReq.class) + .controller(opt -> EnumControllerBuilder.create(opt).enumClass(config.HandRequirements.class) .valueFormatter(v -> Text.translatable("config.sit."+v.name().toLowerCase()))) .build()) .group(OptionGroup.createBuilder() @@ -142,14 +142,14 @@ public class ModMenu implements ModMenuApi { .category(ConfigCategory.createBuilder() .name(lang("category.off_hand")) .tooltip(lang("category.off_hand.tooltip")) - .option(Option.createBuilder() + .option(Option.createBuilder() .name(lang("hand.requirements")) .description(OptionDescription.of(lang("hand.requirements.description") .append("\n\n").append(lang("hand.requirements.description_2").styled(style -> style.withColor(TextColor.fromFormatting(Formatting.AQUA)))) .append("\n").append(lang("hand.requirements.description_3").styled(style -> style.withColor(TextColor.fromFormatting(Formatting.GREEN)))) .append("\n").append(lang("hand.requirements.description_4").styled(style -> style.withColor(TextColor.fromFormatting(Formatting.RED)))))) .binding(config.defaults.offReq, () -> config.offReq, n -> config.offReq = n) - .controller(opt -> EnumControllerBuilder.create(opt).enumClass(config.OffReq.class) + .controller(opt -> EnumControllerBuilder.create(opt).enumClass(config.HandRequirements.class) .valueFormatter(v -> Text.translatable("config.sit."+v.name().toLowerCase()))) .build()) .group(OptionGroup.createBuilder() diff --git a/src/main/java/one/oth3r/sit/SitCommand.java b/src/main/java/one/oth3r/sit/SitCommand.java index ed05388..8d59a80 100644 --- a/src/main/java/one/oth3r/sit/SitCommand.java +++ b/src/main/java/one/oth3r/sit/SitCommand.java @@ -17,7 +17,6 @@ import net.minecraft.util.Formatting; import net.minecraft.util.math.BlockPos; import net.minecraft.world.World; -import java.util.Objects; import java.util.concurrent.CompletableFuture; public class SitCommand { @@ -31,8 +30,6 @@ public class SitCommand { .executes((context2) -> command(context2.getSource(), context2.getInput())))); } public static CompletableFuture getSuggestions(CommandContext context, SuggestionsBuilder builder) { - ServerPlayerEntity player = Objects.requireNonNull(context.getSource().getPlayer()); - String[] args = context.getInput().split(" "); builder.suggest("reload"); builder.suggest("purgeChairEntities"); return builder.buildFuture(); diff --git a/src/main/java/one/oth3r/sit/config.java b/src/main/java/one/oth3r/sit/config.java index d772133..409349b 100644 --- a/src/main/java/one/oth3r/sit/config.java +++ b/src/main/java/one/oth3r/sit/config.java @@ -24,23 +24,18 @@ public class config { public static boolean fullBlocksOn = defaults.fullBlocksOn; public static boolean customOn = defaults.customOn; public static List customBlocks = defaults.customBlocks; - enum MainReq { + enum HandRequirements { empty, restrictive, none } - public static MainReq mainReq = defaults.mainReq; + public static HandRequirements mainReq = defaults.mainReq; public static boolean mainBlock = defaults.mainBlock; public static boolean mainFood = defaults.mainFood; public static boolean mainUsable = defaults.mainUsable; public static List mainWhitelist = defaults.mainWhitelist; public static List mainBlacklist = defaults.mainBlacklist; - enum OffReq { - empty, - restrictive, - none - } - public static OffReq offReq = defaults.offReq; + public static HandRequirements offReq = defaults.offReq; public static boolean offBlock = defaults.offBlock; public static boolean offFood = defaults.offFood; public static boolean offUsable = defaults.offUsable; @@ -82,7 +77,7 @@ public class config { try (FileInputStream fileStream = new FileInputStream(configFile())) { Properties properties = new Properties(); properties.load(fileStream); - loadVersion(properties,(String) properties.computeIfAbsent("version", a -> defaults.version+"")); + loadVersion(properties,(String) properties.computeIfAbsent("version", a -> defaults.version)); save(); } catch (Exception f) { //read fail @@ -92,33 +87,33 @@ public class config { } public static void loadVersion(Properties properties, String version) { Type mapType = new TypeToken>() {}.getType(); - lang = (String) properties.computeIfAbsent("lang", a -> defaults.lang+""); + lang = (String) properties.computeIfAbsent("lang", a -> defaults.lang); //CONFIG - keepActive = Boolean.parseBoolean((String) properties.computeIfAbsent("keep-active", a -> defaults.keepActive+"")); - sitWhileSeated = Boolean.parseBoolean((String) properties.computeIfAbsent("sit-while-seated", a -> defaults.sitWhileSeated+"")); - stairsOn = Boolean.parseBoolean((String) properties.computeIfAbsent("stairs", a -> defaults.stairsOn+"")); - slabsOn = Boolean.parseBoolean((String) properties.computeIfAbsent("slabs", a -> defaults.slabsOn+"")); - carpetsOn = Boolean.parseBoolean((String) properties.computeIfAbsent("carpets", a -> defaults.carpetsOn+"")); - fullBlocksOn = Boolean.parseBoolean((String) properties.computeIfAbsent("full-blocks", a -> defaults.fullBlocksOn+"")); - customOn = Boolean.parseBoolean((String) properties.computeIfAbsent("custom", a -> defaults.customOn+"")); + keepActive = Boolean.parseBoolean((String) properties.computeIfAbsent("keep-active", a -> String.valueOf(defaults.keepActive))); + sitWhileSeated = Boolean.parseBoolean((String) properties.computeIfAbsent("sit-while-seated", a -> String.valueOf(defaults.sitWhileSeated))); + stairsOn = Boolean.parseBoolean((String) properties.computeIfAbsent("stairs", a -> String.valueOf(defaults.stairsOn))); + slabsOn = Boolean.parseBoolean((String) properties.computeIfAbsent("slabs", a -> String.valueOf(defaults.slabsOn))); + carpetsOn = Boolean.parseBoolean((String) properties.computeIfAbsent("carpets", a -> String.valueOf(defaults.carpetsOn))); + fullBlocksOn = Boolean.parseBoolean((String) properties.computeIfAbsent("full-blocks", a -> String.valueOf(defaults.fullBlocksOn))); + customOn = Boolean.parseBoolean((String) properties.computeIfAbsent("custom", a -> String.valueOf(defaults.customOn))); customBlocks = new Gson().fromJson((String) - properties.computeIfAbsent("custom-blocks", a -> defaults.customBlocks+""),mapType); - mainReq = MainReq.valueOf((String) properties.computeIfAbsent("main-hand-requirement", a -> defaults.mainReq+"")); - mainBlock = Boolean.parseBoolean((String) properties.computeIfAbsent("main-hand-block", a -> defaults.mainBlock+"")); - mainFood = Boolean.parseBoolean((String) properties.computeIfAbsent("main-hand-food", a -> defaults.mainFood+"")); - mainUsable = Boolean.parseBoolean((String) properties.computeIfAbsent("main-hand-usable", a -> defaults.mainUsable +"")); + properties.computeIfAbsent("custom-blocks", a -> String.valueOf(defaults.customBlocks)),mapType); + mainReq = HandRequirements.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 -> defaults.mainWhitelist+""),mapType); + properties.computeIfAbsent("main-hand-whitelist", a -> String.valueOf(defaults.mainWhitelist)),mapType); mainBlacklist = new Gson().fromJson((String) - properties.computeIfAbsent("main-hand-blacklist", a -> defaults.mainBlacklist+""),mapType); - offReq = OffReq.valueOf((String) properties.computeIfAbsent("off-hand-requirement", a -> defaults.offReq+"")); - offBlock = Boolean.parseBoolean((String) properties.computeIfAbsent("off-hand-block", a -> defaults.offBlock+"")); - offFood = Boolean.parseBoolean((String) properties.computeIfAbsent("off-hand-food", a -> defaults.offFood+"")); - offUsable = Boolean.parseBoolean((String) properties.computeIfAbsent("off-hand-usable", a -> defaults.offUsable +"")); + properties.computeIfAbsent("main-hand-blacklist", a -> String.valueOf(defaults.mainBlacklist)),mapType); + offReq = HandRequirements.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 -> defaults.offWhitelist+""),mapType); + properties.computeIfAbsent("off-hand-whitelist", a -> String.valueOf(defaults.offWhitelist)),mapType); offBlacklist = new Gson().fromJson((String) - properties.computeIfAbsent("off-hand-blacklist", a -> defaults.offBlacklist+""),mapType); + properties.computeIfAbsent("off-hand-blacklist", a -> String.valueOf(defaults.offBlacklist)),mapType); } public static MutableText lang(String key, Object... args) { LangReader.loadLanguageFile(); @@ -185,13 +180,13 @@ public class config { public static boolean fullBlocksOn = false; public static boolean customOn = false; public static List customBlocks = List.of("minecraft:campfire|.46|1|lit=false","minecraft:soul_campfire|.46|1|lit=false"); - public static MainReq mainReq = MainReq.empty; + public static HandRequirements mainReq = HandRequirements.empty; public static boolean mainBlock = false; public static boolean mainFood = false; public static boolean mainUsable = false; public static List mainWhitelist = new ArrayList<>(); public static List mainBlacklist = new ArrayList<>(); - public static OffReq offReq = OffReq.restrictive; + public static HandRequirements offReq = HandRequirements.restrictive; public static boolean offBlock = true; public static boolean offFood = false; public static boolean offUsable = true;