fix 缺失苍白橡木

compat_42/data/fzsd/advancements/game_event/on_killed_mob_or_player.json

@@ -1,34 +0,0 @@
-{
-    "parent": "fzsd:game_event",
-    "criteria": {
-        "on_killed_mob_or_player": {
-            "trigger": "minecraft:player_killed_entity",
-            "conditions": {
-                "player": [
-                    {
-                        "condition": "minecraft:reference",
-                        "name": "fzsd:is_real_player"
-                    }
-                ],
-                "entity": [
-                    {
-                        "condition": "minecraft:inverted",
-                        "term": {
-                            "condition": "minecraft:entity_properties",
-                            "entity": "this",
-                            "predicate": {
-                                "type": "#fzsd:ignore_on_player_killed_entity"
-                            }
-                        }
-                    }
-                ],
-                "killing_blow": {
-                    "bypasses_invulnerability": false
-                }
-            }
-        }
-    },
-    "rewards": {
-        "function": "fzsd:game_event/advancement/on_killed_mob_or_player"
-    }
-}

compat_42/data/fzsd/predicate/sweeper/whitelist.json

@@ -0,0 +1,101 @@
+{
+    "condition": "minecraft:any_of",
+    "terms": [
+        {
+            "condition": "minecraft:entity_properties",
+            "entity": "this",
+            "predicate": {
+                "type": "item",
+                "nbt": "{Item:{id:\"minecraft:minecart\"}}"
+            }
+        },
+        {
+            "condition": "minecraft:entity_properties",
+            "entity": "this",
+            "predicate": {
+                "type": "item",
+                "nbt": "{Item:{id:\"minecraft:hopper_minecart\"}}"
+            }
+        },
+        {
+            "condition": "minecraft:entity_properties",
+            "entity": "this",
+            "predicate": {
+                "type": "item",
+                "nbt": "{Item:{id:\"minecraft:chest_minecart\"}}"
+            }
+        },
+        {
+            "condition": "minecraft:entity_properties",
+            "entity": "this",
+            "predicate": {
+                "type": "item",
+                "nbt": "{Item:{id:\"minecraft:furnace_minecart\"}}"
+            }
+        },
+        {
+            "condition": "minecraft:entity_properties",
+            "entity": "this",
+            "predicate": {
+                "type": "item",
+                "nbt": "{Item:{id:\"minecraft:oak_boat\"}}"
+            }
+        },
+        {
+            "condition": "minecraft:entity_properties",
+            "entity": "this",
+            "predicate": {
+                "type": "item",
+                "nbt": "{Item:{id:\"minecraft:birch_boat\"}}"
+            }
+        },
+        {
+            "condition": "minecraft:entity_properties",
+            "entity": "this",
+            "predicate": {
+                "type": "item",
+                "nbt": "{Item:{id:\"minecraft:acacia_boat\"}}"
+            }
+        },
+        {
+            "condition": "minecraft:entity_properties",
+            "entity": "this",
+            "predicate": {
+                "type": "item",
+                "nbt": "{Item:{id:\"minecraft:cherry_boat\"}}"
+            }
+        },
+        {
+            "condition": "minecraft:entity_properties",
+            "entity": "this",
+            "predicate": {
+                "type": "item",
+                "nbt": "{Item:{id:\"minecraft:jungle_boat\"}}"
+            }
+        },
+        {
+            "condition": "minecraft:entity_properties",
+            "entity": "this",
+            "predicate": {
+                "type": "item",
+                "nbt": "{Item:{id:\"minecraft:spruce_boat\"}}"
+            }
+        },
+        {
+            "condition": "minecraft:entity_properties",
+            "entity": "this",
+            "predicate": {
+                "type": "item",
+                "nbt": "{Item:{id:\"minecraft:mangrove_boat\"}}"
+            }
+        },
+        {
+            "condition": "minecraft:entity_properties",
+            "entity": "this",
+            "predicate": {
+                "type": "item",
+                "nbt": "{Item:{id:\"minecraft:bamboo_raft\"}}"
+            }
+        }
+    ]
+}

compat_42/data/fzsd/tags/block/stripped_blocks.json

@@ -0,0 +1,25 @@
+{
+    "replace": false,
+    "values": [
+        "minecraft:stripped_acacia_log",
+        "minecraft:stripped_acacia_wood",
+        "minecraft:stripped_birch_log",
+        "minecraft:stripped_birch_wood",
+        "minecraft:stripped_crimson_hyphae",
+        "minecraft:stripped_crimson_stem",
+        "minecraft:stripped_dark_oak_log",
+        "minecraft:stripped_dark_oak_wood",
+        "minecraft:stripped_jungle_log",
+        "minecraft:stripped_jungle_wood",
+        "minecraft:stripped_oak_log",
+        "minecraft:stripped_oak_wood",
+        "minecraft:stripped_spruce_log",
+        "minecraft:stripped_spruce_wood",
+        "minecraft:stripped_warped_hyphae",
+        "minecraft:stripped_warped_stem",
+        "minecraft:stripped_cherry_log",
+        "minecraft:stripped_cherry_wood",
+        "minecraft:stripped_mangrove_log",
+        "minecraft:stripped_mangrove_wood"
+    ]
+}

data/fzsd/predicates/sweeper/whitelist.json

@@ -85,6 +85,13 @@
                 "nbt": "{Item:{id:\"minecraft:mangrove_boat\"}}"
             }
         },
+        {
+            "condition": "minecraft:entity_properties",
+            "entity": "this",
+            "predicate": {
+                "nbt": "{Item:{id:\"minecraft:pale_oak_boat\"}}"
+            }
+        },
         {
             "condition": "minecraft:entity_properties",
             "entity": "this",

data/fzsd/tags/block/stripped_blocks.json

@@ -20,6 +20,8 @@
         "minecraft:stripped_cherry_log",
         "minecraft:stripped_cherry_wood",
         "minecraft:stripped_mangrove_log",
-        "minecraft:stripped_mangrove_wood"
+        "minecraft:stripped_mangrove_wood",
+        "minecraft:stripped_pale_oak_log",
+        "minecraft:stripped_pale_oak_wood"
     ]
 }