-
Notifications
You must be signed in to change notification settings - Fork 5
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
added new config system for registering visual workbenches
- Loading branch information
Showing
10 changed files
with
211 additions
and
96 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
165 changes: 165 additions & 0 deletions
165
src/main/java/fuzs/visualworkbench/config/JsonConfigBuilder.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,165 @@ | ||
| package fuzs.visualworkbench.config; | ||
|
|
||
| import com.google.common.collect.ImmutableList; | ||
| import com.google.gson.Gson; | ||
| import com.google.gson.GsonBuilder; | ||
| import com.google.gson.JsonElement; | ||
| import com.google.gson.JsonObject; | ||
| import com.google.gson.reflect.TypeToken; | ||
| import fuzs.puzzleslib.json.JsonConfigFileUtil; | ||
| import fuzs.puzzleslib.json.JsonSerializationUtil; | ||
| import fuzs.visualworkbench.VisualWorkbench; | ||
| import net.minecraft.resources.ResourceLocation; | ||
| import net.minecraft.world.level.block.Block; | ||
| import net.minecraftforge.registries.ForgeRegistries; | ||
|
|
||
| import java.io.File; | ||
| import java.io.FileReader; | ||
| import java.lang.reflect.Type; | ||
| import java.util.List; | ||
| import java.util.Objects; | ||
| import java.util.Set; | ||
| import java.util.stream.Collectors; | ||
| import java.util.stream.Stream; | ||
|
|
||
| public class JsonConfigBuilder { | ||
| public static final JsonConfigBuilder INSTANCE = new JsonConfigBuilder(); | ||
| private static final Gson GSON = new GsonBuilder().setPrettyPrinting().disableHtmlEscaping() | ||
| .registerTypeAdapter(ResourceLocation.class, new ResourceLocation.Serializer()) | ||
| .create(); | ||
| private static final String JSON_CONFIG_NAME = "visual_workbench.json"; | ||
| private static final List<ResourceLocation> DEFAULT_VISUAL_WORKBENCHES = Stream.of( | ||
| "minecraft:crafting_table", | ||
| "blue_skies:bluebright_crafting_table", | ||
| "blue_skies:starlit_crafting_table", | ||
| "blue_skies:frostbright_crafting_table", | ||
| "blue_skies:lunar_crafting_table", | ||
| "blue_skies:dusk_crafting_table", | ||
| "blue_skies:maple_crafting_table", | ||
| "blue_skies:cherry_crafting_table", | ||
| "blocksplus:spruce_crafting_table", | ||
| "blocksplus:birch_crafting_table", | ||
| "blocksplus:jungle_crafting_table", | ||
| "blocksplus:acacia_crafting_table", | ||
| "blocksplus:dark_oak_crafting_table", | ||
| "blocksplus:crimson_crafting_table", | ||
| "blocksplus:warped_crafting_table", | ||
| "blocksplus:bamboo_crafting_table", | ||
| "blocksplus:mushroom_crafting_table", | ||
| "mctb:spruce_crafting_table", | ||
| "mctb:birch_crafting_table", | ||
| "mctb:acacia_crafting_table", | ||
| "mctb:jungle_crafting_table", | ||
| "mctb:dark_oak_crafting_table", | ||
| "mctb:warped_crafting_table", | ||
| "mctb:crimson_crafting_table", | ||
| "mctb:cherry_crafting_table", | ||
| "mctb:dead_crafting_table", | ||
| "mctb:fir_crafting_table", | ||
| "mctb:hellbark_crafting_table", | ||
| "mctb:jacaranda_crafting_table", | ||
| "mctb:magic_crafting_table", | ||
| "mctb:mahogany_crafting_table", | ||
| "mctb:palm_crafting_table", | ||
| "mctb:redwood_crafting_table", | ||
| "mctb:umbran_crafting_table", | ||
| "mctb:willow_crafting_table", | ||
| "betternether:crafting_table_anchor_tree", | ||
| "betternether:crafting_table_nether_sakura", | ||
| "betternether:crafting_table_crimson", | ||
| "betternether:crafting_table_warped", | ||
| "betternether:crafting_table_stalagnate", | ||
| "betternether:crafting_table_reed", | ||
| "betternether:crafting_table_willow", | ||
| "betternether:crafting_table_wart", | ||
| "betternether:crafting_table_rubeus", | ||
| "betternether:crafting_table_mushroom", | ||
| "betternether:crafting_table_mushroom_fir", | ||
| "betterendforge:mossy_glowshroom_crafting_table", | ||
| "betterendforge:lacugrove_crafting_table", | ||
| "betterendforge:end_lotus_crafting_table", | ||
| "betterendforge:pythadendron_crafting_table", | ||
| "betterendforge:dragon_tree_crafting_table", | ||
| "betterendforge:tenanea_crafting_table", | ||
| "betterendforge:helix_tree_crafting_table", | ||
| "betterendforge:umbrella_tree_crafting_table", | ||
| "betterendforge:jellyshroom_crafting_table", | ||
| "betterendforge:lucernia_crafting_table", | ||
| "crumbs:spruce_crafting_table", | ||
| "crumbs:birch_crafting_table", | ||
| "crumbs:jungle_crafting_table", | ||
| "crumbs:acacia_crafting_table", | ||
| "crumbs:dark_oak_crafting_table", | ||
| "crumbs:crimson_crafting_table", | ||
| "crumbs:warped_crafting_table", | ||
| "byg:aspen_crafting_table", | ||
| "byg:baobab_crafting_table", | ||
| "byg:blue_enchanted_crafting_table", | ||
| "byg:cherry_crafting_table", | ||
| "byg:cika_crafting_table", | ||
| "byg:cypress_crafting_table", | ||
| "byg:ebony_crafting_table", | ||
| "byg:fir_crafting_table", | ||
| "byg:green_enchanted_crafting_table", | ||
| "byg:holly_crafting_table", | ||
| "byg:jacaranda_crafting_table", | ||
| "byg:mahogany_crafting_table", | ||
| "byg:mangrove_crafting_table", | ||
| "byg:maple_crafting_table", | ||
| "byg:pine_crafting_table", | ||
| "byg:rainbow_eucalyptus_crafting_table", | ||
| "byg:redwood_crafting_table", | ||
| "byg:skyris_crafting_table", | ||
| "byg:willow_crafting_table", | ||
| "byg:witch_hazel_crafting_table", | ||
| "byg:zelkova_crafting_table", | ||
| "byg:sythian_crafting_table", | ||
| "byg:embur_crafting_table", | ||
| "byg:palm_crafting_table", | ||
| "byg:lament_crafting_table", | ||
| "byg:bulbis_crafting_table", | ||
| "byg:nightshade_crafting_table", | ||
| "byg:ether_crafting_table", | ||
| "byg:imparius_crafting_table" | ||
| ) | ||
| .map(ResourceLocation::new) | ||
| .collect(Collectors.collectingAndThen(Collectors.toList(), ImmutableList::copyOf)); | ||
|
|
||
| private ResourceLocation[] locationValues; | ||
| private Set<Block> blockValues; | ||
|
|
||
| public void load() { | ||
| JsonConfigFileUtil.getAndLoad(JSON_CONFIG_NAME, JsonConfigBuilder::serialize, (FileReader reader) -> this.locationValues = JsonConfigBuilder.deserialize(reader)); | ||
| } | ||
|
|
||
| public boolean contains(Block block) { | ||
| if (this.blockValues == null) { | ||
| this.blockValues = this.getBlockStream().collect(Collectors.toSet()); | ||
| } | ||
| return this.blockValues.contains(block); | ||
| } | ||
|
|
||
| private static void serialize(File jsonFile) { | ||
| final JsonObject jsonObject = JsonSerializationUtil.getConfigBase(String.format("Crafting table blocks to enable %s support for.", VisualWorkbench.MOD_NAME)); | ||
| Type token = new TypeToken<List<ResourceLocation>>(){}.getType(); | ||
| JsonElement jsonElement = GSON.toJsonTree(DEFAULT_VISUAL_WORKBENCHES, token); | ||
| jsonObject.add("values", jsonElement); | ||
| JsonConfigFileUtil.saveToFile(jsonFile, jsonObject); | ||
| } | ||
|
|
||
| private static ResourceLocation[] deserialize(FileReader reader) { | ||
| final JsonElement values = JsonSerializationUtil.readJsonObject(reader).get("values"); | ||
| if (values != null) { | ||
| return GSON.fromJson(values, ResourceLocation[].class); | ||
| } | ||
| VisualWorkbench.LOGGER.error("Unable to read {} json config file", VisualWorkbench.MOD_NAME); | ||
| return new ResourceLocation[0]; | ||
| } | ||
|
|
||
| public Stream<Block> getBlockStream() { | ||
| return Stream.of(this.locationValues) | ||
| .filter(Objects::nonNull) | ||
| .filter(ForgeRegistries.BLOCKS::containsKey) | ||
| .map(ForgeRegistries.BLOCKS::getValue); | ||
| } | ||
| } |
28 changes: 0 additions & 28 deletions
28
src/main/java/fuzs/visualworkbench/config/ServerConfig.java
This file was deleted.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.