Merge branch '1.17'

b3spectacled · Sep 13, 2020 · 5752e29 · 5752e29
2 parents fdba9bb + c76be3f
commit 5752e29
Show file tree

Hide file tree

Showing 72 changed files with 1,795 additions and 558 deletions.
diff --git a/Modern Beta BAC Compatibility/data/blazeandcave/advancements/biomes/cold_feet.json b/Modern Beta BAC Compatibility/data/blazeandcave/advancements/biomes/cold_feet.json
@@ -30,6 +30,12 @@
             "conditions": {
                 "biome": "minecraft:taiga"
             }
-        }	
+        },
+        "cold_river": {
+            "trigger": "minecraft:location",
+            "conditions": {
+                "biome": "minecraft:cold_river"
+            }
+        }
     }
 }
diff --git a/Modern Beta BAC Compatibility/data/blazeandcave/advancements/biomes/explorer_of_worlds.json b/Modern Beta BAC Compatibility/data/blazeandcave/advancements/biomes/explorer_of_worlds.json
@@ -69,6 +69,14 @@
             }
           }
         },
+        "minecraft:cold_river": {
+          "trigger": "minecraft:location",
+          "conditions": {
+            "location": {
+              "biome": "minecraft:cold_river"
+            }
+          }
+        },
         "minecraft:dark_forest": {
           "trigger": "minecraft:location",
           "conditions": {
@@ -125,6 +133,14 @@
             }
           }
         },
+        "minecraft:desert_river": {
+          "trigger": "minecraft:location",
+          "conditions": {
+            "location": {
+              "biome": "minecraft:desert_river"
+            }
+          }
+        },
         "minecraft:flower_forest": {
           "trigger": "minecraft:location",
           "conditions": {
@@ -149,6 +165,14 @@
             }
           }
         },
+        "minecraft:frozen_river": {
+          "trigger": "minecraft:location",
+          "conditions": {
+            "location": {
+              "biome": "minecraft:frozen_river"
+            }
+          }
+        },
         "minecraft:giant_spruce_taiga": {
           "trigger": "minecraft:location",
           "conditions": {
@@ -205,6 +229,14 @@
             }
           }
         },
+        "minecraft:lukewarm_river": {
+          "trigger": "minecraft:location",
+          "conditions": {
+            "location": {
+              "biome": "minecraft:lukewarm_river"
+            }
+          }
+        },
         "minecraft:marsh": {
           "trigger": "minecraft:location",
           "conditions": {
@@ -245,6 +277,14 @@
             }
           }
         },
+        "minecraft:river": {
+          "trigger": "minecraft:location",
+          "conditions": {
+            "location": {
+              "biome": "minecraft:river"
+            }
+          }
+        },
         "minecraft:savanna": {
           "trigger": "minecraft:location",
           "conditions": {

diff --git a/Modern Beta BAC Compatibility/data/blazeandcave/advancements/biomes/snow_feet.json b/Modern Beta BAC Compatibility/data/blazeandcave/advancements/biomes/snow_feet.json
@@ -25,11 +25,17 @@
                 "biome": "minecraft:snowy_tundra"
             }
         },
-        "cold_beach": {
+        "snowy_beach": {
             "trigger": "minecraft:location",
             "conditions": {
                 "biome": "minecraft:snowy_beach"
             }
+        },
+        "frozen_river": {
+            "trigger": "minecraft:location",
+            "conditions": {
+                "biome": "minecraft:frozen_river"
+            }
         }		
     }
 }
diff --git a/Modern Beta BAC Compatibility/data/blazeandcave/advancements/biomes/the_sea_calls_you.json b/Modern Beta BAC Compatibility/data/blazeandcave/advancements/biomes/the_sea_calls_you.json
@@ -70,7 +70,19 @@
             "conditions": {
                 "biome": "minecraft:deep_warm_ocean"
             }
-        }		
+        },
+        "river": {
+            "trigger": "minecraft:location",
+            "conditions": {
+                "biome": "minecraft:river"
+            }
+        },
+        "lukewarm_river": {
+            "trigger": "minecraft:location",
+            "conditions": {
+                "biome": "minecraft:lukewarm_river"
+            }
+        }
     },
     "requirements": [
 		[
@@ -83,7 +95,9 @@
 		"lukewarm_ocean",
 		"deep_lukewarm_ocean",
 		"warm_ocean",
-        "deep_warm_ocean"
+        "deep_warm_ocean",
+        "river",
+        "lukewarm_river"
 		]
     ]
 }
diff --git a/Modern Beta BAC Compatibility/data/blazeandcave/advancements/biomes/warm_feet.json b/Modern Beta BAC Compatibility/data/blazeandcave/advancements/biomes/warm_feet.json
@@ -19,6 +19,12 @@
                 "biome": "minecraft:desert"
             }
         },
+        "desert_river": {
+            "trigger": "minecraft:location",
+            "conditions": {
+                "biome": "minecraft:desert_river"
+            }
+        },
         "mesa": {
             "trigger": "minecraft:location",
             "conditions": {

diff --git a/Modern Beta BAC Compatibility/data/blazeandcave/advancements/biomes/wet_feet.json b/Modern Beta BAC Compatibility/data/blazeandcave/advancements/biomes/wet_feet.json
@@ -102,6 +102,18 @@
             "conditions": {
                 "biome": "minecraft:deep_warm_ocean"
             }
+        },
+        "river": {
+            "trigger": "minecraft:location",
+            "conditions": {
+                "biome": "minecraft:river"
+            }
+        },
+        "lukewarm_river": {
+            "trigger": "minecraft:location",
+            "conditions": {
+                "biome": "minecraft:lukewarm_river"
+            }
         }
     }
 }
diff --git a/Modern Beta BAC Compatibility/data/minecraft/advancements/adventure/adventuring_time.json b/Modern Beta BAC Compatibility/data/minecraft/advancements/adventure/adventuring_time.json
@@ -76,6 +76,14 @@
         }
       }
     },
+    "minecraft:cold_river": {
+      "trigger": "minecraft:location",
+      "conditions": {
+        "location": {
+          "biome": "minecraft:cold_river"
+        }
+      }
+    },
     "minecraft:dark_forest": {
       "trigger": "minecraft:location",
       "conditions": {
@@ -132,6 +140,14 @@
         }
       }
     },
+    "minecraft:desert_river": {
+      "trigger": "minecraft:location",
+      "conditions": {
+        "location": {
+          "biome": "minecraft:desert_river"
+        }
+      }
+    },
     "minecraft:flower_forest": {
       "trigger": "minecraft:location",
       "conditions": {
@@ -156,6 +172,14 @@
         }
       }
     },
+    "minecraft:frozen_river": {
+      "trigger": "minecraft:location",
+      "conditions": {
+        "location": {
+          "biome": "minecraft:frozen_river"
+        }
+      }
+    },
     "minecraft:giant_spruce_taiga": {
       "trigger": "minecraft:location",
       "conditions": {
@@ -196,6 +220,14 @@
         }
       }
     },
+    "minecraft:lukewarm_river": {
+      "trigger": "minecraft:location",
+      "conditions": {
+        "location": {
+          "biome": "minecraft:lukewarm_river"
+        }
+      }
+    },
     "minecraft:marsh": {
       "trigger": "minecraft:location",
       "conditions": {
@@ -236,6 +268,14 @@
         }
       }
     },
+    "minecraft:river": {
+      "trigger": "minecraft:location",
+      "conditions": {
+        "location": {
+          "biome": "minecraft:river"
+        }
+      }
+    },
     "minecraft:savanna": {
       "trigger": "minecraft:location",
       "conditions": {
@@ -347,6 +387,9 @@
     [
       "minecraft:cold_ocean"
     ],
+    [
+      "minecraft:cold_river"
+    ],
     [
       "minecraft:dark_forest"
     ],
@@ -368,6 +411,9 @@
     [
       "minecraft:desert"
     ],
+    [
+      "minecraft:desert_river"
+    ],
     [
       "minecraft:flower_forest"
     ],
@@ -377,6 +423,9 @@
     [
       "minecraft:frozen_ocean"
     ],
+    [
+      "minecraft:frozen_river"
+    ],
     [
       "minecraft:giant_spruce_taiga"
     ],
@@ -392,6 +441,9 @@
     [
       "minecraft:lukewarm_ocean"
     ],
+    [
+      "minecraft:lukewarm_river"
+    ],
     [
       "minecraft:marsh"
     ],
@@ -407,6 +459,9 @@
     [
       "minecraft:rainforest"
     ],
+    [
+      "minecraft:river"
+    ],
     [
       "minecraft:savanna"
     ],