Skip to content

Commit fdb3820

Browse files
Sundering anchor stuffs
1 parent c4187c6 commit fdb3820

File tree

73 files changed

+964
-762
lines changed

Some content is hidden

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

73 files changed

+964
-762
lines changed

aseprite/malum_banner_textures.ase

311 Bytes
Binary file not shown.

aseprite/malum_textures.ase

1.47 KB
Binary file not shown.

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

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,7 @@
2323
"banner_pattern.malum.break": "Break",
2424
"banner_pattern.malum.breath": "Breath",
2525
"banner_pattern.malum.breeze": "Breeze",
26+
"banner_pattern.malum.burn": "Burn",
2627
"banner_pattern.malum.default": "Default",
2728
"banner_pattern.malum.hallucination": "Hallucination",
2829
"banner_pattern.malum.heft": "Heft",
@@ -441,6 +442,7 @@
441442
"entity.malum.scythe_boomerang": "Scythe Boomerang",
442443
"entity.malum.scythe_maelstrom": "Scythe Maelstrom",
443444
"entity.malum.soulwood_boat": "Soulwood Boat",
445+
"entity.malum.sundering_anchor": "Sundering Anchor",
444446
"entity.malum.thrown_gluttony": "Thrown Gluttony",
445447
"entity.malum.vivid_nitrate": "Vivid Nitrate",
446448
"item.malum.accelerating_inlay": "Accelerating Inlay",

src/generated/resources/assets/malum/models/item/soulwoven_banner.json

Lines changed: 10 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -38,28 +38,34 @@
3838
}
3939
},
4040
{
41-
"model": "malum:item/soulwoven_banner_hunger",
41+
"model": "malum:item/soulwoven_banner_burn",
4242
"predicate": {
4343
"malum:pattern": 7.0
4444
}
4545
},
4646
{
47-
"model": "malum:item/soulwoven_banner_horns",
47+
"model": "malum:item/soulwoven_banner_hunger",
4848
"predicate": {
4949
"malum:pattern": 8.0
5050
}
5151
},
5252
{
53-
"model": "malum:item/soulwoven_banner_heft",
53+
"model": "malum:item/soulwoven_banner_horns",
5454
"predicate": {
5555
"malum:pattern": 9.0
5656
}
5757
},
5858
{
59-
"model": "malum:item/soulwoven_banner_hallucination",
59+
"model": "malum:item/soulwoven_banner_heft",
6060
"predicate": {
6161
"malum:pattern": 10.0
6262
}
63+
},
64+
{
65+
"model": "malum:item/soulwoven_banner_hallucination",
66+
"predicate": {
67+
"malum:pattern": 11.0
68+
}
6369
}
6470
],
6571
"textures": {
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": "malum:item/soulwoven_banner_burn"
5+
}
6+
}
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_living_flesh": {
5+
"conditions": {
6+
"items": [
7+
{
8+
"items": "malum:living_flesh"
9+
}
10+
]
11+
},
12+
"trigger": "minecraft:inventory_changed"
13+
},
14+
"has_the_recipe": {
15+
"conditions": {
16+
"recipe": "malum:block_of_living_flesh"
17+
},
18+
"trigger": "minecraft:recipe_unlocked"
19+
}
20+
},
21+
"requirements": [
22+
[
23+
"has_the_recipe",
24+
"has_living_flesh"
25+
]
26+
],
27+
"rewards": {
28+
"recipes": [
29+
"malum:block_of_living_flesh"
30+
]
31+
}
32+
}
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_living_flesh": {
5+
"conditions": {
6+
"items": [
7+
{
8+
"items": "malum:living_flesh"
9+
}
10+
]
11+
},
12+
"trigger": "minecraft:inventory_changed"
13+
},
14+
"has_the_recipe": {
15+
"conditions": {
16+
"recipe": "malum:living_flesh_from_block"
17+
},
18+
"trigger": "minecraft:recipe_unlocked"
19+
}
20+
},
21+
"requirements": [
22+
[
23+
"has_the_recipe",
24+
"has_living_flesh"
25+
]
26+
],
27+
"rewards": {
28+
"recipes": [
29+
"malum:living_flesh_from_block"
30+
]
31+
}
32+
}
Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,21 @@
1+
{
2+
"parent": "minecraft:recipes/root",
3+
"criteria": {
4+
"has_the_recipe": {
5+
"conditions": {
6+
"recipe": "malum:banner_crafting_burn"
7+
},
8+
"trigger": "minecraft:recipe_unlocked"
9+
}
10+
},
11+
"requirements": [
12+
[
13+
"has_the_recipe"
14+
]
15+
],
16+
"rewards": {
17+
"recipes": [
18+
"malum:banner_crafting_burn"
19+
]
20+
}
21+
}
Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
1+
{
2+
"type": "minecraft:crafting_shaped",
3+
"category": "misc",
4+
"key": {
5+
"#": {
6+
"item": "malum:living_flesh"
7+
}
8+
},
9+
"pattern": [
10+
"###",
11+
"###",
12+
"###"
13+
],
14+
"result": {
15+
"count": 1,
16+
"id": "malum:block_of_living_flesh"
17+
}
18+
}
Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
{
2+
"type": "minecraft:crafting_shapeless",
3+
"category": "misc",
4+
"ingredients": [
5+
{
6+
"item": "malum:block_of_living_flesh"
7+
}
8+
],
9+
"result": {
10+
"count": 9,
11+
"id": "malum:living_flesh"
12+
}
13+
}

0 commit comments

Comments
 (0)