From eea9778840b665ca3914780c34d7560cfcec0819 Mon Sep 17 00:00:00 2001 From: simibubi <31564874+simibubi@users.noreply.github.com> Date: Tue, 27 Jul 2021 13:43:58 +0200 Subject: [PATCH] Post-PR datagen --- src/generated/resources/.cache/cache | 4 +++- .../data/create/advancements/aesthetics.json | 4 ++-- .../data/create/recipes/milling/beetroot.json | 19 +++++++++++++++++++ .../create/recipes/milling/sea_pickle.json | 19 +++++++++++++++++++ .../data/recipe/MillingRecipeGen.java | 2 +- 5 files changed, 44 insertions(+), 4 deletions(-) create mode 100644 src/generated/resources/data/create/recipes/milling/beetroot.json create mode 100644 src/generated/resources/data/create/recipes/milling/sea_pickle.json diff --git a/src/generated/resources/.cache/cache b/src/generated/resources/.cache/cache index 1b69ce010..5a1b5d0de 100644 --- a/src/generated/resources/.cache/cache +++ b/src/generated/resources/.cache/cache @@ -1700,7 +1700,7 @@ d080b1b25e5bc8baf5aee68691b08c7f12ece3b0 assets/create/models/item/windmill_bear a80fb25a0b655e76be986b5b49fcb0f03461a1ab assets/create/models/item/zinc_nugget.json b1689617190c05ef34bd18456b0c7ae09bb3210f assets/create/models/item/zinc_ore.json 58880e397902f8ca5b3b59ed4423e626109ddc4c assets/create/sounds.json -0f1b4b980afba9bf2caf583b88e261bba8b10313 data/create/advancements/aesthetics.json +5d0cc4c0255dc241e61c173b31ddca70c88d08e4 data/create/advancements/aesthetics.json 187921fa131b06721bfaf63f2623a28c141aae9a data/create/advancements/andesite_alloy.json 0ea2db7173b5be28b289ea7c9a6a0cf5805c60c7 data/create/advancements/andesite_casing.json 83c046bd200623933545c9e4326f782fb02c87fa data/create/advancements/arm_blaze_burner.json @@ -3387,6 +3387,7 @@ e491fd8a8873308270f9dc2a57ac8f2c70431dcc data/create/recipes/mechanical_crafting 8c7e1cbc87c7ca7df2bf949957e89422fef8ad94 data/create/recipes/milling/aluminum_ore.json bcff4d30ae09a0729bce8b2dbde4ddd6719a998b data/create/recipes/milling/andesite.json ac3f1c92115a113a1ea7e5543c1e061e3d2a0b36 data/create/recipes/milling/azure_bluet.json +83fc4663a012e78cebbb0f08e01a10df06b04873 data/create/recipes/milling/beetroot.json 95d673bb272d273c2ad25bf01723dd978642faed data/create/recipes/milling/blue_orchid.json 25d008621c461a1f6fef0e45913dc8654c645ea3 data/create/recipes/milling/bone.json 8c09dc48b3e3c3c6bfdc4ed7683bdee860802172 data/create/recipes/milling/bone_meal.json @@ -3426,6 +3427,7 @@ bda581c2039f41f7d55527814a46903f10da7e05 data/create/recipes/milling/rose_bush.j 54be62a1bf098a370d315f79068ec326e4f4d6c2 data/create/recipes/milling/saddle.json 8bc6124293f4efb5f2d0fa4a3166c6d00a88a14c data/create/recipes/milling/sand.json 42c5837c16132632da52325cddea3cdbb318e822 data/create/recipes/milling/sandstone.json +d11b247b41fc1c36c75a68a56eca8404367707f8 data/create/recipes/milling/sea_pickle.json 87e30347cc28aa5fb2daefae4c25fa81ce92b0f1 data/create/recipes/milling/silver_ore.json 1e14bd30032aab6dfaff5bca50c791332ffc1aaa data/create/recipes/milling/sugar_cane.json af2beca9f934601ad029f34bad08be3cee07f6b4 data/create/recipes/milling/sunflower.json diff --git a/src/generated/resources/data/create/advancements/aesthetics.json b/src/generated/resources/data/create/advancements/aesthetics.json index d723cbe38..59a86f429 100644 --- a/src/generated/resources/data/create/advancements/aesthetics.json +++ b/src/generated/resources/data/create/advancements/aesthetics.json @@ -28,8 +28,8 @@ "trigger": "create:bracket_apply", "conditions": { "accepted_entries": [ - "create:cogwheel", - "create:large_cogwheel" + "create:large_cogwheel", + "create:cogwheel" ] } }, diff --git a/src/generated/resources/data/create/recipes/milling/beetroot.json b/src/generated/resources/data/create/recipes/milling/beetroot.json new file mode 100644 index 000000000..740896026 --- /dev/null +++ b/src/generated/resources/data/create/recipes/milling/beetroot.json @@ -0,0 +1,19 @@ +{ + "type": "create:milling", + "ingredients": [ + { + "item": "minecraft:beetroot" + } + ], + "results": [ + { + "item": "minecraft:red_dye", + "count": 2 + }, + { + "item": "minecraft:beetroot_seeds", + "chance": 0.1 + } + ], + "processingTime": 70 +} \ No newline at end of file diff --git a/src/generated/resources/data/create/recipes/milling/sea_pickle.json b/src/generated/resources/data/create/recipes/milling/sea_pickle.json new file mode 100644 index 000000000..93769b17d --- /dev/null +++ b/src/generated/resources/data/create/recipes/milling/sea_pickle.json @@ -0,0 +1,19 @@ +{ + "type": "create:milling", + "ingredients": [ + { + "item": "minecraft:sea_pickle" + } + ], + "results": [ + { + "item": "minecraft:lime_dye", + "count": 2 + }, + { + "item": "minecraft:green_dye", + "chance": 0.1 + } + ], + "processingTime": 50 +} \ No newline at end of file diff --git a/src/main/java/com/simibubi/create/foundation/data/recipe/MillingRecipeGen.java b/src/main/java/com/simibubi/create/foundation/data/recipe/MillingRecipeGen.java index 04da36c99..5a939f2eb 100644 --- a/src/main/java/com/simibubi/create/foundation/data/recipe/MillingRecipeGen.java +++ b/src/main/java/com/simibubi/create/foundation/data/recipe/MillingRecipeGen.java @@ -96,7 +96,7 @@ public class MillingRecipeGen extends ProcessingRecipeGen { BEETROOT = create(() -> Items.BEETROOT, b -> b.duration(70) .output(Items.RED_DYE, 2) - .output(.1f, Items.PURPLE_DYE)), + .output(.1f, Items.BEETROOT_SEEDS)), INK_SAC = create(() -> Items.INK_SAC, b -> b.duration(100) .output(Items.BLACK_DYE, 2)