Update to 1.20 and leftover fixes (#898)

- Actually works in 1.20, after including the required location tags - Addresses SneakingSpider's last mentioned issue regarding milk/cows - Turns out milk uses player_interacted_with_entity, not filled_bucket - Addresses rx's concern about the powder snow toggle - It is now off by default - Updates the bucket shamir nbt in init - As a result, this autoupdates pre-existing Infinitas buckets after use
Gamemode4Dev · Sep 22, 2023 · 42d0437 · 42d0437
1 parent 3943e7a
commit 42d0437
Show file tree

Hide file tree

Showing 16 changed files with 498 additions and 182 deletions.
diff --git a/gm4_metallurgy/data/gm4_infinitas_shamir/advancements/empty/pickup_mainhand.json b/gm4_metallurgy/data/gm4_infinitas_shamir/advancements/empty/pickup_mainhand.json
@@ -21,13 +21,18 @@
             }
           }
         ],
-        "location": {
-          "block": {
-            "blocks": [
-              "minecraft:cauldron"
-            ]
+        "location": [
+          {
+            "condition": "minecraft:location_check",
+            "predicate": {
+              "block": {
+                "blocks": [
+                  "minecraft:cauldron"
+                ]
+              }
+            }
           }
-        }
+        ]
       }
     },
     "lava_bucket": {
@@ -50,7 +55,7 @@
       }
     },
     "milk_bucket": {
-      "trigger": "minecraft:filled_bucket",
+      "trigger": "minecraft:player_interacted_with_entity",
       "conditions": {
         "player": [
           {
@@ -63,7 +68,7 @@
         ],
         "item": {
           "items": [
-            "minecraft:milk_bucket"
+            "minecraft:bucket"
           ]
         }
       }

diff --git a/gm4_metallurgy/data/gm4_infinitas_shamir/advancements/empty/pickup_offhand.json b/gm4_metallurgy/data/gm4_infinitas_shamir/advancements/empty/pickup_offhand.json
@@ -21,13 +21,18 @@
             }
           }
         ],
-        "location": {
-          "block": {
-            "blocks": [
-              "minecraft:cauldron"
-            ]
+        "location": [
+          {
+            "condition": "minecraft:location_check",
+            "predicate": {
+              "block": {
+                "blocks": [
+                  "minecraft:cauldron"
+                ]
+              }
+            }
           }
-        }
+        ]
       }
     },
     "lava_bucket": {
@@ -50,7 +55,7 @@
       }
     },
     "milk_bucket": {
-      "trigger": "minecraft:filled_bucket",
+      "trigger": "minecraft:player_interacted_with_entity",
       "conditions": {
         "player": [
           {
@@ -63,7 +68,7 @@
         ],
         "item": {
           "items": [
-            "minecraft:milk_bucket"
+            "minecraft:bucket"
           ]
         }
       }

diff --git a/gm4_metallurgy/data/gm4_infinitas_shamir/advancements/lava/place_mainhand.json b/gm4_metallurgy/data/gm4_infinitas_shamir/advancements/lava/place_mainhand.json
@@ -7,36 +7,28 @@
           {
             "condition": "minecraft:inverted",
             "term": {
-              "condition": "minecraft:alternative",
-              "terms": [
-                {
-                  "condition": "minecraft:inverted",
-                  "term": {
-                    "condition": "minecraft:value_check",
-                    "value": {
-                      "type": "minecraft:score",
-                      "target": {
-                        "type": "minecraft:fixed",
-                        "name": "$lava_infinitas"
-                      },
-                      "score": "gm4_ml_data"
-                    },
-                    "range": 1
-                  }
-                },
-                {
-                  "condition": "minecraft:entity_properties",
-                  "entity": "this",
-                  "predicate": {
-                    "type_specific": {
-                      "type": "player",
-                      "gamemode": "creative"
-                    }
-                  }
+              "condition": "minecraft:entity_properties",
+              "entity": "this",
+              "predicate": {
+                "type_specific": {
+                  "type": "player",
+                  "gamemode": "creative"
                 }
-              ]
+              }
             }
           },
+          {
+            "condition": "minecraft:value_check",
+            "value": {
+              "type": "minecraft:score",
+              "target": {
+                "type": "minecraft:fixed",
+                "name": "$lava_infinitas"
+              },
+              "score": "gm4_ml_data"
+            },
+            "range": 1
+          },
           {
             "condition": "minecraft:entity_properties",
             "entity": "this",
@@ -51,6 +43,18 @@
               }
             }
           }
+        ],
+        "location": [
+          {
+            "condition": "minecraft:location_check",
+            "predicate": {
+              "block": {
+                "blocks": [
+                  "minecraft:lava"
+                ]
+              }
+            }
+          }
         ]
       }
     },
@@ -61,51 +65,55 @@
           {
             "condition": "minecraft:inverted",
             "term": {
-              "condition": "minecraft:alternative",
-              "terms": [
-                {
-                  "condition": "minecraft:inverted",
-                  "term": {
-                    "condition": "minecraft:value_check",
-                    "value": {
-                      "type": "minecraft:score",
-                      "target": {
-                        "type": "minecraft:fixed",
-                        "name": "$lava_infinitas"
-                      },
-                      "score": "gm4_ml_data"
-                    },
-                    "range": 1
-                  }
-                },
-                {
-                  "condition": "minecraft:inverted",
-                  "term": {
-                    "condition": "minecraft:entity_properties",
-                    "entity": "this",
-                    "predicate": {
-                      "nbt": "{Tags:[\"gm4_infinitas_mainhand_lava\"]}",
-                      "equipment": {
-                        "mainhand": {
-                          "items": [
-                            "minecraft:bucket"
-                          ]
-                        }
-                      }
-                    }
-                  }
+              "condition": "minecraft:entity_properties",
+              "entity": "this",
+              "predicate": {
+                "type_specific": {
+                  "type": "player",
+                  "gamemode": "creative"
+                }
+              }
+            }
+          },
+          {
+            "condition": "minecraft:value_check",
+            "value": {
+              "type": "minecraft:score",
+              "target": {
+                "type": "minecraft:fixed",
+                "name": "$lava_infinitas"
+              },
+              "score": "gm4_ml_data"
+            },
+            "range": 1
+          },
+          {
+            "condition": "minecraft:entity_properties",
+            "entity": "this",
+            "predicate": {
+              "nbt": "{Tags:[\"gm4_infinitas_mainhand_lava\"]}",
+              "equipment": {
+                "mainhand": {
+                  "items": [
+                    "minecraft:bucket"
+                  ]
                 }
-              ]
+              }
             }
           }
         ],
-        "location": {
-          "block": {
-            "blocks": [
-              "minecraft:lava_cauldron"
-            ]
+        "location": [
+          {
+            "condition": "minecraft:location_check",
+            "predicate": {
+              "block": {
+                "blocks": [
+                  "minecraft:lava_cauldron"
+                ]
+              }
+            }
           }
-        }
+        ]
       }
     }
   },