-
-
Notifications
You must be signed in to change notification settings - Fork 37
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
I need to sleep on boyfriend's chest
- Loading branch information
1 parent
deb8a6b
commit b9d7484
Showing
37 changed files
with
486 additions
and
231 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
2 changes: 1 addition & 1 deletion
2
...lum/models/item/cthonic_gold_cluster.json → ...um/models/item/cthonic_gold_fragment.json
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,6 +1,6 @@ | ||
{ | ||
"parent": "minecraft:item/generated", | ||
"textures": { | ||
"layer0": "malum:block/ores/cthonic_gold_cluster" | ||
"layer0": "malum:item/cthonic_gold_fragment" | ||
} | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
35 changes: 35 additions & 0 deletions
35
src/generated/resources/data/malum/advancements/recipes/misc/cthonic_gold_from_block.json
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,35 @@ | ||
{ | ||
"parent": "minecraft:recipes/root", | ||
"criteria": { | ||
"has_cthonic_gold": { | ||
"conditions": { | ||
"items": [ | ||
{ | ||
"items": [ | ||
"malum:cthonic_gold" | ||
] | ||
} | ||
] | ||
}, | ||
"trigger": "minecraft:inventory_changed" | ||
}, | ||
"has_the_recipe": { | ||
"conditions": { | ||
"recipe": "malum:cthonic_gold_from_block" | ||
}, | ||
"trigger": "minecraft:recipe_unlocked" | ||
} | ||
}, | ||
"requirements": [ | ||
[ | ||
"has_cthonic_gold", | ||
"has_the_recipe" | ||
] | ||
], | ||
"rewards": { | ||
"recipes": [ | ||
"malum:cthonic_gold_from_block" | ||
] | ||
}, | ||
"sends_telemetry_event": false | ||
} |
35 changes: 35 additions & 0 deletions
35
src/generated/resources/data/malum/advancements/recipes/misc/cthonic_gold_from_fragment.json
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,35 @@ | ||
{ | ||
"parent": "minecraft:recipes/root", | ||
"criteria": { | ||
"has_cthonic_gold": { | ||
"conditions": { | ||
"items": [ | ||
{ | ||
"items": [ | ||
"malum:cthonic_gold" | ||
] | ||
} | ||
] | ||
}, | ||
"trigger": "minecraft:inventory_changed" | ||
}, | ||
"has_the_recipe": { | ||
"conditions": { | ||
"recipe": "malum:cthonic_gold_from_fragment" | ||
}, | ||
"trigger": "minecraft:recipe_unlocked" | ||
} | ||
}, | ||
"requirements": [ | ||
[ | ||
"has_cthonic_gold", | ||
"has_the_recipe" | ||
] | ||
], | ||
"rewards": { | ||
"recipes": [ | ||
"malum:cthonic_gold_from_fragment" | ||
] | ||
}, | ||
"sends_telemetry_event": false | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
18 changes: 18 additions & 0 deletions
18
src/generated/resources/data/malum/recipes/block_of_cthonic_gold.json
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,18 @@ | ||
{ | ||
"type": "minecraft:crafting_shaped", | ||
"category": "misc", | ||
"key": { | ||
"#": { | ||
"item": "malum:cthonic_gold" | ||
} | ||
}, | ||
"pattern": [ | ||
"###", | ||
"###", | ||
"###" | ||
], | ||
"result": { | ||
"item": "malum:block_of_cthonic_gold" | ||
}, | ||
"show_notification": true | ||
} |
13 changes: 13 additions & 0 deletions
13
src/generated/resources/data/malum/recipes/cthonic_gold_fragment.json
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,13 @@ | ||
{ | ||
"type": "minecraft:crafting_shapeless", | ||
"category": "misc", | ||
"ingredients": [ | ||
{ | ||
"item": "malum:cthonic_gold" | ||
} | ||
], | ||
"result": { | ||
"count": 8, | ||
"item": "malum:cthonic_gold_fragment" | ||
} | ||
} |
10 changes: 0 additions & 10 deletions
10
src/generated/resources/data/malum/recipes/cthonic_gold_from_blasting.json
This file was deleted.
Oops, something went wrong.
13 changes: 13 additions & 0 deletions
13
src/generated/resources/data/malum/recipes/cthonic_gold_from_block.json
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,13 @@ | ||
{ | ||
"type": "minecraft:crafting_shapeless", | ||
"category": "misc", | ||
"ingredients": [ | ||
{ | ||
"item": "malum:block_of_cthonic_gold" | ||
} | ||
], | ||
"result": { | ||
"count": 9, | ||
"item": "malum:cthonic_gold" | ||
} | ||
} |
33 changes: 33 additions & 0 deletions
33
src/generated/resources/data/malum/recipes/cthonic_gold_from_fragment.json
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,33 @@ | ||
{ | ||
"type": "minecraft:crafting_shapeless", | ||
"category": "misc", | ||
"ingredients": [ | ||
{ | ||
"item": "malum:cthonic_gold_fragment" | ||
}, | ||
{ | ||
"item": "malum:cthonic_gold_fragment" | ||
}, | ||
{ | ||
"item": "malum:cthonic_gold_fragment" | ||
}, | ||
{ | ||
"item": "malum:cthonic_gold_fragment" | ||
}, | ||
{ | ||
"item": "malum:cthonic_gold_fragment" | ||
}, | ||
{ | ||
"item": "malum:cthonic_gold_fragment" | ||
}, | ||
{ | ||
"item": "malum:cthonic_gold_fragment" | ||
}, | ||
{ | ||
"item": "malum:cthonic_gold_fragment" | ||
} | ||
], | ||
"result": { | ||
"item": "malum:cthonic_gold" | ||
} | ||
} |
10 changes: 0 additions & 10 deletions
10
src/generated/resources/data/malum/recipes/cthonic_gold_from_smelting.json
This file was deleted.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -7,7 +7,7 @@ | |
}, | ||
{ | ||
"type": "minecraft:rarity_filter", | ||
"chance": 5 | ||
"chance": 10 | ||
}, | ||
{ | ||
"type": "minecraft:in_square" | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -7,7 +7,7 @@ | |
}, | ||
{ | ||
"type": "minecraft:rarity_filter", | ||
"chance": 10 | ||
"chance": 5 | ||
}, | ||
{ | ||
"type": "minecraft:in_square" | ||
|
1 change: 1 addition & 0 deletions
1
src/generated/resources/data/minecraft/tags/blocks/beacon_base_blocks.json
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.