Ubujira
/
ironbarrels
2
1
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fix the diamond to osbidian chest upgrades being flipped Closes #235

This commit is contained in:
Alexander Behrhof 2021-11-30 12:32:19 -05:00
parent 87d629a1c8
commit a518b3ebfa
4 changed files with 16 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/generated/resources/.cache/cache
View File

@ -33,8 +33,8 @@ c4ce3a2d83ee91bc30b7f88fef054b6331f71d8d data/ironchest/recipes/chests/vanilla_c
12878399ae3ea231cd4b73f5883cd741938bbd5f data/ironchest/recipes/chests/vanilla_iron_chest.json 12878399ae3ea231cd4b73f5883cd741938bbd5f data/ironchest/recipes/chests/vanilla_iron_chest.json
4511348163faf1009f48d5f7fa0f158aab35a971 data/ironchest/recipes/upgrades/copper_to_iron_chest_upgrade.json 4511348163faf1009f48d5f7fa0f158aab35a971 data/ironchest/recipes/upgrades/copper_to_iron_chest_upgrade.json
476f824dc9b7721cfacf02d81472d2c2ecbe35ba data/ironchest/recipes/upgrades/copper_to_silver_chest_upgrade.json 476f824dc9b7721cfacf02d81472d2c2ecbe35ba data/ironchest/recipes/upgrades/copper_to_silver_chest_upgrade.json
e25f174a4a36d367d96d2e61561d526e83a5e155 data/ironchest/recipes/upgrades/diamond_to_crystal_chest_upgrade.json 780bbb21db7e8c0ca51e366eb1ef9846b046a612 data/ironchest/recipes/upgrades/diamond_to_crystal_chest_upgrade.json
9f0931b4d648fcea11dd2a7953d8e09df623d539 data/ironchest/recipes/upgrades/diamond_to_obsidian_chest_upgrade.json 8f49486d68aa7f56c740d8e9008db5fd2f53fd6e data/ironchest/recipes/upgrades/diamond_to_obsidian_chest_upgrade.json
793e25f4ae9a93636292036ceb9b0aaa821d299b data/ironchest/recipes/upgrades/gold_to_diamond_chest_upgrade.json 793e25f4ae9a93636292036ceb9b0aaa821d299b data/ironchest/recipes/upgrades/gold_to_diamond_chest_upgrade.json
1b70eef2a303cf31300a5a5bc20780f9cea7e444 data/ironchest/recipes/upgrades/iron_to_gold_chest_upgrade.json 1b70eef2a303cf31300a5a5bc20780f9cea7e444 data/ironchest/recipes/upgrades/iron_to_gold_chest_upgrade.json
aaa8c0135a8ca7c2146337d0a42e7fb84015e4c4 data/ironchest/recipes/upgrades/silver_to_gold_chest_upgrade.json aaa8c0135a8ca7c2146337d0a42e7fb84015e4c4 data/ironchest/recipes/upgrades/silver_to_gold_chest_upgrade.json

6
src/generated/resources/data/ironchest/recipes/upgrades/diamond_to_crystal_chest_upgrade.json
View File

@ -1,9 +1,9 @@
{ {
"type": "minecraft:crafting_shaped", "type": "minecraft:crafting_shaped",
"pattern": [ "pattern": [
"MMM", "GGG",
"MGM", "GMG",
"MMM" "GGG"
], ],
"key": { "key": {
"M": { "M": {

8
src/generated/resources/data/ironchest/recipes/upgrades/diamond_to_obsidian_chest_upgrade.json
View File

@ -1,12 +1,12 @@
{ {
"type": "minecraft:crafting_shaped", "type": "minecraft:crafting_shaped",
"pattern": [ "pattern": [
"GGG", "MMM",
"GSG", "MGM",
"GGG" "MMM"
], ],
"key": { "key": {
"S": { "M": {
"item": "minecraft:obsidian" "item": "minecraft:obsidian"
}, },
"G": { "G": {

14
src/main/java/com/progwml6/ironchest/common/data/IronChestsRecipeProvider.java
View File

@ -257,20 +257,20 @@ public class IronChestsRecipeProvider extends RecipeProvider implements IConditi
.build(consumer, prefix(IronChestsItems.UPGRADES.get(IronChestsUpgradeType.GOLD_TO_DIAMOND).get(), folder)); .build(consumer, prefix(IronChestsItems.UPGRADES.get(IronChestsUpgradeType.GOLD_TO_DIAMOND).get(), folder));
ShapedRecipeBuilder.shapedRecipe(IronChestsItems.UPGRADES.get(IronChestsUpgradeType.DIAMOND_TO_OBSIDIAN).get()) ShapedRecipeBuilder.shapedRecipe(IronChestsItems.UPGRADES.get(IronChestsUpgradeType.DIAMOND_TO_OBSIDIAN).get())
.key('S', Blocks.OBSIDIAN) .key('M', Blocks.OBSIDIAN)
.key('G', Tags.Items.GLASS) .key('G', Tags.Items.GLASS)
.patternLine("GGG") .patternLine("MMM")
.patternLine("GSG") .patternLine("MGM")
.patternLine("GGG") .patternLine("MMM")
.addCriterion("has_glass", hasItem(Tags.Items.GLASS)) .addCriterion("has_glass", hasItem(Tags.Items.GLASS))
.build(consumer, prefix(IronChestsItems.UPGRADES.get(IronChestsUpgradeType.DIAMOND_TO_OBSIDIAN).get(), folder)); .build(consumer, prefix(IronChestsItems.UPGRADES.get(IronChestsUpgradeType.DIAMOND_TO_OBSIDIAN).get(), folder));
ShapedRecipeBuilder.shapedRecipe(IronChestsItems.UPGRADES.get(IronChestsUpgradeType.DIAMOND_TO_CRYSTAL).get()) ShapedRecipeBuilder.shapedRecipe(IronChestsItems.UPGRADES.get(IronChestsUpgradeType.DIAMOND_TO_CRYSTAL).get())
.key('M', Blocks.OBSIDIAN) .key('M', Blocks.OBSIDIAN)
.key('G', Tags.Items.GLASS) .key('G', Tags.Items.GLASS)
.patternLine("MMM") .patternLine("GGG")
.patternLine("MGM") .patternLine("GMG")
.patternLine("MMM") .patternLine("GGG")
.addCriterion("has_glass", hasItem(Tags.Items.GLASS)) .addCriterion("has_glass", hasItem(Tags.Items.GLASS))
.build(consumer, prefix(IronChestsItems.UPGRADES.get(IronChestsUpgradeType.DIAMOND_TO_CRYSTAL).get(), folder)); .build(consumer, prefix(IronChestsItems.UPGRADES.get(IronChestsUpgradeType.DIAMOND_TO_CRYSTAL).get(), folder));