some file defaults

This commit is contained in:
Oth3r 2024-08-07 12:45:53 -05:00
commit ea12d8eba1
3 changed files with 24 additions and 4 deletions

View file

@ -2,7 +2,11 @@ package one.oth3r.sit.file;
import net.minecraft.entity.decoration.DisplayEntity; import net.minecraft.entity.decoration.DisplayEntity;
import net.minecraft.server.network.ServerPlayerEntity; 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; import java.util.HashMap;
public class FileData { public class FileData {
@ -103,4 +107,21 @@ public class FileData {
Utl.sendSettingsPackets(); Utl.sendSettingsPackets();
} }
} }
public static class Defaults {
public static final ArrayList<CustomBlock> 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<>()));
}
} }

View file

@ -27,7 +27,7 @@ public class ServerConfig {
@SerializedName("custom-enabled") @SerializedName("custom-enabled")
private Boolean customEnabled = false; private Boolean customEnabled = false;
@SerializedName("custom-blocks") @SerializedName("custom-blocks")
private ArrayList<CustomBlock> customBlocks = new ArrayList<>(); private ArrayList<CustomBlock> customBlocks = FileData.Defaults.CUSTOM_BLOCKS;
@SerializedName("blacklisted-blocks") @SerializedName("blacklisted-blocks")
private ArrayList<String> blacklistedBlocks = new ArrayList<>(); private ArrayList<String> blacklistedBlocks = new ArrayList<>();

View file

@ -21,10 +21,9 @@ public class SittingConfig {
@SerializedName("hand-sitting") @SerializedName("hand-sitting")
private Boolean handSitting = true; private Boolean handSitting = true;
@SerializedName("main-hand") @SerializedName("main-hand")
private HandSetting mainHand = new HandSetting(HandSetting.SittingRequirement.EMPTY, new HandSetting.Filter()); private HandSetting mainHand = FileData.Defaults.MAIN_HAND;
@SerializedName("off-hand") @SerializedName("off-hand")
private HandSetting offHand = new HandSetting(HandSetting.SittingRequirement.FILTER, private HandSetting offHand = FileData.Defaults.OFF_HAND;
new HandSetting.Filter(false,true,false,new ArrayList<>(),new ArrayList<>())); // todo fill out some fox examples sake
public SittingConfig() {} public SittingConfig() {}