From 4f5acb76dbeb05019e75d42942bf2b28bb93c9c3 Mon Sep 17 00:00:00 2001 From: Oth3r <68134921+oth3r@users.noreply.github.com> Date: Sat, 16 Aug 2025 20:13:32 -0500 Subject: [PATCH] optimizations and comments --- src/main/java/one/oth3r/sit/file/FileData.java | 14 +++++++------- src/main/java/one/oth3r/sit/file/ServerConfig.java | 3 +++ 2 files changed, 10 insertions(+), 7 deletions(-) diff --git a/src/main/java/one/oth3r/sit/file/FileData.java b/src/main/java/one/oth3r/sit/file/FileData.java index f3cb229..71b978c 100644 --- a/src/main/java/one/oth3r/sit/file/FileData.java +++ b/src/main/java/one/oth3r/sit/file/FileData.java @@ -96,19 +96,19 @@ public class FileData { public static final ArrayList SITTING_BLOCKS = new ArrayList<>(Arrays.asList( new SittingBlock(new ArrayList<>(),new ArrayList<>(Arrays.asList("#minecraft:campfires")), new ArrayList<>(Arrays.asList("lit=false")),.437), new SittingBlock(new ArrayList<>(Arrays.asList("!minecraft:crimson_stem","!minecraft:warped_stem","minecraft:polished_basalt")), new ArrayList<>(Arrays.asList("#minecraft:logs","!#minecraft:oak_logs")), new ArrayList<>(Arrays.asList("!axis=y")),1.0), - new SittingBlock(new ArrayList<>(Arrays.asList()), new ArrayList<>(Arrays.asList("#minecraft:beds")), new ArrayList<>(Arrays.asList("part=foot","occupied=false")),.5625) + new SittingBlock(new ArrayList<>(), new ArrayList<>(Arrays.asList("#minecraft:beds")), new ArrayList<>(Arrays.asList("part=foot","occupied=false")),.5625) )); - public static final ArrayList BLACKLISTED_BLOCKS = new ArrayList<>(Arrays.asList( - new CustomBlock(new ArrayList<>(),new ArrayList<>(Arrays.asList("#minecraft:shulker_boxes")),new ArrayList<>()) + public static final ArrayList BLACKLISTED_BLOCKS = new ArrayList<>(List.of( + new CustomBlock(new ArrayList<>(), new ArrayList<>(List.of("#minecraft:shulker_boxes")), new ArrayList<>()) )); - public static final ArrayList INTERACTION_BLOCKS = new ArrayList<>(Arrays.asList( + public static final ArrayList INTERACTION_BLOCKS = new ArrayList<>(List.of( new CustomBlock(new ArrayList<>(Arrays.asList( - "minecraft:crafter","minecraft:repeating_command_block","minecraft:chain_command_block","minecraft:command_block")), + "minecraft:crafter", "minecraft:repeating_command_block", "minecraft:chain_command_block", "minecraft:command_block")), new ArrayList<>(Arrays.asList( - "#minecraft:shulker_boxes","#c:player_workstations/furnaces","#c:player_workstations/crafting_tables", - "#c:villager_job_sites","#minecraft:trapdoors","#c:chests")), + "#minecraft:shulker_boxes", "#c:player_workstations/furnaces", "#c:player_workstations/crafting_tables", + "#c:villager_job_sites", "#minecraft:trapdoors", "#c:chests")), new ArrayList<>()) )); diff --git a/src/main/java/one/oth3r/sit/file/ServerConfig.java b/src/main/java/one/oth3r/sit/file/ServerConfig.java index ce416b7..bfc8660 100644 --- a/src/main/java/one/oth3r/sit/file/ServerConfig.java +++ b/src/main/java/one/oth3r/sit/file/ServerConfig.java @@ -314,6 +314,9 @@ public class ServerConfig implements CustomFile { return Objects.hash(version, lang, langOptions, keepActive, sitWhileSeated, presetBlocks, yDifferenceLimit, customEnabled, sittingBlocks, blacklistedBlocks, interactionBlocks, allowedAboveSeat); } + /** + * legacy updater + */ protected static class Legacy { /** * gets the legacy file, from the old directory for fabric, and the same one for spigot