virt-mirrors/Sit
1
0
Fork 1
mirror of https://github.com/Oth3r/Sit.git synced 2025-09-20 00:13:21 +02:00
Code Issues Projects Releases Packages Wiki Activity

server config interaction block list + version bump

Browse source
This commit is contained in:
Oth3r 2024-12-02 12:52:53 -06:00
commit 40eb03c967
2 changed files with 28 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

6
src/main/java/one/oth3r/sit/file/FileData.java
View file

@ -88,6 +88,12 @@ public class FileData {
new CustomBlock(new ArrayList<>(),new ArrayList<>(Arrays.asList("#minecraft:shulker_boxes")),new ArrayList<>())
));
public static final ArrayList<CustomBlock> INTERACTION_BLOCKS = new ArrayList<>(Arrays.asList(
new CustomBlock(new ArrayList<>(Arrays.asList("minecraft:crafter")),new ArrayList<>(Arrays.asList(
"#minecraft:shulker_boxes","#c:player_workstations/furnaces","#c:player_workstations/crafting_tables",
"#c:villager_job_sites","#minecraft:trapdoors","#c:chests")),new ArrayList<>())
));
public static final HandSetting MAIN_HAND = new HandSetting(HandSetting.SittingRequirement.EMPTY, new HandSetting.Filter(
false,new HandSetting.Filter.Presets(),
new CustomItem(

27
src/main/java/one/oth3r/sit/file/ServerConfig.java
View file

@ -20,7 +20,7 @@ import java.util.Properties;
public class ServerConfig implements CustomFile<ServerConfig> {
@SerializedName("version")
private Double version = 2.0;
private Double version = 2.1;
@SerializedName("lang")
private String lang = "en_us";
@SerializedName("lang-options")
@ -37,6 +37,8 @@ public class ServerConfig implements CustomFile<ServerConfig> {
private ArrayList<SittingBlock> sittingBlocks = FileData.Defaults.SITTING_BLOCKS;
@SerializedName("blacklisted-blocks")
private ArrayList<CustomBlock> blacklistedBlocks = FileData.Defaults.BLACKLISTED_BLOCKS;
@SerializedName("interaction-blocks")
private ArrayList<CustomBlock> interactionBlocks = FileData.Defaults.INTERACTION_BLOCKS;
public ServerConfig() {}
@ -49,11 +51,13 @@ public class ServerConfig implements CustomFile<ServerConfig> {
this.customEnabled = serverConfig.customEnabled;
this.sittingBlocks = serverConfig.sittingBlocks;
this.blacklistedBlocks = serverConfig.blacklistedBlocks;
this.interactionBlocks = serverConfig.interactionBlocks;
}
public ServerConfig(Double version, String lang, boolean keepActive, boolean sitWhileSeated,
PresetBlocks presetBlocks, boolean customEnabled,
ArrayList<SittingBlock> sittingBlocks, ArrayList<CustomBlock> blacklistedBlocks) {
ArrayList<SittingBlock> sittingBlocks, ArrayList<CustomBlock> blacklistedBlocks,
ArrayList<CustomBlock> interactionBlocks) {
this.version = version;
this.lang = lang;
this.keepActive = keepActive;
@ -62,6 +66,7 @@ public class ServerConfig implements CustomFile<ServerConfig> {
this.customEnabled = customEnabled;
this.sittingBlocks = sittingBlocks;
this.blacklistedBlocks = blacklistedBlocks;
this.interactionBlocks = interactionBlocks;
}
public Double getVersion() {
@ -96,6 +101,10 @@ public class ServerConfig implements CustomFile<ServerConfig> {
return blacklistedBlocks;
}
public ArrayList<CustomBlock> getInteractionBlocks() {
return interactionBlocks;
}
public static class PresetBlocks {
@SerializedName("stairs")
@ -135,7 +144,7 @@ public class ServerConfig implements CustomFile<ServerConfig> {
@Override
public void reset() {
updateToNewFile(new ServerConfig());
loadFileData(new ServerConfig());
}
@Override
@ -144,7 +153,7 @@ public class ServerConfig implements CustomFile<ServerConfig> {
}
@Override
public void updateToNewFile(ServerConfig newFile) {
public void loadFileData(ServerConfig newFile) {
this.version = newFile.version;
this.lang = newFile.lang;
this.keepActive = newFile.keepActive;
@ -155,6 +164,14 @@ public class ServerConfig implements CustomFile<ServerConfig> {
this.blacklistedBlocks = newFile.blacklistedBlocks;
}
@Override
public void update() {
/// update to 2.1, just a new list, nothing to change
if (version == 2.0) {
version = 2.1;
}
}
@Override
public String getFileName() {
return "server-config.json";
@ -283,7 +300,7 @@ public class ServerConfig implements CustomFile<ServerConfig> {
Boolean.parseBoolean((String) properties.computeIfAbsent("custom", a -> String.valueOf(defaultConfig.isCustomEnabled()))),
getCustomBlocks(new Gson().fromJson((String)
properties.computeIfAbsent("custom-blocks", a -> "[]"), listType)),
new ArrayList<>()
new ArrayList<>(), FileData.Defaults.INTERACTION_BLOCKS
);
SittingConfig defaultSittingConfig = new SittingConfig();