From 0ad12eeab636f504efac7e06d9be3d58c611b008 Mon Sep 17 00:00:00 2001 From: Jonathan Coates Date: Mon, 26 Dec 2022 09:30:59 +0000 Subject: [PATCH] Fix computer upgrade recipes Fixes #1272 --- .../data/computercraft/recipes/computer_advanced_upgrade.json | 2 +- .../data/computercraft/recipes/turtle_advanced_upgrade.json | 2 +- src/main/java/dan200/computercraft/data/RecipeGenerator.java | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/generated/resources/data/computercraft/recipes/computer_advanced_upgrade.json b/src/generated/resources/data/computercraft/recipes/computer_advanced_upgrade.json index 7e9781e3f..cd7f38bfa 100644 --- a/src/generated/resources/data/computercraft/recipes/computer_advanced_upgrade.json +++ b/src/generated/resources/data/computercraft/recipes/computer_advanced_upgrade.json @@ -10,7 +10,7 @@ "tag": "forge:ingots/gold" }, "C": { - "item": "computercraft:computer_advanced" + "item": "computercraft:computer_normal" } }, "result": { diff --git a/src/generated/resources/data/computercraft/recipes/turtle_advanced_upgrade.json b/src/generated/resources/data/computercraft/recipes/turtle_advanced_upgrade.json index 406f08a51..86769d54d 100644 --- a/src/generated/resources/data/computercraft/recipes/turtle_advanced_upgrade.json +++ b/src/generated/resources/data/computercraft/recipes/turtle_advanced_upgrade.json @@ -10,7 +10,7 @@ "tag": "forge:ingots/gold" }, "C": { - "item": "computercraft:computer_advanced" + "item": "computercraft:turtle_normal" }, "B": { "tag": "forge:storage_blocks/gold" diff --git a/src/main/java/dan200/computercraft/data/RecipeGenerator.java b/src/main/java/dan200/computercraft/data/RecipeGenerator.java index aef2c05b7..59ad49ea7 100644 --- a/src/main/java/dan200/computercraft/data/RecipeGenerator.java +++ b/src/main/java/dan200/computercraft/data/RecipeGenerator.java @@ -200,7 +200,7 @@ public class RecipeGenerator extends RecipeProvider .pattern( "#C#" ) .pattern( "# #" ) .define( '#', Tags.Items.INGOTS_GOLD ) - .define( 'C', Registry.ModItems.COMPUTER_ADVANCED.get() ) + .define( 'C', Registry.ModItems.COMPUTER_NORMAL.get() ) .unlockedBy( "has_components", inventoryChange( itemPredicate( Registry.ModItems.COMPUTER_NORMAL.get() ), itemPredicate( Tags.Items.INGOTS_GOLD ) ) ) .save( RecipeWrapper.wrap( ComputerUpgradeRecipe.SERIALIZER, add ).withExtraData( family( ComputerFamily.ADVANCED ) ), @@ -246,7 +246,7 @@ public class RecipeGenerator extends RecipeProvider .pattern( "#C#" ) .pattern( " B " ) .define( '#', Tags.Items.INGOTS_GOLD ) - .define( 'C', Registry.ModItems.COMPUTER_ADVANCED.get() ) + .define( 'C', Registry.ModItems.TURTLE_NORMAL.get() ) .define( 'B', Tags.Items.STORAGE_BLOCKS_GOLD ) .unlockedBy( "has_components", inventoryChange( itemPredicate( Registry.ModItems.TURTLE_NORMAL.get() ), itemPredicate( Tags.Items.INGOTS_GOLD ) ) ) .save(