forked from cpw/ironchest
-
Notifications
You must be signed in to change notification settings - Fork 87
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Remove the need for the block.json atlases file as the Iron Chests mo…
…del files were incorrectly specifying a model when not needed. Additionally, remove the need for a conditional check on the copper chest recipes as Copper is now part of Vanilla minecraft
- Loading branch information
Alexander Behrhof
committed
Jan 15, 2023
1 parent
0042752
commit 3df2ffa
Showing
63 changed files
with
632 additions
and
1,489 deletions.
There are no files selected for viewing
3 changes: 1 addition & 2 deletions
3
src/generated/resources/.cache/0dbbd54ceb2dbdad297666c0ed7345b878c15d35
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,3 +1,2 @@ | ||
| // 1.19.3 2023-01-13T22:21:31.7443788 atlases generator for ironchest | ||
| bba03f0849be21ea0fb2f99f25b892838b1ec7a2 assets/minecraft/atlases/blocks.json | ||
| // 1.19.3 2023-01-14T20:11:51.9307695 atlases generator for ironchest | ||
| bba03f0849be21ea0fb2f99f25b892838b1ec7a2 assets/minecraft/atlases/chests.json |
4 changes: 3 additions & 1 deletion
4
src/generated/resources/.cache/73a642a5921fdd8af683dcd68adc2a2cacb7445d
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,3 +1,5 @@ | ||
| // 1.19.3 2023-01-13T22:02:23.8124158 Tags for minecraft:block mod id ironchest | ||
| // 1.19.3 2023-01-14T20:43:17.3984142 Tags for minecraft:block mod id ironchest | ||
| d8f6b5a884da49100b8e712b5b6b542d20ae1073 data/minecraft/tags/blocks/features_cannot_replace.json | ||
| 9d9739e029d3448f4948a70f64e2ee83f71c7eea data/minecraft/tags/blocks/guarded_by_piglins.json | ||
| 9d9739e029d3448f4948a70f64e2ee83f71c7eea data/minecraft/tags/blocks/mineable/pickaxe.json | ||
| 1b0c9b763a2ad4ff1ccd8d407afcc11cb074e1aa data/minecraft/tags/blocks/mineable/shovel.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
This file was deleted.
Oops, something went wrong.
32 changes: 32 additions & 0 deletions
32
...d/resources/data/ironchest/advancements/recipes/decorations/chests/copper_iron_chest.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,32 @@ | ||
| { | ||
| "parent": "minecraft:recipes/root", | ||
| "criteria": { | ||
| "has_iron_ingot": { | ||
| "conditions": { | ||
| "items": [ | ||
| { | ||
| "tag": "forge:ingots/iron" | ||
| } | ||
| ] | ||
| }, | ||
| "trigger": "minecraft:inventory_changed" | ||
| }, | ||
| "has_the_recipe": { | ||
| "conditions": { | ||
| "recipe": "ironchest:chests/copper_iron_chest" | ||
| }, | ||
| "trigger": "minecraft:recipe_unlocked" | ||
| } | ||
| }, | ||
| "requirements": [ | ||
| [ | ||
| "has_iron_ingot", | ||
| "has_the_recipe" | ||
| ] | ||
| ], | ||
| "rewards": { | ||
| "recipes": [ | ||
| "ironchest:chests/copper_iron_chest" | ||
| ] | ||
| } | ||
| } |
32 changes: 32 additions & 0 deletions
32
...esources/data/ironchest/advancements/recipes/decorations/chests/vanilla_copper_chest.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,32 @@ | ||
| { | ||
| "parent": "minecraft:recipes/root", | ||
| "criteria": { | ||
| "has_copper_ingot": { | ||
| "conditions": { | ||
| "items": [ | ||
| { | ||
| "tag": "forge:ingots/copper" | ||
| } | ||
| ] | ||
| }, | ||
| "trigger": "minecraft:inventory_changed" | ||
| }, | ||
| "has_the_recipe": { | ||
| "conditions": { | ||
| "recipe": "ironchest:chests/vanilla_copper_chest" | ||
| }, | ||
| "trigger": "minecraft:recipe_unlocked" | ||
| } | ||
| }, | ||
| "requirements": [ | ||
| [ | ||
| "has_copper_ingot", | ||
| "has_the_recipe" | ||
| ] | ||
| ], | ||
| "rewards": { | ||
| "recipes": [ | ||
| "ironchest:chests/vanilla_copper_chest" | ||
| ] | ||
| } | ||
| } |
32 changes: 32 additions & 0 deletions
32
...ata/ironchest/advancements/recipes/decorations/upgrades/copper_to_iron_chest_upgrade.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,32 @@ | ||
| { | ||
| "parent": "minecraft:recipes/root", | ||
| "criteria": { | ||
| "has_iron_ingot": { | ||
| "conditions": { | ||
| "items": [ | ||
| { | ||
| "tag": "forge:ingots/iron" | ||
| } | ||
| ] | ||
| }, | ||
| "trigger": "minecraft:inventory_changed" | ||
| }, | ||
| "has_the_recipe": { | ||
| "conditions": { | ||
| "recipe": "ironchest:upgrades/copper_to_iron_chest_upgrade" | ||
| }, | ||
| "trigger": "minecraft:recipe_unlocked" | ||
| } | ||
| }, | ||
| "requirements": [ | ||
| [ | ||
| "has_iron_ingot", | ||
| "has_the_recipe" | ||
| ] | ||
| ], | ||
| "rewards": { | ||
| "recipes": [ | ||
| "ironchest:upgrades/copper_to_iron_chest_upgrade" | ||
| ] | ||
| } | ||
| } |
32 changes: 32 additions & 0 deletions
32
...ata/ironchest/advancements/recipes/decorations/upgrades/wood_to_copper_chest_upgrade.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,32 @@ | ||
| { | ||
| "parent": "minecraft:recipes/root", | ||
| "criteria": { | ||
| "has_copper_ingot": { | ||
| "conditions": { | ||
| "items": [ | ||
| { | ||
| "tag": "forge:ingots/copper" | ||
| } | ||
| ] | ||
| }, | ||
| "trigger": "minecraft:inventory_changed" | ||
| }, | ||
| "has_the_recipe": { | ||
| "conditions": { | ||
| "recipe": "ironchest:upgrades/wood_to_copper_chest_upgrade" | ||
| }, | ||
| "trigger": "minecraft:recipe_unlocked" | ||
| } | ||
| }, | ||
| "requirements": [ | ||
| [ | ||
| "has_copper_ingot", | ||
| "has_the_recipe" | ||
| ] | ||
| ], | ||
| "rewards": { | ||
| "recipes": [ | ||
| "ironchest:upgrades/wood_to_copper_chest_upgrade" | ||
| ] | ||
| } | ||
| } |
47 changes: 0 additions & 47 deletions
47
...ted/resources/data/ironchest/advancements/recipes/ironchest/chests/copper_iron_chest.json
This file was deleted.
Oops, something went wrong.
47 changes: 0 additions & 47 deletions
47
.../resources/data/ironchest/advancements/recipes/ironchest/chests/vanilla_copper_chest.json
This file was deleted.
Oops, something went wrong.
47 changes: 0 additions & 47 deletions
47
.../data/ironchest/advancements/recipes/ironchest/upgrades/copper_to_iron_chest_upgrade.json
This file was deleted.
Oops, something went wrong.
Oops, something went wrong.