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
index 6e10af5f0b..1cf96327f5 100644
--- 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
index da47259a55..5f624c2944 100644
--- 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
index a5cbfc7b86..33a643f2ca 100644
--- 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"
+                ]
+              }
+            }
           }
-        }
+        ]
       }
     }
   },
diff --git a/gm4_metallurgy/data/gm4_infinitas_shamir/advancements/lava/place_offhand.json b/gm4_metallurgy/data/gm4_infinitas_shamir/advancements/lava/place_offhand.json
index e28e1638c5..01c4f9094c 100644
--- a/gm4_metallurgy/data/gm4_infinitas_shamir/advancements/lava/place_offhand.json
+++ b/gm4_metallurgy/data/gm4_infinitas_shamir/advancements/lava/place_offhand.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_offhand_lava\"]}",
-                      "equipment": {
-                        "offhand": {
-                          "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_offhand_lava\"]}",
+              "equipment": {
+                "offhand": {
+                  "items": [
+                    "minecraft:bucket"
+                  ]
                 }
-              ]
+              }
             }
           }
         ],
-        "location": {
-          "block": {
-            "blocks": [
-              "minecraft:lava_cauldron"
-            ]
+        "location": [
+          {
+            "condition": "minecraft:location_check",
+            "predicate": {
+              "block": {
+                "blocks": [
+                  "minecraft:lava_cauldron"
+                ]
+              }
+            }
           }
-        }
+        ]
       }
     }
   },
diff --git a/gm4_metallurgy/data/gm4_infinitas_shamir/advancements/powder_snow/place_mainhand.json b/gm4_metallurgy/data/gm4_infinitas_shamir/advancements/powder_snow/place_mainhand.json
index c8d7f5ec0a..672c84e8d9 100644
--- a/gm4_metallurgy/data/gm4_infinitas_shamir/advancements/powder_snow/place_mainhand.json
+++ b/gm4_metallurgy/data/gm4_infinitas_shamir/advancements/powder_snow/place_mainhand.json
@@ -17,6 +17,18 @@
               }
             }
           },
+          {
+            "condition": "minecraft:value_check",
+            "value": {
+              "type": "minecraft:score",
+              "target": {
+                "type": "minecraft:fixed",
+                "name": "$powder_snow_infinitas"
+              },
+              "score": "gm4_ml_data"
+            },
+            "range": 1
+          },
           {
             "condition": "minecraft:entity_properties",
             "entity": "this",
@@ -31,6 +43,18 @@
               }
             }
           }
+        ],
+        "location": [
+          {
+            "condition": "minecraft:location_check",
+            "predicate": {
+              "block": {
+                "blocks": [
+                  "minecraft:powder_snow"
+                ]
+              }
+            }
+          }
         ]
       }
     },
@@ -38,6 +62,31 @@
       "trigger": "minecraft:item_used_on_block",
       "conditions": {
         "player": [
+          {
+            "condition": "minecraft:inverted",
+            "term": {
+              "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": "$powder_snow_infinitas"
+              },
+              "score": "gm4_ml_data"
+            },
+            "range": 1
+          },
           {
             "condition": "minecraft:entity_properties",
             "entity": "this",
@@ -53,13 +102,18 @@
             }
           }
         ],
-        "location": {
-          "block": {
-            "blocks": [
-              "minecraft:powder_snow_cauldron"
-            ]
+        "location": [
+          {
+            "condition": "minecraft:location_check",
+            "predicate": {
+              "block": {
+                "blocks": [
+                  "minecraft:powder_snow_cauldron"
+                ]
+              }
+            }
           }
-        }
+        ]
       }
     }
   },
diff --git a/gm4_metallurgy/data/gm4_infinitas_shamir/advancements/powder_snow/place_offhand.json b/gm4_metallurgy/data/gm4_infinitas_shamir/advancements/powder_snow/place_offhand.json
index 9bacbe37c4..1e371e20e8 100644
--- a/gm4_metallurgy/data/gm4_infinitas_shamir/advancements/powder_snow/place_offhand.json
+++ b/gm4_metallurgy/data/gm4_infinitas_shamir/advancements/powder_snow/place_offhand.json
@@ -17,6 +17,18 @@
               }
             }
           },
+          {
+            "condition": "minecraft:value_check",
+            "value": {
+              "type": "minecraft:score",
+              "target": {
+                "type": "minecraft:fixed",
+                "name": "$powder_snow_infinitas"
+              },
+              "score": "gm4_ml_data"
+            },
+            "range": 1
+          },
           {
             "condition": "minecraft:entity_properties",
             "entity": "this",
@@ -31,6 +43,18 @@
               }
             }
           }
+        ],
+        "location": [
+          {
+            "condition": "minecraft:location_check",
+            "predicate": {
+              "block": {
+                "blocks": [
+                  "minecraft:powder_snow"
+                ]
+              }
+            }
+          }
         ]
       }
     },
@@ -38,6 +62,31 @@
       "trigger": "minecraft:item_used_on_block",
       "conditions": {
         "player": [
+          {
+            "condition": "minecraft:inverted",
+            "term": {
+              "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": "$powder_snow_infinitas"
+              },
+              "score": "gm4_ml_data"
+            },
+            "range": 1
+          },
           {
             "condition": "minecraft:entity_properties",
             "entity": "this",
@@ -53,13 +102,18 @@
             }
           }
         ],
-        "location": {
-          "block": {
-            "blocks": [
-              "minecraft:powder_snow_cauldron"
-            ]
+        "location": [
+          {
+            "condition": "minecraft:location_check",
+            "predicate": {
+              "block": {
+                "blocks": [
+                  "minecraft:powder_snow_cauldron"
+                ]
+              }
+            }
           }
-        }
+        ]
       }
     }
   },
diff --git a/gm4_metallurgy/data/gm4_infinitas_shamir/advancements/water/place_mainhand.json b/gm4_metallurgy/data/gm4_infinitas_shamir/advancements/water/place_mainhand.json
index 78fbc361a3..aa0a8ea0dd 100644
--- a/gm4_metallurgy/data/gm4_infinitas_shamir/advancements/water/place_mainhand.json
+++ b/gm4_metallurgy/data/gm4_infinitas_shamir/advancements/water/place_mainhand.json
@@ -31,6 +31,18 @@
               }
             }
           }
+        ],
+        "location": [
+          {
+            "condition": "minecraft:location_check",
+            "predicate": {
+              "block": {
+                "blocks": [
+                  "minecraft:water"
+                ]
+              }
+            }
+          }
         ]
       }
     },
@@ -65,6 +77,18 @@
               }
             }
           }
+        ],
+        "location": [
+          {
+            "condition": "minecraft:location_check",
+            "predicate": {
+              "block": {
+                "blocks": [
+                  "minecraft:water"
+                ]
+              }
+            }
+          }
         ]
       }
     },
@@ -99,6 +123,18 @@
               }
             }
           }
+        ],
+        "location": [
+          {
+            "condition": "minecraft:location_check",
+            "predicate": {
+              "block": {
+                "blocks": [
+                  "minecraft:water"
+                ]
+              }
+            }
+          }
         ]
       }
     },
@@ -133,6 +169,18 @@
               }
             }
           }
+        ],
+        "location": [
+          {
+            "condition": "minecraft:location_check",
+            "predicate": {
+              "block": {
+                "blocks": [
+                  "minecraft:water"
+                ]
+              }
+            }
+          }
         ]
       }
     },
@@ -167,6 +215,18 @@
               }
             }
           }
+        ],
+        "location": [
+          {
+            "condition": "minecraft:location_check",
+            "predicate": {
+              "block": {
+                "blocks": [
+                  "minecraft:water"
+                ]
+              }
+            }
+          }
         ]
       }
     },
@@ -201,6 +261,18 @@
               }
             }
           }
+        ],
+        "location": [
+          {
+            "condition": "minecraft:location_check",
+            "predicate": {
+              "block": {
+                "blocks": [
+                  "minecraft:water"
+                ]
+              }
+            }
+          }
         ]
       }
     },
@@ -235,6 +307,18 @@
               }
             }
           }
+        ],
+        "location": [
+          {
+            "condition": "minecraft:location_check",
+            "predicate": {
+              "block": {
+                "blocks": [
+                  "minecraft:water"
+                ]
+              }
+            }
+          }
         ]
       }
     },
@@ -257,13 +341,18 @@
             }
           }
         ],
-        "location": {
-          "block": {
-            "blocks": [
-              "minecraft:water_cauldron"
-            ]
+        "location": [
+          {
+            "condition": "minecraft:location_check",
+            "predicate": {
+              "block": {
+                "blocks": [
+                  "minecraft:water_cauldron"
+                ]
+              }
+            }
           }
-        }
+        ]
       }
     }
   },
diff --git a/gm4_metallurgy/data/gm4_infinitas_shamir/advancements/water/place_offhand.json b/gm4_metallurgy/data/gm4_infinitas_shamir/advancements/water/place_offhand.json
index 32004ddeb4..8e3dad2ca1 100644
--- a/gm4_metallurgy/data/gm4_infinitas_shamir/advancements/water/place_offhand.json
+++ b/gm4_metallurgy/data/gm4_infinitas_shamir/advancements/water/place_offhand.json
@@ -31,6 +31,18 @@
               }
             }
           }
+        ],
+        "location": [
+          {
+            "condition": "minecraft:location_check",
+            "predicate": {
+              "block": {
+                "blocks": [
+                  "minecraft:water"
+                ]
+              }
+            }
+          }
         ]
       }
     },
@@ -65,6 +77,18 @@
               }
             }
           }
+        ],
+        "location": [
+          {
+            "condition": "minecraft:location_check",
+            "predicate": {
+              "block": {
+                "blocks": [
+                  "minecraft:water"
+                ]
+              }
+            }
+          }
         ]
       }
     },
@@ -99,6 +123,18 @@
               }
             }
           }
+        ],
+        "location": [
+          {
+            "condition": "minecraft:location_check",
+            "predicate": {
+              "block": {
+                "blocks": [
+                  "minecraft:water"
+                ]
+              }
+            }
+          }
         ]
       }
     },
@@ -133,6 +169,18 @@
               }
             }
           }
+        ],
+        "location": [
+          {
+            "condition": "minecraft:location_check",
+            "predicate": {
+              "block": {
+                "blocks": [
+                  "minecraft:water"
+                ]
+              }
+            }
+          }
         ]
       }
     },
@@ -167,6 +215,18 @@
               }
             }
           }
+        ],
+        "location": [
+          {
+            "condition": "minecraft:location_check",
+            "predicate": {
+              "block": {
+                "blocks": [
+                  "minecraft:water"
+                ]
+              }
+            }
+          }
         ]
       }
     },
@@ -201,6 +261,18 @@
               }
             }
           }
+        ],
+        "location": [
+          {
+            "condition": "minecraft:location_check",
+            "predicate": {
+              "block": {
+                "blocks": [
+                  "minecraft:water"
+                ]
+              }
+            }
+          }
         ]
       }
     },
@@ -235,6 +307,18 @@
               }
             }
           }
+        ],
+        "location": [
+          {
+            "condition": "minecraft:location_check",
+            "predicate": {
+              "block": {
+                "blocks": [
+                  "minecraft:water"
+                ]
+              }
+            }
+          }
         ]
       }
     },
@@ -257,13 +341,18 @@
             }
           }
         ],
-        "location": {
-          "block": {
-            "blocks": [
-              "minecraft:water_cauldron"
-            ]
+        "location": [
+          {
+            "condition": "minecraft:location_check",
+            "predicate": {
+              "block": {
+                "blocks": [
+                  "minecraft:water_cauldron"
+                ]
+              }
+            }
           }
-        }
+        ]
       }
     }
   },
diff --git a/gm4_metallurgy/data/gm4_infinitas_shamir/functions/mark_item_validity.mcfunction b/gm4_metallurgy/data/gm4_infinitas_shamir/functions/mark_item_validity.mcfunction
index f5e86d152b..b20f0818b2 100644
--- a/gm4_metallurgy/data/gm4_infinitas_shamir/functions/mark_item_validity.mcfunction
+++ b/gm4_metallurgy/data/gm4_infinitas_shamir/functions/mark_item_validity.mcfunction
@@ -6,7 +6,7 @@ execute unless score valid_item gm4_ml_data matches 1 store success score valid_
 execute unless score valid_item gm4_ml_data matches 1 store success score valid_item gm4_ml_data if entity @s[nbt={Item:{id:"minecraft:cod_bucket"}}]
 execute unless score valid_item gm4_ml_data matches 1 if score $lava_infinitas gm4_ml_data matches 1 store success score valid_item gm4_ml_data if entity @s[nbt={Item:{id:"minecraft:lava_bucket"}}]
 execute unless score valid_item gm4_ml_data matches 1 store success score valid_item gm4_ml_data if entity @s[nbt={Item:{id:"minecraft:milk_bucket"}}]
-execute unless score valid_item gm4_ml_data matches 1 store success score valid_item gm4_ml_data if entity @s[nbt={Item:{id:"minecraft:powder_snow_bucket"}}]
+execute unless score valid_item gm4_ml_data matches 1 if score $powder_snow_infinitas gm4_ml_data matches 1 store success score valid_item gm4_ml_data if entity @s[nbt={Item:{id:"minecraft:powder_snow_bucket"}}]
 execute unless score valid_item gm4_ml_data matches 1 store success score valid_item gm4_ml_data if entity @s[nbt={Item:{id:"minecraft:pufferfish_bucket"}}]
 execute unless score valid_item gm4_ml_data matches 1 store success score valid_item gm4_ml_data if entity @s[nbt={Item:{id:"minecraft:salmon_bucket"}}]
 execute unless score valid_item gm4_ml_data matches 1 store success score valid_item gm4_ml_data if entity @s[nbt={Item:{id:"minecraft:tadpole_bucket"}}]
diff --git a/gm4_metallurgy/data/gm4_infinitas_shamir/predicates/mainhand/after/empty.json b/gm4_metallurgy/data/gm4_infinitas_shamir/predicates/mainhand/after/empty.json
index 81c08d0aaa..b6502b6895 100644
--- a/gm4_metallurgy/data/gm4_infinitas_shamir/predicates/mainhand/after/empty.json
+++ b/gm4_metallurgy/data/gm4_infinitas_shamir/predicates/mainhand/after/empty.json
@@ -1,5 +1,5 @@
 {
-  "condition": "minecraft:alternative",
+  "condition": "minecraft:any_of",
   "terms": [
     {
       "condition": "minecraft:entity_properties",
diff --git a/gm4_metallurgy/data/gm4_infinitas_shamir/predicates/mainhand/after/use_bucket.json b/gm4_metallurgy/data/gm4_infinitas_shamir/predicates/mainhand/after/use_bucket.json
index 3ef45dc1c1..aa4bbf4828 100644
--- a/gm4_metallurgy/data/gm4_infinitas_shamir/predicates/mainhand/after/use_bucket.json
+++ b/gm4_metallurgy/data/gm4_infinitas_shamir/predicates/mainhand/after/use_bucket.json
@@ -1,5 +1,5 @@
 {
-  "condition": "minecraft:alternative",
+  "condition": "minecraft:any_of",
   "terms": [
     {
       "condition": "minecraft:entity_properties",
diff --git a/gm4_metallurgy/data/gm4_infinitas_shamir/predicates/offhand/after/empty.json b/gm4_metallurgy/data/gm4_infinitas_shamir/predicates/offhand/after/empty.json
index 63e38f5cde..74bfb8ac5b 100644
--- a/gm4_metallurgy/data/gm4_infinitas_shamir/predicates/offhand/after/empty.json
+++ b/gm4_metallurgy/data/gm4_infinitas_shamir/predicates/offhand/after/empty.json
@@ -1,5 +1,5 @@
 {
-  "condition": "minecraft:alternative",
+  "condition": "minecraft:any_of",
   "terms": [
     {
       "condition": "minecraft:entity_properties",
diff --git a/gm4_metallurgy/data/gm4_infinitas_shamir/predicates/offhand/after/use_bucket.json b/gm4_metallurgy/data/gm4_infinitas_shamir/predicates/offhand/after/use_bucket.json
index 0b2719914f..f79c267b8c 100644
--- a/gm4_metallurgy/data/gm4_infinitas_shamir/predicates/offhand/after/use_bucket.json
+++ b/gm4_metallurgy/data/gm4_infinitas_shamir/predicates/offhand/after/use_bucket.json
@@ -1,5 +1,5 @@
 {
-  "condition": "minecraft:alternative",
+  "condition": "minecraft:any_of",
   "terms": [
     {
       "condition": "minecraft:entity_properties",
diff --git a/gm4_metallurgy/data/gm4_infinitas_shamir/predicates/offhand/after/water.json b/gm4_metallurgy/data/gm4_infinitas_shamir/predicates/offhand/after/water.json
index 18a5fa9b52..cac8d4b85d 100644
--- a/gm4_metallurgy/data/gm4_infinitas_shamir/predicates/offhand/after/water.json
+++ b/gm4_metallurgy/data/gm4_infinitas_shamir/predicates/offhand/after/water.json
@@ -1,5 +1,5 @@
 {
-  "condition": "minecraft:alternative",
+  "condition": "minecraft:any_of",
   "terms": [
     {
       "condition": "minecraft:entity_properties",
diff --git a/gm4_metallurgy/data/gm4_metallurgy/functions/init.mcfunction b/gm4_metallurgy/data/gm4_metallurgy/functions/init.mcfunction
index 11a867b0b2..0ef1098c71 100644
--- a/gm4_metallurgy/data/gm4_metallurgy/functions/init.mcfunction
+++ b/gm4_metallurgy/data/gm4_metallurgy/functions/init.mcfunction
@@ -87,7 +87,11 @@ scoreboard objectives add gm4_infinitas_water_held dummy
 scoreboard objectives add gm4_infinitas_leave minecraft.custom:leave_game
 scoreboard objectives add gm4_infinitas_success_check dummy
 scoreboard players add $lava_infinitas gm4_ml_data 0
-data modify storage gm4_infinitas_shamir:bucket shamir set value {display:{Lore:['{"italic":false,"color":"#467A1B","translate":"%1$s%3427655$s","with":["Curie\'s Bismium Band",{"translate":"item.gm4.metallurgy.band","with":[{"translate":"item.gm4.metallurgy.curies_bismium"}]}]}','{"italic":false,"color":"aqua","translate":"%1$s%3427655$s","with":["Shamir",{"translate":"item.gm4.metallurgy.shamir"}]}','{"italic":false,"color":"gray","translate":"%1$s%3427655$s","with":["Infinitas",{"translate":"item.gm4.shamir.infinitas"}]}']},CustomModelData:3420100,gm4_metallurgy:{metal:{type:"curies_bismium"},custom_model_data:3420100,has_shamir:1b,active_shamir:"infinitas",skull_owner:"[Drop to Fix Item] gm4_infinitas_shamir:band"}}
+scoreboard players add $powder_snow_infinitas gm4_ml_data 0
+
+# register infinitas storage
+data remove storage gm4_infinitas_shamir:bucket shamir
+execute unless data storage gm4_infinitas_shamir:bucket shamir run data modify storage gm4_infinitas_shamir:bucket shamir set value {display:{Lore:['{"italic":false,"color":"#467A1B","translate":"item.gm4.metallurgy.band","fallback":"%s Band","with":[{"translate":"item.gm4.metallurgy.curies_bismium","fallback":"Curie\'s Bismium"}]}','{"italic":false,"color":"aqua","translate":"item.gm4.metallurgy.shamir","fallback":"Shamir"}','{"italic":false,"color":"gray","translate":"item.gm4.shamir.infinitas","fallback":"Infinitas"}']},CustomModelData:3420100,gm4_metallurgy:{metal:{type:"curies_bismium"},custom_model_data:3420100,has_shamir:1b,active_shamir:"infinitas",skull_owner:"[Drop to Fix Item] gm4_infinitas_shamir:band"}}
 
 #musical
 scoreboard objectives add gm4_note_collect totalKillCount
diff --git a/gm4_metallurgy/data/gm4_metallurgy/predicates/infinitas_active.json b/gm4_metallurgy/data/gm4_metallurgy/predicates/infinitas_active.json
index 6be773501d..89a550def1 100644
--- a/gm4_metallurgy/data/gm4_metallurgy/predicates/infinitas_active.json
+++ b/gm4_metallurgy/data/gm4_metallurgy/predicates/infinitas_active.json
@@ -1,5 +1,5 @@
 {
-  "condition": "minecraft:alternative",
+  "condition": "minecraft:any_of",
   "terms": [
     {
       "condition": "minecraft:entity_properties",