From cda65027b253947f5cc431bb190234d0404581b7 Mon Sep 17 00:00:00 2001 From: attackeight Date: Thu, 9 May 2024 16:53:24 -0400 Subject: [PATCH] Fix Ore Crushing Inconsistency and add Gilded Blackstone Crushing fixes Creators-of-Create#6440 --- src/generated/resources/.cache/cache | 3 ++- .../recipes/crushing/deepslate_coal_ore.json | 7 +++--- .../recipes/crushing/gilded_blackstone.json | 23 +++++++++++++++++++ .../data/recipe/CrushingRecipeGen.java | 4 +++- 4 files changed, 32 insertions(+), 5 deletions(-) create mode 100644 src/generated/resources/data/create/recipes/crushing/gilded_blackstone.json diff --git a/src/generated/resources/.cache/cache b/src/generated/resources/.cache/cache index 1f49b621b..0946d510c 100644 --- a/src/generated/resources/.cache/cache +++ b/src/generated/resources/.cache/cache @@ -4251,7 +4251,7 @@ fe6620822b1c90527c6b77ab6f6e25873d19487c data/create/recipes/crushing/compat/the 2670e2454e82fd7dc44e896e40771bce9c515285 data/create/recipes/crushing/copper_ore.json 4106006671af487158d165c8211553028585ebb3 data/create/recipes/crushing/crimsite.json b2ba06eb5bcc907f16e4605fc53f31aa35bc2cfd data/create/recipes/crushing/crimsite_recycling.json -c0f2d4de4d00504607a8f3e2d1327d754835eebe data/create/recipes/crushing/deepslate_coal_ore.json +57a02cc2631a232a6bad5e772b622983087ecb18 data/create/recipes/crushing/deepslate_coal_ore.json 81ae6cf7b0f7dbf8f4966a4670121919de7b5391 data/create/recipes/crushing/deepslate_copper_ore.json 2f9f26daadda2d291989bccd2b0ea5f85e3ef5ae data/create/recipes/crushing/deepslate_diamond_ore.json ae3070fc3ae237192949ad06ebb8a4c157f7e832 data/create/recipes/crushing/deepslate_emerald_ore.json @@ -4265,6 +4265,7 @@ c42d105c8567c0844fcd811349093c2d754ea7d0 data/create/recipes/crushing/diamond_or f2b1c52cde3ecd83f021eff5114375e2f6526d90 data/create/recipes/crushing/diorite.json 38e958ba2e12daeed2fb0bc65a9ab9e04c98b816 data/create/recipes/crushing/diorite_recycling.json 1327589e844cb587a02167e4428fd604350d60e1 data/create/recipes/crushing/emerald_ore.json +23623c1aa357e96b791019d64bdaf0124652baaf data/create/recipes/crushing/gilded_blackstone.json b26b1f0dccf2ffb194ce12173890a83e93369b39 data/create/recipes/crushing/glowstone.json 159ac6c38b0232fa9bf3ed5e7ea8e23854c96f22 data/create/recipes/crushing/gold_ore.json 55c0656723bd5a87089965651fe268b2d2956771 data/create/recipes/crushing/golden_horse_armor.json diff --git a/src/generated/resources/data/create/recipes/crushing/deepslate_coal_ore.json b/src/generated/resources/data/create/recipes/crushing/deepslate_coal_ore.json index 1a7b72c05..6cf1a77d8 100644 --- a/src/generated/resources/data/create/recipes/crushing/deepslate_coal_ore.json +++ b/src/generated/resources/data/create/recipes/crushing/deepslate_coal_ore.json @@ -7,11 +7,12 @@ ], "results": [ { - "item": "minecraft:coal" + "item": "minecraft:coal", + "count": 2 }, { "item": "minecraft:coal", - "chance": 0.75 + "chance": 0.25 }, { "item": "create:experience_nugget", @@ -22,5 +23,5 @@ "chance": 0.125 } ], - "processingTime": 250 + "processingTime": 300 } \ No newline at end of file diff --git a/src/generated/resources/data/create/recipes/crushing/gilded_blackstone.json b/src/generated/resources/data/create/recipes/crushing/gilded_blackstone.json new file mode 100644 index 000000000..df163c327 --- /dev/null +++ b/src/generated/resources/data/create/recipes/crushing/gilded_blackstone.json @@ -0,0 +1,23 @@ +{ + "type": "create:crushing", + "ingredients": [ + { + "item": "minecraft:gilded_blackstone" + } + ], + "results": [ + { + "item": "minecraft:gold_nugget", + "count": 18 + }, + { + "item": "create:experience_nugget", + "chance": 0.75 + }, + { + "item": "minecraft:blackstone", + "chance": 0.125 + } + ], + "processingTime": 400 +} \ No newline at end of file diff --git a/src/main/java/com/simibubi/create/foundation/data/recipe/CrushingRecipeGen.java b/src/main/java/com/simibubi/create/foundation/data/recipe/CrushingRecipeGen.java index ee78cbec9..33223bb04 100644 --- a/src/main/java/com/simibubi/create/foundation/data/recipe/CrushingRecipeGen.java +++ b/src/main/java/com/simibubi/create/foundation/data/recipe/CrushingRecipeGen.java @@ -93,13 +93,15 @@ public class CrushingRecipeGen extends ProcessingRecipeGen { DEEP_GOLD_ORE = deepslateOre(() -> Items.DEEPSLATE_GOLD_ORE, AllItems.CRUSHED_GOLD::get, 2.25f, 350), DEEP_DIAMOND_ORE = deepslateOre(() -> Items.DEEPSLATE_DIAMOND_ORE, () -> Items.DIAMOND, 2.25f, 450), DEEP_EMERALD_ORE = deepslateOre(() -> Items.DEEPSLATE_EMERALD_ORE, () -> Items.EMERALD, 2.25f, 450), - DEEP_COAL_ORE = deepslateOre(() -> Items.DEEPSLATE_COAL_ORE, () -> Items.COAL, 1.75f, 250), + DEEP_COAL_ORE = deepslateOre(() -> Items.DEEPSLATE_COAL_ORE, () -> Items.COAL, 2.25f, 300), DEEP_REDSTONE_ORE = deepslateOre(() -> Items.DEEPSLATE_REDSTONE_ORE, () -> Items.REDSTONE, 7.5f, 350), DEEP_LAPIS_ORE = deepslateOre(() -> Items.DEEPSLATE_LAPIS_ORE, () -> Items.LAPIS_LAZULI, 12.5f, 350), NETHER_GOLD_ORE = netherOre(() -> Items.NETHER_GOLD_ORE, () -> Items.GOLD_NUGGET, 18, 350), NETHER_QUARTZ_ORE = netherOre(() -> Items.NETHER_QUARTZ_ORE, () -> Items.QUARTZ, 2.25f, 350), + GILDED_BLACKSTONE = ore(Items.BLACKSTONE, () -> Items.GILDED_BLACKSTONE, () -> Items.GOLD_NUGGET, 18, 400), + RAW_COPPER_ORE = rawOre(() -> Items.RAW_COPPER, AllItems.CRUSHED_COPPER::get, 1), RAW_ZINC_ORE = rawOre(AllItems.RAW_ZINC::get, AllItems.CRUSHED_ZINC::get, 1), RAW_IRON_ORE = rawOre(() -> Items.RAW_IRON, AllItems.CRUSHED_IRON::get, 1),