🚀 Update data-json for 22w16a

misode · Apr 20, 2022 · 4838359 · 4838359
1 parent 4b1d1cb
commit 4838359
Show file tree

Hide file tree

Showing 21 changed files with 221 additions and 41 deletions.
diff --git a/data/minecraft/advancements/husbandry/complete_catalogue.json b/data/minecraft/advancements/husbandry/complete_catalogue.json
@@ -19,15 +19,15 @@
     "experience": 50
   },
   "criteria": {
-    "minecraft:black": {
+    "minecraft:ragdoll": {
       "trigger": "minecraft:tame_animal",
       "conditions": {
         "entity": [
           {
             "condition": "minecraft:entity_properties",
             "predicate": {
               "type_specific": {
-                "variant": "minecraft:black",
+                "variant": "minecraft:ragdoll",
                 "type": "cat"
               }
             },
@@ -36,15 +36,15 @@
         ]
       }
     },
-    "minecraft:tabby": {
+    "minecraft:calico": {
       "trigger": "minecraft:tame_animal",
       "conditions": {
         "entity": [
           {
             "condition": "minecraft:entity_properties",
             "predicate": {
               "type_specific": {
-                "variant": "minecraft:tabby",
+                "variant": "minecraft:calico",
                 "type": "cat"
               }
             },
@@ -53,15 +53,15 @@
         ]
       }
     },
-    "minecraft:ragdoll": {
+    "minecraft:jellie": {
       "trigger": "minecraft:tame_animal",
       "conditions": {
         "entity": [
           {
             "condition": "minecraft:entity_properties",
             "predicate": {
               "type_specific": {
-                "variant": "minecraft:ragdoll",
+                "variant": "minecraft:jellie",
                 "type": "cat"
               }
             },
@@ -70,15 +70,15 @@
         ]
       }
     },
-    "minecraft:british": {
+    "minecraft:tabby": {
       "trigger": "minecraft:tame_animal",
       "conditions": {
         "entity": [
           {
             "condition": "minecraft:entity_properties",
             "predicate": {
               "type_specific": {
-                "variant": "minecraft:british",
+                "variant": "minecraft:tabby",
                 "type": "cat"
               }
             },
@@ -87,15 +87,15 @@
         ]
       }
     },
-    "minecraft:white": {
+    "minecraft:all_black": {
       "trigger": "minecraft:tame_animal",
       "conditions": {
         "entity": [
           {
             "condition": "minecraft:entity_properties",
             "predicate": {
               "type_specific": {
-                "variant": "minecraft:white",
+                "variant": "minecraft:all_black",
                 "type": "cat"
               }
             },
@@ -121,15 +121,15 @@
         ]
       }
     },
-    "minecraft:calico": {
+    "minecraft:british": {
       "trigger": "minecraft:tame_animal",
       "conditions": {
         "entity": [
           {
             "condition": "minecraft:entity_properties",
             "predicate": {
               "type_specific": {
-                "variant": "minecraft:calico",
+                "variant": "minecraft:british",
                 "type": "cat"
               }
             },
@@ -138,15 +138,15 @@
         ]
       }
     },
-    "minecraft:siamese": {
+    "minecraft:black": {
       "trigger": "minecraft:tame_animal",
       "conditions": {
         "entity": [
           {
             "condition": "minecraft:entity_properties",
             "predicate": {
               "type_specific": {
-                "variant": "minecraft:siamese",
+                "variant": "minecraft:black",
                 "type": "cat"
               }
             },
@@ -155,15 +155,15 @@
         ]
       }
     },
-    "minecraft:all_black": {
+    "minecraft:siamese": {
       "trigger": "minecraft:tame_animal",
       "conditions": {
         "entity": [
           {
             "condition": "minecraft:entity_properties",
             "predicate": {
               "type_specific": {
-                "variant": "minecraft:all_black",
+                "variant": "minecraft:siamese",
                 "type": "cat"
               }
             },
@@ -172,15 +172,15 @@
         ]
       }
     },
-    "minecraft:jellie": {
+    "minecraft:white": {
       "trigger": "minecraft:tame_animal",
       "conditions": {
         "entity": [
           {
             "condition": "minecraft:entity_properties",
             "predicate": {
               "type_specific": {
-                "variant": "minecraft:jellie",
+                "variant": "minecraft:white",
                 "type": "cat"
               }
             },
@@ -209,34 +209,34 @@
   },
   "requirements": [
     [
-      "minecraft:black"
+      "minecraft:ragdoll"
     ],
     [
-      "minecraft:tabby"
+      "minecraft:calico"
     ],
     [
-      "minecraft:ragdoll"
+      "minecraft:jellie"
     ],
     [
-      "minecraft:british"
+      "minecraft:tabby"
     ],
     [
-      "minecraft:white"
+      "minecraft:all_black"
     ],
     [
       "minecraft:persian"
     ],
     [
-      "minecraft:calico"
+      "minecraft:british"
     ],
     [
-      "minecraft:siamese"
+      "minecraft:black"
     ],
     [
-      "minecraft:all_black"
+      "minecraft:siamese"
     ],
     [
-      "minecraft:jellie"
+      "minecraft:white"
     ],
     [
       "minecraft:red"

diff --git a/data/minecraft/advancements/recipes/misc/music_disc_5.json b/data/minecraft/advancements/recipes/misc/music_disc_5.json
@@ -0,0 +1,34 @@
+{
+  "parent": "minecraft:recipes/root",
+  "rewards": {
+    "recipes": [
+      "minecraft:music_disc_5"
+    ]
+  },
+  "criteria": {
+    "has_disc_fragment_5": {
+      "trigger": "minecraft:inventory_changed",
+      "conditions": {
+        "items": [
+          {
+            "items": [
+              "minecraft:disc_fragment_5"
+            ]
+          }
+        ]
+      }
+    },
+    "has_the_recipe": {
+      "trigger": "minecraft:recipe_unlocked",
+      "conditions": {
+        "recipe": "minecraft:music_disc_5"
+      }
+    }
+  },
+  "requirements": [
+    [
+      "has_disc_fragment_5",
+      "has_the_recipe"
+    ]
+  ]
+}
diff --git a/data/minecraft/loot_tables/chests/ancient_city.json b/data/minecraft/loot_tables/chests/ancient_city.json
@@ -294,6 +294,22 @@
           ],
           "name": "minecraft:echo_shard"
         },
+        {
+          "type": "minecraft:item",
+          "weight": 4,
+          "functions": [
+            {
+              "function": "minecraft:set_count",
+              "count": {
+                "type": "minecraft:uniform",
+                "min": 1.0,
+                "max": 3.0
+              },
+              "add": false
+            }
+          ],
+          "name": "minecraft:disc_fragment_5"
+        },
         {
           "type": "minecraft:item",
           "weight": 5,

diff --git a/data/minecraft/loot_tables/chests/ancient_city_ice_box.json b/data/minecraft/loot_tables/chests/ancient_city_ice_box.json
@@ -16,19 +16,19 @@
               "function": "minecraft:set_stew_effect",
               "effects": [
                 {
-                  "type": "minecraft:night_vision",
+                  "type": "minecraft:blindness",
                   "duration": {
                     "type": "minecraft:uniform",
-                    "min": 7.0,
-                    "max": 10.0
+                    "min": 5.0,
+                    "max": 7.0
                   }
                 },
                 {
-                  "type": "minecraft:blindness",
+                  "type": "minecraft:night_vision",
                   "duration": {
                     "type": "minecraft:uniform",
-                    "min": 5.0,
-                    "max": 7.0
+                    "min": 7.0,
+                    "max": 10.0
                   }
                 }
               ]

diff --git a/data/minecraft/recipes/music_disc_5.json b/data/minecraft/recipes/music_disc_5.json
@@ -0,0 +1,16 @@
+{
+  "type": "minecraft:crafting_shaped",
+  "pattern": [
+    "SSS",
+    "SSS",
+    "SSS"
+  ],
+  "key": {
+    "S": {
+      "item": "minecraft:disc_fragment_5"
+    }
+  },
+  "result": {
+    "item": "minecraft:music_disc_5"
+  }
+}
diff --git a/data/minecraft/tags/blocks/frogs_spawnable_on.json b/data/minecraft/tags/blocks/frogs_spawnable_on.json
@@ -0,0 +1,10 @@
+{
+  "replace": false,
+  "values": [
+    "minecraft:grass_block",
+    "minecraft:mud",
+    "minecraft:mangrove_roots",
+    "minecraft:muddy_mangrove_roots",
+    "minecraft:moss_carpet"
+  ]
+}
diff --git a/data/minecraft/tags/items/music_discs.json b/data/minecraft/tags/items/music_discs.json
@@ -3,6 +3,7 @@
   "values": [
     "#minecraft:creeper_drop_music_discs",
     "minecraft:music_disc_pigstep",
-    "minecraft:music_disc_otherside"
+    "minecraft:music_disc_otherside",
+    "minecraft:music_disc_5"
   ]
 }
diff --git a/data/minecraft/tags/painting_variant/placeable.json b/data/minecraft/tags/painting_variant/placeable.json
@@ -0,0 +1,31 @@
+{
+  "replace": false,
+  "values": [
+    "minecraft:kebab",
+    "minecraft:aztec",
+    "minecraft:alban",
+    "minecraft:aztec2",
+    "minecraft:bomb",
+    "minecraft:plant",
+    "minecraft:wasteland",
+    "minecraft:pool",
+    "minecraft:courbet",
+    "minecraft:sea",
+    "minecraft:sunset",
+    "minecraft:creebet",
+    "minecraft:wanderer",
+    "minecraft:graham",
+    "minecraft:match",
+    "minecraft:bust",
+    "minecraft:stage",
+    "minecraft:void",
+    "minecraft:skull_and_roses",
+    "minecraft:wither",
+    "minecraft:fighters",
+    "minecraft:pointer",
+    "minecraft:pigscene",
+    "minecraft:burning_skull",
+    "minecraft:skeleton",
+    "minecraft:donkey_kong"
+  ]
+}
diff --git a/data/minecraft/worldgen/biome/bamboo_jungle.json b/data/minecraft/worldgen/biome/bamboo_jungle.json
@@ -9,6 +9,12 @@
       "block_search_extent": 8,
       "offset": 2.0
     },
+    "music": {
+      "sound": "minecraft:music.overworld.jungle_and_forest",
+      "min_delay": 12000,
+      "max_delay": 24000,
+      "replace_current_music": false
+    },
     "sky_color": 7842047,
     "fog_color": 12638463,
     "water_color": 4159204,

diff --git a/data/minecraft/worldgen/biome/birch_forest.json b/data/minecraft/worldgen/biome/birch_forest.json
@@ -9,6 +9,12 @@
       "block_search_extent": 8,
       "offset": 2.0
     },
+    "music": {
+      "sound": "minecraft:music.overworld.jungle_and_forest",
+      "min_delay": 12000,
+      "max_delay": 24000,
+      "replace_current_music": false
+    },
     "sky_color": 8037887,
     "fog_color": 12638463,
     "water_color": 4159204,