From ea12d8eba1c95ecb1f31ac542f609f6511c914eb Mon Sep 17 00:00:00 2001 From: Oth3r Date: Wed, 7 Aug 2024 12:45:53 -0500 Subject: [PATCH] some file defaults --- .../java/one/oth3r/sit/file/FileData.java | 21 +++++++++++++++++++ .../java/one/oth3r/sit/file/ServerConfig.java | 2 +- .../one/oth3r/sit/file/SittingConfig.java | 5 ++--- 3 files changed, 24 insertions(+), 4 deletions(-) diff --git a/src/main/java/one/oth3r/sit/file/FileData.java b/src/main/java/one/oth3r/sit/file/FileData.java index 1e639d5..1eb86a5 100644 --- a/src/main/java/one/oth3r/sit/file/FileData.java +++ b/src/main/java/one/oth3r/sit/file/FileData.java @@ -2,7 +2,11 @@ package one.oth3r.sit.file; import net.minecraft.entity.decoration.DisplayEntity; import net.minecraft.server.network.ServerPlayerEntity; +import one.oth3r.sit.utl.Data; +import one.oth3r.sit.utl.Utl; +import java.util.ArrayList; +import java.util.Arrays; import java.util.HashMap; public class FileData { @@ -103,4 +107,21 @@ public class FileData { Utl.sendSettingsPackets(); } } + + public static class Defaults { + public static final ArrayList CUSTOM_BLOCKS = new ArrayList<>(Arrays.asList( + new CustomBlock(new ArrayList<>(),new ArrayList<>(Arrays.asList("#minecraft:campfires")), new ArrayList<>(Arrays.asList("lit=false")),.43), + new CustomBlock(new ArrayList<>(Arrays.asList("!minecraft:oak_log", "minecraft:crimson_stem")), new ArrayList<>(Arrays.asList("#minecraft:logs")), new ArrayList<>(Arrays.asList("!axis=y")),1.0), + new CustomBlock(new ArrayList<>(Arrays.asList()), new ArrayList<>(Arrays.asList("#minecraft:beds")), new ArrayList<>(Arrays.asList("part=foot","occupied=false")),.5) + )); + + public static final HandSetting MAIN_HAND = new HandSetting(HandSetting.SittingRequirement.EMPTY, new HandSetting.Filter( + false,false,false,new ArrayList<>(), new ArrayList<>(Arrays.asList("#minecraft:bookshelf_books","!#minecraft:lectern_books")))); + + public static final HandSetting OFF_HAND = new HandSetting(HandSetting.SittingRequirement.FILTER, new HandSetting.Filter( + false,true,true, new ArrayList<>(Arrays.asList("minecraft:filled_map", + "minecraft:torch", "minecraft:soul_torch","minecraft:redstone_torch", + "minecraft:lantern", "minecraft:soul_lantern")), + 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 a33f82b..f398619 100644 --- a/src/main/java/one/oth3r/sit/file/ServerConfig.java +++ b/src/main/java/one/oth3r/sit/file/ServerConfig.java @@ -27,7 +27,7 @@ public class ServerConfig { @SerializedName("custom-enabled") private Boolean customEnabled = false; @SerializedName("custom-blocks") - private ArrayList customBlocks = new ArrayList<>(); + private ArrayList customBlocks = FileData.Defaults.CUSTOM_BLOCKS; @SerializedName("blacklisted-blocks") private ArrayList blacklistedBlocks = new ArrayList<>(); diff --git a/src/main/java/one/oth3r/sit/file/SittingConfig.java b/src/main/java/one/oth3r/sit/file/SittingConfig.java index fd9fd8a..e268174 100644 --- a/src/main/java/one/oth3r/sit/file/SittingConfig.java +++ b/src/main/java/one/oth3r/sit/file/SittingConfig.java @@ -21,10 +21,9 @@ public class SittingConfig { @SerializedName("hand-sitting") private Boolean handSitting = true; @SerializedName("main-hand") - private HandSetting mainHand = new HandSetting(HandSetting.SittingRequirement.EMPTY, new HandSetting.Filter()); + private HandSetting mainHand = FileData.Defaults.MAIN_HAND; @SerializedName("off-hand") - private HandSetting offHand = new HandSetting(HandSetting.SittingRequirement.FILTER, - new HandSetting.Filter(false,true,false,new ArrayList<>(),new ArrayList<>())); // todo fill out some fox examples sake + private HandSetting offHand = FileData.Defaults.OFF_HAND; public SittingConfig() {}