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

Fix the diamond to osbidian chest upgrades being flipped

This commit is contained in:
Alexander Behrhof 2021-11-30 12:31:29 -05:00
parent b2f78dbdb5
commit 9efc6adb89
5 changed files with 18 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -36,8 +36,8 @@ c4ce3a2d83ee91bc30b7f88fef054b6331f71d8d data/ironchest/recipes/chests/vanilla_c
6a2a1c0af03d5d3ea12ee4ee2f9ccebbb4f86196 data/ironchest/recipes/chests/vanilla_dirt_chest.json
12878399ae3ea231cd4b73f5883cd741938bbd5f data/ironchest/recipes/chests/vanilla_iron_chest.json
4511348163faf1009f48d5f7fa0f158aab35a971 data/ironchest/recipes/upgrades/copper_to_iron_chest_upgrade.json
e25f174a4a36d367d96d2e61561d526e83a5e155 data/ironchest/recipes/upgrades/diamond_to_crystal_chest_upgrade.json
9f0931b4d648fcea11dd2a7953d8e09df623d539 data/ironchest/recipes/upgrades/diamond_to_obsidian_chest_upgrade.json
780bbb21db7e8c0ca51e366eb1ef9846b046a612 data/ironchest/recipes/upgrades/diamond_to_crystal_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
1b70eef2a303cf31300a5a5bc20780f9cea7e444 data/ironchest/recipes/upgrades/iron_to_gold_chest_upgrade.json
058c4081d18ddcff952f218a1e1e31ea1c26fa04 data/ironchest/recipes/upgrades/wood_to_copper_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",
"pattern": [
"MMM",
"MGM",
"MMM"
"GGG",
"GMG",
"GGG"
],
"key": {
"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",
"pattern": [
"GGG",
"GSG",
"GGG"
"MMM",
"MGM",
"MMM"
],
"key": {
"S": {
"M": {
"item": "minecraft:obsidian"
},
"G": {

4
src/main/java/com/progwml6/ironchest/common/ai/IronChestCatSitOnBlockGoal.java
View File

@ -11,8 +11,8 @@ import net.minecraft.world.level.LevelReader;
public class IronChestCatSitOnBlockGoal extends CatSitOnBlockGoal {
public IronChestCatSitOnBlockGoal(Cat cat, double p_i50330_2_) {
super(cat, p_i50330_2_);
public IronChestCatSitOnBlockGoal(Cat cat, double speedModifier) {
super(cat, speedModifier);
}
@Override

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

@ -216,20 +216,20 @@ public class IronChestsRecipeProvider extends RecipeProvider implements IConditi
.save(consumer, prefix(IronChestsItems.UPGRADES.get(IronChestsUpgradeType.GOLD_TO_DIAMOND).get(), folder));
ShapedRecipeBuilder.shaped(IronChestsItems.UPGRADES.get(IronChestsUpgradeType.DIAMOND_TO_OBSIDIAN).get())
.define('S', Blocks.OBSIDIAN)
.define('M', Blocks.OBSIDIAN)
.define('G', Tags.Items.GLASS)
.pattern("GGG")
.pattern("GSG")
.pattern("GGG")
.pattern("MMM")
.pattern("MGM")
.pattern("MMM")
.unlockedBy("has_glass", has(Tags.Items.GLASS))
.save(consumer, prefix(IronChestsItems.UPGRADES.get(IronChestsUpgradeType.DIAMOND_TO_OBSIDIAN).get(), folder));
ShapedRecipeBuilder.shaped(IronChestsItems.UPGRADES.get(IronChestsUpgradeType.DIAMOND_TO_CRYSTAL).get())
.define('M', Blocks.OBSIDIAN)
.define('G', Tags.Items.GLASS)
.pattern("MMM")
.pattern("MGM")
.pattern("MMM")
.pattern("GGG")
.pattern("GMG")
.pattern("GGG")
.unlockedBy("has_glass", has(Tags.Items.GLASS))
.save(consumer, prefix(IronChestsItems.UPGRADES.get(IronChestsUpgradeType.DIAMOND_TO_CRYSTAL).get(), folder));