diff --git a/src/generated/resources/.cache/cbced4962689e36cb386fe2a02f01561d1264b58 b/src/generated/resources/.cache/cbced4962689e36cb386fe2a02f01561d1264b58 index e66ffc57a..e276a2bb5 100644 --- a/src/generated/resources/.cache/cbced4962689e36cb386fe2a02f01561d1264b58 +++ b/src/generated/resources/.cache/cbced4962689e36cb386fe2a02f01561d1264b58 @@ -1,4 +1,4 @@ -// 1.20.4 2024-03-11T00:45:42.8987725 Crushing Recipes +// 1.20.4 2024-06-11T21:54:35.7904866 Crushing Recipes 07795b4aba877586e7aa11e6029caad068454978 data/actuallyadditions/recipes/crushing/allium.json 30d7431e146baa3e25afd3db941d8b6352be2b14 data/actuallyadditions/recipes/crushing/azure_bluet.json 928786acb608867ea89632b52104fd051ee004ba data/actuallyadditions/recipes/crushing/black_quartz_ore.json @@ -8,11 +8,15 @@ fb79df8b27902475a107c891f6dfcfcd83e5addb data/actuallyadditions/recipes/crushing/coal_block.json 8955e3aba3eca7c4de62b08e1b2aa1339360e19a data/actuallyadditions/recipes/crushing/coal_ore.json 6ac7b08799b8996fbefedee184d34b6cfa8d8e6a data/actuallyadditions/recipes/crushing/cobblestone.json +ea948d12c81c549e8686c196f65941768d5a5239 data/actuallyadditions/recipes/crushing/copper_ore.json e4214825ce0531be1e63fe9951a341130d05dd85 data/actuallyadditions/recipes/crushing/cornflower.json 0f3b98f6f2ec3521acf9f6fbb281f24302e5552a data/actuallyadditions/recipes/crushing/danedlion.json a916d475df783d565d879fb3ae08195a2c561474 data/actuallyadditions/recipes/crushing/deepslate_coal_ore.json +fd6c994fbec0588aea1b58ef56c7f43b766fe8b2 data/actuallyadditions/recipes/crushing/deepslate_copper_ore.json 6ff5d96d4e0a8214bf7e270bce9d77b427aa3a6e data/actuallyadditions/recipes/crushing/deepslate_diamond_ore.json 14dc3d945a793a11d08834f8814ecf7882f08bd9 data/actuallyadditions/recipes/crushing/deepslate_emerald_ore.json +4e82f10e091ab19ce477a30f7652a4abf75175c8 data/actuallyadditions/recipes/crushing/deepslate_gold_ore.json +00ae89f72dae549b0a0f8c9b1d26c8126e222305 data/actuallyadditions/recipes/crushing/deepslate_iron_ore.json b90588af31abd2bfff1179144823ee7e24fe98ff data/actuallyadditions/recipes/crushing/deepslate_lapis_ore.json 53d8c4bfbcd7f8347d25c567030c35de015b6ede data/actuallyadditions/recipes/crushing/deepslate_redstone_ore.json b93fc1e7009a67eae296792186d210d3f82d11b9 data/actuallyadditions/recipes/crushing/diamond_horse_armor.json diff --git a/src/generated/resources/data/actuallyadditions/recipes/crushing/copper_ore.json b/src/generated/resources/data/actuallyadditions/recipes/crushing/copper_ore.json new file mode 100644 index 000000000..a122d6dd3 --- /dev/null +++ b/src/generated/resources/data/actuallyadditions/recipes/crushing/copper_ore.json @@ -0,0 +1,21 @@ +{ + "type": "actuallyadditions:crushing", + "ingredient": { + "item": "minecraft:copper_ore" + }, + "result": [ + { + "result": { + "Count": 2, + "id": "minecraft:raw_copper" + } + }, + { + "chance": 0.05, + "result": { + "Count": 1, + "id": "minecraft:raw_gold" + } + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/actuallyadditions/recipes/crushing/deepslate_copper_ore.json b/src/generated/resources/data/actuallyadditions/recipes/crushing/deepslate_copper_ore.json new file mode 100644 index 000000000..b01efa252 --- /dev/null +++ b/src/generated/resources/data/actuallyadditions/recipes/crushing/deepslate_copper_ore.json @@ -0,0 +1,21 @@ +{ + "type": "actuallyadditions:crushing", + "ingredient": { + "item": "minecraft:deepslate_copper_ore" + }, + "result": [ + { + "result": { + "Count": 2, + "id": "minecraft:raw_copper" + } + }, + { + "chance": 0.05, + "result": { + "Count": 1, + "id": "minecraft:raw_gold" + } + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/actuallyadditions/recipes/crushing/deepslate_gold_ore.json b/src/generated/resources/data/actuallyadditions/recipes/crushing/deepslate_gold_ore.json new file mode 100644 index 000000000..b10618d65 --- /dev/null +++ b/src/generated/resources/data/actuallyadditions/recipes/crushing/deepslate_gold_ore.json @@ -0,0 +1,21 @@ +{ + "type": "actuallyadditions:crushing", + "ingredient": { + "item": "minecraft:deepslate_gold_ore" + }, + "result": [ + { + "result": { + "Count": 2, + "id": "minecraft:raw_gold" + } + }, + { + "chance": 0.0, + "result": { + "Count": 0, + "id": "minecraft:air" + } + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/actuallyadditions/recipes/crushing/deepslate_iron_ore.json b/src/generated/resources/data/actuallyadditions/recipes/crushing/deepslate_iron_ore.json new file mode 100644 index 000000000..19c95d8bd --- /dev/null +++ b/src/generated/resources/data/actuallyadditions/recipes/crushing/deepslate_iron_ore.json @@ -0,0 +1,21 @@ +{ + "type": "actuallyadditions:crushing", + "ingredient": { + "item": "minecraft:deepslate_iron_ore" + }, + "result": [ + { + "result": { + "Count": 2, + "id": "minecraft:raw_iron" + } + }, + { + "chance": 0.2, + "result": { + "Count": 1, + "id": "minecraft:raw_gold" + } + } + ] +} \ No newline at end of file diff --git a/src/main/java/de/ellpeck/actuallyadditions/data/CrushingRecipeGenerator.java b/src/main/java/de/ellpeck/actuallyadditions/data/CrushingRecipeGenerator.java index 39b7ebaf2..4b3492738 100644 --- a/src/main/java/de/ellpeck/actuallyadditions/data/CrushingRecipeGenerator.java +++ b/src/main/java/de/ellpeck/actuallyadditions/data/CrushingRecipeGenerator.java @@ -113,11 +113,20 @@ public class CrushingRecipeGenerator extends RecipeProvider { .save(recipeOutput, "prismarine_shard"); new CrushingBuilder(Ingredient.of(ActuallyBlocks.BLACK_QUARTZ_ORE.get()), new CrushingRecipe.CrushingResult(new ItemStack(ActuallyItems.BLACK_QUARTZ.get(), 2), 1.0f)) .save(recipeOutput, "black_quartz_ore"); + new CrushingBuilder(Ingredient.of(Items.COPPER_ORE), new CrushingRecipe.CrushingResult(new ItemStack(Items.RAW_COPPER, 2), 1.0f)) + .addResult2(new CrushingRecipe.CrushingResult(new ItemStack(Items.RAW_GOLD, 1), 0.05f)) + .save(recipeOutput, "copper_ore"); + new CrushingBuilder(Ingredient.of(Items.DEEPSLATE_COPPER_ORE), new CrushingRecipe.CrushingResult(new ItemStack(Items.RAW_COPPER, 2), 1.0f)) + .addResult2(new CrushingRecipe.CrushingResult(new ItemStack(Items.RAW_GOLD, 1), 0.05f)) + .save(recipeOutput, "deepslate_copper_ore"); //TODO: Think about the recipes that returned crushed ores before and what to replace them with new CrushingBuilder(Ingredient.of(Items.IRON_ORE), new CrushingRecipe.CrushingResult(new ItemStack(Items.RAW_IRON, 2), 1.0f)) .addResult2(new CrushingRecipe.CrushingResult(new ItemStack(Items.RAW_GOLD, 1), 0.2f)) .save(recipeOutput, "iron_ore"); + new CrushingBuilder(Ingredient.of(Items.DEEPSLATE_IRON_ORE), new CrushingRecipe.CrushingResult(new ItemStack(Items.RAW_IRON, 2), 1.0f)) + .addResult2(new CrushingRecipe.CrushingResult(new ItemStack(Items.RAW_GOLD, 1), 0.2f)) + .save(recipeOutput, "deepslate_iron_ore"); new CrushingBuilder(Ingredient.of(Items.IRON_HORSE_ARMOR), new CrushingRecipe.CrushingResult(new ItemStack(Items.RAW_IRON, 6), 1.0f)) .save(recipeOutput, "iron_horse_armor"); new CrushingBuilder(Ingredient.of(Items.GOLDEN_HORSE_ARMOR), new CrushingRecipe.CrushingResult(new ItemStack(Items.RAW_GOLD, 6), 1.0f)) @@ -126,6 +135,8 @@ public class CrushingRecipeGenerator extends RecipeProvider { .save(recipeOutput, "diamond_horse_armor"); new CrushingBuilder(Ingredient.of(Items.GOLD_ORE), new CrushingRecipe.CrushingResult(new ItemStack(Items.RAW_GOLD, 2), 1.0f)) .save(recipeOutput, "gold_ore"); + new CrushingBuilder(Ingredient.of(Items.DEEPSLATE_GOLD_ORE), new CrushingRecipe.CrushingResult(new ItemStack(Items.RAW_GOLD, 2), 1.0f)) + .save(recipeOutput, "deepslate_gold_ore"); }