improv: rebalancing shifting glass loot generation rate and added advancement for using the aerbunny bell and shifting glass

src/generated/resources/assets/aether_ii/items/aerbunny_bell.json

@@ -0,0 +1,22 @@
+{
+  "model": {
+    "type": "minecraft:condition",
+    "on_false": {
+      "type": "minecraft:model",
+      "model": "aether_ii:item/aerbunny_bell_empty"
+    },
+    "on_true": {
+      "type": "minecraft:condition",
+      "on_false": {
+        "type": "minecraft:model",
+        "model": "aether_ii:item/aerbunny_bell_active"
+      },
+      "on_true": {
+        "type": "minecraft:model",
+        "model": "aether_ii:item/aerbunny_bell"
+      },
+      "property": "aether_ii:stored_companion"
+    },
+    "property": "aether_ii:attached_companion"
+  }
+}

src/generated/resources/assets/aether_ii/items/companion.json → src/generated/resources/assets/aether_ii/items/stone_of_resonance.json

@@ -1,6 +1,6 @@
 {
   "model": {
     "type": "minecraft:model",
-    "model": "aether_ii:item/companion"
+    "model": "aether_ii:item/stone_of_resonance"
   }
 }

src/generated/resources/assets/aether_ii/lang/en_us.json

@@ -4,6 +4,8 @@
   "accessories.slot.aether_ii.relic_slot": "Relic",
   "advancement.aether_ii.aerbunny": "Marketable Plushie",
   "advancement.aether_ii.aerbunny.desc": "Interact with a tamed Aerbunny to put it on your head",
+  "advancement.aether_ii.aerbunny_bell": "I choose you!",
+  "advancement.aether_ii.aerbunny_bell.desc": "Store an Aerbunny inside an Aerbunny Bell",
   "advancement.aether_ii.aercloud_glider": "Amateur Flying",
   "advancement.aether_ii.aercloud_glider.desc": "Use an Aercloud Glider for better mid-air movement",
   "advancement.aether_ii.alkahest_canister": "Handle with Care",
@@ -78,6 +80,8 @@
   "advancement.aether_ii.plant_cutting.desc": "Harvest a cutting from an Aechor Plant or Carrion Sprout",
   "advancement.aether_ii.sentry_boots_fall": "Vertigo",
   "advancement.aether_ii.sentry_boots_fall.desc": "Survive a critical fall with the help of Sentry Boots",
+  "advancement.aether_ii.shifting_glass": "Move like the Wind",
+  "advancement.aether_ii.shifting_glass.desc": "Perform a dash using the help of the Shifting Glass item",
   "advancement.aether_ii.skyroot_lizard": "Get Stickbugged!",
   "advancement.aether_ii.skyroot_lizard.desc": "Skewer a Skyroot Lizard on a Skyroot Stick",
   "advancement.aether_ii.slider": "Like a Bossaru!",
@@ -209,6 +213,10 @@
   "aether_ii.tooltip.item.charm.type.armor": "Armor Charm",
   "aether_ii.tooltip.item.charm.type.tool": "Tool Charm",
   "aether_ii.tooltip.item.charm.type.weapon": "Weapon Charm",
+  "aether_ii.tooltip.item.companion.status": "Status: %s",
+  "aether_ii.tooltip.item.companion.status.active": "Active",
+  "aether_ii.tooltip.item.companion.status.empty": "Empty",
+  "aether_ii.tooltip.item.companion.status.stored": "Stored",
   "aether_ii.tooltip.item.curative.reduces": "Reduces: %s",
   "aether_ii.tooltip.item.curative.removes": "Removes: %s",
   "aether_ii.tooltip.item.currency.amount": "%s Glint",
@@ -944,6 +952,7 @@
   "death.attack.aether_ii.effect.venom.player": "%1$s succumbed to venom while trying to escape %2$s",
   "death.attack.aether_ii.effect.wound": "%1$s was fatally wounded",
   "death.attack.aether_ii.effect.wound.player": "%1$s was fatally wounded by %2$s",
+  "death.attack.aether_ii.retreat": "%1$s retreated",
   "death.attack.aether_ii.shock": "%1$s was electrocuted",
   "death.attack.aether_ii.shock.player": "%1$s was electrocuted by %2$s",
   "dimension.aether_ii.aether_holy_isles": "Aether Holy Isles",
@@ -1063,6 +1072,7 @@
   "gui.aether_ii.toast.guidebook.exploration": "New Exploration Entry!",
   "item.aether_ii.aechor_petal": "Aechor Petal",
   "item.aether_ii.aechor_plant_spawn_egg": "Aechor Plant Spawn Egg",
+  "item.aether_ii.aerbunny_bell": "Aerbunny Bell",
   "item.aether_ii.aerbunny_spawn_egg": "Aerbunny Spawn Egg",
   "item.aether_ii.aerwhale_spawn_egg": "Aerwhale Spawn Egg",
   "item.aether_ii.aether_portal_frame": "Aether Portal Frame",
@@ -1397,6 +1407,7 @@
   "item.aether_ii.skyroot_water_bucket": "Skyroot Water Bucket",
   "item.aether_ii.slider_spawn_egg": "Slider Spawn Egg",
   "item.aether_ii.splint": "Splint",
+  "item.aether_ii.stone_of_resonance": "Stone of Resonance",
   "item.aether_ii.swet_gel": "Swet Gel",
   "item.aether_ii.swet_gel.nitrogen_internals.ability.tooltip.1": "§9Ability:§r Grows Nature",
   "item.aether_ii.swet_jelly": "Swet Jelly",
@@ -1633,6 +1644,7 @@
   "subtitles.aether_ii.entity.zephyr.hurt": "Zephyr hurts",
   "subtitles.aether_ii.entity.zephyr.shoot": "Zephyr spits",
   "subtitles.aether_ii.item.accessory.equip_generic": "Accessory equips",
+  "subtitles.aether_ii.item.aerbunny_bell.ring": "Aerbunny Bell rings",
   "subtitles.aether_ii.item.ambrosium_shard.use": "Ambrosium Shard used",
   "subtitles.aether_ii.item.arkenium_canister.empty": "Arkenium Canister empties",
   "subtitles.aether_ii.item.arkenium_canister.fill": "Arkenium Canister fills",

src/generated/resources/assets/aether_ii/models/item/companion.json → src/generated/resources/assets/aether_ii/models/item/aerbunny_bell.json

@@ -1,6 +1,6 @@
 {
   "parent": "minecraft:item/generated",
   "textures": {
-    "layer0": "aether_ii:item/companion"
+    "layer0": "aether_ii:item/aerbunny_bell"
   }
 }

src/generated/resources/assets/aether_ii/models/item/aerbunny_bell_active.json

@@ -0,0 +1,6 @@
+{
+  "parent": "minecraft:item/generated",
+  "textures": {
+    "layer0": "aether_ii:item/aerbunny_bell_active"
+  }
+}

src/generated/resources/assets/aether_ii/models/item/aerbunny_bell_empty.json

@@ -0,0 +1,6 @@
+{
+  "parent": "minecraft:item/generated",
+  "textures": {
+    "layer0": "aether_ii:item/aerbunny_bell_empty"
+  }
+}

src/generated/resources/assets/aether_ii/models/item/stone_of_resonance.json

@@ -0,0 +1,6 @@
+{
+  "parent": "minecraft:item/generated",
+  "textures": {
+    "layer0": "aether_ii:item/stone_of_resonance"
+  }
+}

src/generated/resources/assets/aether_ii/sounds.json

@@ -1504,6 +1504,15 @@
     ],
     "subtitle": "subtitles.aether_ii.item.accessory.equip_generic"
   },
+  "item.aerbunny_bell.ring": {
+    "sounds": [
+      {
+        "name": "block/bell/bell_use01",
+        "pitch": 4.0
+      }
+    ],
+    "subtitle": "subtitles.aether_ii.item.aerbunny_bell.ring"
+  },
   "item.ambrosium_shard.use": {
     "sounds": [
       "block/amethyst/shimmer"

src/generated/resources/data/aether_ii/advancement/aerbunny_bell.json

@@ -0,0 +1,36 @@
+{
+  "parent": "aether_ii:aerbunny",
+  "criteria": {
+    "aerbunny_bell": {
+      "conditions": {
+        "items": [
+          {
+            "items": "aether_ii:aerbunny_bell",
+            "predicates": {
+              "aether_ii:companion_tag": {}
+            }
+          }
+        ]
+      },
+      "trigger": "minecraft:inventory_changed"
+    }
+  },
+  "display": {
+    "description": {
+      "color": "aqua",
+      "translate": "advancement.aether_ii.aerbunny_bell.desc"
+    },
+    "icon": {
+      "id": "aether_ii:aerbunny_bell"
+    },
+    "title": {
+      "translate": "advancement.aether_ii.aerbunny_bell"
+    }
+  },
+  "requirements": [
+    [
+      "aerbunny_bell"
+    ]
+  ],
+  "sends_telemetry_event": true
+}

src/generated/resources/data/aether_ii/advancement/recipes/misc/aerbunny_bell.json

@@ -0,0 +1,32 @@
+{
+  "parent": "minecraft:recipes/root",
+  "criteria": {
+    "has_stone_of_resonance": {
+      "conditions": {
+        "items": [
+          {
+            "items": "aether_ii:stone_of_resonance"
+          }
+        ]
+      },
+      "trigger": "minecraft:inventory_changed"
+    },
+    "has_the_recipe": {
+      "conditions": {
+        "recipe": "aether_ii:aerbunny_bell"
+      },
+      "trigger": "minecraft:recipe_unlocked"
+    }
+  },
+  "requirements": [
+    [
+      "has_the_recipe",
+      "has_stone_of_resonance"
+    ]
+  ],
+  "rewards": {
+    "recipes": [
+      "aether_ii:aerbunny_bell"
+    ]
+  }
+}

src/generated/resources/data/aether_ii/advancement/shifting_glass.json

@@ -0,0 +1,31 @@
+{
+  "parent": "aether_ii:blue_aercloud",
+  "criteria": {
+    "shifting_glass": {
+      "conditions": {
+        "item": {
+          "items": "aether_ii:shifting_glass"
+        }
+      },
+      "trigger": "minecraft:using_item"
+    }
+  },
+  "display": {
+    "description": {
+      "color": "aqua",
+      "translate": "advancement.aether_ii.shifting_glass.desc"
+    },
+    "icon": {
+      "id": "aether_ii:shifting_glass"
+    },
+    "title": {
+      "translate": "advancement.aether_ii.shifting_glass"
+    }
+  },
+  "requirements": [
+    [
+      "shifting_glass"
+    ]
+  ],
+  "sends_telemetry_event": true
+}

src/generated/resources/data/aether_ii/loot_table/chests/brexallen_ruins/common.json

@@ -18,7 +18,7 @@
             }
           ],
           "name": "aether_ii:ambrosium_shard",
-          "weight": 10
+          "weight": 5
         },
         {
           "type": "minecraft:item",
@@ -34,7 +34,7 @@
             }
           ],
           "name": "aether_ii:ambrosium_torch",
-          "weight": 8
+          "weight": 4
         },
         {
           "type": "minecraft:item",
@@ -50,7 +50,7 @@
             }
           ],
           "name": "aether_ii:golden_amber",
-          "weight": 6
+          "weight": 3
         },
         {
           "type": "minecraft:item",
@@ -66,28 +66,11 @@
             }
           ],
           "name": "aether_ii:icestone",
-          "weight": 4
-        },
-        {
-          "type": "minecraft:item",
-          "functions": [
-            {
-              "add": false,
-              "damage": {
-                "type": "minecraft:uniform",
-                "max": 0.8,
-                "min": 0.15
-              },
-              "function": "minecraft:set_damage"
-            }
-          ],
-          "name": "aether_ii:shifting_glass",
-          "weight": 3
+          "weight": 2
         },
         {
           "type": "minecraft:item",
-          "name": "aether_ii:fossilized_zanite",
-          "weight": 2
+          "name": "aether_ii:fossilized_zanite"
         }
       ],
       "rolls": {
@@ -185,28 +168,59 @@
             }
           ],
           "name": "aether_ii:glint_coin",
-          "weight": 12
+          "weight": 10
         },
         {
           "type": "minecraft:item",
-          "name": "aether_ii:zanite_pendant",
-          "weight": 6
+          "functions": [
+            {
+              "add": false,
+              "damage": {
+                "type": "minecraft:uniform",
+                "max": 0.4,
+                "min": 0.2
+              },
+              "function": "minecraft:set_damage"
+            }
+          ],
+          "name": "aether_ii:shifting_glass",
+          "weight": 5
         },
         {
           "type": "minecraft:item",
-          "name": "aether_ii:holystone_pickaxe",
-          "weight": 4
+          "name": "aether_ii:zanite_pickaxe",
+          "weight": 3
         },
         {
           "type": "minecraft:item",
-          "name": "aether_ii:zanite_pickaxe",
+          "name": "aether_ii:stone_of_resonance",
+          "weight": 3
+        },
+        {
+          "type": "minecraft:item",
+          "name": "aether_ii:zanite_pendant",
           "weight": 2
         },
         {
           "type": "minecraft:item",
           "name": "aether_ii:guidebook_page",
           "weight": 2
         },
+        {
+          "type": "minecraft:item",
+          "functions": [
+            {
+              "add": false,
+              "damage": {
+                "type": "minecraft:uniform",
+                "max": 0.8,
+                "min": 0.6
+              },
+              "function": "minecraft:set_damage"
+            }
+          ],
+          "name": "aether_ii:shifting_glass"
+        },
         {
           "type": "minecraft:loot_table",
           "value": "aether_ii:chests/dungeons/music_discs"