new version, using consumable component

README.md

@@ -13,13 +13,13 @@ Version: `1.21.4`
 Give Empty Experience Bottle:
 
 ```mcfunction
-/loot give @s loot experience_bottle:empty_experience_bottle
+/loot give @s loot experience_bottle:empty
 ```
 
 Give Filled Experience Bottle:
 
 ```mcfunction
-/loot give @s loot experience_bottle:filled_experience_bottle
+/loot give @s loot experience_bottle:filled
 ```
 
 Disable:

data/experience_bottle/advancement/consume/empty.json

@@ -0,0 +1,19 @@
+{
+  "criteria": {
+    "requirement": {
+      "trigger": "minecraft:consume_item",
+      "conditions": {
+        "item": {
+          "components": {
+            "minecraft:custom_data": {
+              "experience_bottle.empty": true
+            }
+          }
+        }
+      }
+    }
+  },
+  "rewards": {
+      "function": "experience_bottle:empty/consume"
+  }
+}

data/experience_bottle/advancement/consume/filled.json

@@ -0,0 +1,19 @@
+{
+  "criteria": {
+    "requirement": {
+      "trigger": "minecraft:consume_item",
+      "conditions": {
+        "item": {
+          "components": {
+            "minecraft:custom_data": {
+              "experience_bottle.filled": true
+            }
+          }
+        }
+      }
+    }
+  },
+  "rewards": {
+      "function": "experience_bottle:filled/consume"
+  }
+}

data/experience_bottle/function/empty/consume.mcfunction

@@ -0,0 +1,6 @@
+advancement revoke @s only experience_bottle:consume/empty
+
+xp add @s -1395 points
+
+execute if predicate experience_bottle:empty/mainhand run return run loot replace entity @s weapon.mainhand loot experience_bottle:filled
+execute if predicate experience_bottle:empty/offhand run return run loot replace entity @s weapon.offhand loot experience_bottle:filled

data/experience_bottle/function/empty/holding.mcfunction

@@ -0,0 +1,5 @@
+execute store result score @s experience_bottle.player.xp run xp query @s levels
+
+$execute if score @s experience_bottle.player.xp matches ..29 run return run item modify entity @s weapon.$(hand)hand experience_bottle:non_consumable
+
+$item modify entity @s weapon.$(hand)hand experience_bottle:consumable/empty

data/experience_bottle/function/filled/consume.mcfunction

@@ -0,0 +1,9 @@
+advancement revoke @s only experience_bottle:consume/filled
+
+xp add @s 1395 points
+
+execute if predicate experience_bottle:filled/mainhand run return run loot replace entity @s weapon.mainhand loot experience_bottle:empty
+execute if predicate experience_bottle:filled/offhand run return run loot replace entity @s weapon.offhand loot experience_bottle:empty
+
+# execute if items entity @s weapon.mainhand minecraft:glass_bottle run return run loot replace entity @s weapon.mainhand loot experience_bottle:empty
+# execute if items entity @s weapon.offhand minecraft:glass_bottle run return run loot replace entity @s weapon.offhand loot experience_bottle:empty

data/experience_bottle/function/load.mcfunction

@@ -1,2 +1,4 @@
-scoreboard objectives add experience_bottle.potion_use minecraft.used:minecraft.potion
-scoreboard objectives add experience_bottle.player_xp dummy
+scoreboard objectives add experience_bottle.player.xp dummy
+
+advancement revoke @a only experience_bottle:consume/empty
+advancement revoke @a only experience_bottle:consume/filled

data/experience_bottle/function/tick.mcfunction

@@ -1,4 +1,2 @@
-execute as @a[nbt={active_effects:[{id:"minecraft:mining_fatigue",amplifier:19b}]}] if score @s experience_bottle.potion_use matches 1.. run function experience_bottle:empty/check_xp
-execute as @a[nbt={active_effects:[{id:"minecraft:mining_fatigue",amplifier:20b}]}] if score @s experience_bottle.potion_use matches 1.. at @s run function experience_bottle:filled/check_hand
-
-execute as @a if score @s experience_bottle.potion_use matches 1.. run scoreboard players reset @s experience_bottle.potion_use
+execute as @a if predicate experience_bottle:empty/mainhand run function experience_bottle:empty/holding {"hand":"main"}
+execute as @a if predicate experience_bottle:empty/offhand run function experience_bottle:empty/holding {"hand":"off"}

data/experience_bottle/item_modifier/consumable/empty.json

@@ -0,0 +1,11 @@
+{
+    "function": "minecraft:set_components",
+    "components": {
+      "minecraft:consumable": {
+        "consume_seconds": 0.05,
+        "animation": "none",
+        "sound": "minecraft:block.trial_spawner.spawn_mob",
+        "has_consume_particles": false
+      }
+    }
+}

data/experience_bottle/item_modifier/consumable/filled.json

@@ -0,0 +1,17 @@
+{
+    "function": "minecraft:set_components",
+    "components": {
+      "minecraft:consumable": {
+        "consume_seconds": 2,
+        "animation": "drink",
+        "sound": "minecraft:entity.generic.drink",
+        "has_consume_particles": false,
+        "on_consume_effects": [
+          {
+            "type": "minecraft:play_sound",
+            "sound": "entity.player.levelup"
+          }
+        ]
+      }
+    }
+}

data/experience_bottle/item_modifier/non_consumable.json

@@ -0,0 +1,6 @@
+{
+    "function": "minecraft:set_components",
+    "components": {
+      "!minecraft:consumable": {}
+    }
+}

data/experience_bottle/loot_table/empty.json

@@ -0,0 +1,43 @@
+{
+  "pools": [
+    {
+      "rolls": 1,
+      "entries": [
+        {
+          "type": "item",
+          "weight": 1,
+          "name": "minecraft:command_block",
+          "functions": [
+            {
+              "function": "set_count",
+              "count": 1
+            },
+            {
+              "function": "set_components",
+              "components": {
+                "minecraft:rarity": "epic",
+                "minecraft:enchantment_glint_override": true,
+                "minecraft:max_stack_size": 1,
+                "minecraft:custom_data": {
+                  "experience_bottle.empty": true
+                },
+                "minecraft:consumable": {
+                  "consume_seconds": 0.05,
+                  "animation": "none",
+                  "sound": "minecraft:block.trial_spawner.spawn_mob",
+                  "has_consume_particles": false
+                },
+                "minecraft:use_cooldown": {
+                  "seconds": 2,
+                  "cooldown_group": "experience_bottle:cooldown"
+                },
+                "minecraft:item_model": "minecraft:glass_bottle",
+                "minecraft:custom_name": "{\"text\":\"Experience Bottle\",\"italic\": false}"
+              }
+            }
+          ]
+        }
+      ]
+    }
+  ]
+}

data/experience_bottle/loot_table/filled.json

@@ -0,0 +1,52 @@
+{
+  "pools": [
+    {
+      "rolls": 1,
+      "entries": [
+        {
+          "type": "item",
+          "weight": 1,
+          "name": "minecraft:potion",
+          "functions": [
+            {
+              "function": "set_count",
+              "count": 1
+            },
+            {
+              "function": "set_components",
+              "components": {
+                "minecraft:rarity": "epic",
+                "minecraft:enchantment_glint_override": true,
+                "minecraft:custom_data": {
+                  "experience_bottle.filled": true
+                },
+                "minecraft:potion_contents": {
+                  "custom_color": 2276636
+                },
+                "minecraft:hide_additional_tooltip": {},
+                "minecraft:consumable": {
+                  "consume_seconds": 2,
+                  "animation": "drink",
+                  "sound": "minecraft:entity.generic.drink",
+                  "has_consume_particles": false,
+                  "on_consume_effects": [
+                    {
+                      "type": "minecraft:play_sound",
+                      "sound": "entity.player.levelup"
+                    }
+                  ]
+                },
+                "minecraft:use_cooldown": {
+                  "seconds": 2,
+                  "cooldown_group": "experience_bottle:cooldown"
+                },
+                "minecraft:custom_name": "{\"text\":\"Experience Bottle\",\"italic\": false}",
+                "!minecraft:use_remainder": {}
+              }
+            }
+          ]
+        }
+      ]
+    }
+  ]
+}