Zauber Cauldrons 1.20 Feature Update (Spreading the Magic Update)

.gitignore

@@ -3,6 +3,9 @@
 .AppleDouble
 .LSOverride
 
+### Libre Office ###
+.~lock.*
+
 ### Python ###
 __pycache__/
 *.py[cod]

gm4_zauber_cauldrons/beet.yaml

@@ -1,16 +1,21 @@
 id: gm4_zauber_cauldrons
 name: Zauber Cauldrons
-version: 1.9.X
+version: 1.10.X
 
 data_pack:
   load: .
 
+require:
+  - bolt
+
 pipeline:
+  - gm4_zauber_cauldrons.generate
   - gm4.plugins.extend.module
   - gm4.plugins.include.lib_forceload
   - gm4.plugins.include.lib_player_heads
   - gm4.plugins.include.lib_brewing
   - gm4.plugins.include.lib_trades
+  - gm4.plugins.include.lib_potion_tracking
 
 meta:
   gm4:
@@ -20,13 +25,16 @@ meta:
         lib_player_heads: 1.1.0
         lib_brewing: 1.0.0
         lib_trades: 1.3.0
+        lib_potion_tracking: 1.0.0
+
       schedule_loops:
         - main
-        - cauldron/extra_items/crack_bottle
+        - cauldron/extra_items/process_bottled_vex_items
     website:
       description: Powerful potions, Wormholes, portable Beacons and special armour that makes you stronger! Zauber Cauldrons adds an entire magic branch to the game.
       recommended:
         - gm4_resource_pack
+        - gm4_zauber_liquids
       notes: []
     video: https://www.youtube.com/watch?v=Io1JTFUzyrc
     wiki: https://wiki.gm4.co/wiki/Zauber_Cauldrons

gm4_zauber_cauldrons/data/gm4/advancements/zauber_cauldrons_drink_all_magicol.json

@@ -0,0 +1,200 @@
+{
+    "display": {
+        "icon": {
+            "item": "minecraft:potion",
+            "nbt": "{CustomModelData:3420000}"
+        },
+        "title": {
+            "translate": "advancement.gm4.zauber_cauldrons.drink_all_magicol.title",
+            "fallback": "Taste the Rainbow"
+        },
+        "description": {
+            "translate": "advancement.gm4.zauber_cauldrons.drink_all_magicol.description",
+            "fallback": "Drink all colors of Magicol",
+            "color": "gray"
+        },
+        "frame": "challenge",
+        "hidden": false
+    },
+    "parent": "gm4:zauber_cauldrons_make_magicol",
+    "criteria": {
+        "white_magicol": {
+            "trigger": "minecraft:consume_item",
+            "conditions": {
+                "item": {
+                    "nbt": "{gm4_zauber_cauldrons:{item:\"bottled_magicol\",color:\"white\"}}"
+                }
+            }
+        },
+        "light_gray_magicol": {
+            "trigger": "minecraft:consume_item",
+            "conditions": {
+                "item": {
+                    "nbt": "{gm4_zauber_cauldrons:{item:\"bottled_magicol\",color:\"light_gray\"}}"
+                }
+            }
+        },
+        "gray_magicol": {
+            "trigger": "minecraft:consume_item",
+            "conditions": {
+                "item": {
+                    "nbt": "{gm4_zauber_cauldrons:{item:\"bottled_magicol\",color:\"gray\"}}"
+                }
+            }
+        },
+        "black_magicol": {
+            "trigger": "minecraft:consume_item",
+            "conditions": {
+                "item": {
+                    "nbt": "{gm4_zauber_cauldrons:{item:\"bottled_magicol\",color:\"black\"}}"
+                }
+            }
+        },
+        "brown_magicol": {
+            "trigger": "minecraft:consume_item",
+            "conditions": {
+                "item": {
+                    "nbt": "{gm4_zauber_cauldrons:{item:\"bottled_magicol\",color:\"brown\"}}"
+                }
+            }
+        },
+        "red_magicol": {
+            "trigger": "minecraft:consume_item",
+            "conditions": {
+                "item": {
+                    "nbt": "{gm4_zauber_cauldrons:{item:\"bottled_magicol\",color:\"red\"}}"
+                }
+            }
+        },
+        "orange_magicol": {
+            "trigger": "minecraft:consume_item",
+            "conditions": {
+                "item": {
+                    "nbt": "{gm4_zauber_cauldrons:{item:\"bottled_magicol\",color:\"orange\"}}"
+                }
+            }
+        },
+        "yellow_magicol": {
+            "trigger": "minecraft:consume_item",
+            "conditions": {
+                "item": {
+                    "nbt": "{gm4_zauber_cauldrons:{item:\"bottled_magicol\",color:\"yellow\"}}"
+                }
+            }
+        },
+        "lime_magicol": {
+            "trigger": "minecraft:consume_item",
+            "conditions": {
+                "item": {
+                    "nbt": "{gm4_zauber_cauldrons:{item:\"bottled_magicol\",color:\"lime\"}}"
+                }
+            }
+        },
+        "green_magicol": {
+            "trigger": "minecraft:consume_item",
+            "conditions": {
+                "item": {
+                    "nbt": "{gm4_zauber_cauldrons:{item:\"bottled_magicol\",color:\"green\"}}"
+                }
+            }
+        },
+        "cyan_magicol": {
+            "trigger": "minecraft:consume_item",
+            "conditions": {
+                "item": {
+                    "nbt": "{gm4_zauber_cauldrons:{item:\"bottled_magicol\",color:\"cyan\"}}"
+                }
+            }
+        },
+        "light_blue_magicol": {
+            "trigger": "minecraft:consume_item",
+            "conditions": {
+                "item": {
+                    "nbt": "{gm4_zauber_cauldrons:{item:\"bottled_magicol\",color:\"light_blue\"}}"
+                }
+            }
+        },
+        "blue_magicol": {
+            "trigger": "minecraft:consume_item",
+            "conditions": {
+                "item": {
+                    "nbt": "{gm4_zauber_cauldrons:{item:\"bottled_magicol\",color:\"blue\"}}"
+                }
+            }
+        },
+        "purple_magicol": {
+            "trigger": "minecraft:consume_item",
+            "conditions": {
+                "item": {
+                    "nbt": "{gm4_zauber_cauldrons:{item:\"bottled_magicol\",color:\"purple\"}}"
+                }
+            }
+        },
+        "magenta_magicol": {
+            "trigger": "minecraft:consume_item",
+            "conditions": {
+                "item": {
+                    "nbt": "{gm4_zauber_cauldrons:{item:\"bottled_magicol\",color:\"magenta\"}}"
+                }
+            }
+        },
+        "pink_magicol": {
+            "trigger": "minecraft:consume_item",
+            "conditions": {
+                "item": {
+                    "nbt": "{gm4_zauber_cauldrons:{item:\"bottled_magicol\",color:\"pink\"}}"
+                }
+            }
+        }
+    },
+    "requirements": [
+        [
+            "white_magicol"
+        ],
+        [
+            "light_gray_magicol"
+        ],
+        [
+            "gray_magicol"
+        ],
+        [
+            "black_magicol"
+        ],
+        [
+            "brown_magicol"
+        ],
+        [
+            "red_magicol"
+        ],
+        [
+            "orange_magicol"
+        ],
+        [
+            "yellow_magicol"
+        ],
+        [
+            "lime_magicol"
+        ],
+        [
+            "green_magicol"
+        ],
+        [
+            "cyan_magicol"
+        ],
+        [
+            "light_blue_magicol"
+        ],
+        [
+            "blue_magicol"
+        ],
+        [
+            "purple_magicol"
+        ],
+        [
+            "magenta_magicol"
+        ],
+        [
+            "pink_magicol"
+        ]
+    ]
+}

gm4_zauber_cauldrons/data/gm4/advancements/zauber_cauldrons_make_magicol.json

@@ -0,0 +1,25 @@
+{
+    "display": {
+        "icon": {
+            "item": "clock",
+            "nbt": "{CustomModelData:3420000}"
+        },
+        "title": {
+            "translate": "advancement.gm4.zauber_cauldrons.make_magicol.title",
+            "fallback": "Seeing Things in a New Light"
+        },
+        "description": {
+            "translate": "advancement.gm4.zauber_cauldrons.make_magicol.description",
+            "fallback": "Wait for the right Moon phase to make some Magicol",
+            "color": "gray"
+        },
+        "frame": "task",
+        "hidden": false
+    },
+    "parent": "gm4:zauber_cauldrons_full_armor",
+    "criteria": {
+        "make_magicol": {
+            "trigger": "minecraft:impossible"
+        }
+    }
+}

gm4_zauber_cauldrons/data/gm4/advancements/zauber_cauldrons_paint_biome.json

@@ -0,0 +1,25 @@
+{
+    "display": {
+        "icon": {
+            "item": "grass_block",
+            "nbt": "{CustomModelData:3420000}"
+        },
+        "title": {
+            "translate": "advancement.gm4.zauber_cauldrons.paint_biome.title",
+            "fallback": "Spreading the Magic"
+        },
+        "description": {
+            "translate": "advancement.gm4.zauber_cauldrons.paint_biome.description",
+            "fallback": "Use Bottled Magicol to give a biome a new look",
+            "color": "gray"
+        },
+        "frame": "goal",
+        "hidden": false
+    },
+    "parent": "gm4:zauber_cauldrons_make_magicol",
+    "criteria": {
+        "paint_biome": {
+            "trigger": "minecraft:impossible"
+        }
+    }
+}

gm4_zauber_cauldrons/data/gm4_potion_tracking/tags/functions/potion_landed.json

@@ -0,0 +1,5 @@
+{
+    "values": [
+        "gm4_zauber_cauldrons:thrown_potion_tracking/verify_potion_nbt"
+    ]
+}

gm4_zauber_cauldrons/data/gm4_potion_tracking/tags/functions/tag_potion.json

@@ -0,0 +1,5 @@
+{
+    "values": [
+        "gm4_zauber_cauldrons:thrown_potion_tracking/tag_potion"
+    ]
+}

gm4_zauber_cauldrons/data/gm4_zauber_cauldrons/advancements/cauldron/level_0.json

@@ -0,0 +1,24 @@
+{
+    "criteria": {
+        "requirement": {
+            "trigger": "minecraft:item_used_on_block",
+            "conditions": {
+                "location": [
+                    {
+                        "condition": "minecraft:location_check",
+                        "predicate": {
+                            "block": {
+                                "blocks": [
+                                    "minecraft:cauldron"
+                                ]
+                            }
+                        }
+                    }
+                ]
+            }
+        }
+    },
+    "rewards": {
+        "function": "gm4_zauber_cauldrons:cauldron/liquid/update/level_0/find_cauldron"
+    }
+}

gm4_zauber_cauldrons/data/gm4_zauber_cauldrons/advancements/cauldron/level_1.json

@@ -0,0 +1,27 @@
+{
+    "criteria": {
+        "requirement": {
+            "trigger": "minecraft:item_used_on_block",
+            "conditions": {
+                "location": [
+                    {
+                        "condition": "minecraft:location_check",
+                        "predicate": {
+                            "block": {
+                                "blocks": [
+                                    "minecraft:water_cauldron"
+                                ],
+                                "state": {
+                                    "level": "1"
+                                }
+                            }
+                        }
+                    }
+                ]
+            }
+        }
+    },
+    "rewards": {
+        "function": "gm4_zauber_cauldrons:cauldron/liquid/update/level_1/find_cauldron"
+    }
+}

gm4_zauber_cauldrons/data/gm4_zauber_cauldrons/advancements/cauldron/level_2.json

@@ -0,0 +1,27 @@
+{
+    "criteria": {
+        "requirement": {
+            "trigger": "minecraft:item_used_on_block",
+            "conditions": {
+                "location": [
+                    {
+                        "condition": "minecraft:location_check",
+                        "predicate": {
+                            "block": {
+                                "blocks": [
+                                    "minecraft:water_cauldron"
+                                ],
+                                "state": {
+                                    "level": "2"
+                                }
+                            }
+                        }
+                    }
+                ]
+            }
+        }
+    },
+    "rewards": {
+        "function": "gm4_zauber_cauldrons:cauldron/liquid/update/level_2/find_cauldron"
+    }
+}