feat: make tag matcher log error instead of throwing exception if tag…

… unavailable See EnigmaticaModpacks/Enigmatica9#544
klikli-dev · Aug 1, 2023 · 06908e9 · 06908e9
1 parent 98fc47d
commit 06908e9
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 2 deletions.
diff --git a/src/main/java/com/klikli_dev/modonomicon/multiblock/matcher/TagMatcher.java b/src/main/java/com/klikli_dev/modonomicon/multiblock/matcher/TagMatcher.java
@@ -19,6 +19,7 @@
 import net.minecraft.core.Registry;
 import net.minecraft.network.FriendlyByteBuf;
 import net.minecraft.resources.ResourceLocation;
+import net.minecraft.tags.BlockTags;
 import net.minecraft.tags.TagKey;
 import net.minecraft.util.GsonHelper;
 import net.minecraft.world.level.BlockGetter;
@@ -79,7 +80,8 @@ public static TagMatcher fromJson(JsonObject json) {
                     var parserResult = BlockStateParser.parseForTesting(Registry.BLOCK, new StringReader(finalTagString), true).right().orElseThrow();
                    return parserResult.tag().unwrap().left().orElseThrow();
                 } catch (CommandSyntaxException e) {
-                    throw new IllegalArgumentException("Failed to parse Tag and BlockState properties from json member \"tag\" for TagMatcher.", e);
+                    Modonomicon.LOGGER.error("Failed to parse Tag and BlockState properties from json member \"tag\" for TagMatcher: {0}. Will use \"modonomicon:bedrock\" as fallback, Exception: {1}", finalTagString,  e);
+                    return TagKey.create(Registry.BLOCK_REGISTRY, Modonomicon.loc("bedrock"));
                 }
             });
 
@@ -88,7 +90,8 @@ public static TagMatcher fromJson(JsonObject json) {
                     var parserResult = BlockStateParser.parseForTesting(Registry.BLOCK, new StringReader(finalTagString), true).right().orElseThrow();
                     return parserResult.vagueProperties();
                 } catch (CommandSyntaxException e) {
-                    throw new IllegalArgumentException("Failed to parse Tag and BlockState properties from json member \"tag\" for TagMatcher.", e);
+                    Modonomicon.LOGGER.error("Failed to parse Tag and BlockState properties from json member \"tag\" for TagMatcher: {0}. Will use empty property map as fallback, Exception: {1}", finalTagString,  e);
+                    return Map.of();
                 }
             });
 

diff --git a/src/main/resources/data/modonomicon/tags/blocks/bedrock.json b/src/main/resources/data/modonomicon/tags/blocks/bedrock.json
@@ -0,0 +1,5 @@
+{
+  "values": [
+    "minecraft:bedrock"
+  ]
+}