Skip to content

Commit f1f2f32

Browse files
devilbringerdevilbringer
authored
feat: aerbunny companion item (#1032)
closes #966
2 parents 6899678 + e68e598 commit f1f2f32

42 files changed

Lines changed: 734 additions & 179 deletions

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

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

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,22 @@
1+
{
2+
"model": {
3+
"type": "minecraft:condition",
4+
"on_false": {
5+
"type": "minecraft:model",
6+
"model": "aether_ii:item/aerbunny_bell_empty"
7+
},
8+
"on_true": {
9+
"type": "minecraft:condition",
10+
"on_false": {
11+
"type": "minecraft:model",
12+
"model": "aether_ii:item/aerbunny_bell_active"
13+
},
14+
"on_true": {
15+
"type": "minecraft:model",
16+
"model": "aether_ii:item/aerbunny_bell"
17+
},
18+
"property": "aether_ii:stored_companion"
19+
},
20+
"property": "aether_ii:attached_companion"
21+
}
22+
}

src/generated/resources/assets/aether_ii/items/companion.json renamed to src/generated/resources/assets/aether_ii/items/resonant_stone.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"model": {
33
"type": "minecraft:model",
4-
"model": "aether_ii:item/companion"
4+
"model": "aether_ii:item/resonant_stone"
55
}
66
}

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

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -213,6 +213,11 @@
213213
"aether_ii.tooltip.item.charm.type.armor": "Armor Charm",
214214
"aether_ii.tooltip.item.charm.type.tool": "Tool Charm",
215215
"aether_ii.tooltip.item.charm.type.weapon": "Weapon Charm",
216+
"aether_ii.tooltip.item.companion.status": "Status: %s",
217+
"aether_ii.tooltip.item.companion.status.active": "Active",
218+
"aether_ii.tooltip.item.companion.status.empty": "Empty",
219+
"aether_ii.tooltip.item.companion.status.recovering": "Recovering",
220+
"aether_ii.tooltip.item.companion.status.stored": "Stored",
216221
"aether_ii.tooltip.item.curative.reduces": "Reduces: %s",
217222
"aether_ii.tooltip.item.curative.removes": "Removes: %s",
218223
"aether_ii.tooltip.item.currency.amount": "%s Glint",
@@ -954,6 +959,7 @@
954959
"death.attack.aether_ii.effect.venom.player": "%1$s succumbed to venom while trying to escape %2$s",
955960
"death.attack.aether_ii.effect.wound": "%1$s was fatally wounded",
956961
"death.attack.aether_ii.effect.wound.player": "%1$s was fatally wounded by %2$s",
962+
"death.attack.aether_ii.retreat": "%1$s retreated",
957963
"death.attack.aether_ii.shock": "%1$s was electrocuted",
958964
"death.attack.aether_ii.shock.player": "%1$s was electrocuted by %2$s",
959965
"dimension.aether_ii.aether_holy_isles": "Aether Holy Isles",
@@ -1075,6 +1081,7 @@
10751081
"gui.aether_ii.toast.guidebook.exploration": "New Exploration Entry!",
10761082
"item.aether_ii.aechor_petal": "Aechor Petal",
10771083
"item.aether_ii.aechor_plant_spawn_egg": "Aechor Plant Spawn Egg",
1084+
"item.aether_ii.aerbunny_bell": "Aerbunny Bell",
10781085
"item.aether_ii.aerbunny_spawn_egg": "Aerbunny Spawn Egg",
10791086
"item.aether_ii.aerwhale_spawn_egg": "Aerwhale Spawn Egg",
10801087
"item.aether_ii.aether_portal_frame": "Aether Portal Frame",
@@ -1365,6 +1372,7 @@
13651372
"item.aether_ii.purple_aercloud_glider.nitrogen_internals.ability.tooltip.1": "§9Ability:§r Forwards Boost",
13661373
"item.aether_ii.purple_aercloud_glider.nitrogen_internals.ability.tooltip.2": "§3Use:§r Click-Use",
13671374
"item.aether_ii.raw_taegore_meat": "Raw Taegore Meat",
1375+
"item.aether_ii.resonant_stone": "Resonant Stone",
13681376
"item.aether_ii.roasted_skyroot_lizard_on_a_stick": "Roasted Skyroot Lizard on a Stick",
13691377
"item.aether_ii.satival_bulb": "Satival Bulb",
13701378
"item.aether_ii.scatterglass_bolt": "Scatterglass Bolt",
@@ -1658,6 +1666,7 @@
16581666
"subtitles.aether_ii.entity.zephyr.hurt": "Zephyr hurts",
16591667
"subtitles.aether_ii.entity.zephyr.shoot": "Zephyr spits",
16601668
"subtitles.aether_ii.item.accessory.equip_generic": "Accessory equips",
1669+
"subtitles.aether_ii.item.aerbunny_bell.ring": "Aerbunny Bell rings",
16611670
"subtitles.aether_ii.item.ambrosium_shard.use": "Ambrosium Shard used",
16621671
"subtitles.aether_ii.item.arkenium_canister.empty": "Arkenium Canister empties",
16631672
"subtitles.aether_ii.item.arkenium_canister.fill": "Arkenium Canister fills",

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"parent": "minecraft:item/generated",
33
"textures": {
4-
"layer0": "aether_ii:item/companion"
4+
"layer0": "aether_ii:item/aerbunny_bell"
55
}
66
}

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

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
{
2+
"parent": "minecraft:item/generated",
3+
"textures": {
4+
"layer0": "aether_ii:item/aerbunny_bell_active"
5+
}
6+
}

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

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
{
2+
"parent": "minecraft:item/generated",
3+
"textures": {
4+
"layer0": "aether_ii:item/aerbunny_bell_empty"
5+
}
6+
}

‎src/generated/resources/assets/aether_ii/models/item/resonant_stone.json‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
{
2+
"parent": "minecraft:item/generated",
3+
"textures": {
4+
"layer0": "aether_ii:item/resonant_stone"
5+
}
6+
}

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

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1655,6 +1655,15 @@
16551655
],
16561656
"subtitle": "subtitles.aether_ii.item.accessory.equip_generic"
16571657
},
1658+
"item.aerbunny_bell.ring": {
1659+
"sounds": [
1660+
{
1661+
"name": "block/bell/bell_use01",
1662+
"pitch": 20.0
1663+
}
1664+
],
1665+
"subtitle": "subtitles.aether_ii.item.aerbunny_bell.ring"
1666+
},
16581667
"item.ambrosium_shard.use": {
16591668
"sounds": [
16601669
"block/amethyst/shimmer"

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

Lines changed: 32 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,32 @@
1+
{
2+
"parent": "minecraft:recipes/root",
3+
"criteria": {
4+
"has_resonant_stone": {
5+
"conditions": {
6+
"items": [
7+
{
8+
"items": "aether_ii:resonant_stone"
9+
}
10+
]
11+
},
12+
"trigger": "minecraft:inventory_changed"
13+
},
14+
"has_the_recipe": {
15+
"conditions": {
16+
"recipe": "aether_ii:aerbunny_bell"
17+
},
18+
"trigger": "minecraft:recipe_unlocked"
19+
}
20+
},
21+
"requirements": [
22+
[
23+
"has_the_recipe",
24+
"has_resonant_stone"
25+
]
26+
],
27+
"rewards": {
28+
"recipes": [
29+
"aether_ii:aerbunny_bell"
30+
]
31+
}
32+
}

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

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -185,18 +185,23 @@
185185
}
186186
],
187187
"name": "aether_ii:glint_coin",
188-
"weight": 12
188+
"weight": 10
189189
},
190190
{
191191
"type": "minecraft:item",
192192
"name": "aether_ii:zanite_pendant",
193-
"weight": 6
193+
"weight": 4
194194
},
195195
{
196196
"type": "minecraft:item",
197197
"name": "aether_ii:holystone_pickaxe",
198198
"weight": 4
199199
},
200+
{
201+
"type": "minecraft:item",
202+
"name": "aether_ii:resonant_stone",
203+
"weight": 2
204+
},
200205
{
201206
"type": "minecraft:item",
202207
"name": "aether_ii:zanite_pickaxe",

0 commit comments

Comments
 (0)