diff --git a/src/generated/resources/.cache/2d64935085b86659cb7857bad9701dbf9bab6e4c b/src/generated/resources/.cache/2d64935085b86659cb7857bad9701dbf9bab6e4c index bfe960ae9..0bb432d1d 100644 --- a/src/generated/resources/.cache/2d64935085b86659cb7857bad9701dbf9bab6e4c +++ b/src/generated/resources/.cache/2d64935085b86659cb7857bad9701dbf9bab6e4c @@ -1,4 +1,4 @@ -// 1.20.1 2023-07-04T18:31:12.3492665 Registrate Provider for create [Recipes, Advancements, Loot Tables, Tags (blocks), Tags (items), Tags (fluids), Tags (entity_types), Blockstates, Item models, Lang (en_us/en_ud)] +// 1.20.1 2023-08-22T15:37:03.5601186 Registrate Provider for create [Recipes, Advancements, Loot Tables, Tags (blocks), Tags (items), Tags (fluids), Tags (entity_types), Blockstates, Item models, Lang (en_us/en_ud)] 60bbdf92d2ac9824ea6144955c74043a6005f79d assets/create/blockstates/acacia_window.json 6a67703c2697d81b7dc83e9d72a66f9c9ff08383 assets/create/blockstates/acacia_window_pane.json c3ae87b62e81d8e9476eccd793bb1548d74c66a1 assets/create/blockstates/adjustable_chain_gearshift.json @@ -4218,8 +4218,8 @@ e22493305e0cebfb7ededae122e19ee9dd24fc9d data/create/tags/items/stone_types/scor 5def5088f7fd31b80e6f28c1c4ea146aa9d7d15b data/create/tags/items/toolboxes.json 22c744a157399a21492bcd8b211578f8f504e653 data/create/tags/items/upright_on_belt.json da739ad2160e7df4e0e5cc89587670ce5e9450c3 data/create/tags/items/valve_handles.json -03989b943d729293db75c8f681c490c55f594d53 data/create/tags/items/vanilla_stripped_logs.json -a82f75a9af4c0b28f08de8dfcaea2dce2accda28 data/create/tags/items/vanilla_stripped_wood.json +c59c9fc0cdd45de659aa8023d36f9decb90f708c data/create/tags/items/vanilla_stripped_logs.json +64441ac1daa64c81601b94b82b21c0ee862b6344 data/create/tags/items/vanilla_stripped_wood.json 10d5f0c1763f80860a39398ecc33dbbe43099471 data/forge/tags/blocks/glass/colorless.json de1fc89be6a52473d526d3efe0204b9b8489058c data/forge/tags/blocks/glass_panes.json 81b107ada9c6ac5679a21f8c6a006bf230f69c39 data/forge/tags/blocks/ores.json diff --git a/src/generated/resources/.cache/84f9c7ad2eb0c05bbc6dce996bf102df34b68360 b/src/generated/resources/.cache/84f9c7ad2eb0c05bbc6dce996bf102df34b68360 index 3b95807c9..08cca5a55 100644 --- a/src/generated/resources/.cache/84f9c7ad2eb0c05bbc6dce996bf102df34b68360 +++ b/src/generated/resources/.cache/84f9c7ad2eb0c05bbc6dce996bf102df34b68360 @@ -1,4 +1,4 @@ -// 1.20.1 2023-07-04T18:31:12.3293201 Tags for minecraft:damage_type mod id create -035f94f328fba0594df1a6bd7c374b8b99b8d7d1 data/minecraft/tags/damage_type/bypasses_armor.json +// 1.20.1 2023-08-23T16:37:58.1179329 Tags for minecraft:damage_type mod id create +d33fa726908e2795b379ae6226a71ecfd9a5dc40 data/minecraft/tags/damage_type/bypasses_armor.json 62231dbbc4e6a21bafe1b3cdb3c86d06ff647ec7 data/minecraft/tags/damage_type/is_explosion.json ad45c55a9cc7883cfcd8b208f735c739f599e1d0 data/minecraft/tags/damage_type/is_fire.json diff --git a/src/generated/resources/.cache/b256105d8411632b0d585496ea8944a751a08034 b/src/generated/resources/.cache/b256105d8411632b0d585496ea8944a751a08034 index cf299c85d..2be284ded 100644 --- a/src/generated/resources/.cache/b256105d8411632b0d585496ea8944a751a08034 +++ b/src/generated/resources/.cache/b256105d8411632b0d585496ea8944a751a08034 @@ -1,4 +1,4 @@ -// 1.20.1 2023-07-04T18:31:12.3313149 Create's Processing Recipes +// 1.20.1 2023-08-23T16:29:07.6573146 Create's Processing Recipes 3c94326fb730f68c1e44fe1e2ef09c9db6ffd92b data/create/recipes/compacting/andesite_from_flint.json 8d3d5b31f3601b9f681ff710e0545a483a1494c6 data/create/recipes/compacting/blaze_cake.json 8bd7f4e3a686ab520b2d55594d2018d0e9a50c91 data/create/recipes/compacting/chocolate.json @@ -89,8 +89,12 @@ b135e3faf6afef4b6a5f00197997b47ff8e90568 data/create/recipes/crushing/wool.json b5c33d039e3c9771b3ffc322aadae7e75a823635 data/create/recipes/cutting/acacia_log.json b45b88bf2ac614b2518437656746f8e8a465d693 data/create/recipes/cutting/acacia_wood.json cdb26cd91feeda5901f31f57c16517dda5287810 data/create/recipes/cutting/andesite_alloy.json +5afeada82e71eb5012e35725821792f64d92a6b3 data/create/recipes/cutting/bamboo_block.json +4ac4bb94de7b25a3eec85e8290ab5f2f6b2b4167 data/create/recipes/cutting/bamboo_planks.json 1a3dd0e51603a3e47da4465da210004c78028faf data/create/recipes/cutting/birch_log.json 71c3a093c849a99fbaef8772114ac9305627f2c1 data/create/recipes/cutting/birch_wood.json +31a1713f8bc5577b3fcf2fcfd2d42dac145f9560 data/create/recipes/cutting/cherry_log.json +0f54293540ad75e6395452253f4ab5c8e5166e93 data/create/recipes/cutting/cherry_wood.json 4f756e256a7814e2b9a6632d38633bb78c5046cd data/create/recipes/cutting/compat/architects_palette/stripped_twisted_log.json 310dfb6c7e7649c0ede306fda71459e7f2bc8c7e data/create/recipes/cutting/compat/architects_palette/stripped_twisted_wood.json 8645e8ee47b0a6a432f85b7f2e07957e21adeb70 data/create/recipes/cutting/compat/architects_palette/twisted_log.json @@ -407,8 +411,11 @@ e34df7cc80df6139a0f77cd5f7b8b17b0abbffa9 data/create/recipes/cutting/jungle_wood 85cf63074b922696ea691cfbc2cf7c348d4e0977 data/create/recipes/cutting/spruce_wood.json 1e83972fa75e6cef279da72312ae0577e6b074a3 data/create/recipes/cutting/stripped_acacia_log.json 070aa9790369a368666c03bf1cea9643ed0e5bc7 data/create/recipes/cutting/stripped_acacia_wood.json +558e81291da72b7f042b3b3270744b2c05ddc6fa data/create/recipes/cutting/stripped_bamboo_block.json 944dc5880749a146067716dd34b7edef77b925f5 data/create/recipes/cutting/stripped_birch_log.json 0ce39eb489b8d876954cbfcf715e94af79a57119 data/create/recipes/cutting/stripped_birch_wood.json +67c248e1be1e67054d4a65b94396d874156d5f29 data/create/recipes/cutting/stripped_cherry_log.json +1e34d2b0a2ae375ee312ca49aaaad8ff9e35b465 data/create/recipes/cutting/stripped_cherry_wood.json b90e5b0a18d6d2e7eae62d0caf41fb3dd597c1e9 data/create/recipes/cutting/stripped_crimson_hyphae.json 7244f0450df30a3b08139a1a43c82d3dfcc9f9a7 data/create/recipes/cutting/stripped_crimson_stem.json fc37b271373157c95e306bb33b6585dae45d3edb data/create/recipes/cutting/stripped_dark_oak_log.json diff --git a/src/generated/resources/data/create/recipes/cutting/bamboo_block.json b/src/generated/resources/data/create/recipes/cutting/bamboo_block.json new file mode 100644 index 000000000..4899ac8c1 --- /dev/null +++ b/src/generated/resources/data/create/recipes/cutting/bamboo_block.json @@ -0,0 +1,14 @@ +{ + "type": "create:cutting", + "ingredients": [ + { + "item": "minecraft:bamboo_block" + } + ], + "processingTime": 50, + "results": [ + { + "item": "minecraft:stripped_bamboo_block" + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/create/recipes/cutting/bamboo_planks.json b/src/generated/resources/data/create/recipes/cutting/bamboo_planks.json new file mode 100644 index 000000000..0e9bb2a4e --- /dev/null +++ b/src/generated/resources/data/create/recipes/cutting/bamboo_planks.json @@ -0,0 +1,14 @@ +{ + "type": "create:cutting", + "ingredients": [ + { + "item": "minecraft:bamboo_planks" + } + ], + "processingTime": 20, + "results": [ + { + "item": "minecraft:bamboo_mosaic" + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/create/recipes/cutting/cherry_log.json b/src/generated/resources/data/create/recipes/cutting/cherry_log.json new file mode 100644 index 000000000..d413e3067 --- /dev/null +++ b/src/generated/resources/data/create/recipes/cutting/cherry_log.json @@ -0,0 +1,14 @@ +{ + "type": "create:cutting", + "ingredients": [ + { + "item": "minecraft:cherry_log" + } + ], + "processingTime": 50, + "results": [ + { + "item": "minecraft:stripped_cherry_log" + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/create/recipes/cutting/cherry_wood.json b/src/generated/resources/data/create/recipes/cutting/cherry_wood.json new file mode 100644 index 000000000..373d7d143 --- /dev/null +++ b/src/generated/resources/data/create/recipes/cutting/cherry_wood.json @@ -0,0 +1,14 @@ +{ + "type": "create:cutting", + "ingredients": [ + { + "item": "minecraft:cherry_wood" + } + ], + "processingTime": 50, + "results": [ + { + "item": "minecraft:stripped_cherry_wood" + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/create/recipes/cutting/stripped_bamboo_block.json b/src/generated/resources/data/create/recipes/cutting/stripped_bamboo_block.json new file mode 100644 index 000000000..606aa762f --- /dev/null +++ b/src/generated/resources/data/create/recipes/cutting/stripped_bamboo_block.json @@ -0,0 +1,15 @@ +{ + "type": "create:cutting", + "ingredients": [ + { + "item": "minecraft:stripped_bamboo_block" + } + ], + "processingTime": 50, + "results": [ + { + "count": 3, + "item": "minecraft:bamboo_planks" + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/create/recipes/cutting/stripped_cherry_log.json b/src/generated/resources/data/create/recipes/cutting/stripped_cherry_log.json new file mode 100644 index 000000000..a18f6116b --- /dev/null +++ b/src/generated/resources/data/create/recipes/cutting/stripped_cherry_log.json @@ -0,0 +1,15 @@ +{ + "type": "create:cutting", + "ingredients": [ + { + "item": "minecraft:stripped_cherry_log" + } + ], + "processingTime": 50, + "results": [ + { + "count": 6, + "item": "minecraft:cherry_planks" + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/create/recipes/cutting/stripped_cherry_wood.json b/src/generated/resources/data/create/recipes/cutting/stripped_cherry_wood.json new file mode 100644 index 000000000..03ed47cfd --- /dev/null +++ b/src/generated/resources/data/create/recipes/cutting/stripped_cherry_wood.json @@ -0,0 +1,15 @@ +{ + "type": "create:cutting", + "ingredients": [ + { + "item": "minecraft:stripped_cherry_wood" + } + ], + "processingTime": 50, + "results": [ + { + "count": 6, + "item": "minecraft:cherry_planks" + } + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/create/tags/items/vanilla_stripped_logs.json b/src/generated/resources/data/create/tags/items/vanilla_stripped_logs.json index fae2469d7..cd14f5cee 100644 --- a/src/generated/resources/data/create/tags/items/vanilla_stripped_logs.json +++ b/src/generated/resources/data/create/tags/items/vanilla_stripped_logs.json @@ -8,6 +8,8 @@ "minecraft:stripped_mangrove_log", "minecraft:stripped_oak_log", "minecraft:stripped_spruce_log", - "minecraft:stripped_warped_stem" + "minecraft:stripped_warped_stem", + "minecraft:stripped_cherry_log", + "minecraft:stripped_bamboo_block" ] } \ No newline at end of file diff --git a/src/generated/resources/data/create/tags/items/vanilla_stripped_wood.json b/src/generated/resources/data/create/tags/items/vanilla_stripped_wood.json index 2b2865eb6..14263b1a0 100644 --- a/src/generated/resources/data/create/tags/items/vanilla_stripped_wood.json +++ b/src/generated/resources/data/create/tags/items/vanilla_stripped_wood.json @@ -8,6 +8,7 @@ "minecraft:stripped_mangrove_wood", "minecraft:stripped_oak_wood", "minecraft:stripped_spruce_wood", - "minecraft:stripped_warped_hyphae" + "minecraft:stripped_warped_hyphae", + "minecraft:stripped_cherry_wood" ] } \ No newline at end of file diff --git a/src/generated/resources/data/minecraft/tags/damage_type/bypasses_armor.json b/src/generated/resources/data/minecraft/tags/damage_type/bypasses_armor.json index affc96ef1..86fb2af87 100644 --- a/src/generated/resources/data/minecraft/tags/damage_type/bypasses_armor.json +++ b/src/generated/resources/data/minecraft/tags/damage_type/bypasses_armor.json @@ -1,15 +1,11 @@ { "values": [ - { - "id": "create:fan_lava", - "required": false - }, { "id": "create:mechanical_saw", "required": false }, { - "id": "create:crush", + "id": "create:mechanical_drill", "required": false }, { @@ -17,7 +13,11 @@ "required": false }, { - "id": "create:mechanical_drill", + "id": "create:crush", + "required": false + }, + { + "id": "create:fan_lava", "required": false } ] diff --git a/src/main/java/com/simibubi/create/foundation/data/TagGen.java b/src/main/java/com/simibubi/create/foundation/data/TagGen.java index 69969330f..47be8524f 100644 --- a/src/main/java/com/simibubi/create/foundation/data/TagGen.java +++ b/src/main/java/com/simibubi/create/foundation/data/TagGen.java @@ -81,7 +81,7 @@ public class TagGen { private static void genBlockTags(RegistrateTagsProvider provIn) { CreateTagsProvider prov = new CreateTagsProvider<>(provIn, Block::builtInRegistryHolder); - + prov.tag(AllBlockTags.BRITTLE.tag) .add(Blocks.BELL, Blocks.COCOA, Blocks.FLOWER_POT) .addTag(BlockTags.BEDS) @@ -149,7 +149,7 @@ public class TagGen { private static void genItemTags(RegistrateTagsProvider provIn) { CreateTagsProvider prov = new CreateTagsProvider<>(provIn, Item::builtInRegistryHolder); - + prov.tag(AllItemTags.SLEEPERS.tag) .add(Items.STONE_SLAB, Items.SMOOTH_STONE_SLAB, Items.ANDESITE_SLAB); @@ -160,7 +160,7 @@ public class TagGen { prov.tag(AllItemTags.STRIPPED_WOOD.tag) .addTag(AllItemTags.VANILLA_STRIPPED_WOOD.tag) .addTag(AllItemTags.MODDED_STRIPPED_WOOD.tag); - + prov.tag(AllItemTags.DEPLOYABLE_DRINK.tag) .add(Items.MILK_BUCKET, Items.POTION); @@ -174,12 +174,14 @@ public class TagGen { prov.tag(AllItemTags.VANILLA_STRIPPED_LOGS.tag) .add(Items.STRIPPED_ACACIA_LOG, Items.STRIPPED_BIRCH_LOG, Items.STRIPPED_CRIMSON_STEM, Items.STRIPPED_DARK_OAK_LOG, Items.STRIPPED_JUNGLE_LOG, Items.STRIPPED_MANGROVE_LOG, - Items.STRIPPED_OAK_LOG, Items.STRIPPED_SPRUCE_LOG, Items.STRIPPED_WARPED_STEM); + Items.STRIPPED_OAK_LOG, Items.STRIPPED_SPRUCE_LOG, Items.STRIPPED_WARPED_STEM, + Items.STRIPPED_CHERRY_LOG, Items.STRIPPED_BAMBOO_BLOCK); prov.tag(AllItemTags.VANILLA_STRIPPED_WOOD.tag) .add(Items.STRIPPED_ACACIA_WOOD, Items.STRIPPED_BIRCH_WOOD, Items.STRIPPED_CRIMSON_HYPHAE, Items.STRIPPED_DARK_OAK_WOOD, Items.STRIPPED_JUNGLE_WOOD, Items.STRIPPED_MANGROVE_WOOD, - Items.STRIPPED_OAK_WOOD, Items.STRIPPED_SPRUCE_WOOD, Items.STRIPPED_WARPED_HYPHAE); + Items.STRIPPED_OAK_WOOD, Items.STRIPPED_SPRUCE_WOOD, Items.STRIPPED_WARPED_HYPHAE, + Items.STRIPPED_CHERRY_WOOD); prov.tag(ItemTags.BEACON_PAYMENT_ITEMS) .addTag(AllItemTags.CREATE_INGOTS.tag); @@ -246,7 +248,7 @@ public class TagGen { private static void genEntityTags(RegistrateTagsProvider> provIn) { CreateTagsProvider> prov = new CreateTagsProvider<>(provIn, EntityType::builtInRegistryHolder); - + // VALIDATE for (AllEntityTags tag : AllEntityTags.values()) { diff --git a/src/main/java/com/simibubi/create/foundation/data/recipe/CuttingRecipeGen.java b/src/main/java/com/simibubi/create/foundation/data/recipe/CuttingRecipeGen.java index 38b4e6bb6..89e013bf2 100644 --- a/src/main/java/com/simibubi/create/foundation/data/recipe/CuttingRecipeGen.java +++ b/src/main/java/com/simibubi/create/foundation/data/recipe/CuttingRecipeGen.java @@ -14,11 +14,15 @@ public class CuttingRecipeGen extends ProcessingRecipeGen { ANDESITE_ALLOY = create(I::andesite, b -> b.duration(200) .output(AllBlocks.SHAFT.get(), 6)), + BAMBOO_PLANKS = create(() -> Blocks.BAMBOO_PLANKS, b -> b.duration(20) + .output(Blocks.BAMBOO_MOSAIC, 1)), + OAK_WOOD = stripAndMakePlanks(Blocks.OAK_WOOD, Blocks.STRIPPED_OAK_WOOD, Blocks.OAK_PLANKS), SPRUCE_WOOD = stripAndMakePlanks(Blocks.SPRUCE_WOOD, Blocks.STRIPPED_SPRUCE_WOOD, Blocks.SPRUCE_PLANKS), BIRCH_WOOD = stripAndMakePlanks(Blocks.BIRCH_WOOD, Blocks.STRIPPED_BIRCH_WOOD, Blocks.BIRCH_PLANKS), JUNGLE_WOOD = stripAndMakePlanks(Blocks.JUNGLE_WOOD, Blocks.STRIPPED_JUNGLE_WOOD, Blocks.JUNGLE_PLANKS), ACACIA_WOOD = stripAndMakePlanks(Blocks.ACACIA_WOOD, Blocks.STRIPPED_ACACIA_WOOD, Blocks.ACACIA_PLANKS), + CHERRY_WOOD = stripAndMakePlanks(Blocks.CHERRY_WOOD, Blocks.STRIPPED_CHERRY_WOOD, Blocks.CHERRY_PLANKS), DARK_OAK_WOOD = stripAndMakePlanks(Blocks.DARK_OAK_WOOD, Blocks.STRIPPED_DARK_OAK_WOOD, Blocks.DARK_OAK_PLANKS), MANGROVE_WOOD = stripAndMakePlanks(Blocks.MANGROVE_WOOD, Blocks.STRIPPED_MANGROVE_WOOD, Blocks.MANGROVE_PLANKS), CRIMSON_WOOD = stripAndMakePlanks(Blocks.CRIMSON_HYPHAE, Blocks.STRIPPED_CRIMSON_HYPHAE, Blocks.CRIMSON_PLANKS), @@ -29,8 +33,10 @@ public class CuttingRecipeGen extends ProcessingRecipeGen { BIRCH_LOG = stripAndMakePlanks(Blocks.BIRCH_LOG, Blocks.STRIPPED_BIRCH_LOG, Blocks.BIRCH_PLANKS), JUNGLE_LOG = stripAndMakePlanks(Blocks.JUNGLE_LOG, Blocks.STRIPPED_JUNGLE_LOG, Blocks.JUNGLE_PLANKS), ACACIA_LOG = stripAndMakePlanks(Blocks.ACACIA_LOG, Blocks.STRIPPED_ACACIA_LOG, Blocks.ACACIA_PLANKS), + CHERRY_LOG = stripAndMakePlanks(Blocks.CHERRY_LOG, Blocks.STRIPPED_CHERRY_LOG, Blocks.CHERRY_PLANKS), DARK_OAK_LOG = stripAndMakePlanks(Blocks.DARK_OAK_LOG, Blocks.STRIPPED_DARK_OAK_LOG, Blocks.DARK_OAK_PLANKS), MANGROVE_LOG = stripAndMakePlanks(Blocks.MANGROVE_LOG, Blocks.STRIPPED_MANGROVE_LOG, Blocks.MANGROVE_PLANKS), + BAMBOO_BLOCK = stripAndMakePlanks(Blocks.BAMBOO_BLOCK, Blocks.STRIPPED_BAMBOO_BLOCK, Blocks.BAMBOO_PLANKS, 3), CRIMSON_LOG = stripAndMakePlanks(Blocks.CRIMSON_STEM, Blocks.STRIPPED_CRIMSON_STEM, Blocks.CRIMSON_PLANKS), WARPED_LOG = stripAndMakePlanks(Blocks.WARPED_STEM, Blocks.STRIPPED_WARPED_STEM, Blocks.WARPED_PLANKS), @@ -108,10 +114,14 @@ public class CuttingRecipeGen extends ProcessingRecipeGen { ; GeneratedRecipe stripAndMakePlanks(Block wood, Block stripped, Block planks) { + return stripAndMakePlanks(wood, stripped, planks, 6); + } + + GeneratedRecipe stripAndMakePlanks(Block wood, Block stripped, Block planks, int planksAmount) { create(() -> wood, b -> b.duration(50) .output(stripped)); return create(() -> stripped, b -> b.duration(50) - .output(planks, 6)); + .output(planks, planksAmount)); } GeneratedRecipe cuttingCompat(Mods mod, String... woodtypes) {