diff --git a/LICENSE b/LICENSE index 3aa3ff3..c3b5056 100644 --- a/LICENSE +++ b/LICENSE @@ -1,6 +1,6 @@ MIT License -Copyright (c) 2021-2022 Ennui Langeweile +Copyright (c) 2021-2023 Ennui Langeweile Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal diff --git a/src/main/java/io/github/ennuil/boring_default_game_rules/config/JsonSerializer.java b/src/main/java/io/github/ennuil/boring_default_game_rules/config/JsonSerializer.java index a0469e1..fe82e3f 100644 --- a/src/main/java/io/github/ennuil/boring_default_game_rules/config/JsonSerializer.java +++ b/src/main/java/io/github/ennuil/boring_default_game_rules/config/JsonSerializer.java @@ -54,37 +54,37 @@ public String getFileExtension() { } private void serialize(JsonWriter writer, Object value) throws IOException { - if (value instanceof Integer) { - writer.value((Integer) value); - } else if (value instanceof Long) { - writer.value((Long) value); - } else if (value instanceof Float) { - writer.value((Float) value); - } else if (value instanceof Double) { - writer.value((Double) value); - } else if (value instanceof Boolean) { - writer.value((Boolean) value); - } else if (value instanceof String) { - writer.value((String) value); - } else if (value instanceof ValueList) { + if (value instanceof Integer intValue) { + writer.value(intValue); + } else if (value instanceof Long longValue) { + writer.value(longValue); + } else if (value instanceof Float floatValue) { + writer.value(floatValue); + } else if (value instanceof Double doubleValue) { + writer.value(doubleValue); + } else if (value instanceof Boolean booleanValue) { + writer.value(booleanValue); + } else if (value instanceof String stringValue) { + writer.value(stringValue); + } else if (value instanceof ValueList valueList) { writer.beginArray(); - for (Object v : (ValueList) value) { + for (var v : valueList) { serialize(writer, v); } writer.endArray(); - } else if (value instanceof ValueMap) { + } else if (value instanceof ValueMap valueMap) { writer.beginObject(); - for (Map.Entry entry : (ValueMap) value) { + for (var entry : valueMap) { writer.name(entry.getKey()); serialize(writer, entry.getValue()); } writer.endObject(); - } else if (value instanceof ConfigSerializableObject) { - serialize(writer, ((ConfigSerializableObject) value).getRepresentation()); + } else if (value instanceof ConfigSerializableObject serializableObject) { + serialize(writer, serializableObject.getRepresentation()); } else if (value == null) { writer.nullValue(); } else if (value.getClass().isEnum()) { diff --git a/src/main/java/io/github/ennuil/boring_default_game_rules/config/ModConfig.java b/src/main/java/io/github/ennuil/boring_default_game_rules/config/ModConfig.java index 03bb5b6..6c6f585 100644 --- a/src/main/java/io/github/ennuil/boring_default_game_rules/config/ModConfig.java +++ b/src/main/java/io/github/ennuil/boring_default_game_rules/config/ModConfig.java @@ -12,7 +12,7 @@ public class ModConfig extends WrappedConfig { public final ValueMap default_game_rules = ValueMap.builder((Object) "").build(); public final boolean generate_json_schema = true; - // TODO - JSON support, with JSON5 being opt-in + // TODO - Opt-in JSON5/JSONC support public void setSerializer(Config.Builder builder) { builder.format("json"); } diff --git a/src/main/java/io/github/ennuil/boring_default_game_rules/config/ModConfigManager.java b/src/main/java/io/github/ennuil/boring_default_game_rules/config/ModConfigManager.java index c9485f8..c4b583b 100644 --- a/src/main/java/io/github/ennuil/boring_default_game_rules/config/ModConfigManager.java +++ b/src/main/java/io/github/ennuil/boring_default_game_rules/config/ModConfigManager.java @@ -38,7 +38,6 @@ public class ModConfigManager { public static final String GENERATE_ME = "GENERATE_ME"; public static final Path SCHEMA_DIRECTORY_PATH = QuiltLoader.getConfigDir().resolve("boring_default_game_rules"); public static final Path SCHEMA_PATH = SCHEMA_DIRECTORY_PATH.resolve("config.schema.json"); - public static final Path CONFIG_PATH = QuiltLoader.getConfigDir().resolve("boringdefaultgamerules.json"); private static final Gson GSON = new GsonBuilder().setPrettyPrinting().create(); public static final ModConfig CONFIG = QuiltConfig.create("boring_default_game_rules", "config", ModConfig.class); diff --git a/src/main/java/io/github/ennuil/boring_default_game_rules/mixin/client/EditGameRulesScreenAccessor.java b/src/main/java/io/github/ennuil/boring_default_game_rules/mixin/client/EditGameRulesScreenAccessor.java index f011691..2c7c3cb 100644 --- a/src/main/java/io/github/ennuil/boring_default_game_rules/mixin/client/EditGameRulesScreenAccessor.java +++ b/src/main/java/io/github/ennuil/boring_default_game_rules/mixin/client/EditGameRulesScreenAccessor.java @@ -9,8 +9,8 @@ @Mixin(EditGameRulesScreen.class) public interface EditGameRulesScreenAccessor { @Accessor - public EditGameRulesScreen.RuleListWidget getRuleListWidget(); + EditGameRulesScreen.RuleListWidget getRuleListWidget(); @Accessor - public void setGameRules(GameRules gameRules); + void setGameRules(GameRules gameRules); } diff --git a/src/main/resources/assets/boring_default_game_rules/icon_128x.png b/src/main/resources/assets/boring_default_game_rules/icon_128x.png index aacc848..47228c0 100644 Binary files a/src/main/resources/assets/boring_default_game_rules/icon_128x.png and b/src/main/resources/assets/boring_default_game_rules/icon_128x.png differ