-
Notifications
You must be signed in to change notification settings - Fork 65
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Made predetermined Captchas Data oriented (#584)
Added a Predetermined Captcha class that loads predetermined captchas from user Datapacks. --------- Co-authored-by: kirderf1 <[email protected]>
- Loading branch information
1 parent
1a72692
commit 85e02ad
Showing
3 changed files
with
175 additions
and
20 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
134 changes: 134 additions & 0 deletions
134
src/main/java/com/mraof/minestuck/alchemy/PredeterminedCardCaptchas.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,134 @@ | ||
| package com.mraof.minestuck.alchemy; | ||
|
|
||
| import com.google.common.collect.BiMap; | ||
| import com.google.common.collect.HashBiMap; | ||
| import com.google.common.collect.ImmutableBiMap; | ||
| import com.google.gson.JsonElement; | ||
| import com.google.gson.JsonParser; | ||
| import com.mojang.serialization.Codec; | ||
| import com.mojang.serialization.JsonOps; | ||
| import com.mraof.minestuck.Minestuck; | ||
| import net.minecraft.MethodsReturnNonnullByDefault; | ||
| import net.minecraft.resources.ResourceLocation; | ||
| import net.minecraft.server.packs.resources.ResourceManager; | ||
| import net.minecraft.server.packs.resources.SimplePreparableReloadListener; | ||
| import net.minecraft.util.profiling.ProfilerFiller; | ||
| import net.minecraft.world.item.Item; | ||
| import net.minecraftforge.event.AddReloadListenerEvent; | ||
| import net.minecraftforge.event.server.ServerStoppedEvent; | ||
| import net.minecraftforge.eventbus.api.SubscribeEvent; | ||
| import net.minecraftforge.fml.common.Mod; | ||
| import net.minecraftforge.registries.ForgeRegistries; | ||
| import org.apache.logging.log4j.LogManager; | ||
| import org.apache.logging.log4j.Logger; | ||
|
|
||
| import javax.annotation.Nullable; | ||
| import javax.annotation.ParametersAreNonnullByDefault; | ||
| import java.io.IOException; | ||
| import java.io.Reader; | ||
| import java.util.Map; | ||
| import java.util.Objects; | ||
| import java.util.Optional; | ||
|
|
||
| @ParametersAreNonnullByDefault | ||
| @MethodsReturnNonnullByDefault | ||
| @Mod.EventBusSubscriber(modid = Minestuck.MOD_ID, bus = Mod.EventBusSubscriber.Bus.FORGE) | ||
| public class PredeterminedCardCaptchas | ||
| { | ||
| @Nullable | ||
| private static BiMap<Item, String> predefinedCardMap; | ||
|
|
||
| private static void setData(BiMap<Item, String> predefinedCards) | ||
| { | ||
| PredeterminedCardCaptchas.predefinedCardMap = predefinedCards; | ||
| } | ||
|
|
||
| public static BiMap<Item, String> getData() | ||
| { | ||
| return Objects.requireNonNull(PredeterminedCardCaptchas.predefinedCardMap, "Tried to get an instance of Predetermined Captchas too early."); | ||
| } | ||
|
|
||
| @SubscribeEvent | ||
| public static void onServerStopped(ServerStoppedEvent event) | ||
| { | ||
| predefinedCardMap = null; | ||
| } | ||
|
|
||
| @SubscribeEvent | ||
| public static void onResourceReload(AddReloadListenerEvent event) | ||
| { | ||
| event.addListener(new Loader()); | ||
| } | ||
|
|
||
| private final static class Loader extends SimplePreparableReloadListener<Map<String, Item>> | ||
| { | ||
| private static final Logger LOGGER = LogManager.getLogger(); | ||
| public static final String PATH = "minestuck/captcha_codes.json"; | ||
| @Override | ||
| protected Map<String, Item> prepare(ResourceManager resourceManager, ProfilerFiller profiler) | ||
| { | ||
| BiMap<String, Item> captchaData = HashBiMap.create(); | ||
|
|
||
| for(String namespace : resourceManager.getNamespaces()) | ||
| { | ||
| parseCaptchaCodesFromNamespace(resourceManager, namespace).ifPresent(parsedData -> processCaptchaData(captchaData, parsedData)); | ||
| } | ||
| return captchaData; | ||
| } | ||
|
|
||
| @Override | ||
| protected void apply(Map<String, Item> data, ResourceManager resourceManager, ProfilerFiller profiler) | ||
| { | ||
| ImmutableBiMap.Builder<Item, String> predefinedCards = ImmutableBiMap.builder(); | ||
|
|
||
| for(Map.Entry<String, Item> entrySet : data.entrySet()) | ||
| { | ||
| predefinedCards.put(entrySet.getValue(), entrySet.getKey()); | ||
| } | ||
|
|
||
| PredeterminedCardCaptchas.setData(predefinedCards.build()); | ||
| } | ||
|
|
||
| private static final Codec<Map<String, Item>> PREDEFINED_CAPTCHAS_CODEC = Codec.unboundedMap(Codec.STRING, ForgeRegistries.ITEMS.getCodec()); | ||
|
|
||
| private static Optional<Map<String, Item>> parseCaptchaCodesFromNamespace(ResourceManager resourceManager, String namespace) | ||
| { | ||
| ResourceLocation rs = new ResourceLocation(namespace, PATH); | ||
|
|
||
| return resourceManager.getResource(rs).flatMap(resource -> { | ||
| try(Reader reader = resource.openAsReader()) | ||
| { | ||
| JsonElement json = JsonParser.parseReader(reader); | ||
| return PREDEFINED_CAPTCHAS_CODEC.parse(JsonOps.INSTANCE, json) | ||
| .resultOrPartial(message -> LOGGER.error("Problem parsing json: {}, reason: {}", rs, message)); | ||
|
|
||
| } catch(IOException ignored) | ||
| { | ||
| return Optional.empty(); | ||
| } | ||
| }); | ||
| } | ||
|
|
||
| private static void processCaptchaData(BiMap<String, Item> incompleteMap, Map<String, Item> parsedMap) | ||
| { | ||
| for(Map.Entry<String, Item> entry : parsedMap.entrySet()) | ||
| { | ||
| String captcha = entry.getKey(); | ||
| Item item = entry.getValue(); | ||
|
|
||
| if(incompleteMap.containsValue(item)) | ||
| { | ||
| LOGGER.error("Item {} already has an existing Code of '{}'!", item , incompleteMap.inverse().get(item)); | ||
| } | ||
| else if(incompleteMap.containsKey(captcha)) | ||
| { | ||
| LOGGER.error("Code '{}' is already assigned to Item: {}!", captcha, incompleteMap.get(captcha)); | ||
| } | ||
| else | ||
| { | ||
| incompleteMap.put(entry.getKey(), entry.getValue()); | ||
| } | ||
| } | ||
| } | ||
| } | ||
| } |
4 changes: 4 additions & 0 deletions
4
src/main/resources/data/minestuck/minestuck/captcha_codes.json
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,4 @@ | ||
| { | ||
| "00000000": "minestuck:generic_object", | ||
| "SUPRePIC": "minestuck:sord" | ||
| } |