Skip to content

Commit 6eb49c4

Browse files
authored
improv: equipment stuff (#896)
- Zanite and Ice Pendants can now be upgraded inside the Arkenium Forge - Buffed neptune armor set-bonus - Added a Tooltip to Sentry Boots displaying their Zephyr repelling ability
2 parents 43e5af4 + 20ac415 commit 6eb49c4

23 files changed

Lines changed: 117 additions & 34 deletions
Lines changed: 22 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,26 @@
11
{
22
"model": {
3-
"type": "minecraft:model",
4-
"model": "aether_ii:item/ice_pendant"
3+
"type": "minecraft:range_dispatch",
4+
"entries": [
5+
{
6+
"model": {
7+
"type": "minecraft:model",
8+
"model": "aether_ii:item/ice_pendant_reinforced_1"
9+
},
10+
"threshold": 0.1
11+
},
12+
{
13+
"model": {
14+
"type": "minecraft:model",
15+
"model": "aether_ii:item/ice_pendant_reinforced_2"
16+
},
17+
"threshold": 0.3
18+
}
19+
],
20+
"fallback": {
21+
"type": "minecraft:model",
22+
"model": "aether_ii:item/ice_pendant"
23+
},
24+
"property": "aether_ii:reinforcement_tier"
525
}
626
}
Lines changed: 22 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,26 @@
11
{
22
"model": {
3-
"type": "minecraft:model",
4-
"model": "aether_ii:item/zanite_pendant"
3+
"type": "minecraft:range_dispatch",
4+
"entries": [
5+
{
6+
"model": {
7+
"type": "minecraft:model",
8+
"model": "aether_ii:item/zanite_pendant_reinforced_1"
9+
},
10+
"threshold": 0.1
11+
},
12+
{
13+
"model": {
14+
"type": "minecraft:model",
15+
"model": "aether_ii:item/zanite_pendant_reinforced_2"
16+
},
17+
"threshold": 0.3
18+
}
19+
],
20+
"fallback": {
21+
"type": "minecraft:model",
22+
"model": "aether_ii:item/zanite_pendant"
23+
},
24+
"property": "aether_ii:reinforcement_tier"
525
}
626
}

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1308,6 +1308,7 @@
13081308
"item.aether_ii.scatterglass_shard": "Scatterglass Shard",
13091309
"item.aether_ii.scatterglass_vial": "Scatterglass Vial",
13101310
"item.aether_ii.sentry_boots": "Sentry Boots",
1311+
"item.aether_ii.sentry_boots.nitrogen_internals.ability.tooltip.1": "§9Ability:§r Zephyr Protection",
13111312
"item.aether_ii.sentry_crate_mimic_spawn_egg": "Sentry Crate Mimic Spawn Egg",
13121313
"item.aether_ii.sentry_golem_spawn_egg": "Sentry Golem Spawn Egg",
13131314
"item.aether_ii.sentry_servo": "Sentry Servo",

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{
2-
"parent": "minecraft:item/generated",
2+
"parent": "minecraft:item/handheld",
33
"textures": {
44
"layer0": "aether_ii:item/ice_pendant"
55
}
Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
{
2+
"parent": "minecraft:item/handheld",
3+
"textures": {
4+
"layer0": "aether_ii:item/ice_pendant_reinforced_1"
5+
}
6+
}
Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
{
2+
"parent": "minecraft:item/handheld",
3+
"textures": {
4+
"layer0": "aether_ii:item/ice_pendant_reinforced_2"
5+
}
6+
}

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
{
2-
"parent": "minecraft:item/generated",
2+
"parent": "minecraft:item/handheld",
33
"textures": {
44
"layer0": "aether_ii:item/zanite_pendant"
55
}
Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
{
2+
"parent": "minecraft:item/handheld",
3+
"textures": {
4+
"layer0": "aether_ii:item/zanite_pendant_reinforced_1"
5+
}
6+
}
Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
{
2+
"parent": "minecraft:item/handheld",
3+
"textures": {
4+
"layer0": "aether_ii:item/zanite_pendant_reinforced_2"
5+
}
6+
}
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
{
22
"values": [
33
"#aether_ii:equipment/handwear",
4+
"#aether_ii:equipment/accessories",
45
"#c:armors"
56
]
67
}

0 commit comments

Comments
 (0)