From aa6f32fa0291f15e5d9c258eeb23a5d300866e3a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Christian=20Vo=C3=9F?= Date: Tue, 28 Apr 2020 11:48:40 +0200 Subject: [PATCH] block tags, item tags & recipes added to data generation - woodcutting and other external mod recipes are missing for now - changed some tags - beige to colorless - mushrooms, caps & stems moved to forge - recipes with sticks are now using forge:rods/wooden tag --- .../tags/items/allowed_items.json | 0 .../colorless}/mushroom_planks.json | 6 +- .../colorless}/mushroom_slab.json | 4 +- .../colorless/mushroom_stairs.json} | 4 +- .../glowshroom}/glowshroom_planks.json | 2 +- .../glowshroom}/glowshroom_slab.json | 0 .../glowshroom}/glowshroom_stairs.json | 0 .../poisonous_mushroom_planks.json | 2 +- .../poisonous_mushroom_slab.json | 0 .../poisonous_mushroom_stairs.json | 0 .../mushroom_cap/brown}/brown_banner.json | 6 +- .../mushroom_cap/brown}/brown_bed.json | 6 +- .../brown}/brown_mushroom_carpet.json | 6 +- .../mushroom_cap/glowshroom}/blue_banner.json | 6 +- .../mushroom_cap/glowshroom}/blue_bed.json | 6 +- .../glowshroom}/glowshroom_cap_carpet.json | 2 +- .../poisonous_mushroom_cap_carpet.json | 2 +- .../poisonous_mushroom}/purple_banner.json | 6 +- .../poisonous_mushroom}/purple_bed.json | 6 +- .../mushroom_cap/red}/red_banner.json | 6 +- .../mushroom_cap/red}/red_bed.json | 6 +- .../red}/red_mushroom_carpet.json | 6 +- .../colorless}/mushroom_fence.json | 4 +- .../glowshroom}/glowshroom_fence.json | 0 .../poisonous_mushroom_fence.json | 0 .../recipes/decorations/oak_sign.json | 4 +- .../recipes/food/grilled_mushroom.json | 6 +- ...rilled_mushroom_from_campfire_cooking.json | 6 +- .../food/grilled_mushroom_from_smoking.json | 6 +- .../recipes/food/mushroom_bread.json | 6 +- .../rabbit_stew_from_edible_mushroom.json | 0 .../misc/brown_dye_from_infested_flower.json | 4 +- .../recipes/misc/glowstone_crumbs.json | 8 +- .../recipes/misc/glowstone_dust.json | 8 +- .../recipes/misc/mushroom_spores.json | 4 +- .../brown}/brown_mushroom_button.json | 6 +- .../brown}/brown_mushroom_pressure_plate.json | 6 +- .../glowshroom}/glowshroom_cap_button.json | 2 +- .../glowshroom_cap_pressure_plate.json | 2 +- .../poisonous_mushroom_cap_button.json | 2 +- ...poisonous_mushroom_cap_pressure_plate.json | 2 +- .../red}/red_mushroom_button.json | 6 +- .../red}/red_mushroom_pressure_plate.json | 6 +- .../colorless}/mushroom_button.json | 4 +- .../colorless}/mushroom_door.json | 4 +- .../colorless/mushroom_fence_gate.json} | 4 +- .../colorless}/mushroom_pressure_plate.json | 4 +- .../colorless}/mushroom_trapdoor.json | 4 +- .../glowshroom}/glowshroom_button.json | 0 .../glowshroom}/glowshroom_door.json | 0 .../glowshroom}/glowshroom_fence_gate.json | 0 .../glowshroom_pressure_plate.json | 0 .../glowshroom}/glowshroom_trapdoor.json | 0 .../poisonous_mushroom_button.json | 0 .../poisonous_mushroom_door.json | 0 .../poisonous_mushroom_fence_gate.json | 0 .../poisonous_mushroom_pressure_plate.json | 0 .../poisonous_mushroom_trapdoor.json | 0 .../colorless}/mushroom_boat.json | 4 +- .../glowshroom}/glowshroom_boat.json | 0 .../poisonous_mushroom_boat.json | 0 .../brown_dye_from_infested_flower.json | 0 .../recipes}/glowstone_crumbs.json | 0 .../recipes}/glowstone_dust.json | 0 .../recipes}/grilled_mushroom.json | 2 +- ...rilled_mushroom_from_campfire_cooking.json | 2 +- .../grilled_mushroom_from_smoking.json | 2 +- .../recipes}/mushroom_bread.json | 8 +- .../mushroom_cap/brown/brown_banner.json | 4 +- .../recipes/mushroom_cap/brown/brown_bed.json | 6 +- .../brown/brown_mushroom_button.json | 2 +- .../brown/brown_mushroom_carpet.json | 2 +- .../brown/brown_mushroom_pressure_plate.json | 2 +- .../mushroom_cap/glowshroom/blue_banner.json | 4 +- .../mushroom_cap/glowshroom/blue_bed.json | 6 +- .../glowshroom/glowshroom_cap_button.json | 2 +- .../glowshroom/glowshroom_cap_carpet.json | 2 +- .../glowshroom_cap_pressure_plate.json | 2 +- .../poisonous_mushroom_cap_button.json | 2 +- .../poisonous_mushroom_cap_carpet.json | 2 +- ...poisonous_mushroom_cap_pressure_plate.json | 2 +- .../poisonous_mushroom/purple_banner.json | 4 +- .../poisonous_mushroom/purple_bed.json | 6 +- .../recipes/mushroom_cap/red/red_banner.json | 4 +- .../recipes/mushroom_cap/red/red_bed.json | 6 +- .../mushroom_cap/red/red_mushroom_button.json | 2 +- .../mushroom_cap/red/red_mushroom_carpet.json | 2 +- .../red/red_mushroom_pressure_plate.json | 2 +- .../recipes}/mushroom_spores.json | 0 .../colorless}/mushroom_boat.json | 0 .../colorless}/mushroom_button.json | 0 .../colorless}/mushroom_door.json | 0 .../colorless}/mushroom_fence.json | 2 +- .../colorless}/mushroom_fence_gate.json | 2 +- .../colorless}/mushroom_planks.json | 2 +- .../colorless}/mushroom_pressure_plate.json | 0 .../colorless}/mushroom_slab.json | 0 .../colorless}/mushroom_stairs.json | 0 .../colorless}/mushroom_trapdoor.json | 0 .../glowshroom/glowshroom_boat.json | 0 .../glowshroom/glowshroom_button.json | 0 .../glowshroom/glowshroom_door.json | 0 .../glowshroom/glowshroom_fence.json | 2 +- .../glowshroom/glowshroom_fence_gate.json | 2 +- .../glowshroom/glowshroom_planks.json | 2 +- .../glowshroom/glowshroom_pressure_plate.json | 0 .../glowshroom/glowshroom_slab.json | 0 .../glowshroom/glowshroom_stairs.json | 0 .../glowshroom/glowshroom_trapdoor.json | 0 .../poisonous_mushroom_boat.json | 0 .../poisonous_mushroom_button.json | 0 .../poisonous_mushroom_door.json | 0 .../poisonous_mushroom_fence.json | 2 +- .../poisonous_mushroom_fence_gate.json | 2 +- .../poisonous_mushroom_planks.json | 2 +- .../poisonous_mushroom_pressure_plate.json | 0 .../poisonous_mushroom_slab.json | 0 .../poisonous_mushroom_stairs.json | 0 .../poisonous_mushroom_trapdoor.json | 0 .../extendedmushrooms/recipes/oak_sign.json} | 6 +- .../rabbit_stew_from_edible_mushroom.json | 2 +- .../tags/blocks/mushroom_buttons.json | 0 .../tags/blocks}/mushroom_buttons/wood.json | 2 +- .../tags/blocks}/mushroom_buttons/wool.json | 4 +- .../tags/blocks}/mushroom_carpets.json | 4 +- .../tags/blocks}/mushroom_doors.json | 2 +- .../tags/blocks/mushroom_fences.json | 2 +- .../tags/blocks/mushroom_growing_blocks.json | 0 .../mushroom_growing_blocks_lightlevel.json | 0 .../tags/blocks}/mushroom_planks.json | 2 +- .../tags/blocks/mushroom_pressure_plates.json | 0 .../blocks/mushroom_pressure_plates/wood.json | 2 +- .../blocks/mushroom_pressure_plates/wool.json | 4 +- .../tags/blocks}/mushroom_slabs.json | 2 +- .../tags/blocks/mushroom_stairs.json | 2 +- .../tags/blocks/mushroom_trapdoors.json | 2 +- .../tags/blocks/mushroom_valid_blocks.json | 0 .../tags/blocks/mushrooms/edible.json} | 0 .../tags/items/mushroom_boats.json | 2 +- .../tags/items/mushroom_buttons.json | 0 .../tags/items}/mushroom_buttons/wood.json | 2 +- .../tags/items}/mushroom_buttons/wool.json | 4 +- .../tags/items}/mushroom_carpets.json | 4 +- .../tags/items}/mushroom_doors.json | 2 +- .../tags/items/mushroom_fences.json | 2 +- .../tags/items}/mushroom_planks.json | 2 +- .../tags/items/mushroom_pressure_plates.json | 0 .../items/mushroom_pressure_plates/wood.json | 2 +- .../items/mushroom_pressure_plates/wool.json | 4 +- .../tags/items}/mushroom_slabs.json | 2 +- .../tags/items/mushroom_stairs.json | 2 +- .../tags/items/mushroom_trapdoors.json | 2 +- .../tags/items/mushrooms/edible.json} | 0 .../data/forge/tags/blocks/mushroom_caps.json | 9 + .../tags/blocks/mushroom_caps/brown.json | 6 + .../tags/blocks/mushroom_caps/glowshroom.json | 6 + .../tags/blocks/mushroom_caps/purple.json | 6 + .../forge/tags/blocks/mushroom_caps/red.json} | 2 +- .../forge/tags/blocks/mushroom_stems.json | 8 + .../blocks/mushroom_stems/colorless.json} | 0 .../blocks/mushroom_stems/glowshroom.json | 0 .../tags/blocks/mushroom_stems/green.json} | 0 .../data/forge/tags/blocks/mushrooms.json | 9 + .../forge/tags/blocks/mushrooms/blue.json | 6 + .../forge/tags/blocks/mushrooms/brown.json | 6 + .../forge/tags/blocks/mushrooms/edible.json} | 2 +- .../tags/blocks/mushrooms/poisonous.json} | 0 .../forge/tags/blocks/mushrooms/purple.json} | 0 .../data/forge/tags/blocks/mushrooms/red.json | 6 + .../data/forge/tags/items/bread.json | 0 .../data/forge/tags/items/mushroom_caps.json | 9 + .../forge/tags/items/mushroom_caps/brown.json | 6 + .../tags/items/mushroom_caps/glowshroom.json | 6 + .../tags/items/mushroom_caps/purple.json | 6 + .../forge/tags/items/mushroom_caps/red.json | 6 + .../data/forge/tags/items/mushroom_stems.json | 8 + .../tags/items/mushroom_stems/colorless.json} | 0 .../tags/items/mushroom_stems/glowshroom.json | 0 .../tags/items/mushroom_stems/green.json} | 0 .../data/forge/tags/items/mushrooms.json | 9 + .../data/forge/tags/items/mushrooms/blue.json | 6 + .../forge/tags/items/mushrooms/brown.json | 6 + .../forge/tags/items/mushrooms/edible.json} | 2 +- .../tags/items/mushrooms/poisonous.json} | 1 - .../forge/tags/items/mushrooms/purple.json | 6 + .../data/forge/tags/items/mushrooms/red.json | 6 + .../data/forge/tags/items/shears.json | 0 .../data/minecraft/tags/blocks/buttons.json | 0 .../data/minecraft/tags/blocks/carpets.json | 0 .../data/minecraft/tags/blocks/doors.json | 0 .../data/minecraft/tags/blocks/fences.json | 0 .../data/minecraft/tags/blocks/logs.json | 0 .../data/minecraft/tags/blocks/planks.json | 0 .../data/minecraft/tags/blocks/slabs.json | 0 .../minecraft/tags/blocks/small_flowers.json} | 0 .../data/minecraft/tags/blocks/stairs.json | 0 .../data/minecraft/tags/blocks/trapdoors.json | 0 .../minecraft/tags/blocks/wooden_buttons.json | 0 .../minecraft/tags/blocks/wooden_doors.json | 0 .../minecraft/tags/blocks/wooden_fences.json | 0 .../tags/blocks/wooden_pressure_plates.json | 0 .../minecraft/tags/blocks/wooden_slabs.json | 0 .../minecraft/tags/blocks/wooden_stairs.json | 0 .../tags/blocks/wooden_trapdoors.json | 0 .../data/minecraft/tags/blocks/wool.json | 0 .../data/minecraft/tags/items/boats.json | 0 .../data/minecraft/tags/items/buttons.json | 0 .../data/minecraft/tags/items/carpets.json | 0 .../data/minecraft/tags/items/doors.json | 0 .../data/minecraft/tags/items/fences.json | 0 .../data/minecraft/tags/items/logs.json | 0 .../data/minecraft/tags/items/planks.json | 0 .../data/minecraft/tags/items/slabs.json | 0 .../minecraft/tags/items/small_flowers.json} | 0 .../data/minecraft/tags/items/stairs.json | 0 .../data/minecraft/tags/items/trapdoors.json | 0 .../minecraft/tags/items/wooden_buttons.json | 0 .../minecraft/tags/items/wooden_doors.json | 0 .../minecraft/tags/items/wooden_fences.json | 0 .../tags/items/wooden_pressure_plates.json | 0 .../minecraft/tags/items/wooden_slabs.json | 0 .../minecraft/tags/items/wooden_stairs.json | 0 .../tags/items/wooden_trapdoors.json | 0 .../data/minecraft/tags/items/wool.json | 0 .../woolplates/tags/blocks/woolplates.json | 0 .../woolplates/tags/items/woolplates.json | 0 .../api/tags/ExtendedMushroomsTags.java | 70 ----- .../data/BlockLootProvider.java | 4 +- .../data/BlockTagProvider.java | 166 ++++++++++ .../data/ItemTagProvider.java | 105 +++++++ .../data/ModDataGenerator.java | 4 +- .../data/RecipeProvider.java | 297 ++++++++++++++++++ .../entity/passive/MushroomSheepEntity.java | 4 +- .../extendedmushrooms/init/ModTags.java | 141 +++++++++ .../MushroomCapLootModifier.java | 4 +- .../MushroomStemLootModifier.java | 4 +- .../MixinAbstractBigMushroomFeature.java | 4 +- .../mixin/MixinMushroomBlock.java | 8 +- .../world/gen/feature/BigMushroomFeature.java | 4 +- .../tags/blocks/mushroom_stems.json | 8 - .../tags/blocks/mushrooms.json | 7 - .../tags/items/mushroom_stems.json | 8 - .../tags/items/mushrooms.json | 7 - .../forge/tags/blocks/edible_mushrooms.json | 8 - .../data/forge/tags/blocks/mushroom_caps.json | 9 - .../forge/tags/blocks/mushroom_stems.json | 7 - .../data/forge/tags/items/mushroom_caps.json | 9 - .../data/forge/tags/items/mushroom_stems.json | 7 - .../minecraft/tags/blocks/small_flowers.json | 6 - .../minecraft/tags/items/small_flowers.json | 6 - 250 files changed, 1043 insertions(+), 353 deletions(-) rename src/{main => generated}/resources/data/corail_woodcutter/tags/items/allowed_items.json (100%) rename src/{main/resources/data/extendedmushrooms/advancements/recipes/building_blocks => generated/resources/data/extendedmushrooms/advancements/recipes/building_blocks/mushroom_wood/colorless}/mushroom_planks.json (69%) rename src/{main/resources/data/extendedmushrooms/advancements/recipes/building_blocks => generated/resources/data/extendedmushrooms/advancements/recipes/building_blocks/mushroom_wood/colorless}/mushroom_slab.json (78%) rename src/{main/resources/data/extendedmushrooms/advancements/recipes/redstone/mushroom_fence_gate.json => generated/resources/data/extendedmushrooms/advancements/recipes/building_blocks/mushroom_wood/colorless/mushroom_stairs.json} (78%) rename src/{main/resources/data/extendedmushrooms/advancements/recipes/building_blocks => generated/resources/data/extendedmushrooms/advancements/recipes/building_blocks/mushroom_wood/glowshroom}/glowshroom_planks.json (90%) rename src/{main/resources/data/extendedmushrooms/advancements/recipes/building_blocks => generated/resources/data/extendedmushrooms/advancements/recipes/building_blocks/mushroom_wood/glowshroom}/glowshroom_slab.json (100%) rename src/{main/resources/data/extendedmushrooms/advancements/recipes/building_blocks => generated/resources/data/extendedmushrooms/advancements/recipes/building_blocks/mushroom_wood/glowshroom}/glowshroom_stairs.json (100%) rename src/{main/resources/data/extendedmushrooms/advancements/recipes/building_blocks => generated/resources/data/extendedmushrooms/advancements/recipes/building_blocks/mushroom_wood/poisonous_mushroom}/poisonous_mushroom_planks.json (89%) rename src/{main/resources/data/extendedmushrooms/advancements/recipes/building_blocks => generated/resources/data/extendedmushrooms/advancements/recipes/building_blocks/mushroom_wood/poisonous_mushroom}/poisonous_mushroom_slab.json (100%) rename src/{main/resources/data/extendedmushrooms/advancements/recipes/building_blocks => generated/resources/data/extendedmushrooms/advancements/recipes/building_blocks/mushroom_wood/poisonous_mushroom}/poisonous_mushroom_stairs.json (100%) rename src/{main/resources/data/extendedmushrooms/advancements/recipes/decorations => generated/resources/data/extendedmushrooms/advancements/recipes/decorations/mushroom_cap/brown}/brown_banner.json (84%) rename src/{main/resources/data/extendedmushrooms/advancements/recipes/decorations => generated/resources/data/extendedmushrooms/advancements/recipes/decorations/mushroom_cap/brown}/brown_bed.json (83%) rename src/{main/resources/data/extendedmushrooms/advancements/recipes/decorations => generated/resources/data/extendedmushrooms/advancements/recipes/decorations/mushroom_cap/brown}/brown_mushroom_carpet.json (84%) rename src/{main/resources/data/extendedmushrooms/advancements/recipes/decorations => generated/resources/data/extendedmushrooms/advancements/recipes/decorations/mushroom_cap/glowshroom}/blue_banner.json (84%) rename src/{main/resources/data/extendedmushrooms/advancements/recipes/decorations => generated/resources/data/extendedmushrooms/advancements/recipes/decorations/mushroom_cap/glowshroom}/blue_bed.json (84%) rename src/{main/resources/data/extendedmushrooms/advancements/recipes/decorations => generated/resources/data/extendedmushrooms/advancements/recipes/decorations/mushroom_cap/glowshroom}/glowshroom_cap_carpet.json (91%) rename src/{main/resources/data/extendedmushrooms/advancements/recipes/decorations => generated/resources/data/extendedmushrooms/advancements/recipes/decorations/mushroom_cap/poisonous_mushroom}/poisonous_mushroom_cap_carpet.json (90%) rename src/{main/resources/data/extendedmushrooms/advancements/recipes/decorations => generated/resources/data/extendedmushrooms/advancements/recipes/decorations/mushroom_cap/poisonous_mushroom}/purple_banner.json (83%) rename src/{main/resources/data/extendedmushrooms/advancements/recipes/decorations => generated/resources/data/extendedmushrooms/advancements/recipes/decorations/mushroom_cap/poisonous_mushroom}/purple_bed.json (83%) rename src/{main/resources/data/extendedmushrooms/advancements/recipes/decorations => generated/resources/data/extendedmushrooms/advancements/recipes/decorations/mushroom_cap/red}/red_banner.json (84%) rename src/{main/resources/data/extendedmushrooms/advancements/recipes/decorations => generated/resources/data/extendedmushrooms/advancements/recipes/decorations/mushroom_cap/red}/red_bed.json (84%) rename src/{main/resources/data/extendedmushrooms/advancements/recipes/decorations => generated/resources/data/extendedmushrooms/advancements/recipes/decorations/mushroom_cap/red}/red_mushroom_carpet.json (85%) rename src/{main/resources/data/extendedmushrooms/advancements/recipes/decorations => generated/resources/data/extendedmushrooms/advancements/recipes/decorations/mushroom_wood/colorless}/mushroom_fence.json (78%) rename src/{main/resources/data/extendedmushrooms/advancements/recipes/decorations => generated/resources/data/extendedmushrooms/advancements/recipes/decorations/mushroom_wood/glowshroom}/glowshroom_fence.json (100%) rename src/{main/resources/data/extendedmushrooms/advancements/recipes/decorations => generated/resources/data/extendedmushrooms/advancements/recipes/decorations/mushroom_wood/poisonous_mushroom}/poisonous_mushroom_fence.json (100%) rename src/{main => generated}/resources/data/extendedmushrooms/advancements/recipes/decorations/oak_sign.json (79%) rename src/{main => generated}/resources/data/extendedmushrooms/advancements/recipes/food/grilled_mushroom.json (74%) rename src/{main => generated}/resources/data/extendedmushrooms/advancements/recipes/food/grilled_mushroom_from_campfire_cooking.json (69%) rename src/{main => generated}/resources/data/extendedmushrooms/advancements/recipes/food/grilled_mushroom_from_smoking.json (71%) rename src/{main => generated}/resources/data/extendedmushrooms/advancements/recipes/food/mushroom_bread.json (75%) rename src/{main => generated}/resources/data/extendedmushrooms/advancements/recipes/food/rabbit_stew_from_edible_mushroom.json (100%) rename src/{main => generated}/resources/data/extendedmushrooms/advancements/recipes/misc/brown_dye_from_infested_flower.json (78%) rename src/{main => generated}/resources/data/extendedmushrooms/advancements/recipes/misc/glowstone_crumbs.json (73%) rename src/{main => generated}/resources/data/extendedmushrooms/advancements/recipes/misc/glowstone_dust.json (73%) rename src/{main => generated}/resources/data/extendedmushrooms/advancements/recipes/misc/mushroom_spores.json (82%) rename src/{main/resources/data/extendedmushrooms/advancements/recipes/redstone => generated/resources/data/extendedmushrooms/advancements/recipes/redstone/mushroom_cap/brown}/brown_mushroom_button.json (84%) rename src/{main/resources/data/extendedmushrooms/advancements/recipes/redstone => generated/resources/data/extendedmushrooms/advancements/recipes/redstone/mushroom_cap/brown}/brown_mushroom_pressure_plate.json (84%) rename src/{main/resources/data/extendedmushrooms/advancements/recipes/redstone => generated/resources/data/extendedmushrooms/advancements/recipes/redstone/mushroom_cap/glowshroom}/glowshroom_cap_button.json (91%) rename src/{main/resources/data/extendedmushrooms/advancements/recipes/redstone => generated/resources/data/extendedmushrooms/advancements/recipes/redstone/mushroom_cap/glowshroom}/glowshroom_cap_pressure_plate.json (91%) rename src/{main/resources/data/extendedmushrooms/advancements/recipes/redstone => generated/resources/data/extendedmushrooms/advancements/recipes/redstone/mushroom_cap/poisonous_mushroom}/poisonous_mushroom_cap_button.json (90%) rename src/{main/resources/data/extendedmushrooms/advancements/recipes/redstone => generated/resources/data/extendedmushrooms/advancements/recipes/redstone/mushroom_cap/poisonous_mushroom}/poisonous_mushroom_cap_pressure_plate.json (91%) rename src/{main/resources/data/extendedmushrooms/advancements/recipes/redstone => generated/resources/data/extendedmushrooms/advancements/recipes/redstone/mushroom_cap/red}/red_mushroom_button.json (85%) rename src/{main/resources/data/extendedmushrooms/advancements/recipes/redstone => generated/resources/data/extendedmushrooms/advancements/recipes/redstone/mushroom_cap/red}/red_mushroom_pressure_plate.json (85%) rename src/{main/resources/data/extendedmushrooms/advancements/recipes/redstone => generated/resources/data/extendedmushrooms/advancements/recipes/redstone/mushroom_wood/colorless}/mushroom_button.json (77%) rename src/{main/resources/data/extendedmushrooms/advancements/recipes/redstone => generated/resources/data/extendedmushrooms/advancements/recipes/redstone/mushroom_wood/colorless}/mushroom_door.json (78%) rename src/{main/resources/data/extendedmushrooms/advancements/recipes/building_blocks/mushroom_stairs.json => generated/resources/data/extendedmushrooms/advancements/recipes/redstone/mushroom_wood/colorless/mushroom_fence_gate.json} (76%) rename src/{main/resources/data/extendedmushrooms/advancements/recipes/redstone => generated/resources/data/extendedmushrooms/advancements/recipes/redstone/mushroom_wood/colorless}/mushroom_pressure_plate.json (75%) rename src/{main/resources/data/extendedmushrooms/advancements/recipes/redstone => generated/resources/data/extendedmushrooms/advancements/recipes/redstone/mushroom_wood/colorless}/mushroom_trapdoor.json (77%) rename src/{main/resources/data/extendedmushrooms/advancements/recipes/redstone => generated/resources/data/extendedmushrooms/advancements/recipes/redstone/mushroom_wood/glowshroom}/glowshroom_button.json (100%) rename src/{main/resources/data/extendedmushrooms/advancements/recipes/redstone => generated/resources/data/extendedmushrooms/advancements/recipes/redstone/mushroom_wood/glowshroom}/glowshroom_door.json (100%) rename src/{main/resources/data/extendedmushrooms/advancements/recipes/redstone => generated/resources/data/extendedmushrooms/advancements/recipes/redstone/mushroom_wood/glowshroom}/glowshroom_fence_gate.json (100%) rename src/{main/resources/data/extendedmushrooms/advancements/recipes/redstone => generated/resources/data/extendedmushrooms/advancements/recipes/redstone/mushroom_wood/glowshroom}/glowshroom_pressure_plate.json (100%) rename src/{main/resources/data/extendedmushrooms/advancements/recipes/redstone => generated/resources/data/extendedmushrooms/advancements/recipes/redstone/mushroom_wood/glowshroom}/glowshroom_trapdoor.json (100%) rename src/{main/resources/data/extendedmushrooms/advancements/recipes/redstone => generated/resources/data/extendedmushrooms/advancements/recipes/redstone/mushroom_wood/poisonous_mushroom}/poisonous_mushroom_button.json (100%) rename src/{main/resources/data/extendedmushrooms/advancements/recipes/redstone => generated/resources/data/extendedmushrooms/advancements/recipes/redstone/mushroom_wood/poisonous_mushroom}/poisonous_mushroom_door.json (100%) rename src/{main/resources/data/extendedmushrooms/advancements/recipes/redstone => generated/resources/data/extendedmushrooms/advancements/recipes/redstone/mushroom_wood/poisonous_mushroom}/poisonous_mushroom_fence_gate.json (100%) rename src/{main/resources/data/extendedmushrooms/advancements/recipes/redstone => generated/resources/data/extendedmushrooms/advancements/recipes/redstone/mushroom_wood/poisonous_mushroom}/poisonous_mushroom_pressure_plate.json (100%) rename src/{main/resources/data/extendedmushrooms/advancements/recipes/redstone => generated/resources/data/extendedmushrooms/advancements/recipes/redstone/mushroom_wood/poisonous_mushroom}/poisonous_mushroom_trapdoor.json (100%) rename src/{main/resources/data/extendedmushrooms/advancements/recipes/transportation => generated/resources/data/extendedmushrooms/advancements/recipes/transportation/mushroom_wood/colorless}/mushroom_boat.json (75%) rename src/{main/resources/data/extendedmushrooms/advancements/recipes/transportation => generated/resources/data/extendedmushrooms/advancements/recipes/transportation/mushroom_wood/glowshroom}/glowshroom_boat.json (100%) rename src/{main/resources/data/extendedmushrooms/advancements/recipes/transportation => generated/resources/data/extendedmushrooms/advancements/recipes/transportation/mushroom_wood/poisonous_mushroom}/poisonous_mushroom_boat.json (100%) rename src/{main/resources/data/extendedmushrooms/recipes/misc => generated/resources/data/extendedmushrooms/recipes}/brown_dye_from_infested_flower.json (100%) rename src/{main/resources/data/extendedmushrooms/recipes/misc => generated/resources/data/extendedmushrooms/recipes}/glowstone_crumbs.json (100%) rename src/{main/resources/data/extendedmushrooms/recipes/misc => generated/resources/data/extendedmushrooms/recipes}/glowstone_dust.json (100%) rename src/{main/resources/data/extendedmushrooms/recipes/food => generated/resources/data/extendedmushrooms/recipes}/grilled_mushroom.json (80%) rename src/{main/resources/data/extendedmushrooms/recipes/food => generated/resources/data/extendedmushrooms/recipes}/grilled_mushroom_from_campfire_cooking.json (81%) rename src/{main/resources/data/extendedmushrooms/recipes/food => generated/resources/data/extendedmushrooms/recipes}/grilled_mushroom_from_smoking.json (80%) rename src/{main/resources/data/extendedmushrooms/recipes/food => generated/resources/data/extendedmushrooms/recipes}/mushroom_bread.json (65%) rename src/{main => generated}/resources/data/extendedmushrooms/recipes/mushroom_cap/brown/brown_banner.json (73%) rename src/{main => generated}/resources/data/extendedmushrooms/recipes/mushroom_cap/brown/brown_bed.json (75%) rename src/{main => generated}/resources/data/extendedmushrooms/recipes/mushroom_cap/brown/brown_mushroom_button.json (79%) rename src/{main => generated}/resources/data/extendedmushrooms/recipes/mushroom_cap/brown/brown_mushroom_carpet.json (81%) rename src/{main => generated}/resources/data/extendedmushrooms/recipes/mushroom_cap/brown/brown_mushroom_pressure_plate.json (84%) rename src/{main => generated}/resources/data/extendedmushrooms/recipes/mushroom_cap/glowshroom/blue_banner.json (73%) rename src/{main => generated}/resources/data/extendedmushrooms/recipes/mushroom_cap/glowshroom/blue_bed.json (75%) rename src/{main => generated}/resources/data/extendedmushrooms/recipes/mushroom_cap/glowshroom/glowshroom_cap_button.json (78%) rename src/{main => generated}/resources/data/extendedmushrooms/recipes/mushroom_cap/glowshroom/glowshroom_cap_carpet.json (81%) rename src/{main => generated}/resources/data/extendedmushrooms/recipes/mushroom_cap/glowshroom/glowshroom_cap_pressure_plate.json (83%) rename src/{main => generated}/resources/data/extendedmushrooms/recipes/mushroom_cap/poisonous_mushroom/poisonous_mushroom_cap_button.json (76%) rename src/{main => generated}/resources/data/extendedmushrooms/recipes/mushroom_cap/poisonous_mushroom/poisonous_mushroom_cap_carpet.json (79%) rename src/{main => generated}/resources/data/extendedmushrooms/recipes/mushroom_cap/poisonous_mushroom/poisonous_mushroom_cap_pressure_plate.json (81%) rename src/{main => generated}/resources/data/extendedmushrooms/recipes/mushroom_cap/poisonous_mushroom/purple_banner.json (71%) rename src/{main => generated}/resources/data/extendedmushrooms/recipes/mushroom_cap/poisonous_mushroom/purple_bed.json (73%) rename src/{main => generated}/resources/data/extendedmushrooms/recipes/mushroom_cap/red/red_banner.json (73%) rename src/{main => generated}/resources/data/extendedmushrooms/recipes/mushroom_cap/red/red_bed.json (76%) rename src/{main => generated}/resources/data/extendedmushrooms/recipes/mushroom_cap/red/red_mushroom_button.json (79%) rename src/{main => generated}/resources/data/extendedmushrooms/recipes/mushroom_cap/red/red_mushroom_carpet.json (82%) rename src/{main => generated}/resources/data/extendedmushrooms/recipes/mushroom_cap/red/red_mushroom_pressure_plate.json (84%) rename src/{main/resources/data/extendedmushrooms/recipes/misc => generated/resources/data/extendedmushrooms/recipes}/mushroom_spores.json (100%) rename src/{main/resources/data/extendedmushrooms/recipes/mushroom_wood/beige => generated/resources/data/extendedmushrooms/recipes/mushroom_wood/colorless}/mushroom_boat.json (100%) rename src/{main/resources/data/extendedmushrooms/recipes/mushroom_wood/beige => generated/resources/data/extendedmushrooms/recipes/mushroom_wood/colorless}/mushroom_button.json (100%) rename src/{main/resources/data/extendedmushrooms/recipes/mushroom_wood/beige => generated/resources/data/extendedmushrooms/recipes/mushroom_wood/colorless}/mushroom_door.json (100%) rename src/{main/resources/data/extendedmushrooms/recipes/mushroom_wood/beige => generated/resources/data/extendedmushrooms/recipes/mushroom_wood/colorless}/mushroom_fence.json (89%) rename src/{main/resources/data/extendedmushrooms/recipes/mushroom_wood/beige => generated/resources/data/extendedmushrooms/recipes/mushroom_wood/colorless}/mushroom_fence_gate.json (89%) rename src/{main/resources/data/extendedmushrooms/recipes/mushroom_wood/beige => generated/resources/data/extendedmushrooms/recipes/mushroom_wood/colorless}/mushroom_planks.json (77%) rename src/{main/resources/data/extendedmushrooms/recipes/mushroom_wood/beige => generated/resources/data/extendedmushrooms/recipes/mushroom_wood/colorless}/mushroom_pressure_plate.json (100%) rename src/{main/resources/data/extendedmushrooms/recipes/mushroom_wood/beige => generated/resources/data/extendedmushrooms/recipes/mushroom_wood/colorless}/mushroom_slab.json (100%) rename src/{main/resources/data/extendedmushrooms/recipes/mushroom_wood/beige => generated/resources/data/extendedmushrooms/recipes/mushroom_wood/colorless}/mushroom_stairs.json (100%) rename src/{main/resources/data/extendedmushrooms/recipes/mushroom_wood/beige => generated/resources/data/extendedmushrooms/recipes/mushroom_wood/colorless}/mushroom_trapdoor.json (100%) rename src/{main => generated}/resources/data/extendedmushrooms/recipes/mushroom_wood/glowshroom/glowshroom_boat.json (100%) rename src/{main => generated}/resources/data/extendedmushrooms/recipes/mushroom_wood/glowshroom/glowshroom_button.json (100%) rename src/{main => generated}/resources/data/extendedmushrooms/recipes/mushroom_wood/glowshroom/glowshroom_door.json (100%) rename src/{main => generated}/resources/data/extendedmushrooms/recipes/mushroom_wood/glowshroom/glowshroom_fence.json (89%) rename src/{main => generated}/resources/data/extendedmushrooms/recipes/mushroom_wood/glowshroom/glowshroom_fence_gate.json (89%) rename src/{main => generated}/resources/data/extendedmushrooms/recipes/mushroom_wood/glowshroom/glowshroom_planks.json (75%) rename src/{main => generated}/resources/data/extendedmushrooms/recipes/mushroom_wood/glowshroom/glowshroom_pressure_plate.json (100%) rename src/{main => generated}/resources/data/extendedmushrooms/recipes/mushroom_wood/glowshroom/glowshroom_slab.json (100%) rename src/{main => generated}/resources/data/extendedmushrooms/recipes/mushroom_wood/glowshroom/glowshroom_stairs.json (100%) rename src/{main => generated}/resources/data/extendedmushrooms/recipes/mushroom_wood/glowshroom/glowshroom_trapdoor.json (100%) rename src/{main => generated}/resources/data/extendedmushrooms/recipes/mushroom_wood/poisonous_mushroom/poisonous_mushroom_boat.json (100%) rename src/{main => generated}/resources/data/extendedmushrooms/recipes/mushroom_wood/poisonous_mushroom/poisonous_mushroom_button.json (100%) rename src/{main => generated}/resources/data/extendedmushrooms/recipes/mushroom_wood/poisonous_mushroom/poisonous_mushroom_door.json (100%) rename src/{main => generated}/resources/data/extendedmushrooms/recipes/mushroom_wood/poisonous_mushroom/poisonous_mushroom_fence.json (90%) rename src/{main => generated}/resources/data/extendedmushrooms/recipes/mushroom_wood/poisonous_mushroom/poisonous_mushroom_fence_gate.json (90%) rename src/{main => generated}/resources/data/extendedmushrooms/recipes/mushroom_wood/poisonous_mushroom/poisonous_mushroom_planks.json (74%) rename src/{main => generated}/resources/data/extendedmushrooms/recipes/mushroom_wood/poisonous_mushroom/poisonous_mushroom_pressure_plate.json (100%) rename src/{main => generated}/resources/data/extendedmushrooms/recipes/mushroom_wood/poisonous_mushroom/poisonous_mushroom_slab.json (100%) rename src/{main => generated}/resources/data/extendedmushrooms/recipes/mushroom_wood/poisonous_mushroom/poisonous_mushroom_stairs.json (100%) rename src/{main => generated}/resources/data/extendedmushrooms/recipes/mushroom_wood/poisonous_mushroom/poisonous_mushroom_trapdoor.json (100%) rename src/{main/resources/data/extendedmushrooms/recipes/mushroom_wood/mushroom_oak_sign.json => generated/resources/data/extendedmushrooms/recipes/oak_sign.json} (81%) rename src/{main/resources/data/extendedmushrooms/recipes/food => generated/resources/data/extendedmushrooms/recipes}/rabbit_stew_from_edible_mushroom.json (87%) rename src/{main => generated}/resources/data/extendedmushrooms/tags/blocks/mushroom_buttons.json (100%) rename src/{main/resources/data/extendedmushrooms/tags/items => generated/resources/data/extendedmushrooms/tags/blocks}/mushroom_buttons/wood.json (100%) rename src/{main/resources/data/extendedmushrooms/tags/items => generated/resources/data/extendedmushrooms/tags/blocks}/mushroom_buttons/wool.json (57%) rename src/{main/resources/data/extendedmushrooms/tags/items => generated/resources/data/extendedmushrooms/tags/blocks}/mushroom_carpets.json (57%) rename src/{main/resources/data/extendedmushrooms/tags/items => generated/resources/data/extendedmushrooms/tags/blocks}/mushroom_doors.json (100%) rename src/{main => generated}/resources/data/extendedmushrooms/tags/blocks/mushroom_fences.json (100%) rename src/{main => generated}/resources/data/extendedmushrooms/tags/blocks/mushroom_growing_blocks.json (100%) rename src/{main => generated}/resources/data/extendedmushrooms/tags/blocks/mushroom_growing_blocks_lightlevel.json (100%) rename src/{main/resources/data/extendedmushrooms/tags/items => generated/resources/data/extendedmushrooms/tags/blocks}/mushroom_planks.json (100%) rename src/{main => generated}/resources/data/extendedmushrooms/tags/blocks/mushroom_pressure_plates.json (100%) rename src/{main => generated}/resources/data/extendedmushrooms/tags/blocks/mushroom_pressure_plates/wood.json (100%) rename src/{main => generated}/resources/data/extendedmushrooms/tags/blocks/mushroom_pressure_plates/wool.json (56%) rename src/{main/resources/data/extendedmushrooms/tags/items => generated/resources/data/extendedmushrooms/tags/blocks}/mushroom_slabs.json (100%) rename src/{main => generated}/resources/data/extendedmushrooms/tags/blocks/mushroom_stairs.json (100%) rename src/{main => generated}/resources/data/extendedmushrooms/tags/blocks/mushroom_trapdoors.json (100%) rename src/{main => generated}/resources/data/extendedmushrooms/tags/blocks/mushroom_valid_blocks.json (100%) rename src/{main/resources/data/extendedmushrooms/tags/blocks/edible_mushrooms.json => generated/resources/data/extendedmushrooms/tags/blocks/mushrooms/edible.json} (100%) rename src/{main => generated}/resources/data/extendedmushrooms/tags/items/mushroom_boats.json (100%) rename src/{main => generated}/resources/data/extendedmushrooms/tags/items/mushroom_buttons.json (100%) rename src/{main/resources/data/extendedmushrooms/tags/blocks => generated/resources/data/extendedmushrooms/tags/items}/mushroom_buttons/wood.json (100%) rename src/{main/resources/data/extendedmushrooms/tags/blocks => generated/resources/data/extendedmushrooms/tags/items}/mushroom_buttons/wool.json (57%) rename src/{main/resources/data/extendedmushrooms/tags/blocks => generated/resources/data/extendedmushrooms/tags/items}/mushroom_carpets.json (57%) rename src/{main/resources/data/extendedmushrooms/tags/blocks => generated/resources/data/extendedmushrooms/tags/items}/mushroom_doors.json (100%) rename src/{main => generated}/resources/data/extendedmushrooms/tags/items/mushroom_fences.json (100%) rename src/{main/resources/data/extendedmushrooms/tags/blocks => generated/resources/data/extendedmushrooms/tags/items}/mushroom_planks.json (100%) rename src/{main => generated}/resources/data/extendedmushrooms/tags/items/mushroom_pressure_plates.json (100%) rename src/{main => generated}/resources/data/extendedmushrooms/tags/items/mushroom_pressure_plates/wood.json (100%) rename src/{main => generated}/resources/data/extendedmushrooms/tags/items/mushroom_pressure_plates/wool.json (56%) rename src/{main/resources/data/extendedmushrooms/tags/blocks => generated/resources/data/extendedmushrooms/tags/items}/mushroom_slabs.json (100%) rename src/{main => generated}/resources/data/extendedmushrooms/tags/items/mushroom_stairs.json (100%) rename src/{main => generated}/resources/data/extendedmushrooms/tags/items/mushroom_trapdoors.json (100%) rename src/{main/resources/data/extendedmushrooms/tags/items/edible_mushrooms.json => generated/resources/data/extendedmushrooms/tags/items/mushrooms/edible.json} (100%) create mode 100644 src/generated/resources/data/forge/tags/blocks/mushroom_caps.json create mode 100644 src/generated/resources/data/forge/tags/blocks/mushroom_caps/brown.json create mode 100644 src/generated/resources/data/forge/tags/blocks/mushroom_caps/glowshroom.json create mode 100644 src/generated/resources/data/forge/tags/blocks/mushroom_caps/purple.json rename src/{main/resources/data/forge/tags/items/mushrooms.json => generated/resources/data/forge/tags/blocks/mushroom_caps/red.json} (53%) create mode 100644 src/generated/resources/data/forge/tags/blocks/mushroom_stems.json rename src/{main/resources/data/extendedmushrooms/tags/blocks/mushroom_stems/beige.json => generated/resources/data/forge/tags/blocks/mushroom_stems/colorless.json} (100%) rename src/{main/resources/data/extendedmushrooms => generated/resources/data/forge}/tags/blocks/mushroom_stems/glowshroom.json (100%) rename src/{main/resources/data/extendedmushrooms/tags/blocks/mushroom_stems/poisonous_mushroom.json => generated/resources/data/forge/tags/blocks/mushroom_stems/green.json} (100%) create mode 100644 src/generated/resources/data/forge/tags/blocks/mushrooms.json create mode 100644 src/generated/resources/data/forge/tags/blocks/mushrooms/blue.json create mode 100644 src/generated/resources/data/forge/tags/blocks/mushrooms/brown.json rename src/{main/resources/data/forge/tags/blocks/mushrooms.json => generated/resources/data/forge/tags/blocks/mushrooms/edible.json} (71%) rename src/{main/resources/data/extendedmushrooms/tags/blocks/poisonous_mushrooms.json => generated/resources/data/forge/tags/blocks/mushrooms/poisonous.json} (100%) rename src/{main/resources/data/extendedmushrooms/tags/items/poisonous_mushrooms.json => generated/resources/data/forge/tags/blocks/mushrooms/purple.json} (100%) create mode 100644 src/generated/resources/data/forge/tags/blocks/mushrooms/red.json rename src/{main => generated}/resources/data/forge/tags/items/bread.json (100%) create mode 100644 src/generated/resources/data/forge/tags/items/mushroom_caps.json create mode 100644 src/generated/resources/data/forge/tags/items/mushroom_caps/brown.json create mode 100644 src/generated/resources/data/forge/tags/items/mushroom_caps/glowshroom.json create mode 100644 src/generated/resources/data/forge/tags/items/mushroom_caps/purple.json create mode 100644 src/generated/resources/data/forge/tags/items/mushroom_caps/red.json create mode 100644 src/generated/resources/data/forge/tags/items/mushroom_stems.json rename src/{main/resources/data/extendedmushrooms/tags/items/mushroom_stems/beige.json => generated/resources/data/forge/tags/items/mushroom_stems/colorless.json} (100%) rename src/{main/resources/data/extendedmushrooms => generated/resources/data/forge}/tags/items/mushroom_stems/glowshroom.json (100%) rename src/{main/resources/data/extendedmushrooms/tags/items/mushroom_stems/poisonous_mushroom.json => generated/resources/data/forge/tags/items/mushroom_stems/green.json} (100%) create mode 100644 src/generated/resources/data/forge/tags/items/mushrooms.json create mode 100644 src/generated/resources/data/forge/tags/items/mushrooms/blue.json create mode 100644 src/generated/resources/data/forge/tags/items/mushrooms/brown.json rename src/{main/resources/data/forge/tags/items/edible_mushrooms.json => generated/resources/data/forge/tags/items/mushrooms/edible.json} (71%) rename src/{main/resources/data/extendedmushrooms/tags/items/arrow_mushrooms.json => generated/resources/data/forge/tags/items/mushrooms/poisonous.json} (70%) create mode 100644 src/generated/resources/data/forge/tags/items/mushrooms/purple.json create mode 100644 src/generated/resources/data/forge/tags/items/mushrooms/red.json rename src/{main => generated}/resources/data/forge/tags/items/shears.json (100%) rename src/{main => generated}/resources/data/minecraft/tags/blocks/buttons.json (100%) rename src/{main => generated}/resources/data/minecraft/tags/blocks/carpets.json (100%) rename src/{main => generated}/resources/data/minecraft/tags/blocks/doors.json (100%) rename src/{main => generated}/resources/data/minecraft/tags/blocks/fences.json (100%) rename src/{main => generated}/resources/data/minecraft/tags/blocks/logs.json (100%) rename src/{main => generated}/resources/data/minecraft/tags/blocks/planks.json (100%) rename src/{main => generated}/resources/data/minecraft/tags/blocks/slabs.json (100%) rename src/{main/resources/data/extendedmushrooms/tags/blocks/infested_flowers.json => generated/resources/data/minecraft/tags/blocks/small_flowers.json} (100%) rename src/{main => generated}/resources/data/minecraft/tags/blocks/stairs.json (100%) rename src/{main => generated}/resources/data/minecraft/tags/blocks/trapdoors.json (100%) rename src/{main => generated}/resources/data/minecraft/tags/blocks/wooden_buttons.json (100%) rename src/{main => generated}/resources/data/minecraft/tags/blocks/wooden_doors.json (100%) rename src/{main => generated}/resources/data/minecraft/tags/blocks/wooden_fences.json (100%) rename src/{main => generated}/resources/data/minecraft/tags/blocks/wooden_pressure_plates.json (100%) rename src/{main => generated}/resources/data/minecraft/tags/blocks/wooden_slabs.json (100%) rename src/{main => generated}/resources/data/minecraft/tags/blocks/wooden_stairs.json (100%) rename src/{main => generated}/resources/data/minecraft/tags/blocks/wooden_trapdoors.json (100%) rename src/{main => generated}/resources/data/minecraft/tags/blocks/wool.json (100%) rename src/{main => generated}/resources/data/minecraft/tags/items/boats.json (100%) rename src/{main => generated}/resources/data/minecraft/tags/items/buttons.json (100%) rename src/{main => generated}/resources/data/minecraft/tags/items/carpets.json (100%) rename src/{main => generated}/resources/data/minecraft/tags/items/doors.json (100%) rename src/{main => generated}/resources/data/minecraft/tags/items/fences.json (100%) rename src/{main => generated}/resources/data/minecraft/tags/items/logs.json (100%) rename src/{main => generated}/resources/data/minecraft/tags/items/planks.json (100%) rename src/{main => generated}/resources/data/minecraft/tags/items/slabs.json (100%) rename src/{main/resources/data/extendedmushrooms/tags/items/infested_flowers.json => generated/resources/data/minecraft/tags/items/small_flowers.json} (100%) rename src/{main => generated}/resources/data/minecraft/tags/items/stairs.json (100%) rename src/{main => generated}/resources/data/minecraft/tags/items/trapdoors.json (100%) rename src/{main => generated}/resources/data/minecraft/tags/items/wooden_buttons.json (100%) rename src/{main => generated}/resources/data/minecraft/tags/items/wooden_doors.json (100%) rename src/{main => generated}/resources/data/minecraft/tags/items/wooden_fences.json (100%) rename src/{main => generated}/resources/data/minecraft/tags/items/wooden_pressure_plates.json (100%) rename src/{main => generated}/resources/data/minecraft/tags/items/wooden_slabs.json (100%) rename src/{main => generated}/resources/data/minecraft/tags/items/wooden_stairs.json (100%) rename src/{main => generated}/resources/data/minecraft/tags/items/wooden_trapdoors.json (100%) rename src/{main => generated}/resources/data/minecraft/tags/items/wool.json (100%) rename src/{main => generated}/resources/data/woolplates/tags/blocks/woolplates.json (100%) rename src/{main => generated}/resources/data/woolplates/tags/items/woolplates.json (100%) delete mode 100644 src/main/java/cech12/extendedmushrooms/api/tags/ExtendedMushroomsTags.java create mode 100644 src/main/java/cech12/extendedmushrooms/data/BlockTagProvider.java create mode 100644 src/main/java/cech12/extendedmushrooms/data/ItemTagProvider.java create mode 100644 src/main/java/cech12/extendedmushrooms/data/RecipeProvider.java create mode 100644 src/main/java/cech12/extendedmushrooms/init/ModTags.java delete mode 100644 src/main/resources/data/extendedmushrooms/tags/blocks/mushroom_stems.json delete mode 100644 src/main/resources/data/extendedmushrooms/tags/blocks/mushrooms.json delete mode 100644 src/main/resources/data/extendedmushrooms/tags/items/mushroom_stems.json delete mode 100644 src/main/resources/data/extendedmushrooms/tags/items/mushrooms.json delete mode 100644 src/main/resources/data/forge/tags/blocks/edible_mushrooms.json delete mode 100644 src/main/resources/data/forge/tags/blocks/mushroom_caps.json delete mode 100644 src/main/resources/data/forge/tags/blocks/mushroom_stems.json delete mode 100644 src/main/resources/data/forge/tags/items/mushroom_caps.json delete mode 100644 src/main/resources/data/forge/tags/items/mushroom_stems.json delete mode 100644 src/main/resources/data/minecraft/tags/blocks/small_flowers.json delete mode 100644 src/main/resources/data/minecraft/tags/items/small_flowers.json diff --git a/src/main/resources/data/corail_woodcutter/tags/items/allowed_items.json b/src/generated/resources/data/corail_woodcutter/tags/items/allowed_items.json similarity index 100% rename from src/main/resources/data/corail_woodcutter/tags/items/allowed_items.json rename to src/generated/resources/data/corail_woodcutter/tags/items/allowed_items.json diff --git a/src/main/resources/data/extendedmushrooms/advancements/recipes/building_blocks/mushroom_planks.json b/src/generated/resources/data/extendedmushrooms/advancements/recipes/building_blocks/mushroom_wood/colorless/mushroom_planks.json similarity index 69% rename from src/main/resources/data/extendedmushrooms/advancements/recipes/building_blocks/mushroom_planks.json rename to src/generated/resources/data/extendedmushrooms/advancements/recipes/building_blocks/mushroom_wood/colorless/mushroom_planks.json index c8f17629..819514b6 100644 --- a/src/main/resources/data/extendedmushrooms/advancements/recipes/building_blocks/mushroom_planks.json +++ b/src/generated/resources/data/extendedmushrooms/advancements/recipes/building_blocks/mushroom_wood/colorless/mushroom_planks.json @@ -2,7 +2,7 @@ "parent": "minecraft:recipes/root", "rewards": { "recipes": [ - "extendedmushrooms:mushroom_wood/beige/mushroom_planks" + "extendedmushrooms:mushroom_wood/colorless/mushroom_planks" ] }, "criteria": { @@ -11,7 +11,7 @@ "conditions": { "items": [ { - "tag": "extendedmushrooms:mushroom_stems/beige" + "tag": "forge:mushroom_stems/colorless" } ] } @@ -19,7 +19,7 @@ "has_the_recipe": { "trigger": "minecraft:recipe_unlocked", "conditions": { - "recipe": "extendedmushrooms:mushroom_wood/beige/mushroom_planks" + "recipe": "extendedmushrooms:mushroom_wood/colorless/mushroom_planks" } } }, diff --git a/src/main/resources/data/extendedmushrooms/advancements/recipes/building_blocks/mushroom_slab.json b/src/generated/resources/data/extendedmushrooms/advancements/recipes/building_blocks/mushroom_wood/colorless/mushroom_slab.json similarity index 78% rename from src/main/resources/data/extendedmushrooms/advancements/recipes/building_blocks/mushroom_slab.json rename to src/generated/resources/data/extendedmushrooms/advancements/recipes/building_blocks/mushroom_wood/colorless/mushroom_slab.json index 88a6ef42..dbb7278b 100644 --- a/src/main/resources/data/extendedmushrooms/advancements/recipes/building_blocks/mushroom_slab.json +++ b/src/generated/resources/data/extendedmushrooms/advancements/recipes/building_blocks/mushroom_wood/colorless/mushroom_slab.json @@ -2,7 +2,7 @@ "parent": "minecraft:recipes/root", "rewards": { "recipes": [ - "extendedmushrooms:mushroom_wood/beige/mushroom_slab" + "extendedmushrooms:mushroom_wood/colorless/mushroom_slab" ] }, "criteria": { @@ -19,7 +19,7 @@ "has_the_recipe": { "trigger": "minecraft:recipe_unlocked", "conditions": { - "recipe": "extendedmushrooms:mushroom_wood/beige/mushroom_slab" + "recipe": "extendedmushrooms:mushroom_wood/colorless/mushroom_slab" } } }, diff --git a/src/main/resources/data/extendedmushrooms/advancements/recipes/redstone/mushroom_fence_gate.json b/src/generated/resources/data/extendedmushrooms/advancements/recipes/building_blocks/mushroom_wood/colorless/mushroom_stairs.json similarity index 78% rename from src/main/resources/data/extendedmushrooms/advancements/recipes/redstone/mushroom_fence_gate.json rename to src/generated/resources/data/extendedmushrooms/advancements/recipes/building_blocks/mushroom_wood/colorless/mushroom_stairs.json index ac27a614..291440ca 100644 --- a/src/main/resources/data/extendedmushrooms/advancements/recipes/redstone/mushroom_fence_gate.json +++ b/src/generated/resources/data/extendedmushrooms/advancements/recipes/building_blocks/mushroom_wood/colorless/mushroom_stairs.json @@ -2,7 +2,7 @@ "parent": "minecraft:recipes/root", "rewards": { "recipes": [ - "extendedmushrooms:mushroom_wood/beige/mushroom_fence_gate" + "extendedmushrooms:mushroom_wood/colorless/mushroom_stairs" ] }, "criteria": { @@ -19,7 +19,7 @@ "has_the_recipe": { "trigger": "minecraft:recipe_unlocked", "conditions": { - "recipe": "extendedmushrooms:mushroom_wood/beige/mushroom_fence_gate" + "recipe": "extendedmushrooms:mushroom_wood/colorless/mushroom_stairs" } } }, diff --git a/src/main/resources/data/extendedmushrooms/advancements/recipes/building_blocks/glowshroom_planks.json b/src/generated/resources/data/extendedmushrooms/advancements/recipes/building_blocks/mushroom_wood/glowshroom/glowshroom_planks.json similarity index 90% rename from src/main/resources/data/extendedmushrooms/advancements/recipes/building_blocks/glowshroom_planks.json rename to src/generated/resources/data/extendedmushrooms/advancements/recipes/building_blocks/mushroom_wood/glowshroom/glowshroom_planks.json index 03dbb1ae..a594c518 100644 --- a/src/main/resources/data/extendedmushrooms/advancements/recipes/building_blocks/glowshroom_planks.json +++ b/src/generated/resources/data/extendedmushrooms/advancements/recipes/building_blocks/mushroom_wood/glowshroom/glowshroom_planks.json @@ -11,7 +11,7 @@ "conditions": { "items": [ { - "tag": "extendedmushrooms:mushroom_stems/glowshroom" + "tag": "forge:mushroom_stems/glowshroom" } ] } diff --git a/src/main/resources/data/extendedmushrooms/advancements/recipes/building_blocks/glowshroom_slab.json b/src/generated/resources/data/extendedmushrooms/advancements/recipes/building_blocks/mushroom_wood/glowshroom/glowshroom_slab.json similarity index 100% rename from src/main/resources/data/extendedmushrooms/advancements/recipes/building_blocks/glowshroom_slab.json rename to src/generated/resources/data/extendedmushrooms/advancements/recipes/building_blocks/mushroom_wood/glowshroom/glowshroom_slab.json diff --git a/src/main/resources/data/extendedmushrooms/advancements/recipes/building_blocks/glowshroom_stairs.json b/src/generated/resources/data/extendedmushrooms/advancements/recipes/building_blocks/mushroom_wood/glowshroom/glowshroom_stairs.json similarity index 100% rename from src/main/resources/data/extendedmushrooms/advancements/recipes/building_blocks/glowshroom_stairs.json rename to src/generated/resources/data/extendedmushrooms/advancements/recipes/building_blocks/mushroom_wood/glowshroom/glowshroom_stairs.json diff --git a/src/main/resources/data/extendedmushrooms/advancements/recipes/building_blocks/poisonous_mushroom_planks.json b/src/generated/resources/data/extendedmushrooms/advancements/recipes/building_blocks/mushroom_wood/poisonous_mushroom/poisonous_mushroom_planks.json similarity index 89% rename from src/main/resources/data/extendedmushrooms/advancements/recipes/building_blocks/poisonous_mushroom_planks.json rename to src/generated/resources/data/extendedmushrooms/advancements/recipes/building_blocks/mushroom_wood/poisonous_mushroom/poisonous_mushroom_planks.json index 9fdf3c74..7f34bfae 100644 --- a/src/main/resources/data/extendedmushrooms/advancements/recipes/building_blocks/poisonous_mushroom_planks.json +++ b/src/generated/resources/data/extendedmushrooms/advancements/recipes/building_blocks/mushroom_wood/poisonous_mushroom/poisonous_mushroom_planks.json @@ -11,7 +11,7 @@ "conditions": { "items": [ { - "tag": "extendedmushrooms:mushroom_stems/poisonous_mushroom" + "tag": "forge:mushroom_stems/green" } ] } diff --git a/src/main/resources/data/extendedmushrooms/advancements/recipes/building_blocks/poisonous_mushroom_slab.json b/src/generated/resources/data/extendedmushrooms/advancements/recipes/building_blocks/mushroom_wood/poisonous_mushroom/poisonous_mushroom_slab.json similarity index 100% rename from src/main/resources/data/extendedmushrooms/advancements/recipes/building_blocks/poisonous_mushroom_slab.json rename to src/generated/resources/data/extendedmushrooms/advancements/recipes/building_blocks/mushroom_wood/poisonous_mushroom/poisonous_mushroom_slab.json diff --git a/src/main/resources/data/extendedmushrooms/advancements/recipes/building_blocks/poisonous_mushroom_stairs.json b/src/generated/resources/data/extendedmushrooms/advancements/recipes/building_blocks/mushroom_wood/poisonous_mushroom/poisonous_mushroom_stairs.json similarity index 100% rename from src/main/resources/data/extendedmushrooms/advancements/recipes/building_blocks/poisonous_mushroom_stairs.json rename to src/generated/resources/data/extendedmushrooms/advancements/recipes/building_blocks/mushroom_wood/poisonous_mushroom/poisonous_mushroom_stairs.json diff --git a/src/main/resources/data/extendedmushrooms/advancements/recipes/decorations/brown_banner.json b/src/generated/resources/data/extendedmushrooms/advancements/recipes/decorations/mushroom_cap/brown/brown_banner.json similarity index 84% rename from src/main/resources/data/extendedmushrooms/advancements/recipes/decorations/brown_banner.json rename to src/generated/resources/data/extendedmushrooms/advancements/recipes/decorations/mushroom_cap/brown/brown_banner.json index 48e7922f..eac19a0d 100644 --- a/src/main/resources/data/extendedmushrooms/advancements/recipes/decorations/brown_banner.json +++ b/src/generated/resources/data/extendedmushrooms/advancements/recipes/decorations/mushroom_cap/brown/brown_banner.json @@ -6,12 +6,12 @@ ] }, "criteria": { - "has_brown_wool": { + "has_cap": { "trigger": "minecraft:inventory_changed", "conditions": { "items": [ { - "item": "minecraft:brown_mushroom_block" + "tag": "forge:mushroom_caps/brown" } ] } @@ -25,7 +25,7 @@ }, "requirements": [ [ - "has_brown_wool", + "has_cap", "has_the_recipe" ] ] diff --git a/src/main/resources/data/extendedmushrooms/advancements/recipes/decorations/brown_bed.json b/src/generated/resources/data/extendedmushrooms/advancements/recipes/decorations/mushroom_cap/brown/brown_bed.json similarity index 83% rename from src/main/resources/data/extendedmushrooms/advancements/recipes/decorations/brown_bed.json rename to src/generated/resources/data/extendedmushrooms/advancements/recipes/decorations/mushroom_cap/brown/brown_bed.json index 0f7d4dd6..4c0f35d2 100644 --- a/src/main/resources/data/extendedmushrooms/advancements/recipes/decorations/brown_bed.json +++ b/src/generated/resources/data/extendedmushrooms/advancements/recipes/decorations/mushroom_cap/brown/brown_bed.json @@ -6,12 +6,12 @@ ] }, "criteria": { - "has_brown_wool": { + "has_cap": { "trigger": "minecraft:inventory_changed", "conditions": { "items": [ { - "item": "minecraft:brown_mushroom_block" + "tag": "forge:mushroom_caps/brown" } ] } @@ -25,7 +25,7 @@ }, "requirements": [ [ - "has_brown_wool", + "has_cap", "has_the_recipe" ] ] diff --git a/src/main/resources/data/extendedmushrooms/advancements/recipes/decorations/brown_mushroom_carpet.json b/src/generated/resources/data/extendedmushrooms/advancements/recipes/decorations/mushroom_cap/brown/brown_mushroom_carpet.json similarity index 84% rename from src/main/resources/data/extendedmushrooms/advancements/recipes/decorations/brown_mushroom_carpet.json rename to src/generated/resources/data/extendedmushrooms/advancements/recipes/decorations/mushroom_cap/brown/brown_mushroom_carpet.json index bd41f19b..2e1a45fb 100644 --- a/src/main/resources/data/extendedmushrooms/advancements/recipes/decorations/brown_mushroom_carpet.json +++ b/src/generated/resources/data/extendedmushrooms/advancements/recipes/decorations/mushroom_cap/brown/brown_mushroom_carpet.json @@ -6,12 +6,12 @@ ] }, "criteria": { - "has_brown_wool": { + "has_cap": { "trigger": "minecraft:inventory_changed", "conditions": { "items": [ { - "item": "minecraft:brown_mushroom_block" + "tag": "forge:mushroom_caps/brown" } ] } @@ -25,7 +25,7 @@ }, "requirements": [ [ - "has_brown_wool", + "has_cap", "has_the_recipe" ] ] diff --git a/src/main/resources/data/extendedmushrooms/advancements/recipes/decorations/blue_banner.json b/src/generated/resources/data/extendedmushrooms/advancements/recipes/decorations/mushroom_cap/glowshroom/blue_banner.json similarity index 84% rename from src/main/resources/data/extendedmushrooms/advancements/recipes/decorations/blue_banner.json rename to src/generated/resources/data/extendedmushrooms/advancements/recipes/decorations/mushroom_cap/glowshroom/blue_banner.json index 46d91c0b..d3079053 100644 --- a/src/main/resources/data/extendedmushrooms/advancements/recipes/decorations/blue_banner.json +++ b/src/generated/resources/data/extendedmushrooms/advancements/recipes/decorations/mushroom_cap/glowshroom/blue_banner.json @@ -6,12 +6,12 @@ ] }, "criteria": { - "has_blue_wool": { + "has_cap": { "trigger": "minecraft:inventory_changed", "conditions": { "items": [ { - "item": "extendedmushrooms:glowshroom_cap" + "tag": "forge:mushroom_caps/glowshroom" } ] } @@ -25,7 +25,7 @@ }, "requirements": [ [ - "has_blue_wool", + "has_cap", "has_the_recipe" ] ] diff --git a/src/main/resources/data/extendedmushrooms/advancements/recipes/decorations/blue_bed.json b/src/generated/resources/data/extendedmushrooms/advancements/recipes/decorations/mushroom_cap/glowshroom/blue_bed.json similarity index 84% rename from src/main/resources/data/extendedmushrooms/advancements/recipes/decorations/blue_bed.json rename to src/generated/resources/data/extendedmushrooms/advancements/recipes/decorations/mushroom_cap/glowshroom/blue_bed.json index 2954c8e4..2b5e9649 100644 --- a/src/main/resources/data/extendedmushrooms/advancements/recipes/decorations/blue_bed.json +++ b/src/generated/resources/data/extendedmushrooms/advancements/recipes/decorations/mushroom_cap/glowshroom/blue_bed.json @@ -6,12 +6,12 @@ ] }, "criteria": { - "has_blue_wool": { + "has_cap": { "trigger": "minecraft:inventory_changed", "conditions": { "items": [ { - "item": "extendedmushrooms:glowshroom_cap" + "tag": "forge:mushroom_caps/glowshroom" } ] } @@ -25,7 +25,7 @@ }, "requirements": [ [ - "has_blue_wool", + "has_cap", "has_the_recipe" ] ] diff --git a/src/main/resources/data/extendedmushrooms/advancements/recipes/decorations/glowshroom_cap_carpet.json b/src/generated/resources/data/extendedmushrooms/advancements/recipes/decorations/mushroom_cap/glowshroom/glowshroom_cap_carpet.json similarity index 91% rename from src/main/resources/data/extendedmushrooms/advancements/recipes/decorations/glowshroom_cap_carpet.json rename to src/generated/resources/data/extendedmushrooms/advancements/recipes/decorations/mushroom_cap/glowshroom/glowshroom_cap_carpet.json index 44b78e92..78b8eba5 100644 --- a/src/main/resources/data/extendedmushrooms/advancements/recipes/decorations/glowshroom_cap_carpet.json +++ b/src/generated/resources/data/extendedmushrooms/advancements/recipes/decorations/mushroom_cap/glowshroom/glowshroom_cap_carpet.json @@ -11,7 +11,7 @@ "conditions": { "items": [ { - "item": "extendedmushrooms:glowshroom_cap" + "tag": "forge:mushroom_caps/glowshroom" } ] } diff --git a/src/main/resources/data/extendedmushrooms/advancements/recipes/decorations/poisonous_mushroom_cap_carpet.json b/src/generated/resources/data/extendedmushrooms/advancements/recipes/decorations/mushroom_cap/poisonous_mushroom/poisonous_mushroom_cap_carpet.json similarity index 90% rename from src/main/resources/data/extendedmushrooms/advancements/recipes/decorations/poisonous_mushroom_cap_carpet.json rename to src/generated/resources/data/extendedmushrooms/advancements/recipes/decorations/mushroom_cap/poisonous_mushroom/poisonous_mushroom_cap_carpet.json index e3cdde70..1cc26265 100644 --- a/src/main/resources/data/extendedmushrooms/advancements/recipes/decorations/poisonous_mushroom_cap_carpet.json +++ b/src/generated/resources/data/extendedmushrooms/advancements/recipes/decorations/mushroom_cap/poisonous_mushroom/poisonous_mushroom_cap_carpet.json @@ -11,7 +11,7 @@ "conditions": { "items": [ { - "item": "extendedmushrooms:poisonous_mushroom_cap" + "tag": "forge:mushroom_caps/purple" } ] } diff --git a/src/main/resources/data/extendedmushrooms/advancements/recipes/decorations/purple_banner.json b/src/generated/resources/data/extendedmushrooms/advancements/recipes/decorations/mushroom_cap/poisonous_mushroom/purple_banner.json similarity index 83% rename from src/main/resources/data/extendedmushrooms/advancements/recipes/decorations/purple_banner.json rename to src/generated/resources/data/extendedmushrooms/advancements/recipes/decorations/mushroom_cap/poisonous_mushroom/purple_banner.json index f08cf77b..561323ae 100644 --- a/src/main/resources/data/extendedmushrooms/advancements/recipes/decorations/purple_banner.json +++ b/src/generated/resources/data/extendedmushrooms/advancements/recipes/decorations/mushroom_cap/poisonous_mushroom/purple_banner.json @@ -6,12 +6,12 @@ ] }, "criteria": { - "has_purple_wool": { + "has_cap": { "trigger": "minecraft:inventory_changed", "conditions": { "items": [ { - "item": "extendedmushrooms:poisonous_mushroom_cap" + "tag": "forge:mushroom_caps/purple" } ] } @@ -25,7 +25,7 @@ }, "requirements": [ [ - "has_purple_wool", + "has_cap", "has_the_recipe" ] ] diff --git a/src/main/resources/data/extendedmushrooms/advancements/recipes/decorations/purple_bed.json b/src/generated/resources/data/extendedmushrooms/advancements/recipes/decorations/mushroom_cap/poisonous_mushroom/purple_bed.json similarity index 83% rename from src/main/resources/data/extendedmushrooms/advancements/recipes/decorations/purple_bed.json rename to src/generated/resources/data/extendedmushrooms/advancements/recipes/decorations/mushroom_cap/poisonous_mushroom/purple_bed.json index a26a3202..dc8999ea 100644 --- a/src/main/resources/data/extendedmushrooms/advancements/recipes/decorations/purple_bed.json +++ b/src/generated/resources/data/extendedmushrooms/advancements/recipes/decorations/mushroom_cap/poisonous_mushroom/purple_bed.json @@ -6,12 +6,12 @@ ] }, "criteria": { - "has_purple_wool": { + "has_cap": { "trigger": "minecraft:inventory_changed", "conditions": { "items": [ { - "item": "extendedmushrooms:poisonous_mushroom_cap" + "tag": "forge:mushroom_caps/purple" } ] } @@ -25,7 +25,7 @@ }, "requirements": [ [ - "has_purple_wool", + "has_cap", "has_the_recipe" ] ] diff --git a/src/main/resources/data/extendedmushrooms/advancements/recipes/decorations/red_banner.json b/src/generated/resources/data/extendedmushrooms/advancements/recipes/decorations/mushroom_cap/red/red_banner.json similarity index 84% rename from src/main/resources/data/extendedmushrooms/advancements/recipes/decorations/red_banner.json rename to src/generated/resources/data/extendedmushrooms/advancements/recipes/decorations/mushroom_cap/red/red_banner.json index 4b357796..3d4ed3db 100644 --- a/src/main/resources/data/extendedmushrooms/advancements/recipes/decorations/red_banner.json +++ b/src/generated/resources/data/extendedmushrooms/advancements/recipes/decorations/mushroom_cap/red/red_banner.json @@ -6,12 +6,12 @@ ] }, "criteria": { - "has_red_wool": { + "has_cap": { "trigger": "minecraft:inventory_changed", "conditions": { "items": [ { - "item": "minecraft:red_mushroom_block" + "tag": "forge:mushroom_caps/red" } ] } @@ -25,7 +25,7 @@ }, "requirements": [ [ - "has_red_wool", + "has_cap", "has_the_recipe" ] ] diff --git a/src/main/resources/data/extendedmushrooms/advancements/recipes/decorations/red_bed.json b/src/generated/resources/data/extendedmushrooms/advancements/recipes/decorations/mushroom_cap/red/red_bed.json similarity index 84% rename from src/main/resources/data/extendedmushrooms/advancements/recipes/decorations/red_bed.json rename to src/generated/resources/data/extendedmushrooms/advancements/recipes/decorations/mushroom_cap/red/red_bed.json index c335982e..ca28569d 100644 --- a/src/main/resources/data/extendedmushrooms/advancements/recipes/decorations/red_bed.json +++ b/src/generated/resources/data/extendedmushrooms/advancements/recipes/decorations/mushroom_cap/red/red_bed.json @@ -6,12 +6,12 @@ ] }, "criteria": { - "has_red_wool": { + "has_cap": { "trigger": "minecraft:inventory_changed", "conditions": { "items": [ { - "item": "minecraft:red_mushroom_block" + "tag": "forge:mushroom_caps/red" } ] } @@ -25,7 +25,7 @@ }, "requirements": [ [ - "has_red_wool", + "has_cap", "has_the_recipe" ] ] diff --git a/src/main/resources/data/extendedmushrooms/advancements/recipes/decorations/red_mushroom_carpet.json b/src/generated/resources/data/extendedmushrooms/advancements/recipes/decorations/mushroom_cap/red/red_mushroom_carpet.json similarity index 85% rename from src/main/resources/data/extendedmushrooms/advancements/recipes/decorations/red_mushroom_carpet.json rename to src/generated/resources/data/extendedmushrooms/advancements/recipes/decorations/mushroom_cap/red/red_mushroom_carpet.json index 062a6eaf..953364ac 100644 --- a/src/main/resources/data/extendedmushrooms/advancements/recipes/decorations/red_mushroom_carpet.json +++ b/src/generated/resources/data/extendedmushrooms/advancements/recipes/decorations/mushroom_cap/red/red_mushroom_carpet.json @@ -6,12 +6,12 @@ ] }, "criteria": { - "has_red_wool": { + "has_cap": { "trigger": "minecraft:inventory_changed", "conditions": { "items": [ { - "item": "minecraft:red_mushroom_block" + "tag": "forge:mushroom_caps/red" } ] } @@ -25,7 +25,7 @@ }, "requirements": [ [ - "has_red_wool", + "has_cap", "has_the_recipe" ] ] diff --git a/src/main/resources/data/extendedmushrooms/advancements/recipes/decorations/mushroom_fence.json b/src/generated/resources/data/extendedmushrooms/advancements/recipes/decorations/mushroom_wood/colorless/mushroom_fence.json similarity index 78% rename from src/main/resources/data/extendedmushrooms/advancements/recipes/decorations/mushroom_fence.json rename to src/generated/resources/data/extendedmushrooms/advancements/recipes/decorations/mushroom_wood/colorless/mushroom_fence.json index 89af8ed2..ecce7611 100644 --- a/src/main/resources/data/extendedmushrooms/advancements/recipes/decorations/mushroom_fence.json +++ b/src/generated/resources/data/extendedmushrooms/advancements/recipes/decorations/mushroom_wood/colorless/mushroom_fence.json @@ -2,7 +2,7 @@ "parent": "minecraft:recipes/root", "rewards": { "recipes": [ - "extendedmushrooms:mushroom_wood/beige/mushroom_fence" + "extendedmushrooms:mushroom_wood/colorless/mushroom_fence" ] }, "criteria": { @@ -19,7 +19,7 @@ "has_the_recipe": { "trigger": "minecraft:recipe_unlocked", "conditions": { - "recipe": "extendedmushrooms:mushroom_wood/beige/mushroom_fence" + "recipe": "extendedmushrooms:mushroom_wood/colorless/mushroom_fence" } } }, diff --git a/src/main/resources/data/extendedmushrooms/advancements/recipes/decorations/glowshroom_fence.json b/src/generated/resources/data/extendedmushrooms/advancements/recipes/decorations/mushroom_wood/glowshroom/glowshroom_fence.json similarity index 100% rename from src/main/resources/data/extendedmushrooms/advancements/recipes/decorations/glowshroom_fence.json rename to src/generated/resources/data/extendedmushrooms/advancements/recipes/decorations/mushroom_wood/glowshroom/glowshroom_fence.json diff --git a/src/main/resources/data/extendedmushrooms/advancements/recipes/decorations/poisonous_mushroom_fence.json b/src/generated/resources/data/extendedmushrooms/advancements/recipes/decorations/mushroom_wood/poisonous_mushroom/poisonous_mushroom_fence.json similarity index 100% rename from src/main/resources/data/extendedmushrooms/advancements/recipes/decorations/poisonous_mushroom_fence.json rename to src/generated/resources/data/extendedmushrooms/advancements/recipes/decorations/mushroom_wood/poisonous_mushroom/poisonous_mushroom_fence.json diff --git a/src/main/resources/data/extendedmushrooms/advancements/recipes/decorations/oak_sign.json b/src/generated/resources/data/extendedmushrooms/advancements/recipes/decorations/oak_sign.json similarity index 79% rename from src/main/resources/data/extendedmushrooms/advancements/recipes/decorations/oak_sign.json rename to src/generated/resources/data/extendedmushrooms/advancements/recipes/decorations/oak_sign.json index 017529c8..464c09c5 100644 --- a/src/main/resources/data/extendedmushrooms/advancements/recipes/decorations/oak_sign.json +++ b/src/generated/resources/data/extendedmushrooms/advancements/recipes/decorations/oak_sign.json @@ -2,7 +2,7 @@ "parent": "minecraft:recipes/root", "rewards": { "recipes": [ - "extendedmushrooms:mushroom_wood/mushroom_oak_sign" + "extendedmushrooms:oak_sign" ] }, "criteria": { @@ -19,7 +19,7 @@ "has_the_recipe": { "trigger": "minecraft:recipe_unlocked", "conditions": { - "recipe": "extendedmushrooms:mushroom_wood/mushroom_oak_sign" + "recipe": "extendedmushrooms:oak_sign" } } }, diff --git a/src/main/resources/data/extendedmushrooms/advancements/recipes/food/grilled_mushroom.json b/src/generated/resources/data/extendedmushrooms/advancements/recipes/food/grilled_mushroom.json similarity index 74% rename from src/main/resources/data/extendedmushrooms/advancements/recipes/food/grilled_mushroom.json rename to src/generated/resources/data/extendedmushrooms/advancements/recipes/food/grilled_mushroom.json index bd03fa82..67a00db7 100644 --- a/src/main/resources/data/extendedmushrooms/advancements/recipes/food/grilled_mushroom.json +++ b/src/generated/resources/data/extendedmushrooms/advancements/recipes/food/grilled_mushroom.json @@ -2,7 +2,7 @@ "parent": "minecraft:recipes/root", "rewards": { "recipes": [ - "extendedmushrooms:food/grilled_mushroom" + "extendedmushrooms:grilled_mushroom" ] }, "criteria": { @@ -11,7 +11,7 @@ "conditions": { "items": [ { - "tag": "forge:edible_mushrooms" + "tag": "forge:mushrooms/edible" } ] } @@ -19,7 +19,7 @@ "has_the_recipe": { "trigger": "minecraft:recipe_unlocked", "conditions": { - "recipe": "extendedmushrooms:food/grilled_mushroom" + "recipe": "extendedmushrooms:grilled_mushroom" } } }, diff --git a/src/main/resources/data/extendedmushrooms/advancements/recipes/food/grilled_mushroom_from_campfire_cooking.json b/src/generated/resources/data/extendedmushrooms/advancements/recipes/food/grilled_mushroom_from_campfire_cooking.json similarity index 69% rename from src/main/resources/data/extendedmushrooms/advancements/recipes/food/grilled_mushroom_from_campfire_cooking.json rename to src/generated/resources/data/extendedmushrooms/advancements/recipes/food/grilled_mushroom_from_campfire_cooking.json index 4733b884..668679bf 100644 --- a/src/main/resources/data/extendedmushrooms/advancements/recipes/food/grilled_mushroom_from_campfire_cooking.json +++ b/src/generated/resources/data/extendedmushrooms/advancements/recipes/food/grilled_mushroom_from_campfire_cooking.json @@ -2,7 +2,7 @@ "parent": "minecraft:recipes/root", "rewards": { "recipes": [ - "extendedmushrooms:food/grilled_mushroom_from_campfire_cooking" + "extendedmushrooms:grilled_mushroom_from_campfire_cooking" ] }, "criteria": { @@ -11,7 +11,7 @@ "conditions": { "items": [ { - "tag": "forge:edible_mushrooms" + "tag": "forge:mushrooms/edible" } ] } @@ -19,7 +19,7 @@ "has_the_recipe": { "trigger": "minecraft:recipe_unlocked", "conditions": { - "recipe": "extendedmushrooms:food/grilled_mushroom_from_campfire_cooking" + "recipe": "extendedmushrooms:grilled_mushroom_from_campfire_cooking" } } }, diff --git a/src/main/resources/data/extendedmushrooms/advancements/recipes/food/grilled_mushroom_from_smoking.json b/src/generated/resources/data/extendedmushrooms/advancements/recipes/food/grilled_mushroom_from_smoking.json similarity index 71% rename from src/main/resources/data/extendedmushrooms/advancements/recipes/food/grilled_mushroom_from_smoking.json rename to src/generated/resources/data/extendedmushrooms/advancements/recipes/food/grilled_mushroom_from_smoking.json index 8467577c..ef715c0d 100644 --- a/src/main/resources/data/extendedmushrooms/advancements/recipes/food/grilled_mushroom_from_smoking.json +++ b/src/generated/resources/data/extendedmushrooms/advancements/recipes/food/grilled_mushroom_from_smoking.json @@ -2,7 +2,7 @@ "parent": "minecraft:recipes/root", "rewards": { "recipes": [ - "extendedmushrooms:food/grilled_mushroom_from_smoking" + "extendedmushrooms:grilled_mushroom_from_smoking" ] }, "criteria": { @@ -11,7 +11,7 @@ "conditions": { "items": [ { - "tag": "forge:edible_mushrooms" + "tag": "forge:mushrooms/edible" } ] } @@ -19,7 +19,7 @@ "has_the_recipe": { "trigger": "minecraft:recipe_unlocked", "conditions": { - "recipe": "extendedmushrooms:food/grilled_mushroom_from_smoking" + "recipe": "extendedmushrooms:grilled_mushroom_from_smoking" } } }, diff --git a/src/main/resources/data/extendedmushrooms/advancements/recipes/food/mushroom_bread.json b/src/generated/resources/data/extendedmushrooms/advancements/recipes/food/mushroom_bread.json similarity index 75% rename from src/main/resources/data/extendedmushrooms/advancements/recipes/food/mushroom_bread.json rename to src/generated/resources/data/extendedmushrooms/advancements/recipes/food/mushroom_bread.json index e2110904..e760a388 100644 --- a/src/main/resources/data/extendedmushrooms/advancements/recipes/food/mushroom_bread.json +++ b/src/generated/resources/data/extendedmushrooms/advancements/recipes/food/mushroom_bread.json @@ -2,7 +2,7 @@ "parent": "minecraft:recipes/root", "rewards": { "recipes": [ - "extendedmushrooms:food/mushroom_bread" + "extendedmushrooms:mushroom_bread" ] }, "criteria": { @@ -11,7 +11,7 @@ "conditions": { "items": [ { - "tag": "forge:edible_mushrooms" + "tag": "forge:mushrooms/edible" } ] } @@ -19,7 +19,7 @@ "has_the_recipe": { "trigger": "minecraft:recipe_unlocked", "conditions": { - "recipe": "extendedmushrooms:food/mushroom_bread" + "recipe": "extendedmushrooms:mushroom_bread" } } }, diff --git a/src/main/resources/data/extendedmushrooms/advancements/recipes/food/rabbit_stew_from_edible_mushroom.json b/src/generated/resources/data/extendedmushrooms/advancements/recipes/food/rabbit_stew_from_edible_mushroom.json similarity index 100% rename from src/main/resources/data/extendedmushrooms/advancements/recipes/food/rabbit_stew_from_edible_mushroom.json rename to src/generated/resources/data/extendedmushrooms/advancements/recipes/food/rabbit_stew_from_edible_mushroom.json diff --git a/src/main/resources/data/extendedmushrooms/advancements/recipes/misc/brown_dye_from_infested_flower.json b/src/generated/resources/data/extendedmushrooms/advancements/recipes/misc/brown_dye_from_infested_flower.json similarity index 78% rename from src/main/resources/data/extendedmushrooms/advancements/recipes/misc/brown_dye_from_infested_flower.json rename to src/generated/resources/data/extendedmushrooms/advancements/recipes/misc/brown_dye_from_infested_flower.json index 30fcbbf2..e51c5c36 100644 --- a/src/main/resources/data/extendedmushrooms/advancements/recipes/misc/brown_dye_from_infested_flower.json +++ b/src/generated/resources/data/extendedmushrooms/advancements/recipes/misc/brown_dye_from_infested_flower.json @@ -2,7 +2,7 @@ "parent": "minecraft:recipes/root", "rewards": { "recipes": [ - "extendedmushrooms:misc/brown_dye_from_infested_flower" + "extendedmushrooms:brown_dye_from_infested_flower" ] }, "criteria": { @@ -19,7 +19,7 @@ "has_the_recipe": { "trigger": "minecraft:recipe_unlocked", "conditions": { - "recipe": "extendedmushrooms:misc/brown_dye_from_infested_flower" + "recipe": "extendedmushrooms:brown_dye_from_infested_flower" } } }, diff --git a/src/main/resources/data/extendedmushrooms/advancements/recipes/misc/glowstone_crumbs.json b/src/generated/resources/data/extendedmushrooms/advancements/recipes/misc/glowstone_crumbs.json similarity index 73% rename from src/main/resources/data/extendedmushrooms/advancements/recipes/misc/glowstone_crumbs.json rename to src/generated/resources/data/extendedmushrooms/advancements/recipes/misc/glowstone_crumbs.json index e552b441..3c8c5a26 100644 --- a/src/main/resources/data/extendedmushrooms/advancements/recipes/misc/glowstone_crumbs.json +++ b/src/generated/resources/data/extendedmushrooms/advancements/recipes/misc/glowstone_crumbs.json @@ -2,11 +2,11 @@ "parent": "minecraft:recipes/root", "rewards": { "recipes": [ - "extendedmushrooms:misc/glowstone_crumbs" + "extendedmushrooms:glowstone_crumbs" ] }, "criteria": { - "has_glowstone_dust": { + "has_dust": { "trigger": "minecraft:inventory_changed", "conditions": { "items": [ @@ -19,13 +19,13 @@ "has_the_recipe": { "trigger": "minecraft:recipe_unlocked", "conditions": { - "recipe": "extendedmushrooms:misc/glowstone_crumbs" + "recipe": "extendedmushrooms:glowstone_crumbs" } } }, "requirements": [ [ - "has_glowstone_dust", + "has_dust", "has_the_recipe" ] ] diff --git a/src/main/resources/data/extendedmushrooms/advancements/recipes/misc/glowstone_dust.json b/src/generated/resources/data/extendedmushrooms/advancements/recipes/misc/glowstone_dust.json similarity index 73% rename from src/main/resources/data/extendedmushrooms/advancements/recipes/misc/glowstone_dust.json rename to src/generated/resources/data/extendedmushrooms/advancements/recipes/misc/glowstone_dust.json index 42b84d44..4f91aceb 100644 --- a/src/main/resources/data/extendedmushrooms/advancements/recipes/misc/glowstone_dust.json +++ b/src/generated/resources/data/extendedmushrooms/advancements/recipes/misc/glowstone_dust.json @@ -2,11 +2,11 @@ "parent": "minecraft:recipes/root", "rewards": { "recipes": [ - "extendedmushrooms:misc/glowstone_dust" + "extendedmushrooms:glowstone_dust" ] }, "criteria": { - "has_glowstone_crumbs": { + "has_crumbs": { "trigger": "minecraft:inventory_changed", "conditions": { "items": [ @@ -19,13 +19,13 @@ "has_the_recipe": { "trigger": "minecraft:recipe_unlocked", "conditions": { - "recipe": "extendedmushrooms:misc/glowstone_dust" + "recipe": "extendedmushrooms:glowstone_dust" } } }, "requirements": [ [ - "has_glowstone_crumbs", + "has_crumbs", "has_the_recipe" ] ] diff --git a/src/main/resources/data/extendedmushrooms/advancements/recipes/misc/mushroom_spores.json b/src/generated/resources/data/extendedmushrooms/advancements/recipes/misc/mushroom_spores.json similarity index 82% rename from src/main/resources/data/extendedmushrooms/advancements/recipes/misc/mushroom_spores.json rename to src/generated/resources/data/extendedmushrooms/advancements/recipes/misc/mushroom_spores.json index d4877429..35a30b42 100644 --- a/src/main/resources/data/extendedmushrooms/advancements/recipes/misc/mushroom_spores.json +++ b/src/generated/resources/data/extendedmushrooms/advancements/recipes/misc/mushroom_spores.json @@ -2,7 +2,7 @@ "parent": "minecraft:recipes/root", "rewards": { "recipes": [ - "extendedmushrooms:misc/mushroom_spores" + "extendedmushrooms:mushroom_spores" ] }, "criteria": { @@ -19,7 +19,7 @@ "has_the_recipe": { "trigger": "minecraft:recipe_unlocked", "conditions": { - "recipe": "extendedmushrooms:misc/mushroom_spores" + "recipe": "extendedmushrooms:mushroom_spores" } } }, diff --git a/src/main/resources/data/extendedmushrooms/advancements/recipes/redstone/brown_mushroom_button.json b/src/generated/resources/data/extendedmushrooms/advancements/recipes/redstone/mushroom_cap/brown/brown_mushroom_button.json similarity index 84% rename from src/main/resources/data/extendedmushrooms/advancements/recipes/redstone/brown_mushroom_button.json rename to src/generated/resources/data/extendedmushrooms/advancements/recipes/redstone/mushroom_cap/brown/brown_mushroom_button.json index aebde3d3..7c6dd9de 100644 --- a/src/main/resources/data/extendedmushrooms/advancements/recipes/redstone/brown_mushroom_button.json +++ b/src/generated/resources/data/extendedmushrooms/advancements/recipes/redstone/mushroom_cap/brown/brown_mushroom_button.json @@ -6,12 +6,12 @@ ] }, "criteria": { - "has_brown_wool": { + "has_cap": { "trigger": "minecraft:inventory_changed", "conditions": { "items": [ { - "item": "minecraft:brown_mushroom_block" + "tag": "forge:mushroom_caps/brown" } ] } @@ -25,7 +25,7 @@ }, "requirements": [ [ - "has_brown_wool", + "has_cap", "has_the_recipe" ] ] diff --git a/src/main/resources/data/extendedmushrooms/advancements/recipes/redstone/brown_mushroom_pressure_plate.json b/src/generated/resources/data/extendedmushrooms/advancements/recipes/redstone/mushroom_cap/brown/brown_mushroom_pressure_plate.json similarity index 84% rename from src/main/resources/data/extendedmushrooms/advancements/recipes/redstone/brown_mushroom_pressure_plate.json rename to src/generated/resources/data/extendedmushrooms/advancements/recipes/redstone/mushroom_cap/brown/brown_mushroom_pressure_plate.json index 2b062ce8..fb6e8e30 100644 --- a/src/main/resources/data/extendedmushrooms/advancements/recipes/redstone/brown_mushroom_pressure_plate.json +++ b/src/generated/resources/data/extendedmushrooms/advancements/recipes/redstone/mushroom_cap/brown/brown_mushroom_pressure_plate.json @@ -6,12 +6,12 @@ ] }, "criteria": { - "has_brown_wool": { + "has_cap": { "trigger": "minecraft:inventory_changed", "conditions": { "items": [ { - "item": "minecraft:brown_mushroom_block" + "tag": "forge:mushroom_caps/brown" } ] } @@ -25,7 +25,7 @@ }, "requirements": [ [ - "has_brown_wool", + "has_cap", "has_the_recipe" ] ] diff --git a/src/main/resources/data/extendedmushrooms/advancements/recipes/redstone/glowshroom_cap_button.json b/src/generated/resources/data/extendedmushrooms/advancements/recipes/redstone/mushroom_cap/glowshroom/glowshroom_cap_button.json similarity index 91% rename from src/main/resources/data/extendedmushrooms/advancements/recipes/redstone/glowshroom_cap_button.json rename to src/generated/resources/data/extendedmushrooms/advancements/recipes/redstone/mushroom_cap/glowshroom/glowshroom_cap_button.json index f5190827..c78d407e 100644 --- a/src/main/resources/data/extendedmushrooms/advancements/recipes/redstone/glowshroom_cap_button.json +++ b/src/generated/resources/data/extendedmushrooms/advancements/recipes/redstone/mushroom_cap/glowshroom/glowshroom_cap_button.json @@ -11,7 +11,7 @@ "conditions": { "items": [ { - "item": "extendedmushrooms:glowshroom_cap" + "tag": "forge:mushroom_caps/glowshroom" } ] } diff --git a/src/main/resources/data/extendedmushrooms/advancements/recipes/redstone/glowshroom_cap_pressure_plate.json b/src/generated/resources/data/extendedmushrooms/advancements/recipes/redstone/mushroom_cap/glowshroom/glowshroom_cap_pressure_plate.json similarity index 91% rename from src/main/resources/data/extendedmushrooms/advancements/recipes/redstone/glowshroom_cap_pressure_plate.json rename to src/generated/resources/data/extendedmushrooms/advancements/recipes/redstone/mushroom_cap/glowshroom/glowshroom_cap_pressure_plate.json index 21443fd7..c639cf40 100644 --- a/src/main/resources/data/extendedmushrooms/advancements/recipes/redstone/glowshroom_cap_pressure_plate.json +++ b/src/generated/resources/data/extendedmushrooms/advancements/recipes/redstone/mushroom_cap/glowshroom/glowshroom_cap_pressure_plate.json @@ -11,7 +11,7 @@ "conditions": { "items": [ { - "item": "extendedmushrooms:glowshroom_cap" + "tag": "forge:mushroom_caps/glowshroom" } ] } diff --git a/src/main/resources/data/extendedmushrooms/advancements/recipes/redstone/poisonous_mushroom_cap_button.json b/src/generated/resources/data/extendedmushrooms/advancements/recipes/redstone/mushroom_cap/poisonous_mushroom/poisonous_mushroom_cap_button.json similarity index 90% rename from src/main/resources/data/extendedmushrooms/advancements/recipes/redstone/poisonous_mushroom_cap_button.json rename to src/generated/resources/data/extendedmushrooms/advancements/recipes/redstone/mushroom_cap/poisonous_mushroom/poisonous_mushroom_cap_button.json index d389bdf0..3bbb1cbf 100644 --- a/src/main/resources/data/extendedmushrooms/advancements/recipes/redstone/poisonous_mushroom_cap_button.json +++ b/src/generated/resources/data/extendedmushrooms/advancements/recipes/redstone/mushroom_cap/poisonous_mushroom/poisonous_mushroom_cap_button.json @@ -11,7 +11,7 @@ "conditions": { "items": [ { - "item": "extendedmushrooms:poisonous_mushroom_cap" + "tag": "forge:mushroom_caps/purple" } ] } diff --git a/src/main/resources/data/extendedmushrooms/advancements/recipes/redstone/poisonous_mushroom_cap_pressure_plate.json b/src/generated/resources/data/extendedmushrooms/advancements/recipes/redstone/mushroom_cap/poisonous_mushroom/poisonous_mushroom_cap_pressure_plate.json similarity index 91% rename from src/main/resources/data/extendedmushrooms/advancements/recipes/redstone/poisonous_mushroom_cap_pressure_plate.json rename to src/generated/resources/data/extendedmushrooms/advancements/recipes/redstone/mushroom_cap/poisonous_mushroom/poisonous_mushroom_cap_pressure_plate.json index 6551659e..e84ee332 100644 --- a/src/main/resources/data/extendedmushrooms/advancements/recipes/redstone/poisonous_mushroom_cap_pressure_plate.json +++ b/src/generated/resources/data/extendedmushrooms/advancements/recipes/redstone/mushroom_cap/poisonous_mushroom/poisonous_mushroom_cap_pressure_plate.json @@ -11,7 +11,7 @@ "conditions": { "items": [ { - "item": "extendedmushrooms:poisonous_mushroom_cap" + "tag": "forge:mushroom_caps/purple" } ] } diff --git a/src/main/resources/data/extendedmushrooms/advancements/recipes/redstone/red_mushroom_button.json b/src/generated/resources/data/extendedmushrooms/advancements/recipes/redstone/mushroom_cap/red/red_mushroom_button.json similarity index 85% rename from src/main/resources/data/extendedmushrooms/advancements/recipes/redstone/red_mushroom_button.json rename to src/generated/resources/data/extendedmushrooms/advancements/recipes/redstone/mushroom_cap/red/red_mushroom_button.json index 7a0620d8..c6f34d21 100644 --- a/src/main/resources/data/extendedmushrooms/advancements/recipes/redstone/red_mushroom_button.json +++ b/src/generated/resources/data/extendedmushrooms/advancements/recipes/redstone/mushroom_cap/red/red_mushroom_button.json @@ -6,12 +6,12 @@ ] }, "criteria": { - "has_red_wool": { + "has_cap": { "trigger": "minecraft:inventory_changed", "conditions": { "items": [ { - "item": "minecraft:red_mushroom_block" + "tag": "forge:mushroom_caps/red" } ] } @@ -25,7 +25,7 @@ }, "requirements": [ [ - "has_red_wool", + "has_cap", "has_the_recipe" ] ] diff --git a/src/main/resources/data/extendedmushrooms/advancements/recipes/redstone/red_mushroom_pressure_plate.json b/src/generated/resources/data/extendedmushrooms/advancements/recipes/redstone/mushroom_cap/red/red_mushroom_pressure_plate.json similarity index 85% rename from src/main/resources/data/extendedmushrooms/advancements/recipes/redstone/red_mushroom_pressure_plate.json rename to src/generated/resources/data/extendedmushrooms/advancements/recipes/redstone/mushroom_cap/red/red_mushroom_pressure_plate.json index dfbf60f3..bbba8103 100644 --- a/src/main/resources/data/extendedmushrooms/advancements/recipes/redstone/red_mushroom_pressure_plate.json +++ b/src/generated/resources/data/extendedmushrooms/advancements/recipes/redstone/mushroom_cap/red/red_mushroom_pressure_plate.json @@ -6,12 +6,12 @@ ] }, "criteria": { - "has_red_wool": { + "has_cap": { "trigger": "minecraft:inventory_changed", "conditions": { "items": [ { - "item": "minecraft:red_mushroom_block" + "tag": "forge:mushroom_caps/red" } ] } @@ -25,7 +25,7 @@ }, "requirements": [ [ - "has_red_wool", + "has_cap", "has_the_recipe" ] ] diff --git a/src/main/resources/data/extendedmushrooms/advancements/recipes/redstone/mushroom_button.json b/src/generated/resources/data/extendedmushrooms/advancements/recipes/redstone/mushroom_wood/colorless/mushroom_button.json similarity index 77% rename from src/main/resources/data/extendedmushrooms/advancements/recipes/redstone/mushroom_button.json rename to src/generated/resources/data/extendedmushrooms/advancements/recipes/redstone/mushroom_wood/colorless/mushroom_button.json index 72a396f3..548e6894 100644 --- a/src/main/resources/data/extendedmushrooms/advancements/recipes/redstone/mushroom_button.json +++ b/src/generated/resources/data/extendedmushrooms/advancements/recipes/redstone/mushroom_wood/colorless/mushroom_button.json @@ -2,7 +2,7 @@ "parent": "minecraft:recipes/root", "rewards": { "recipes": [ - "extendedmushrooms:mushroom_wood/beige/mushroom_button" + "extendedmushrooms:mushroom_wood/colorless/mushroom_button" ] }, "criteria": { @@ -19,7 +19,7 @@ "has_the_recipe": { "trigger": "minecraft:recipe_unlocked", "conditions": { - "recipe": "extendedmushrooms:mushroom_wood/beige/mushroom_button" + "recipe": "extendedmushrooms:mushroom_wood/colorless/mushroom_button" } } }, diff --git a/src/main/resources/data/extendedmushrooms/advancements/recipes/redstone/mushroom_door.json b/src/generated/resources/data/extendedmushrooms/advancements/recipes/redstone/mushroom_wood/colorless/mushroom_door.json similarity index 78% rename from src/main/resources/data/extendedmushrooms/advancements/recipes/redstone/mushroom_door.json rename to src/generated/resources/data/extendedmushrooms/advancements/recipes/redstone/mushroom_wood/colorless/mushroom_door.json index 1aa88079..60a878fd 100644 --- a/src/main/resources/data/extendedmushrooms/advancements/recipes/redstone/mushroom_door.json +++ b/src/generated/resources/data/extendedmushrooms/advancements/recipes/redstone/mushroom_wood/colorless/mushroom_door.json @@ -2,7 +2,7 @@ "parent": "minecraft:recipes/root", "rewards": { "recipes": [ - "extendedmushrooms:mushroom_wood/beige/mushroom_door" + "extendedmushrooms:mushroom_wood/colorless/mushroom_door" ] }, "criteria": { @@ -19,7 +19,7 @@ "has_the_recipe": { "trigger": "minecraft:recipe_unlocked", "conditions": { - "recipe": "extendedmushrooms:mushroom_wood/beige/mushroom_door" + "recipe": "extendedmushrooms:mushroom_wood/colorless/mushroom_door" } } }, diff --git a/src/main/resources/data/extendedmushrooms/advancements/recipes/building_blocks/mushroom_stairs.json b/src/generated/resources/data/extendedmushrooms/advancements/recipes/redstone/mushroom_wood/colorless/mushroom_fence_gate.json similarity index 76% rename from src/main/resources/data/extendedmushrooms/advancements/recipes/building_blocks/mushroom_stairs.json rename to src/generated/resources/data/extendedmushrooms/advancements/recipes/redstone/mushroom_wood/colorless/mushroom_fence_gate.json index 17756063..1bcff16e 100644 --- a/src/main/resources/data/extendedmushrooms/advancements/recipes/building_blocks/mushroom_stairs.json +++ b/src/generated/resources/data/extendedmushrooms/advancements/recipes/redstone/mushroom_wood/colorless/mushroom_fence_gate.json @@ -2,7 +2,7 @@ "parent": "minecraft:recipes/root", "rewards": { "recipes": [ - "extendedmushrooms:mushroom_wood/beige/mushroom_stairs" + "extendedmushrooms:mushroom_wood/colorless/mushroom_fence_gate" ] }, "criteria": { @@ -19,7 +19,7 @@ "has_the_recipe": { "trigger": "minecraft:recipe_unlocked", "conditions": { - "recipe": "extendedmushrooms:mushroom_wood/beige/mushroom_stairs" + "recipe": "extendedmushrooms:mushroom_wood/colorless/mushroom_fence_gate" } } }, diff --git a/src/main/resources/data/extendedmushrooms/advancements/recipes/redstone/mushroom_pressure_plate.json b/src/generated/resources/data/extendedmushrooms/advancements/recipes/redstone/mushroom_wood/colorless/mushroom_pressure_plate.json similarity index 75% rename from src/main/resources/data/extendedmushrooms/advancements/recipes/redstone/mushroom_pressure_plate.json rename to src/generated/resources/data/extendedmushrooms/advancements/recipes/redstone/mushroom_wood/colorless/mushroom_pressure_plate.json index 743216f2..47aac62e 100644 --- a/src/main/resources/data/extendedmushrooms/advancements/recipes/redstone/mushroom_pressure_plate.json +++ b/src/generated/resources/data/extendedmushrooms/advancements/recipes/redstone/mushroom_wood/colorless/mushroom_pressure_plate.json @@ -2,7 +2,7 @@ "parent": "minecraft:recipes/root", "rewards": { "recipes": [ - "extendedmushrooms:mushroom_wood/beige/mushroom_pressure_plate" + "extendedmushrooms:mushroom_wood/colorless/mushroom_pressure_plate" ] }, "criteria": { @@ -19,7 +19,7 @@ "has_the_recipe": { "trigger": "minecraft:recipe_unlocked", "conditions": { - "recipe": "extendedmushrooms:mushroom_wood/beige/mushroom_pressure_plate" + "recipe": "extendedmushrooms:mushroom_wood/colorless/mushroom_pressure_plate" } } }, diff --git a/src/main/resources/data/extendedmushrooms/advancements/recipes/redstone/mushroom_trapdoor.json b/src/generated/resources/data/extendedmushrooms/advancements/recipes/redstone/mushroom_wood/colorless/mushroom_trapdoor.json similarity index 77% rename from src/main/resources/data/extendedmushrooms/advancements/recipes/redstone/mushroom_trapdoor.json rename to src/generated/resources/data/extendedmushrooms/advancements/recipes/redstone/mushroom_wood/colorless/mushroom_trapdoor.json index 077c2da0..c487d145 100644 --- a/src/main/resources/data/extendedmushrooms/advancements/recipes/redstone/mushroom_trapdoor.json +++ b/src/generated/resources/data/extendedmushrooms/advancements/recipes/redstone/mushroom_wood/colorless/mushroom_trapdoor.json @@ -2,7 +2,7 @@ "parent": "minecraft:recipes/root", "rewards": { "recipes": [ - "extendedmushrooms:mushroom_wood/beige/mushroom_trapdoor" + "extendedmushrooms:mushroom_wood/colorless/mushroom_trapdoor" ] }, "criteria": { @@ -19,7 +19,7 @@ "has_the_recipe": { "trigger": "minecraft:recipe_unlocked", "conditions": { - "recipe": "extendedmushrooms:mushroom_wood/beige/mushroom_trapdoor" + "recipe": "extendedmushrooms:mushroom_wood/colorless/mushroom_trapdoor" } } }, diff --git a/src/main/resources/data/extendedmushrooms/advancements/recipes/redstone/glowshroom_button.json b/src/generated/resources/data/extendedmushrooms/advancements/recipes/redstone/mushroom_wood/glowshroom/glowshroom_button.json similarity index 100% rename from src/main/resources/data/extendedmushrooms/advancements/recipes/redstone/glowshroom_button.json rename to src/generated/resources/data/extendedmushrooms/advancements/recipes/redstone/mushroom_wood/glowshroom/glowshroom_button.json diff --git a/src/main/resources/data/extendedmushrooms/advancements/recipes/redstone/glowshroom_door.json b/src/generated/resources/data/extendedmushrooms/advancements/recipes/redstone/mushroom_wood/glowshroom/glowshroom_door.json similarity index 100% rename from src/main/resources/data/extendedmushrooms/advancements/recipes/redstone/glowshroom_door.json rename to src/generated/resources/data/extendedmushrooms/advancements/recipes/redstone/mushroom_wood/glowshroom/glowshroom_door.json diff --git a/src/main/resources/data/extendedmushrooms/advancements/recipes/redstone/glowshroom_fence_gate.json b/src/generated/resources/data/extendedmushrooms/advancements/recipes/redstone/mushroom_wood/glowshroom/glowshroom_fence_gate.json similarity index 100% rename from src/main/resources/data/extendedmushrooms/advancements/recipes/redstone/glowshroom_fence_gate.json rename to src/generated/resources/data/extendedmushrooms/advancements/recipes/redstone/mushroom_wood/glowshroom/glowshroom_fence_gate.json diff --git a/src/main/resources/data/extendedmushrooms/advancements/recipes/redstone/glowshroom_pressure_plate.json b/src/generated/resources/data/extendedmushrooms/advancements/recipes/redstone/mushroom_wood/glowshroom/glowshroom_pressure_plate.json similarity index 100% rename from src/main/resources/data/extendedmushrooms/advancements/recipes/redstone/glowshroom_pressure_plate.json rename to src/generated/resources/data/extendedmushrooms/advancements/recipes/redstone/mushroom_wood/glowshroom/glowshroom_pressure_plate.json diff --git a/src/main/resources/data/extendedmushrooms/advancements/recipes/redstone/glowshroom_trapdoor.json b/src/generated/resources/data/extendedmushrooms/advancements/recipes/redstone/mushroom_wood/glowshroom/glowshroom_trapdoor.json similarity index 100% rename from src/main/resources/data/extendedmushrooms/advancements/recipes/redstone/glowshroom_trapdoor.json rename to src/generated/resources/data/extendedmushrooms/advancements/recipes/redstone/mushroom_wood/glowshroom/glowshroom_trapdoor.json diff --git a/src/main/resources/data/extendedmushrooms/advancements/recipes/redstone/poisonous_mushroom_button.json b/src/generated/resources/data/extendedmushrooms/advancements/recipes/redstone/mushroom_wood/poisonous_mushroom/poisonous_mushroom_button.json similarity index 100% rename from src/main/resources/data/extendedmushrooms/advancements/recipes/redstone/poisonous_mushroom_button.json rename to src/generated/resources/data/extendedmushrooms/advancements/recipes/redstone/mushroom_wood/poisonous_mushroom/poisonous_mushroom_button.json diff --git a/src/main/resources/data/extendedmushrooms/advancements/recipes/redstone/poisonous_mushroom_door.json b/src/generated/resources/data/extendedmushrooms/advancements/recipes/redstone/mushroom_wood/poisonous_mushroom/poisonous_mushroom_door.json similarity index 100% rename from src/main/resources/data/extendedmushrooms/advancements/recipes/redstone/poisonous_mushroom_door.json rename to src/generated/resources/data/extendedmushrooms/advancements/recipes/redstone/mushroom_wood/poisonous_mushroom/poisonous_mushroom_door.json diff --git a/src/main/resources/data/extendedmushrooms/advancements/recipes/redstone/poisonous_mushroom_fence_gate.json b/src/generated/resources/data/extendedmushrooms/advancements/recipes/redstone/mushroom_wood/poisonous_mushroom/poisonous_mushroom_fence_gate.json similarity index 100% rename from src/main/resources/data/extendedmushrooms/advancements/recipes/redstone/poisonous_mushroom_fence_gate.json rename to src/generated/resources/data/extendedmushrooms/advancements/recipes/redstone/mushroom_wood/poisonous_mushroom/poisonous_mushroom_fence_gate.json diff --git a/src/main/resources/data/extendedmushrooms/advancements/recipes/redstone/poisonous_mushroom_pressure_plate.json b/src/generated/resources/data/extendedmushrooms/advancements/recipes/redstone/mushroom_wood/poisonous_mushroom/poisonous_mushroom_pressure_plate.json similarity index 100% rename from src/main/resources/data/extendedmushrooms/advancements/recipes/redstone/poisonous_mushroom_pressure_plate.json rename to src/generated/resources/data/extendedmushrooms/advancements/recipes/redstone/mushroom_wood/poisonous_mushroom/poisonous_mushroom_pressure_plate.json diff --git a/src/main/resources/data/extendedmushrooms/advancements/recipes/redstone/poisonous_mushroom_trapdoor.json b/src/generated/resources/data/extendedmushrooms/advancements/recipes/redstone/mushroom_wood/poisonous_mushroom/poisonous_mushroom_trapdoor.json similarity index 100% rename from src/main/resources/data/extendedmushrooms/advancements/recipes/redstone/poisonous_mushroom_trapdoor.json rename to src/generated/resources/data/extendedmushrooms/advancements/recipes/redstone/mushroom_wood/poisonous_mushroom/poisonous_mushroom_trapdoor.json diff --git a/src/main/resources/data/extendedmushrooms/advancements/recipes/transportation/mushroom_boat.json b/src/generated/resources/data/extendedmushrooms/advancements/recipes/transportation/mushroom_wood/colorless/mushroom_boat.json similarity index 75% rename from src/main/resources/data/extendedmushrooms/advancements/recipes/transportation/mushroom_boat.json rename to src/generated/resources/data/extendedmushrooms/advancements/recipes/transportation/mushroom_wood/colorless/mushroom_boat.json index 358b0ed6..9a14a274 100644 --- a/src/main/resources/data/extendedmushrooms/advancements/recipes/transportation/mushroom_boat.json +++ b/src/generated/resources/data/extendedmushrooms/advancements/recipes/transportation/mushroom_wood/colorless/mushroom_boat.json @@ -2,7 +2,7 @@ "parent": "minecraft:recipes/root", "rewards": { "recipes": [ - "extendedmushrooms:mushroom_wood/beige/mushroom_boat" + "extendedmushrooms:mushroom_wood/colorless/mushroom_boat" ] }, "criteria": { @@ -15,7 +15,7 @@ "has_the_recipe": { "trigger": "minecraft:recipe_unlocked", "conditions": { - "recipe": "extendedmushrooms:mushroom_wood/beige/mushroom_boat" + "recipe": "extendedmushrooms:mushroom_wood/colorless/mushroom_boat" } } }, diff --git a/src/main/resources/data/extendedmushrooms/advancements/recipes/transportation/glowshroom_boat.json b/src/generated/resources/data/extendedmushrooms/advancements/recipes/transportation/mushroom_wood/glowshroom/glowshroom_boat.json similarity index 100% rename from src/main/resources/data/extendedmushrooms/advancements/recipes/transportation/glowshroom_boat.json rename to src/generated/resources/data/extendedmushrooms/advancements/recipes/transportation/mushroom_wood/glowshroom/glowshroom_boat.json diff --git a/src/main/resources/data/extendedmushrooms/advancements/recipes/transportation/poisonous_mushroom_boat.json b/src/generated/resources/data/extendedmushrooms/advancements/recipes/transportation/mushroom_wood/poisonous_mushroom/poisonous_mushroom_boat.json similarity index 100% rename from src/main/resources/data/extendedmushrooms/advancements/recipes/transportation/poisonous_mushroom_boat.json rename to src/generated/resources/data/extendedmushrooms/advancements/recipes/transportation/mushroom_wood/poisonous_mushroom/poisonous_mushroom_boat.json diff --git a/src/main/resources/data/extendedmushrooms/recipes/misc/brown_dye_from_infested_flower.json b/src/generated/resources/data/extendedmushrooms/recipes/brown_dye_from_infested_flower.json similarity index 100% rename from src/main/resources/data/extendedmushrooms/recipes/misc/brown_dye_from_infested_flower.json rename to src/generated/resources/data/extendedmushrooms/recipes/brown_dye_from_infested_flower.json diff --git a/src/main/resources/data/extendedmushrooms/recipes/misc/glowstone_crumbs.json b/src/generated/resources/data/extendedmushrooms/recipes/glowstone_crumbs.json similarity index 100% rename from src/main/resources/data/extendedmushrooms/recipes/misc/glowstone_crumbs.json rename to src/generated/resources/data/extendedmushrooms/recipes/glowstone_crumbs.json diff --git a/src/main/resources/data/extendedmushrooms/recipes/misc/glowstone_dust.json b/src/generated/resources/data/extendedmushrooms/recipes/glowstone_dust.json similarity index 100% rename from src/main/resources/data/extendedmushrooms/recipes/misc/glowstone_dust.json rename to src/generated/resources/data/extendedmushrooms/recipes/glowstone_dust.json diff --git a/src/main/resources/data/extendedmushrooms/recipes/food/grilled_mushroom.json b/src/generated/resources/data/extendedmushrooms/recipes/grilled_mushroom.json similarity index 80% rename from src/main/resources/data/extendedmushrooms/recipes/food/grilled_mushroom.json rename to src/generated/resources/data/extendedmushrooms/recipes/grilled_mushroom.json index 46f27764..6713e7dd 100644 --- a/src/main/resources/data/extendedmushrooms/recipes/food/grilled_mushroom.json +++ b/src/generated/resources/data/extendedmushrooms/recipes/grilled_mushroom.json @@ -1,7 +1,7 @@ { "type": "minecraft:smelting", "ingredient": { - "tag": "forge:edible_mushrooms" + "tag": "forge:mushrooms/edible" }, "result": "extendedmushrooms:grilled_mushroom", "experience": 0.15, diff --git a/src/main/resources/data/extendedmushrooms/recipes/food/grilled_mushroom_from_campfire_cooking.json b/src/generated/resources/data/extendedmushrooms/recipes/grilled_mushroom_from_campfire_cooking.json similarity index 81% rename from src/main/resources/data/extendedmushrooms/recipes/food/grilled_mushroom_from_campfire_cooking.json rename to src/generated/resources/data/extendedmushrooms/recipes/grilled_mushroom_from_campfire_cooking.json index 64029422..d1972b0d 100644 --- a/src/main/resources/data/extendedmushrooms/recipes/food/grilled_mushroom_from_campfire_cooking.json +++ b/src/generated/resources/data/extendedmushrooms/recipes/grilled_mushroom_from_campfire_cooking.json @@ -1,7 +1,7 @@ { "type": "minecraft:campfire_cooking", "ingredient": { - "tag": "forge:edible_mushrooms" + "tag": "forge:mushrooms/edible" }, "result": "extendedmushrooms:grilled_mushroom", "experience": 0.15, diff --git a/src/main/resources/data/extendedmushrooms/recipes/food/grilled_mushroom_from_smoking.json b/src/generated/resources/data/extendedmushrooms/recipes/grilled_mushroom_from_smoking.json similarity index 80% rename from src/main/resources/data/extendedmushrooms/recipes/food/grilled_mushroom_from_smoking.json rename to src/generated/resources/data/extendedmushrooms/recipes/grilled_mushroom_from_smoking.json index d8f82cfe..cfce6770 100644 --- a/src/main/resources/data/extendedmushrooms/recipes/food/grilled_mushroom_from_smoking.json +++ b/src/generated/resources/data/extendedmushrooms/recipes/grilled_mushroom_from_smoking.json @@ -1,7 +1,7 @@ { "type": "minecraft:smoking", "ingredient": { - "tag": "forge:edible_mushrooms" + "tag": "forge:mushrooms/edible" }, "result": "extendedmushrooms:grilled_mushroom", "experience": 0.15, diff --git a/src/main/resources/data/extendedmushrooms/recipes/food/mushroom_bread.json b/src/generated/resources/data/extendedmushrooms/recipes/mushroom_bread.json similarity index 65% rename from src/main/resources/data/extendedmushrooms/recipes/food/mushroom_bread.json rename to src/generated/resources/data/extendedmushrooms/recipes/mushroom_bread.json index 35de6b11..d4fc518b 100644 --- a/src/main/resources/data/extendedmushrooms/recipes/food/mushroom_bread.json +++ b/src/generated/resources/data/extendedmushrooms/recipes/mushroom_bread.json @@ -1,12 +1,12 @@ { "type": "minecraft:crafting_shaped", + "group": "bread", "pattern": [ - "AAA" + "###" ], "key": { - "A": - { - "tag" : "forge:edible_mushrooms" + "#": { + "tag": "forge:mushrooms/edible" } }, "result": { diff --git a/src/main/resources/data/extendedmushrooms/recipes/mushroom_cap/brown/brown_banner.json b/src/generated/resources/data/extendedmushrooms/recipes/mushroom_cap/brown/brown_banner.json similarity index 73% rename from src/main/resources/data/extendedmushrooms/recipes/mushroom_cap/brown/brown_banner.json rename to src/generated/resources/data/extendedmushrooms/recipes/mushroom_cap/brown/brown_banner.json index 70f28fd5..84550efc 100644 --- a/src/main/resources/data/extendedmushrooms/recipes/mushroom_cap/brown/brown_banner.json +++ b/src/generated/resources/data/extendedmushrooms/recipes/mushroom_cap/brown/brown_banner.json @@ -8,10 +8,10 @@ ], "key": { "#": { - "item": "minecraft:brown_mushroom_block" + "tag": "forge:mushroom_caps/brown" }, "|": { - "item": "minecraft:stick" + "tag": "forge:rods/wooden" } }, "result": { diff --git a/src/main/resources/data/extendedmushrooms/recipes/mushroom_cap/brown/brown_bed.json b/src/generated/resources/data/extendedmushrooms/recipes/mushroom_cap/brown/brown_bed.json similarity index 75% rename from src/main/resources/data/extendedmushrooms/recipes/mushroom_cap/brown/brown_bed.json rename to src/generated/resources/data/extendedmushrooms/recipes/mushroom_cap/brown/brown_bed.json index 65ce65e1..4b5516f2 100644 --- a/src/main/resources/data/extendedmushrooms/recipes/mushroom_cap/brown/brown_bed.json +++ b/src/generated/resources/data/extendedmushrooms/recipes/mushroom_cap/brown/brown_bed.json @@ -3,13 +3,13 @@ "group": "bed", "pattern": [ "###", - "XXX" + "WWW" ], "key": { "#": { - "item": "minecraft:brown_mushroom_block" + "tag": "forge:mushroom_caps/brown" }, - "X": { + "W": { "tag": "minecraft:planks" } }, diff --git a/src/main/resources/data/extendedmushrooms/recipes/mushroom_cap/brown/brown_mushroom_button.json b/src/generated/resources/data/extendedmushrooms/recipes/mushroom_cap/brown/brown_mushroom_button.json similarity index 79% rename from src/main/resources/data/extendedmushrooms/recipes/mushroom_cap/brown/brown_mushroom_button.json rename to src/generated/resources/data/extendedmushrooms/recipes/mushroom_cap/brown/brown_mushroom_button.json index a15d07d3..371c2941 100644 --- a/src/main/resources/data/extendedmushrooms/recipes/mushroom_cap/brown/brown_mushroom_button.json +++ b/src/generated/resources/data/extendedmushrooms/recipes/mushroom_cap/brown/brown_mushroom_button.json @@ -3,7 +3,7 @@ "group": "wool_buttons", "ingredients": [ { - "item": "minecraft:brown_mushroom_block" + "tag": "forge:mushroom_caps/brown" } ], "result": { diff --git a/src/main/resources/data/extendedmushrooms/recipes/mushroom_cap/brown/brown_mushroom_carpet.json b/src/generated/resources/data/extendedmushrooms/recipes/mushroom_cap/brown/brown_mushroom_carpet.json similarity index 81% rename from src/main/resources/data/extendedmushrooms/recipes/mushroom_cap/brown/brown_mushroom_carpet.json rename to src/generated/resources/data/extendedmushrooms/recipes/mushroom_cap/brown/brown_mushroom_carpet.json index 7866f236..e1a4e0e2 100644 --- a/src/main/resources/data/extendedmushrooms/recipes/mushroom_cap/brown/brown_mushroom_carpet.json +++ b/src/generated/resources/data/extendedmushrooms/recipes/mushroom_cap/brown/brown_mushroom_carpet.json @@ -6,7 +6,7 @@ ], "key": { "#": { - "item": "minecraft:brown_mushroom_block" + "tag": "forge:mushroom_caps/brown" } }, "result": { diff --git a/src/main/resources/data/extendedmushrooms/recipes/mushroom_cap/brown/brown_mushroom_pressure_plate.json b/src/generated/resources/data/extendedmushrooms/recipes/mushroom_cap/brown/brown_mushroom_pressure_plate.json similarity index 84% rename from src/main/resources/data/extendedmushrooms/recipes/mushroom_cap/brown/brown_mushroom_pressure_plate.json rename to src/generated/resources/data/extendedmushrooms/recipes/mushroom_cap/brown/brown_mushroom_pressure_plate.json index 3750dac1..4f1897b1 100644 --- a/src/main/resources/data/extendedmushrooms/recipes/mushroom_cap/brown/brown_mushroom_pressure_plate.json +++ b/src/generated/resources/data/extendedmushrooms/recipes/mushroom_cap/brown/brown_mushroom_pressure_plate.json @@ -6,7 +6,7 @@ "tag": "minecraft:wooden_pressure_plates" }, { - "item": "minecraft:brown_mushroom_block" + "tag": "forge:mushroom_caps/brown" } ], "result": { diff --git a/src/main/resources/data/extendedmushrooms/recipes/mushroom_cap/glowshroom/blue_banner.json b/src/generated/resources/data/extendedmushrooms/recipes/mushroom_cap/glowshroom/blue_banner.json similarity index 73% rename from src/main/resources/data/extendedmushrooms/recipes/mushroom_cap/glowshroom/blue_banner.json rename to src/generated/resources/data/extendedmushrooms/recipes/mushroom_cap/glowshroom/blue_banner.json index a410db91..96f84806 100644 --- a/src/main/resources/data/extendedmushrooms/recipes/mushroom_cap/glowshroom/blue_banner.json +++ b/src/generated/resources/data/extendedmushrooms/recipes/mushroom_cap/glowshroom/blue_banner.json @@ -8,10 +8,10 @@ ], "key": { "#": { - "item": "extendedmushrooms:glowshroom_cap" + "tag": "forge:mushroom_caps/glowshroom" }, "|": { - "item": "minecraft:stick" + "tag": "forge:rods/wooden" } }, "result": { diff --git a/src/main/resources/data/extendedmushrooms/recipes/mushroom_cap/glowshroom/blue_bed.json b/src/generated/resources/data/extendedmushrooms/recipes/mushroom_cap/glowshroom/blue_bed.json similarity index 75% rename from src/main/resources/data/extendedmushrooms/recipes/mushroom_cap/glowshroom/blue_bed.json rename to src/generated/resources/data/extendedmushrooms/recipes/mushroom_cap/glowshroom/blue_bed.json index 68ecdc98..c90578fb 100644 --- a/src/main/resources/data/extendedmushrooms/recipes/mushroom_cap/glowshroom/blue_bed.json +++ b/src/generated/resources/data/extendedmushrooms/recipes/mushroom_cap/glowshroom/blue_bed.json @@ -3,13 +3,13 @@ "group": "bed", "pattern": [ "###", - "XXX" + "WWW" ], "key": { "#": { - "item": "extendedmushrooms:glowshroom_cap" + "tag": "forge:mushroom_caps/glowshroom" }, - "X": { + "W": { "tag": "minecraft:planks" } }, diff --git a/src/main/resources/data/extendedmushrooms/recipes/mushroom_cap/glowshroom/glowshroom_cap_button.json b/src/generated/resources/data/extendedmushrooms/recipes/mushroom_cap/glowshroom/glowshroom_cap_button.json similarity index 78% rename from src/main/resources/data/extendedmushrooms/recipes/mushroom_cap/glowshroom/glowshroom_cap_button.json rename to src/generated/resources/data/extendedmushrooms/recipes/mushroom_cap/glowshroom/glowshroom_cap_button.json index f6b7c02a..22ebd9a2 100644 --- a/src/main/resources/data/extendedmushrooms/recipes/mushroom_cap/glowshroom/glowshroom_cap_button.json +++ b/src/generated/resources/data/extendedmushrooms/recipes/mushroom_cap/glowshroom/glowshroom_cap_button.json @@ -3,7 +3,7 @@ "group": "wool_buttons", "ingredients": [ { - "item": "extendedmushrooms:glowshroom_cap" + "tag": "forge:mushroom_caps/glowshroom" } ], "result": { diff --git a/src/main/resources/data/extendedmushrooms/recipes/mushroom_cap/glowshroom/glowshroom_cap_carpet.json b/src/generated/resources/data/extendedmushrooms/recipes/mushroom_cap/glowshroom/glowshroom_cap_carpet.json similarity index 81% rename from src/main/resources/data/extendedmushrooms/recipes/mushroom_cap/glowshroom/glowshroom_cap_carpet.json rename to src/generated/resources/data/extendedmushrooms/recipes/mushroom_cap/glowshroom/glowshroom_cap_carpet.json index 88a2b83a..68d355aa 100644 --- a/src/main/resources/data/extendedmushrooms/recipes/mushroom_cap/glowshroom/glowshroom_cap_carpet.json +++ b/src/generated/resources/data/extendedmushrooms/recipes/mushroom_cap/glowshroom/glowshroom_cap_carpet.json @@ -6,7 +6,7 @@ ], "key": { "#": { - "item": "extendedmushrooms:glowshroom_cap" + "tag": "forge:mushroom_caps/glowshroom" } }, "result": { diff --git a/src/main/resources/data/extendedmushrooms/recipes/mushroom_cap/glowshroom/glowshroom_cap_pressure_plate.json b/src/generated/resources/data/extendedmushrooms/recipes/mushroom_cap/glowshroom/glowshroom_cap_pressure_plate.json similarity index 83% rename from src/main/resources/data/extendedmushrooms/recipes/mushroom_cap/glowshroom/glowshroom_cap_pressure_plate.json rename to src/generated/resources/data/extendedmushrooms/recipes/mushroom_cap/glowshroom/glowshroom_cap_pressure_plate.json index ac18a5a0..9e7df3d8 100644 --- a/src/main/resources/data/extendedmushrooms/recipes/mushroom_cap/glowshroom/glowshroom_cap_pressure_plate.json +++ b/src/generated/resources/data/extendedmushrooms/recipes/mushroom_cap/glowshroom/glowshroom_cap_pressure_plate.json @@ -6,7 +6,7 @@ "tag": "minecraft:wooden_pressure_plates" }, { - "item": "extendedmushrooms:glowshroom_cap" + "tag": "forge:mushroom_caps/glowshroom" } ], "result": { diff --git a/src/main/resources/data/extendedmushrooms/recipes/mushroom_cap/poisonous_mushroom/poisonous_mushroom_cap_button.json b/src/generated/resources/data/extendedmushrooms/recipes/mushroom_cap/poisonous_mushroom/poisonous_mushroom_cap_button.json similarity index 76% rename from src/main/resources/data/extendedmushrooms/recipes/mushroom_cap/poisonous_mushroom/poisonous_mushroom_cap_button.json rename to src/generated/resources/data/extendedmushrooms/recipes/mushroom_cap/poisonous_mushroom/poisonous_mushroom_cap_button.json index 29f955ab..34be2765 100644 --- a/src/main/resources/data/extendedmushrooms/recipes/mushroom_cap/poisonous_mushroom/poisonous_mushroom_cap_button.json +++ b/src/generated/resources/data/extendedmushrooms/recipes/mushroom_cap/poisonous_mushroom/poisonous_mushroom_cap_button.json @@ -3,7 +3,7 @@ "group": "wool_buttons", "ingredients": [ { - "item": "extendedmushrooms:poisonous_mushroom_cap" + "tag": "forge:mushroom_caps/purple" } ], "result": { diff --git a/src/main/resources/data/extendedmushrooms/recipes/mushroom_cap/poisonous_mushroom/poisonous_mushroom_cap_carpet.json b/src/generated/resources/data/extendedmushrooms/recipes/mushroom_cap/poisonous_mushroom/poisonous_mushroom_cap_carpet.json similarity index 79% rename from src/main/resources/data/extendedmushrooms/recipes/mushroom_cap/poisonous_mushroom/poisonous_mushroom_cap_carpet.json rename to src/generated/resources/data/extendedmushrooms/recipes/mushroom_cap/poisonous_mushroom/poisonous_mushroom_cap_carpet.json index 335a121d..63bda439 100644 --- a/src/main/resources/data/extendedmushrooms/recipes/mushroom_cap/poisonous_mushroom/poisonous_mushroom_cap_carpet.json +++ b/src/generated/resources/data/extendedmushrooms/recipes/mushroom_cap/poisonous_mushroom/poisonous_mushroom_cap_carpet.json @@ -6,7 +6,7 @@ ], "key": { "#": { - "item": "extendedmushrooms:poisonous_mushroom_cap" + "tag": "forge:mushroom_caps/purple" } }, "result": { diff --git a/src/main/resources/data/extendedmushrooms/recipes/mushroom_cap/poisonous_mushroom/poisonous_mushroom_cap_pressure_plate.json b/src/generated/resources/data/extendedmushrooms/recipes/mushroom_cap/poisonous_mushroom/poisonous_mushroom_cap_pressure_plate.json similarity index 81% rename from src/main/resources/data/extendedmushrooms/recipes/mushroom_cap/poisonous_mushroom/poisonous_mushroom_cap_pressure_plate.json rename to src/generated/resources/data/extendedmushrooms/recipes/mushroom_cap/poisonous_mushroom/poisonous_mushroom_cap_pressure_plate.json index d72c038c..69c34072 100644 --- a/src/main/resources/data/extendedmushrooms/recipes/mushroom_cap/poisonous_mushroom/poisonous_mushroom_cap_pressure_plate.json +++ b/src/generated/resources/data/extendedmushrooms/recipes/mushroom_cap/poisonous_mushroom/poisonous_mushroom_cap_pressure_plate.json @@ -6,7 +6,7 @@ "tag": "minecraft:wooden_pressure_plates" }, { - "item": "extendedmushrooms:poisonous_mushroom_cap" + "tag": "forge:mushroom_caps/purple" } ], "result": { diff --git a/src/main/resources/data/extendedmushrooms/recipes/mushroom_cap/poisonous_mushroom/purple_banner.json b/src/generated/resources/data/extendedmushrooms/recipes/mushroom_cap/poisonous_mushroom/purple_banner.json similarity index 71% rename from src/main/resources/data/extendedmushrooms/recipes/mushroom_cap/poisonous_mushroom/purple_banner.json rename to src/generated/resources/data/extendedmushrooms/recipes/mushroom_cap/poisonous_mushroom/purple_banner.json index ae43199a..feca9dfa 100644 --- a/src/main/resources/data/extendedmushrooms/recipes/mushroom_cap/poisonous_mushroom/purple_banner.json +++ b/src/generated/resources/data/extendedmushrooms/recipes/mushroom_cap/poisonous_mushroom/purple_banner.json @@ -8,10 +8,10 @@ ], "key": { "#": { - "item": "extendedmushrooms:poisonous_mushroom_cap" + "tag": "forge:mushroom_caps/purple" }, "|": { - "item": "minecraft:stick" + "tag": "forge:rods/wooden" } }, "result": { diff --git a/src/main/resources/data/extendedmushrooms/recipes/mushroom_cap/poisonous_mushroom/purple_bed.json b/src/generated/resources/data/extendedmushrooms/recipes/mushroom_cap/poisonous_mushroom/purple_bed.json similarity index 73% rename from src/main/resources/data/extendedmushrooms/recipes/mushroom_cap/poisonous_mushroom/purple_bed.json rename to src/generated/resources/data/extendedmushrooms/recipes/mushroom_cap/poisonous_mushroom/purple_bed.json index b78c50d3..521c0a9e 100644 --- a/src/main/resources/data/extendedmushrooms/recipes/mushroom_cap/poisonous_mushroom/purple_bed.json +++ b/src/generated/resources/data/extendedmushrooms/recipes/mushroom_cap/poisonous_mushroom/purple_bed.json @@ -3,13 +3,13 @@ "group": "bed", "pattern": [ "###", - "XXX" + "WWW" ], "key": { "#": { - "item": "extendedmushrooms:poisonous_mushroom_cap" + "tag": "forge:mushroom_caps/purple" }, - "X": { + "W": { "tag": "minecraft:planks" } }, diff --git a/src/main/resources/data/extendedmushrooms/recipes/mushroom_cap/red/red_banner.json b/src/generated/resources/data/extendedmushrooms/recipes/mushroom_cap/red/red_banner.json similarity index 73% rename from src/main/resources/data/extendedmushrooms/recipes/mushroom_cap/red/red_banner.json rename to src/generated/resources/data/extendedmushrooms/recipes/mushroom_cap/red/red_banner.json index 7a964d30..fc0ed730 100644 --- a/src/main/resources/data/extendedmushrooms/recipes/mushroom_cap/red/red_banner.json +++ b/src/generated/resources/data/extendedmushrooms/recipes/mushroom_cap/red/red_banner.json @@ -8,10 +8,10 @@ ], "key": { "#": { - "item": "minecraft:red_mushroom_block" + "tag": "forge:mushroom_caps/red" }, "|": { - "item": "minecraft:stick" + "tag": "forge:rods/wooden" } }, "result": { diff --git a/src/main/resources/data/extendedmushrooms/recipes/mushroom_cap/red/red_bed.json b/src/generated/resources/data/extendedmushrooms/recipes/mushroom_cap/red/red_bed.json similarity index 76% rename from src/main/resources/data/extendedmushrooms/recipes/mushroom_cap/red/red_bed.json rename to src/generated/resources/data/extendedmushrooms/recipes/mushroom_cap/red/red_bed.json index 70cb4432..3dec970e 100644 --- a/src/main/resources/data/extendedmushrooms/recipes/mushroom_cap/red/red_bed.json +++ b/src/generated/resources/data/extendedmushrooms/recipes/mushroom_cap/red/red_bed.json @@ -3,13 +3,13 @@ "group": "bed", "pattern": [ "###", - "XXX" + "WWW" ], "key": { "#": { - "item": "minecraft:red_mushroom_block" + "tag": "forge:mushroom_caps/red" }, - "X": { + "W": { "tag": "minecraft:planks" } }, diff --git a/src/main/resources/data/extendedmushrooms/recipes/mushroom_cap/red/red_mushroom_button.json b/src/generated/resources/data/extendedmushrooms/recipes/mushroom_cap/red/red_mushroom_button.json similarity index 79% rename from src/main/resources/data/extendedmushrooms/recipes/mushroom_cap/red/red_mushroom_button.json rename to src/generated/resources/data/extendedmushrooms/recipes/mushroom_cap/red/red_mushroom_button.json index f65f336d..ce15f2ab 100644 --- a/src/main/resources/data/extendedmushrooms/recipes/mushroom_cap/red/red_mushroom_button.json +++ b/src/generated/resources/data/extendedmushrooms/recipes/mushroom_cap/red/red_mushroom_button.json @@ -3,7 +3,7 @@ "group": "wool_buttons", "ingredients": [ { - "item": "minecraft:red_mushroom_block" + "tag": "forge:mushroom_caps/red" } ], "result": { diff --git a/src/main/resources/data/extendedmushrooms/recipes/mushroom_cap/red/red_mushroom_carpet.json b/src/generated/resources/data/extendedmushrooms/recipes/mushroom_cap/red/red_mushroom_carpet.json similarity index 82% rename from src/main/resources/data/extendedmushrooms/recipes/mushroom_cap/red/red_mushroom_carpet.json rename to src/generated/resources/data/extendedmushrooms/recipes/mushroom_cap/red/red_mushroom_carpet.json index 46fa16b9..af3c215c 100644 --- a/src/main/resources/data/extendedmushrooms/recipes/mushroom_cap/red/red_mushroom_carpet.json +++ b/src/generated/resources/data/extendedmushrooms/recipes/mushroom_cap/red/red_mushroom_carpet.json @@ -6,7 +6,7 @@ ], "key": { "#": { - "item": "minecraft:red_mushroom_block" + "tag": "forge:mushroom_caps/red" } }, "result": { diff --git a/src/main/resources/data/extendedmushrooms/recipes/mushroom_cap/red/red_mushroom_pressure_plate.json b/src/generated/resources/data/extendedmushrooms/recipes/mushroom_cap/red/red_mushroom_pressure_plate.json similarity index 84% rename from src/main/resources/data/extendedmushrooms/recipes/mushroom_cap/red/red_mushroom_pressure_plate.json rename to src/generated/resources/data/extendedmushrooms/recipes/mushroom_cap/red/red_mushroom_pressure_plate.json index 7a15b868..3cf60c2a 100644 --- a/src/main/resources/data/extendedmushrooms/recipes/mushroom_cap/red/red_mushroom_pressure_plate.json +++ b/src/generated/resources/data/extendedmushrooms/recipes/mushroom_cap/red/red_mushroom_pressure_plate.json @@ -6,7 +6,7 @@ "tag": "minecraft:wooden_pressure_plates" }, { - "item": "minecraft:red_mushroom_block" + "tag": "forge:mushroom_caps/red" } ], "result": { diff --git a/src/main/resources/data/extendedmushrooms/recipes/misc/mushroom_spores.json b/src/generated/resources/data/extendedmushrooms/recipes/mushroom_spores.json similarity index 100% rename from src/main/resources/data/extendedmushrooms/recipes/misc/mushroom_spores.json rename to src/generated/resources/data/extendedmushrooms/recipes/mushroom_spores.json diff --git a/src/main/resources/data/extendedmushrooms/recipes/mushroom_wood/beige/mushroom_boat.json b/src/generated/resources/data/extendedmushrooms/recipes/mushroom_wood/colorless/mushroom_boat.json similarity index 100% rename from src/main/resources/data/extendedmushrooms/recipes/mushroom_wood/beige/mushroom_boat.json rename to src/generated/resources/data/extendedmushrooms/recipes/mushroom_wood/colorless/mushroom_boat.json diff --git a/src/main/resources/data/extendedmushrooms/recipes/mushroom_wood/beige/mushroom_button.json b/src/generated/resources/data/extendedmushrooms/recipes/mushroom_wood/colorless/mushroom_button.json similarity index 100% rename from src/main/resources/data/extendedmushrooms/recipes/mushroom_wood/beige/mushroom_button.json rename to src/generated/resources/data/extendedmushrooms/recipes/mushroom_wood/colorless/mushroom_button.json diff --git a/src/main/resources/data/extendedmushrooms/recipes/mushroom_wood/beige/mushroom_door.json b/src/generated/resources/data/extendedmushrooms/recipes/mushroom_wood/colorless/mushroom_door.json similarity index 100% rename from src/main/resources/data/extendedmushrooms/recipes/mushroom_wood/beige/mushroom_door.json rename to src/generated/resources/data/extendedmushrooms/recipes/mushroom_wood/colorless/mushroom_door.json diff --git a/src/main/resources/data/extendedmushrooms/recipes/mushroom_wood/beige/mushroom_fence.json b/src/generated/resources/data/extendedmushrooms/recipes/mushroom_wood/colorless/mushroom_fence.json similarity index 89% rename from src/main/resources/data/extendedmushrooms/recipes/mushroom_wood/beige/mushroom_fence.json rename to src/generated/resources/data/extendedmushrooms/recipes/mushroom_wood/colorless/mushroom_fence.json index 1425589b..3a35de6c 100644 --- a/src/main/resources/data/extendedmushrooms/recipes/mushroom_wood/beige/mushroom_fence.json +++ b/src/generated/resources/data/extendedmushrooms/recipes/mushroom_wood/colorless/mushroom_fence.json @@ -7,7 +7,7 @@ ], "key": { "#": { - "item": "minecraft:stick" + "tag": "forge:rods/wooden" }, "W": { "item": "extendedmushrooms:mushroom_planks" diff --git a/src/main/resources/data/extendedmushrooms/recipes/mushroom_wood/beige/mushroom_fence_gate.json b/src/generated/resources/data/extendedmushrooms/recipes/mushroom_wood/colorless/mushroom_fence_gate.json similarity index 89% rename from src/main/resources/data/extendedmushrooms/recipes/mushroom_wood/beige/mushroom_fence_gate.json rename to src/generated/resources/data/extendedmushrooms/recipes/mushroom_wood/colorless/mushroom_fence_gate.json index e6813784..45a4772d 100644 --- a/src/main/resources/data/extendedmushrooms/recipes/mushroom_wood/beige/mushroom_fence_gate.json +++ b/src/generated/resources/data/extendedmushrooms/recipes/mushroom_wood/colorless/mushroom_fence_gate.json @@ -7,7 +7,7 @@ ], "key": { "#": { - "item": "minecraft:stick" + "tag": "forge:rods/wooden" }, "W": { "item": "extendedmushrooms:mushroom_planks" diff --git a/src/main/resources/data/extendedmushrooms/recipes/mushroom_wood/beige/mushroom_planks.json b/src/generated/resources/data/extendedmushrooms/recipes/mushroom_wood/colorless/mushroom_planks.json similarity index 77% rename from src/main/resources/data/extendedmushrooms/recipes/mushroom_wood/beige/mushroom_planks.json rename to src/generated/resources/data/extendedmushrooms/recipes/mushroom_wood/colorless/mushroom_planks.json index 62523a57..0e1ced1c 100644 --- a/src/main/resources/data/extendedmushrooms/recipes/mushroom_wood/beige/mushroom_planks.json +++ b/src/generated/resources/data/extendedmushrooms/recipes/mushroom_wood/colorless/mushroom_planks.json @@ -3,7 +3,7 @@ "group": "planks", "ingredients": [ { - "tag": "extendedmushrooms:mushroom_stems/beige" + "tag": "forge:mushroom_stems/colorless" } ], "result": { diff --git a/src/main/resources/data/extendedmushrooms/recipes/mushroom_wood/beige/mushroom_pressure_plate.json b/src/generated/resources/data/extendedmushrooms/recipes/mushroom_wood/colorless/mushroom_pressure_plate.json similarity index 100% rename from src/main/resources/data/extendedmushrooms/recipes/mushroom_wood/beige/mushroom_pressure_plate.json rename to src/generated/resources/data/extendedmushrooms/recipes/mushroom_wood/colorless/mushroom_pressure_plate.json diff --git a/src/main/resources/data/extendedmushrooms/recipes/mushroom_wood/beige/mushroom_slab.json b/src/generated/resources/data/extendedmushrooms/recipes/mushroom_wood/colorless/mushroom_slab.json similarity index 100% rename from src/main/resources/data/extendedmushrooms/recipes/mushroom_wood/beige/mushroom_slab.json rename to src/generated/resources/data/extendedmushrooms/recipes/mushroom_wood/colorless/mushroom_slab.json diff --git a/src/main/resources/data/extendedmushrooms/recipes/mushroom_wood/beige/mushroom_stairs.json b/src/generated/resources/data/extendedmushrooms/recipes/mushroom_wood/colorless/mushroom_stairs.json similarity index 100% rename from src/main/resources/data/extendedmushrooms/recipes/mushroom_wood/beige/mushroom_stairs.json rename to src/generated/resources/data/extendedmushrooms/recipes/mushroom_wood/colorless/mushroom_stairs.json diff --git a/src/main/resources/data/extendedmushrooms/recipes/mushroom_wood/beige/mushroom_trapdoor.json b/src/generated/resources/data/extendedmushrooms/recipes/mushroom_wood/colorless/mushroom_trapdoor.json similarity index 100% rename from src/main/resources/data/extendedmushrooms/recipes/mushroom_wood/beige/mushroom_trapdoor.json rename to src/generated/resources/data/extendedmushrooms/recipes/mushroom_wood/colorless/mushroom_trapdoor.json diff --git a/src/main/resources/data/extendedmushrooms/recipes/mushroom_wood/glowshroom/glowshroom_boat.json b/src/generated/resources/data/extendedmushrooms/recipes/mushroom_wood/glowshroom/glowshroom_boat.json similarity index 100% rename from src/main/resources/data/extendedmushrooms/recipes/mushroom_wood/glowshroom/glowshroom_boat.json rename to src/generated/resources/data/extendedmushrooms/recipes/mushroom_wood/glowshroom/glowshroom_boat.json diff --git a/src/main/resources/data/extendedmushrooms/recipes/mushroom_wood/glowshroom/glowshroom_button.json b/src/generated/resources/data/extendedmushrooms/recipes/mushroom_wood/glowshroom/glowshroom_button.json similarity index 100% rename from src/main/resources/data/extendedmushrooms/recipes/mushroom_wood/glowshroom/glowshroom_button.json rename to src/generated/resources/data/extendedmushrooms/recipes/mushroom_wood/glowshroom/glowshroom_button.json diff --git a/src/main/resources/data/extendedmushrooms/recipes/mushroom_wood/glowshroom/glowshroom_door.json b/src/generated/resources/data/extendedmushrooms/recipes/mushroom_wood/glowshroom/glowshroom_door.json similarity index 100% rename from src/main/resources/data/extendedmushrooms/recipes/mushroom_wood/glowshroom/glowshroom_door.json rename to src/generated/resources/data/extendedmushrooms/recipes/mushroom_wood/glowshroom/glowshroom_door.json diff --git a/src/main/resources/data/extendedmushrooms/recipes/mushroom_wood/glowshroom/glowshroom_fence.json b/src/generated/resources/data/extendedmushrooms/recipes/mushroom_wood/glowshroom/glowshroom_fence.json similarity index 89% rename from src/main/resources/data/extendedmushrooms/recipes/mushroom_wood/glowshroom/glowshroom_fence.json rename to src/generated/resources/data/extendedmushrooms/recipes/mushroom_wood/glowshroom/glowshroom_fence.json index daa8bb68..97ccc598 100644 --- a/src/main/resources/data/extendedmushrooms/recipes/mushroom_wood/glowshroom/glowshroom_fence.json +++ b/src/generated/resources/data/extendedmushrooms/recipes/mushroom_wood/glowshroom/glowshroom_fence.json @@ -7,7 +7,7 @@ ], "key": { "#": { - "item": "minecraft:stick" + "tag": "forge:rods/wooden" }, "W": { "item": "extendedmushrooms:glowshroom_planks" diff --git a/src/main/resources/data/extendedmushrooms/recipes/mushroom_wood/glowshroom/glowshroom_fence_gate.json b/src/generated/resources/data/extendedmushrooms/recipes/mushroom_wood/glowshroom/glowshroom_fence_gate.json similarity index 89% rename from src/main/resources/data/extendedmushrooms/recipes/mushroom_wood/glowshroom/glowshroom_fence_gate.json rename to src/generated/resources/data/extendedmushrooms/recipes/mushroom_wood/glowshroom/glowshroom_fence_gate.json index f1f455ba..4b43697b 100644 --- a/src/main/resources/data/extendedmushrooms/recipes/mushroom_wood/glowshroom/glowshroom_fence_gate.json +++ b/src/generated/resources/data/extendedmushrooms/recipes/mushroom_wood/glowshroom/glowshroom_fence_gate.json @@ -7,7 +7,7 @@ ], "key": { "#": { - "item": "minecraft:stick" + "tag": "forge:rods/wooden" }, "W": { "item": "extendedmushrooms:glowshroom_planks" diff --git a/src/main/resources/data/extendedmushrooms/recipes/mushroom_wood/glowshroom/glowshroom_planks.json b/src/generated/resources/data/extendedmushrooms/recipes/mushroom_wood/glowshroom/glowshroom_planks.json similarity index 75% rename from src/main/resources/data/extendedmushrooms/recipes/mushroom_wood/glowshroom/glowshroom_planks.json rename to src/generated/resources/data/extendedmushrooms/recipes/mushroom_wood/glowshroom/glowshroom_planks.json index 5a92bfeb..9560377a 100644 --- a/src/main/resources/data/extendedmushrooms/recipes/mushroom_wood/glowshroom/glowshroom_planks.json +++ b/src/generated/resources/data/extendedmushrooms/recipes/mushroom_wood/glowshroom/glowshroom_planks.json @@ -3,7 +3,7 @@ "group": "planks", "ingredients": [ { - "tag": "extendedmushrooms:mushroom_stems/glowshroom" + "tag": "forge:mushroom_stems/glowshroom" } ], "result": { diff --git a/src/main/resources/data/extendedmushrooms/recipes/mushroom_wood/glowshroom/glowshroom_pressure_plate.json b/src/generated/resources/data/extendedmushrooms/recipes/mushroom_wood/glowshroom/glowshroom_pressure_plate.json similarity index 100% rename from src/main/resources/data/extendedmushrooms/recipes/mushroom_wood/glowshroom/glowshroom_pressure_plate.json rename to src/generated/resources/data/extendedmushrooms/recipes/mushroom_wood/glowshroom/glowshroom_pressure_plate.json diff --git a/src/main/resources/data/extendedmushrooms/recipes/mushroom_wood/glowshroom/glowshroom_slab.json b/src/generated/resources/data/extendedmushrooms/recipes/mushroom_wood/glowshroom/glowshroom_slab.json similarity index 100% rename from src/main/resources/data/extendedmushrooms/recipes/mushroom_wood/glowshroom/glowshroom_slab.json rename to src/generated/resources/data/extendedmushrooms/recipes/mushroom_wood/glowshroom/glowshroom_slab.json diff --git a/src/main/resources/data/extendedmushrooms/recipes/mushroom_wood/glowshroom/glowshroom_stairs.json b/src/generated/resources/data/extendedmushrooms/recipes/mushroom_wood/glowshroom/glowshroom_stairs.json similarity index 100% rename from src/main/resources/data/extendedmushrooms/recipes/mushroom_wood/glowshroom/glowshroom_stairs.json rename to src/generated/resources/data/extendedmushrooms/recipes/mushroom_wood/glowshroom/glowshroom_stairs.json diff --git a/src/main/resources/data/extendedmushrooms/recipes/mushroom_wood/glowshroom/glowshroom_trapdoor.json b/src/generated/resources/data/extendedmushrooms/recipes/mushroom_wood/glowshroom/glowshroom_trapdoor.json similarity index 100% rename from src/main/resources/data/extendedmushrooms/recipes/mushroom_wood/glowshroom/glowshroom_trapdoor.json rename to src/generated/resources/data/extendedmushrooms/recipes/mushroom_wood/glowshroom/glowshroom_trapdoor.json diff --git a/src/main/resources/data/extendedmushrooms/recipes/mushroom_wood/poisonous_mushroom/poisonous_mushroom_boat.json b/src/generated/resources/data/extendedmushrooms/recipes/mushroom_wood/poisonous_mushroom/poisonous_mushroom_boat.json similarity index 100% rename from src/main/resources/data/extendedmushrooms/recipes/mushroom_wood/poisonous_mushroom/poisonous_mushroom_boat.json rename to src/generated/resources/data/extendedmushrooms/recipes/mushroom_wood/poisonous_mushroom/poisonous_mushroom_boat.json diff --git a/src/main/resources/data/extendedmushrooms/recipes/mushroom_wood/poisonous_mushroom/poisonous_mushroom_button.json b/src/generated/resources/data/extendedmushrooms/recipes/mushroom_wood/poisonous_mushroom/poisonous_mushroom_button.json similarity index 100% rename from src/main/resources/data/extendedmushrooms/recipes/mushroom_wood/poisonous_mushroom/poisonous_mushroom_button.json rename to src/generated/resources/data/extendedmushrooms/recipes/mushroom_wood/poisonous_mushroom/poisonous_mushroom_button.json diff --git a/src/main/resources/data/extendedmushrooms/recipes/mushroom_wood/poisonous_mushroom/poisonous_mushroom_door.json b/src/generated/resources/data/extendedmushrooms/recipes/mushroom_wood/poisonous_mushroom/poisonous_mushroom_door.json similarity index 100% rename from src/main/resources/data/extendedmushrooms/recipes/mushroom_wood/poisonous_mushroom/poisonous_mushroom_door.json rename to src/generated/resources/data/extendedmushrooms/recipes/mushroom_wood/poisonous_mushroom/poisonous_mushroom_door.json diff --git a/src/main/resources/data/extendedmushrooms/recipes/mushroom_wood/poisonous_mushroom/poisonous_mushroom_fence.json b/src/generated/resources/data/extendedmushrooms/recipes/mushroom_wood/poisonous_mushroom/poisonous_mushroom_fence.json similarity index 90% rename from src/main/resources/data/extendedmushrooms/recipes/mushroom_wood/poisonous_mushroom/poisonous_mushroom_fence.json rename to src/generated/resources/data/extendedmushrooms/recipes/mushroom_wood/poisonous_mushroom/poisonous_mushroom_fence.json index 9d2b812b..0e6bffd2 100644 --- a/src/main/resources/data/extendedmushrooms/recipes/mushroom_wood/poisonous_mushroom/poisonous_mushroom_fence.json +++ b/src/generated/resources/data/extendedmushrooms/recipes/mushroom_wood/poisonous_mushroom/poisonous_mushroom_fence.json @@ -7,7 +7,7 @@ ], "key": { "#": { - "item": "minecraft:stick" + "tag": "forge:rods/wooden" }, "W": { "item": "extendedmushrooms:poisonous_mushroom_planks" diff --git a/src/main/resources/data/extendedmushrooms/recipes/mushroom_wood/poisonous_mushroom/poisonous_mushroom_fence_gate.json b/src/generated/resources/data/extendedmushrooms/recipes/mushroom_wood/poisonous_mushroom/poisonous_mushroom_fence_gate.json similarity index 90% rename from src/main/resources/data/extendedmushrooms/recipes/mushroom_wood/poisonous_mushroom/poisonous_mushroom_fence_gate.json rename to src/generated/resources/data/extendedmushrooms/recipes/mushroom_wood/poisonous_mushroom/poisonous_mushroom_fence_gate.json index 415d9cc2..4011df85 100644 --- a/src/main/resources/data/extendedmushrooms/recipes/mushroom_wood/poisonous_mushroom/poisonous_mushroom_fence_gate.json +++ b/src/generated/resources/data/extendedmushrooms/recipes/mushroom_wood/poisonous_mushroom/poisonous_mushroom_fence_gate.json @@ -7,7 +7,7 @@ ], "key": { "#": { - "item": "minecraft:stick" + "tag": "forge:rods/wooden" }, "W": { "item": "extendedmushrooms:poisonous_mushroom_planks" diff --git a/src/main/resources/data/extendedmushrooms/recipes/mushroom_wood/poisonous_mushroom/poisonous_mushroom_planks.json b/src/generated/resources/data/extendedmushrooms/recipes/mushroom_wood/poisonous_mushroom/poisonous_mushroom_planks.json similarity index 74% rename from src/main/resources/data/extendedmushrooms/recipes/mushroom_wood/poisonous_mushroom/poisonous_mushroom_planks.json rename to src/generated/resources/data/extendedmushrooms/recipes/mushroom_wood/poisonous_mushroom/poisonous_mushroom_planks.json index 21e96715..748b1f14 100644 --- a/src/main/resources/data/extendedmushrooms/recipes/mushroom_wood/poisonous_mushroom/poisonous_mushroom_planks.json +++ b/src/generated/resources/data/extendedmushrooms/recipes/mushroom_wood/poisonous_mushroom/poisonous_mushroom_planks.json @@ -3,7 +3,7 @@ "group": "planks", "ingredients": [ { - "tag": "extendedmushrooms:mushroom_stems/poisonous_mushroom" + "tag": "forge:mushroom_stems/green" } ], "result": { diff --git a/src/main/resources/data/extendedmushrooms/recipes/mushroom_wood/poisonous_mushroom/poisonous_mushroom_pressure_plate.json b/src/generated/resources/data/extendedmushrooms/recipes/mushroom_wood/poisonous_mushroom/poisonous_mushroom_pressure_plate.json similarity index 100% rename from src/main/resources/data/extendedmushrooms/recipes/mushroom_wood/poisonous_mushroom/poisonous_mushroom_pressure_plate.json rename to src/generated/resources/data/extendedmushrooms/recipes/mushroom_wood/poisonous_mushroom/poisonous_mushroom_pressure_plate.json diff --git a/src/main/resources/data/extendedmushrooms/recipes/mushroom_wood/poisonous_mushroom/poisonous_mushroom_slab.json b/src/generated/resources/data/extendedmushrooms/recipes/mushroom_wood/poisonous_mushroom/poisonous_mushroom_slab.json similarity index 100% rename from src/main/resources/data/extendedmushrooms/recipes/mushroom_wood/poisonous_mushroom/poisonous_mushroom_slab.json rename to src/generated/resources/data/extendedmushrooms/recipes/mushroom_wood/poisonous_mushroom/poisonous_mushroom_slab.json diff --git a/src/main/resources/data/extendedmushrooms/recipes/mushroom_wood/poisonous_mushroom/poisonous_mushroom_stairs.json b/src/generated/resources/data/extendedmushrooms/recipes/mushroom_wood/poisonous_mushroom/poisonous_mushroom_stairs.json similarity index 100% rename from src/main/resources/data/extendedmushrooms/recipes/mushroom_wood/poisonous_mushroom/poisonous_mushroom_stairs.json rename to src/generated/resources/data/extendedmushrooms/recipes/mushroom_wood/poisonous_mushroom/poisonous_mushroom_stairs.json diff --git a/src/main/resources/data/extendedmushrooms/recipes/mushroom_wood/poisonous_mushroom/poisonous_mushroom_trapdoor.json b/src/generated/resources/data/extendedmushrooms/recipes/mushroom_wood/poisonous_mushroom/poisonous_mushroom_trapdoor.json similarity index 100% rename from src/main/resources/data/extendedmushrooms/recipes/mushroom_wood/poisonous_mushroom/poisonous_mushroom_trapdoor.json rename to src/generated/resources/data/extendedmushrooms/recipes/mushroom_wood/poisonous_mushroom/poisonous_mushroom_trapdoor.json diff --git a/src/main/resources/data/extendedmushrooms/recipes/mushroom_wood/mushroom_oak_sign.json b/src/generated/resources/data/extendedmushrooms/recipes/oak_sign.json similarity index 81% rename from src/main/resources/data/extendedmushrooms/recipes/mushroom_wood/mushroom_oak_sign.json rename to src/generated/resources/data/extendedmushrooms/recipes/oak_sign.json index e18e3403..054a8087 100644 --- a/src/main/resources/data/extendedmushrooms/recipes/mushroom_wood/mushroom_oak_sign.json +++ b/src/generated/resources/data/extendedmushrooms/recipes/oak_sign.json @@ -3,14 +3,14 @@ "pattern": [ "###", "###", - " X " + " | " ], "key": { "#": { "tag": "extendedmushrooms:mushroom_planks" }, - "X": { - "item": "minecraft:stick" + "|": { + "tag": "forge:rods/wooden" } }, "result": { diff --git a/src/main/resources/data/extendedmushrooms/recipes/food/rabbit_stew_from_edible_mushroom.json b/src/generated/resources/data/extendedmushrooms/recipes/rabbit_stew_from_edible_mushroom.json similarity index 87% rename from src/main/resources/data/extendedmushrooms/recipes/food/rabbit_stew_from_edible_mushroom.json rename to src/generated/resources/data/extendedmushrooms/recipes/rabbit_stew_from_edible_mushroom.json index 2b6424a0..5308964d 100644 --- a/src/main/resources/data/extendedmushrooms/recipes/food/rabbit_stew_from_edible_mushroom.json +++ b/src/generated/resources/data/extendedmushrooms/recipes/rabbit_stew_from_edible_mushroom.json @@ -15,7 +15,7 @@ "item": "minecraft:carrot" }, { - "tag": "extendedmushrooms:edible_mushrooms" + "tag": "extendedmushrooms:mushrooms/edible" } ], "result": { diff --git a/src/main/resources/data/extendedmushrooms/tags/blocks/mushroom_buttons.json b/src/generated/resources/data/extendedmushrooms/tags/blocks/mushroom_buttons.json similarity index 100% rename from src/main/resources/data/extendedmushrooms/tags/blocks/mushroom_buttons.json rename to src/generated/resources/data/extendedmushrooms/tags/blocks/mushroom_buttons.json diff --git a/src/main/resources/data/extendedmushrooms/tags/items/mushroom_buttons/wood.json b/src/generated/resources/data/extendedmushrooms/tags/blocks/mushroom_buttons/wood.json similarity index 100% rename from src/main/resources/data/extendedmushrooms/tags/items/mushroom_buttons/wood.json rename to src/generated/resources/data/extendedmushrooms/tags/blocks/mushroom_buttons/wood.json index 32fa0733..7c611295 100644 --- a/src/main/resources/data/extendedmushrooms/tags/items/mushroom_buttons/wood.json +++ b/src/generated/resources/data/extendedmushrooms/tags/blocks/mushroom_buttons/wood.json @@ -1,8 +1,8 @@ { "replace": false, "values": [ - "extendedmushrooms:mushroom_button", "extendedmushrooms:glowshroom_button", + "extendedmushrooms:mushroom_button", "extendedmushrooms:poisonous_mushroom_button" ] } \ No newline at end of file diff --git a/src/main/resources/data/extendedmushrooms/tags/items/mushroom_buttons/wool.json b/src/generated/resources/data/extendedmushrooms/tags/blocks/mushroom_buttons/wool.json similarity index 57% rename from src/main/resources/data/extendedmushrooms/tags/items/mushroom_buttons/wool.json rename to src/generated/resources/data/extendedmushrooms/tags/blocks/mushroom_buttons/wool.json index 1ef82c9a..3c79bdb9 100644 --- a/src/main/resources/data/extendedmushrooms/tags/items/mushroom_buttons/wool.json +++ b/src/generated/resources/data/extendedmushrooms/tags/blocks/mushroom_buttons/wool.json @@ -2,8 +2,8 @@ "replace": false, "values": [ "extendedmushrooms:brown_mushroom_button", - "extendedmushrooms:red_mushroom_button", "extendedmushrooms:glowshroom_cap_button", - "extendedmushrooms:poisonous_mushroom_cap_button" + "extendedmushrooms:poisonous_mushroom_cap_button", + "extendedmushrooms:red_mushroom_button" ] } \ No newline at end of file diff --git a/src/main/resources/data/extendedmushrooms/tags/items/mushroom_carpets.json b/src/generated/resources/data/extendedmushrooms/tags/blocks/mushroom_carpets.json similarity index 57% rename from src/main/resources/data/extendedmushrooms/tags/items/mushroom_carpets.json rename to src/generated/resources/data/extendedmushrooms/tags/blocks/mushroom_carpets.json index 9c73fc9f..49a9489b 100644 --- a/src/main/resources/data/extendedmushrooms/tags/items/mushroom_carpets.json +++ b/src/generated/resources/data/extendedmushrooms/tags/blocks/mushroom_carpets.json @@ -2,8 +2,8 @@ "replace": false, "values": [ "extendedmushrooms:brown_mushroom_carpet", - "extendedmushrooms:red_mushroom_carpet", "extendedmushrooms:glowshroom_cap_carpet", - "extendedmushrooms:poisonous_mushroom_cap_carpet" + "extendedmushrooms:poisonous_mushroom_cap_carpet", + "extendedmushrooms:red_mushroom_carpet" ] } \ No newline at end of file diff --git a/src/main/resources/data/extendedmushrooms/tags/items/mushroom_doors.json b/src/generated/resources/data/extendedmushrooms/tags/blocks/mushroom_doors.json similarity index 100% rename from src/main/resources/data/extendedmushrooms/tags/items/mushroom_doors.json rename to src/generated/resources/data/extendedmushrooms/tags/blocks/mushroom_doors.json index 934ca79e..a8640600 100644 --- a/src/main/resources/data/extendedmushrooms/tags/items/mushroom_doors.json +++ b/src/generated/resources/data/extendedmushrooms/tags/blocks/mushroom_doors.json @@ -1,8 +1,8 @@ { "replace": false, "values": [ - "extendedmushrooms:mushroom_door", "extendedmushrooms:glowshroom_door", + "extendedmushrooms:mushroom_door", "extendedmushrooms:poisonous_mushroom_door" ] } \ No newline at end of file diff --git a/src/main/resources/data/extendedmushrooms/tags/blocks/mushroom_fences.json b/src/generated/resources/data/extendedmushrooms/tags/blocks/mushroom_fences.json similarity index 100% rename from src/main/resources/data/extendedmushrooms/tags/blocks/mushroom_fences.json rename to src/generated/resources/data/extendedmushrooms/tags/blocks/mushroom_fences.json index 487a444e..48bb6981 100644 --- a/src/main/resources/data/extendedmushrooms/tags/blocks/mushroom_fences.json +++ b/src/generated/resources/data/extendedmushrooms/tags/blocks/mushroom_fences.json @@ -1,8 +1,8 @@ { "replace": false, "values": [ - "extendedmushrooms:mushroom_fence", "extendedmushrooms:glowshroom_fence", + "extendedmushrooms:mushroom_fence", "extendedmushrooms:poisonous_mushroom_fence" ] } \ No newline at end of file diff --git a/src/main/resources/data/extendedmushrooms/tags/blocks/mushroom_growing_blocks.json b/src/generated/resources/data/extendedmushrooms/tags/blocks/mushroom_growing_blocks.json similarity index 100% rename from src/main/resources/data/extendedmushrooms/tags/blocks/mushroom_growing_blocks.json rename to src/generated/resources/data/extendedmushrooms/tags/blocks/mushroom_growing_blocks.json diff --git a/src/main/resources/data/extendedmushrooms/tags/blocks/mushroom_growing_blocks_lightlevel.json b/src/generated/resources/data/extendedmushrooms/tags/blocks/mushroom_growing_blocks_lightlevel.json similarity index 100% rename from src/main/resources/data/extendedmushrooms/tags/blocks/mushroom_growing_blocks_lightlevel.json rename to src/generated/resources/data/extendedmushrooms/tags/blocks/mushroom_growing_blocks_lightlevel.json diff --git a/src/main/resources/data/extendedmushrooms/tags/items/mushroom_planks.json b/src/generated/resources/data/extendedmushrooms/tags/blocks/mushroom_planks.json similarity index 100% rename from src/main/resources/data/extendedmushrooms/tags/items/mushroom_planks.json rename to src/generated/resources/data/extendedmushrooms/tags/blocks/mushroom_planks.json index dd17b7f8..7ad7e577 100644 --- a/src/main/resources/data/extendedmushrooms/tags/items/mushroom_planks.json +++ b/src/generated/resources/data/extendedmushrooms/tags/blocks/mushroom_planks.json @@ -1,8 +1,8 @@ { "replace": false, "values": [ - "extendedmushrooms:mushroom_planks", "extendedmushrooms:glowshroom_planks", + "extendedmushrooms:mushroom_planks", "extendedmushrooms:poisonous_mushroom_planks" ] } \ No newline at end of file diff --git a/src/main/resources/data/extendedmushrooms/tags/blocks/mushroom_pressure_plates.json b/src/generated/resources/data/extendedmushrooms/tags/blocks/mushroom_pressure_plates.json similarity index 100% rename from src/main/resources/data/extendedmushrooms/tags/blocks/mushroom_pressure_plates.json rename to src/generated/resources/data/extendedmushrooms/tags/blocks/mushroom_pressure_plates.json diff --git a/src/main/resources/data/extendedmushrooms/tags/blocks/mushroom_pressure_plates/wood.json b/src/generated/resources/data/extendedmushrooms/tags/blocks/mushroom_pressure_plates/wood.json similarity index 100% rename from src/main/resources/data/extendedmushrooms/tags/blocks/mushroom_pressure_plates/wood.json rename to src/generated/resources/data/extendedmushrooms/tags/blocks/mushroom_pressure_plates/wood.json index 5eb8fb8c..03612636 100644 --- a/src/main/resources/data/extendedmushrooms/tags/blocks/mushroom_pressure_plates/wood.json +++ b/src/generated/resources/data/extendedmushrooms/tags/blocks/mushroom_pressure_plates/wood.json @@ -1,8 +1,8 @@ { "replace": false, "values": [ - "extendedmushrooms:mushroom_pressure_plate", "extendedmushrooms:glowshroom_pressure_plate", + "extendedmushrooms:mushroom_pressure_plate", "extendedmushrooms:poisonous_mushroom_pressure_plate" ] } \ No newline at end of file diff --git a/src/main/resources/data/extendedmushrooms/tags/blocks/mushroom_pressure_plates/wool.json b/src/generated/resources/data/extendedmushrooms/tags/blocks/mushroom_pressure_plates/wool.json similarity index 56% rename from src/main/resources/data/extendedmushrooms/tags/blocks/mushroom_pressure_plates/wool.json rename to src/generated/resources/data/extendedmushrooms/tags/blocks/mushroom_pressure_plates/wool.json index 072daffe..7db37134 100644 --- a/src/main/resources/data/extendedmushrooms/tags/blocks/mushroom_pressure_plates/wool.json +++ b/src/generated/resources/data/extendedmushrooms/tags/blocks/mushroom_pressure_plates/wool.json @@ -2,8 +2,8 @@ "replace": false, "values": [ "extendedmushrooms:brown_mushroom_pressure_plate", - "extendedmushrooms:red_mushroom_pressure_plate", "extendedmushrooms:glowshroom_cap_pressure_plate", - "extendedmushrooms:poisonous_mushroom_cap_pressure_plate" + "extendedmushrooms:poisonous_mushroom_cap_pressure_plate", + "extendedmushrooms:red_mushroom_pressure_plate" ] } \ No newline at end of file diff --git a/src/main/resources/data/extendedmushrooms/tags/items/mushroom_slabs.json b/src/generated/resources/data/extendedmushrooms/tags/blocks/mushroom_slabs.json similarity index 100% rename from src/main/resources/data/extendedmushrooms/tags/items/mushroom_slabs.json rename to src/generated/resources/data/extendedmushrooms/tags/blocks/mushroom_slabs.json index 9323048f..e32c97b0 100644 --- a/src/main/resources/data/extendedmushrooms/tags/items/mushroom_slabs.json +++ b/src/generated/resources/data/extendedmushrooms/tags/blocks/mushroom_slabs.json @@ -1,8 +1,8 @@ { "replace": false, "values": [ - "extendedmushrooms:mushroom_slab", "extendedmushrooms:glowshroom_slab", + "extendedmushrooms:mushroom_slab", "extendedmushrooms:poisonous_mushroom_slab" ] } \ No newline at end of file diff --git a/src/main/resources/data/extendedmushrooms/tags/blocks/mushroom_stairs.json b/src/generated/resources/data/extendedmushrooms/tags/blocks/mushroom_stairs.json similarity index 100% rename from src/main/resources/data/extendedmushrooms/tags/blocks/mushroom_stairs.json rename to src/generated/resources/data/extendedmushrooms/tags/blocks/mushroom_stairs.json index 3ad592bb..28a63600 100644 --- a/src/main/resources/data/extendedmushrooms/tags/blocks/mushroom_stairs.json +++ b/src/generated/resources/data/extendedmushrooms/tags/blocks/mushroom_stairs.json @@ -1,8 +1,8 @@ { "replace": false, "values": [ - "extendedmushrooms:mushroom_stairs", "extendedmushrooms:glowshroom_stairs", + "extendedmushrooms:mushroom_stairs", "extendedmushrooms:poisonous_mushroom_stairs" ] } \ No newline at end of file diff --git a/src/main/resources/data/extendedmushrooms/tags/blocks/mushroom_trapdoors.json b/src/generated/resources/data/extendedmushrooms/tags/blocks/mushroom_trapdoors.json similarity index 100% rename from src/main/resources/data/extendedmushrooms/tags/blocks/mushroom_trapdoors.json rename to src/generated/resources/data/extendedmushrooms/tags/blocks/mushroom_trapdoors.json index 3386a04d..6db6dd1e 100644 --- a/src/main/resources/data/extendedmushrooms/tags/blocks/mushroom_trapdoors.json +++ b/src/generated/resources/data/extendedmushrooms/tags/blocks/mushroom_trapdoors.json @@ -1,8 +1,8 @@ { "replace": false, "values": [ - "extendedmushrooms:mushroom_trapdoor", "extendedmushrooms:glowshroom_trapdoor", + "extendedmushrooms:mushroom_trapdoor", "extendedmushrooms:poisonous_mushroom_trapdoor" ] } \ No newline at end of file diff --git a/src/main/resources/data/extendedmushrooms/tags/blocks/mushroom_valid_blocks.json b/src/generated/resources/data/extendedmushrooms/tags/blocks/mushroom_valid_blocks.json similarity index 100% rename from src/main/resources/data/extendedmushrooms/tags/blocks/mushroom_valid_blocks.json rename to src/generated/resources/data/extendedmushrooms/tags/blocks/mushroom_valid_blocks.json diff --git a/src/main/resources/data/extendedmushrooms/tags/blocks/edible_mushrooms.json b/src/generated/resources/data/extendedmushrooms/tags/blocks/mushrooms/edible.json similarity index 100% rename from src/main/resources/data/extendedmushrooms/tags/blocks/edible_mushrooms.json rename to src/generated/resources/data/extendedmushrooms/tags/blocks/mushrooms/edible.json diff --git a/src/main/resources/data/extendedmushrooms/tags/items/mushroom_boats.json b/src/generated/resources/data/extendedmushrooms/tags/items/mushroom_boats.json similarity index 100% rename from src/main/resources/data/extendedmushrooms/tags/items/mushroom_boats.json rename to src/generated/resources/data/extendedmushrooms/tags/items/mushroom_boats.json index b36ab899..fd6dd220 100644 --- a/src/main/resources/data/extendedmushrooms/tags/items/mushroom_boats.json +++ b/src/generated/resources/data/extendedmushrooms/tags/items/mushroom_boats.json @@ -1,8 +1,8 @@ { "replace": false, "values": [ - "extendedmushrooms:mushroom_boat", "extendedmushrooms:glowshroom_boat", + "extendedmushrooms:mushroom_boat", "extendedmushrooms:poisonous_mushroom_boat" ] } \ No newline at end of file diff --git a/src/main/resources/data/extendedmushrooms/tags/items/mushroom_buttons.json b/src/generated/resources/data/extendedmushrooms/tags/items/mushroom_buttons.json similarity index 100% rename from src/main/resources/data/extendedmushrooms/tags/items/mushroom_buttons.json rename to src/generated/resources/data/extendedmushrooms/tags/items/mushroom_buttons.json diff --git a/src/main/resources/data/extendedmushrooms/tags/blocks/mushroom_buttons/wood.json b/src/generated/resources/data/extendedmushrooms/tags/items/mushroom_buttons/wood.json similarity index 100% rename from src/main/resources/data/extendedmushrooms/tags/blocks/mushroom_buttons/wood.json rename to src/generated/resources/data/extendedmushrooms/tags/items/mushroom_buttons/wood.json index 32fa0733..7c611295 100644 --- a/src/main/resources/data/extendedmushrooms/tags/blocks/mushroom_buttons/wood.json +++ b/src/generated/resources/data/extendedmushrooms/tags/items/mushroom_buttons/wood.json @@ -1,8 +1,8 @@ { "replace": false, "values": [ - "extendedmushrooms:mushroom_button", "extendedmushrooms:glowshroom_button", + "extendedmushrooms:mushroom_button", "extendedmushrooms:poisonous_mushroom_button" ] } \ No newline at end of file diff --git a/src/main/resources/data/extendedmushrooms/tags/blocks/mushroom_buttons/wool.json b/src/generated/resources/data/extendedmushrooms/tags/items/mushroom_buttons/wool.json similarity index 57% rename from src/main/resources/data/extendedmushrooms/tags/blocks/mushroom_buttons/wool.json rename to src/generated/resources/data/extendedmushrooms/tags/items/mushroom_buttons/wool.json index 1ef82c9a..3c79bdb9 100644 --- a/src/main/resources/data/extendedmushrooms/tags/blocks/mushroom_buttons/wool.json +++ b/src/generated/resources/data/extendedmushrooms/tags/items/mushroom_buttons/wool.json @@ -2,8 +2,8 @@ "replace": false, "values": [ "extendedmushrooms:brown_mushroom_button", - "extendedmushrooms:red_mushroom_button", "extendedmushrooms:glowshroom_cap_button", - "extendedmushrooms:poisonous_mushroom_cap_button" + "extendedmushrooms:poisonous_mushroom_cap_button", + "extendedmushrooms:red_mushroom_button" ] } \ No newline at end of file diff --git a/src/main/resources/data/extendedmushrooms/tags/blocks/mushroom_carpets.json b/src/generated/resources/data/extendedmushrooms/tags/items/mushroom_carpets.json similarity index 57% rename from src/main/resources/data/extendedmushrooms/tags/blocks/mushroom_carpets.json rename to src/generated/resources/data/extendedmushrooms/tags/items/mushroom_carpets.json index 9c73fc9f..49a9489b 100644 --- a/src/main/resources/data/extendedmushrooms/tags/blocks/mushroom_carpets.json +++ b/src/generated/resources/data/extendedmushrooms/tags/items/mushroom_carpets.json @@ -2,8 +2,8 @@ "replace": false, "values": [ "extendedmushrooms:brown_mushroom_carpet", - "extendedmushrooms:red_mushroom_carpet", "extendedmushrooms:glowshroom_cap_carpet", - "extendedmushrooms:poisonous_mushroom_cap_carpet" + "extendedmushrooms:poisonous_mushroom_cap_carpet", + "extendedmushrooms:red_mushroom_carpet" ] } \ No newline at end of file diff --git a/src/main/resources/data/extendedmushrooms/tags/blocks/mushroom_doors.json b/src/generated/resources/data/extendedmushrooms/tags/items/mushroom_doors.json similarity index 100% rename from src/main/resources/data/extendedmushrooms/tags/blocks/mushroom_doors.json rename to src/generated/resources/data/extendedmushrooms/tags/items/mushroom_doors.json index 934ca79e..a8640600 100644 --- a/src/main/resources/data/extendedmushrooms/tags/blocks/mushroom_doors.json +++ b/src/generated/resources/data/extendedmushrooms/tags/items/mushroom_doors.json @@ -1,8 +1,8 @@ { "replace": false, "values": [ - "extendedmushrooms:mushroom_door", "extendedmushrooms:glowshroom_door", + "extendedmushrooms:mushroom_door", "extendedmushrooms:poisonous_mushroom_door" ] } \ No newline at end of file diff --git a/src/main/resources/data/extendedmushrooms/tags/items/mushroom_fences.json b/src/generated/resources/data/extendedmushrooms/tags/items/mushroom_fences.json similarity index 100% rename from src/main/resources/data/extendedmushrooms/tags/items/mushroom_fences.json rename to src/generated/resources/data/extendedmushrooms/tags/items/mushroom_fences.json index 487a444e..48bb6981 100644 --- a/src/main/resources/data/extendedmushrooms/tags/items/mushroom_fences.json +++ b/src/generated/resources/data/extendedmushrooms/tags/items/mushroom_fences.json @@ -1,8 +1,8 @@ { "replace": false, "values": [ - "extendedmushrooms:mushroom_fence", "extendedmushrooms:glowshroom_fence", + "extendedmushrooms:mushroom_fence", "extendedmushrooms:poisonous_mushroom_fence" ] } \ No newline at end of file diff --git a/src/main/resources/data/extendedmushrooms/tags/blocks/mushroom_planks.json b/src/generated/resources/data/extendedmushrooms/tags/items/mushroom_planks.json similarity index 100% rename from src/main/resources/data/extendedmushrooms/tags/blocks/mushroom_planks.json rename to src/generated/resources/data/extendedmushrooms/tags/items/mushroom_planks.json index dd17b7f8..7ad7e577 100644 --- a/src/main/resources/data/extendedmushrooms/tags/blocks/mushroom_planks.json +++ b/src/generated/resources/data/extendedmushrooms/tags/items/mushroom_planks.json @@ -1,8 +1,8 @@ { "replace": false, "values": [ - "extendedmushrooms:mushroom_planks", "extendedmushrooms:glowshroom_planks", + "extendedmushrooms:mushroom_planks", "extendedmushrooms:poisonous_mushroom_planks" ] } \ No newline at end of file diff --git a/src/main/resources/data/extendedmushrooms/tags/items/mushroom_pressure_plates.json b/src/generated/resources/data/extendedmushrooms/tags/items/mushroom_pressure_plates.json similarity index 100% rename from src/main/resources/data/extendedmushrooms/tags/items/mushroom_pressure_plates.json rename to src/generated/resources/data/extendedmushrooms/tags/items/mushroom_pressure_plates.json diff --git a/src/main/resources/data/extendedmushrooms/tags/items/mushroom_pressure_plates/wood.json b/src/generated/resources/data/extendedmushrooms/tags/items/mushroom_pressure_plates/wood.json similarity index 100% rename from src/main/resources/data/extendedmushrooms/tags/items/mushroom_pressure_plates/wood.json rename to src/generated/resources/data/extendedmushrooms/tags/items/mushroom_pressure_plates/wood.json index 5eb8fb8c..03612636 100644 --- a/src/main/resources/data/extendedmushrooms/tags/items/mushroom_pressure_plates/wood.json +++ b/src/generated/resources/data/extendedmushrooms/tags/items/mushroom_pressure_plates/wood.json @@ -1,8 +1,8 @@ { "replace": false, "values": [ - "extendedmushrooms:mushroom_pressure_plate", "extendedmushrooms:glowshroom_pressure_plate", + "extendedmushrooms:mushroom_pressure_plate", "extendedmushrooms:poisonous_mushroom_pressure_plate" ] } \ No newline at end of file diff --git a/src/main/resources/data/extendedmushrooms/tags/items/mushroom_pressure_plates/wool.json b/src/generated/resources/data/extendedmushrooms/tags/items/mushroom_pressure_plates/wool.json similarity index 56% rename from src/main/resources/data/extendedmushrooms/tags/items/mushroom_pressure_plates/wool.json rename to src/generated/resources/data/extendedmushrooms/tags/items/mushroom_pressure_plates/wool.json index 072daffe..7db37134 100644 --- a/src/main/resources/data/extendedmushrooms/tags/items/mushroom_pressure_plates/wool.json +++ b/src/generated/resources/data/extendedmushrooms/tags/items/mushroom_pressure_plates/wool.json @@ -2,8 +2,8 @@ "replace": false, "values": [ "extendedmushrooms:brown_mushroom_pressure_plate", - "extendedmushrooms:red_mushroom_pressure_plate", "extendedmushrooms:glowshroom_cap_pressure_plate", - "extendedmushrooms:poisonous_mushroom_cap_pressure_plate" + "extendedmushrooms:poisonous_mushroom_cap_pressure_plate", + "extendedmushrooms:red_mushroom_pressure_plate" ] } \ No newline at end of file diff --git a/src/main/resources/data/extendedmushrooms/tags/blocks/mushroom_slabs.json b/src/generated/resources/data/extendedmushrooms/tags/items/mushroom_slabs.json similarity index 100% rename from src/main/resources/data/extendedmushrooms/tags/blocks/mushroom_slabs.json rename to src/generated/resources/data/extendedmushrooms/tags/items/mushroom_slabs.json index 9323048f..e32c97b0 100644 --- a/src/main/resources/data/extendedmushrooms/tags/blocks/mushroom_slabs.json +++ b/src/generated/resources/data/extendedmushrooms/tags/items/mushroom_slabs.json @@ -1,8 +1,8 @@ { "replace": false, "values": [ - "extendedmushrooms:mushroom_slab", "extendedmushrooms:glowshroom_slab", + "extendedmushrooms:mushroom_slab", "extendedmushrooms:poisonous_mushroom_slab" ] } \ No newline at end of file diff --git a/src/main/resources/data/extendedmushrooms/tags/items/mushroom_stairs.json b/src/generated/resources/data/extendedmushrooms/tags/items/mushroom_stairs.json similarity index 100% rename from src/main/resources/data/extendedmushrooms/tags/items/mushroom_stairs.json rename to src/generated/resources/data/extendedmushrooms/tags/items/mushroom_stairs.json index 3ad592bb..28a63600 100644 --- a/src/main/resources/data/extendedmushrooms/tags/items/mushroom_stairs.json +++ b/src/generated/resources/data/extendedmushrooms/tags/items/mushroom_stairs.json @@ -1,8 +1,8 @@ { "replace": false, "values": [ - "extendedmushrooms:mushroom_stairs", "extendedmushrooms:glowshroom_stairs", + "extendedmushrooms:mushroom_stairs", "extendedmushrooms:poisonous_mushroom_stairs" ] } \ No newline at end of file diff --git a/src/main/resources/data/extendedmushrooms/tags/items/mushroom_trapdoors.json b/src/generated/resources/data/extendedmushrooms/tags/items/mushroom_trapdoors.json similarity index 100% rename from src/main/resources/data/extendedmushrooms/tags/items/mushroom_trapdoors.json rename to src/generated/resources/data/extendedmushrooms/tags/items/mushroom_trapdoors.json index 3386a04d..6db6dd1e 100644 --- a/src/main/resources/data/extendedmushrooms/tags/items/mushroom_trapdoors.json +++ b/src/generated/resources/data/extendedmushrooms/tags/items/mushroom_trapdoors.json @@ -1,8 +1,8 @@ { "replace": false, "values": [ - "extendedmushrooms:mushroom_trapdoor", "extendedmushrooms:glowshroom_trapdoor", + "extendedmushrooms:mushroom_trapdoor", "extendedmushrooms:poisonous_mushroom_trapdoor" ] } \ No newline at end of file diff --git a/src/main/resources/data/extendedmushrooms/tags/items/edible_mushrooms.json b/src/generated/resources/data/extendedmushrooms/tags/items/mushrooms/edible.json similarity index 100% rename from src/main/resources/data/extendedmushrooms/tags/items/edible_mushrooms.json rename to src/generated/resources/data/extendedmushrooms/tags/items/mushrooms/edible.json diff --git a/src/generated/resources/data/forge/tags/blocks/mushroom_caps.json b/src/generated/resources/data/forge/tags/blocks/mushroom_caps.json new file mode 100644 index 00000000..2d79882d --- /dev/null +++ b/src/generated/resources/data/forge/tags/blocks/mushroom_caps.json @@ -0,0 +1,9 @@ +{ + "replace": false, + "values": [ + "#forge:mushroom_caps/brown", + "#forge:mushroom_caps/red", + "#forge:mushroom_caps/glowshroom", + "#forge:mushroom_caps/purple" + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/forge/tags/blocks/mushroom_caps/brown.json b/src/generated/resources/data/forge/tags/blocks/mushroom_caps/brown.json new file mode 100644 index 00000000..1e74a01f --- /dev/null +++ b/src/generated/resources/data/forge/tags/blocks/mushroom_caps/brown.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "minecraft:brown_mushroom_block" + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/forge/tags/blocks/mushroom_caps/glowshroom.json b/src/generated/resources/data/forge/tags/blocks/mushroom_caps/glowshroom.json new file mode 100644 index 00000000..6833b1ba --- /dev/null +++ b/src/generated/resources/data/forge/tags/blocks/mushroom_caps/glowshroom.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "extendedmushrooms:glowshroom_cap" + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/forge/tags/blocks/mushroom_caps/purple.json b/src/generated/resources/data/forge/tags/blocks/mushroom_caps/purple.json new file mode 100644 index 00000000..49bd44b8 --- /dev/null +++ b/src/generated/resources/data/forge/tags/blocks/mushroom_caps/purple.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "extendedmushrooms:poisonous_mushroom_cap" + ] +} \ No newline at end of file diff --git a/src/main/resources/data/forge/tags/items/mushrooms.json b/src/generated/resources/data/forge/tags/blocks/mushroom_caps/red.json similarity index 53% rename from src/main/resources/data/forge/tags/items/mushrooms.json rename to src/generated/resources/data/forge/tags/blocks/mushroom_caps/red.json index 5ce49fbf..f15c091e 100644 --- a/src/main/resources/data/forge/tags/items/mushrooms.json +++ b/src/generated/resources/data/forge/tags/blocks/mushroom_caps/red.json @@ -1,6 +1,6 @@ { "replace": false, "values": [ - "#extendedmushrooms:mushrooms" + "minecraft:red_mushroom_block" ] } \ No newline at end of file diff --git a/src/generated/resources/data/forge/tags/blocks/mushroom_stems.json b/src/generated/resources/data/forge/tags/blocks/mushroom_stems.json new file mode 100644 index 00000000..ddfbfe2d --- /dev/null +++ b/src/generated/resources/data/forge/tags/blocks/mushroom_stems.json @@ -0,0 +1,8 @@ +{ + "replace": false, + "values": [ + "#forge:mushroom_stems/colorless", + "#forge:mushroom_stems/glowshroom", + "#forge:mushroom_stems/green" + ] +} \ No newline at end of file diff --git a/src/main/resources/data/extendedmushrooms/tags/blocks/mushroom_stems/beige.json b/src/generated/resources/data/forge/tags/blocks/mushroom_stems/colorless.json similarity index 100% rename from src/main/resources/data/extendedmushrooms/tags/blocks/mushroom_stems/beige.json rename to src/generated/resources/data/forge/tags/blocks/mushroom_stems/colorless.json diff --git a/src/main/resources/data/extendedmushrooms/tags/blocks/mushroom_stems/glowshroom.json b/src/generated/resources/data/forge/tags/blocks/mushroom_stems/glowshroom.json similarity index 100% rename from src/main/resources/data/extendedmushrooms/tags/blocks/mushroom_stems/glowshroom.json rename to src/generated/resources/data/forge/tags/blocks/mushroom_stems/glowshroom.json diff --git a/src/main/resources/data/extendedmushrooms/tags/blocks/mushroom_stems/poisonous_mushroom.json b/src/generated/resources/data/forge/tags/blocks/mushroom_stems/green.json similarity index 100% rename from src/main/resources/data/extendedmushrooms/tags/blocks/mushroom_stems/poisonous_mushroom.json rename to src/generated/resources/data/forge/tags/blocks/mushroom_stems/green.json diff --git a/src/generated/resources/data/forge/tags/blocks/mushrooms.json b/src/generated/resources/data/forge/tags/blocks/mushrooms.json new file mode 100644 index 00000000..8f61ffbe --- /dev/null +++ b/src/generated/resources/data/forge/tags/blocks/mushrooms.json @@ -0,0 +1,9 @@ +{ + "replace": false, + "values": [ + "#forge:mushrooms/brown", + "#forge:mushrooms/red", + "#forge:mushrooms/blue", + "#forge:mushrooms/purple" + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/forge/tags/blocks/mushrooms/blue.json b/src/generated/resources/data/forge/tags/blocks/mushrooms/blue.json new file mode 100644 index 00000000..e7c92e6e --- /dev/null +++ b/src/generated/resources/data/forge/tags/blocks/mushrooms/blue.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "extendedmushrooms:glowshroom" + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/forge/tags/blocks/mushrooms/brown.json b/src/generated/resources/data/forge/tags/blocks/mushrooms/brown.json new file mode 100644 index 00000000..cc3e566e --- /dev/null +++ b/src/generated/resources/data/forge/tags/blocks/mushrooms/brown.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "minecraft:brown_mushroom" + ] +} \ No newline at end of file diff --git a/src/main/resources/data/forge/tags/blocks/mushrooms.json b/src/generated/resources/data/forge/tags/blocks/mushrooms/edible.json similarity index 71% rename from src/main/resources/data/forge/tags/blocks/mushrooms.json rename to src/generated/resources/data/forge/tags/blocks/mushrooms/edible.json index 179d37b1..d2d85bb6 100644 --- a/src/main/resources/data/forge/tags/blocks/mushrooms.json +++ b/src/generated/resources/data/forge/tags/blocks/mushrooms/edible.json @@ -3,6 +3,6 @@ "values": [ "minecraft:brown_mushroom", "minecraft:red_mushroom", - "#extendedmushrooms:mushrooms" + "#extendedmushrooms:mushrooms/edible" ] } \ No newline at end of file diff --git a/src/main/resources/data/extendedmushrooms/tags/blocks/poisonous_mushrooms.json b/src/generated/resources/data/forge/tags/blocks/mushrooms/poisonous.json similarity index 100% rename from src/main/resources/data/extendedmushrooms/tags/blocks/poisonous_mushrooms.json rename to src/generated/resources/data/forge/tags/blocks/mushrooms/poisonous.json diff --git a/src/main/resources/data/extendedmushrooms/tags/items/poisonous_mushrooms.json b/src/generated/resources/data/forge/tags/blocks/mushrooms/purple.json similarity index 100% rename from src/main/resources/data/extendedmushrooms/tags/items/poisonous_mushrooms.json rename to src/generated/resources/data/forge/tags/blocks/mushrooms/purple.json diff --git a/src/generated/resources/data/forge/tags/blocks/mushrooms/red.json b/src/generated/resources/data/forge/tags/blocks/mushrooms/red.json new file mode 100644 index 00000000..cc132161 --- /dev/null +++ b/src/generated/resources/data/forge/tags/blocks/mushrooms/red.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "minecraft:red_mushroom" + ] +} \ No newline at end of file diff --git a/src/main/resources/data/forge/tags/items/bread.json b/src/generated/resources/data/forge/tags/items/bread.json similarity index 100% rename from src/main/resources/data/forge/tags/items/bread.json rename to src/generated/resources/data/forge/tags/items/bread.json diff --git a/src/generated/resources/data/forge/tags/items/mushroom_caps.json b/src/generated/resources/data/forge/tags/items/mushroom_caps.json new file mode 100644 index 00000000..2d79882d --- /dev/null +++ b/src/generated/resources/data/forge/tags/items/mushroom_caps.json @@ -0,0 +1,9 @@ +{ + "replace": false, + "values": [ + "#forge:mushroom_caps/brown", + "#forge:mushroom_caps/red", + "#forge:mushroom_caps/glowshroom", + "#forge:mushroom_caps/purple" + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/forge/tags/items/mushroom_caps/brown.json b/src/generated/resources/data/forge/tags/items/mushroom_caps/brown.json new file mode 100644 index 00000000..1e74a01f --- /dev/null +++ b/src/generated/resources/data/forge/tags/items/mushroom_caps/brown.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "minecraft:brown_mushroom_block" + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/forge/tags/items/mushroom_caps/glowshroom.json b/src/generated/resources/data/forge/tags/items/mushroom_caps/glowshroom.json new file mode 100644 index 00000000..6833b1ba --- /dev/null +++ b/src/generated/resources/data/forge/tags/items/mushroom_caps/glowshroom.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "extendedmushrooms:glowshroom_cap" + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/forge/tags/items/mushroom_caps/purple.json b/src/generated/resources/data/forge/tags/items/mushroom_caps/purple.json new file mode 100644 index 00000000..49bd44b8 --- /dev/null +++ b/src/generated/resources/data/forge/tags/items/mushroom_caps/purple.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "extendedmushrooms:poisonous_mushroom_cap" + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/forge/tags/items/mushroom_caps/red.json b/src/generated/resources/data/forge/tags/items/mushroom_caps/red.json new file mode 100644 index 00000000..f15c091e --- /dev/null +++ b/src/generated/resources/data/forge/tags/items/mushroom_caps/red.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "minecraft:red_mushroom_block" + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/forge/tags/items/mushroom_stems.json b/src/generated/resources/data/forge/tags/items/mushroom_stems.json new file mode 100644 index 00000000..ddfbfe2d --- /dev/null +++ b/src/generated/resources/data/forge/tags/items/mushroom_stems.json @@ -0,0 +1,8 @@ +{ + "replace": false, + "values": [ + "#forge:mushroom_stems/colorless", + "#forge:mushroom_stems/glowshroom", + "#forge:mushroom_stems/green" + ] +} \ No newline at end of file diff --git a/src/main/resources/data/extendedmushrooms/tags/items/mushroom_stems/beige.json b/src/generated/resources/data/forge/tags/items/mushroom_stems/colorless.json similarity index 100% rename from src/main/resources/data/extendedmushrooms/tags/items/mushroom_stems/beige.json rename to src/generated/resources/data/forge/tags/items/mushroom_stems/colorless.json diff --git a/src/main/resources/data/extendedmushrooms/tags/items/mushroom_stems/glowshroom.json b/src/generated/resources/data/forge/tags/items/mushroom_stems/glowshroom.json similarity index 100% rename from src/main/resources/data/extendedmushrooms/tags/items/mushroom_stems/glowshroom.json rename to src/generated/resources/data/forge/tags/items/mushroom_stems/glowshroom.json diff --git a/src/main/resources/data/extendedmushrooms/tags/items/mushroom_stems/poisonous_mushroom.json b/src/generated/resources/data/forge/tags/items/mushroom_stems/green.json similarity index 100% rename from src/main/resources/data/extendedmushrooms/tags/items/mushroom_stems/poisonous_mushroom.json rename to src/generated/resources/data/forge/tags/items/mushroom_stems/green.json diff --git a/src/generated/resources/data/forge/tags/items/mushrooms.json b/src/generated/resources/data/forge/tags/items/mushrooms.json new file mode 100644 index 00000000..8f61ffbe --- /dev/null +++ b/src/generated/resources/data/forge/tags/items/mushrooms.json @@ -0,0 +1,9 @@ +{ + "replace": false, + "values": [ + "#forge:mushrooms/brown", + "#forge:mushrooms/red", + "#forge:mushrooms/blue", + "#forge:mushrooms/purple" + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/forge/tags/items/mushrooms/blue.json b/src/generated/resources/data/forge/tags/items/mushrooms/blue.json new file mode 100644 index 00000000..e7c92e6e --- /dev/null +++ b/src/generated/resources/data/forge/tags/items/mushrooms/blue.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "extendedmushrooms:glowshroom" + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/forge/tags/items/mushrooms/brown.json b/src/generated/resources/data/forge/tags/items/mushrooms/brown.json new file mode 100644 index 00000000..cc3e566e --- /dev/null +++ b/src/generated/resources/data/forge/tags/items/mushrooms/brown.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "minecraft:brown_mushroom" + ] +} \ No newline at end of file diff --git a/src/main/resources/data/forge/tags/items/edible_mushrooms.json b/src/generated/resources/data/forge/tags/items/mushrooms/edible.json similarity index 71% rename from src/main/resources/data/forge/tags/items/edible_mushrooms.json rename to src/generated/resources/data/forge/tags/items/mushrooms/edible.json index 15fbcf14..d2d85bb6 100644 --- a/src/main/resources/data/forge/tags/items/edible_mushrooms.json +++ b/src/generated/resources/data/forge/tags/items/mushrooms/edible.json @@ -3,6 +3,6 @@ "values": [ "minecraft:brown_mushroom", "minecraft:red_mushroom", - "#extendedmushrooms:edible_mushrooms" + "#extendedmushrooms:mushrooms/edible" ] } \ No newline at end of file diff --git a/src/main/resources/data/extendedmushrooms/tags/items/arrow_mushrooms.json b/src/generated/resources/data/forge/tags/items/mushrooms/poisonous.json similarity index 70% rename from src/main/resources/data/extendedmushrooms/tags/items/arrow_mushrooms.json rename to src/generated/resources/data/forge/tags/items/mushrooms/poisonous.json index 5a162ed9..a9bb4304 100644 --- a/src/main/resources/data/extendedmushrooms/tags/items/arrow_mushrooms.json +++ b/src/generated/resources/data/forge/tags/items/mushrooms/poisonous.json @@ -1,7 +1,6 @@ { "replace": false, "values": [ - "extendedmushrooms:glowshroom", "extendedmushrooms:poisonous_mushroom" ] } \ No newline at end of file diff --git a/src/generated/resources/data/forge/tags/items/mushrooms/purple.json b/src/generated/resources/data/forge/tags/items/mushrooms/purple.json new file mode 100644 index 00000000..a9bb4304 --- /dev/null +++ b/src/generated/resources/data/forge/tags/items/mushrooms/purple.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "extendedmushrooms:poisonous_mushroom" + ] +} \ No newline at end of file diff --git a/src/generated/resources/data/forge/tags/items/mushrooms/red.json b/src/generated/resources/data/forge/tags/items/mushrooms/red.json new file mode 100644 index 00000000..cc132161 --- /dev/null +++ b/src/generated/resources/data/forge/tags/items/mushrooms/red.json @@ -0,0 +1,6 @@ +{ + "replace": false, + "values": [ + "minecraft:red_mushroom" + ] +} \ No newline at end of file diff --git a/src/main/resources/data/forge/tags/items/shears.json b/src/generated/resources/data/forge/tags/items/shears.json similarity index 100% rename from src/main/resources/data/forge/tags/items/shears.json rename to src/generated/resources/data/forge/tags/items/shears.json diff --git a/src/main/resources/data/minecraft/tags/blocks/buttons.json b/src/generated/resources/data/minecraft/tags/blocks/buttons.json similarity index 100% rename from src/main/resources/data/minecraft/tags/blocks/buttons.json rename to src/generated/resources/data/minecraft/tags/blocks/buttons.json diff --git a/src/main/resources/data/minecraft/tags/blocks/carpets.json b/src/generated/resources/data/minecraft/tags/blocks/carpets.json similarity index 100% rename from src/main/resources/data/minecraft/tags/blocks/carpets.json rename to src/generated/resources/data/minecraft/tags/blocks/carpets.json diff --git a/src/main/resources/data/minecraft/tags/blocks/doors.json b/src/generated/resources/data/minecraft/tags/blocks/doors.json similarity index 100% rename from src/main/resources/data/minecraft/tags/blocks/doors.json rename to src/generated/resources/data/minecraft/tags/blocks/doors.json diff --git a/src/main/resources/data/minecraft/tags/blocks/fences.json b/src/generated/resources/data/minecraft/tags/blocks/fences.json similarity index 100% rename from src/main/resources/data/minecraft/tags/blocks/fences.json rename to src/generated/resources/data/minecraft/tags/blocks/fences.json diff --git a/src/main/resources/data/minecraft/tags/blocks/logs.json b/src/generated/resources/data/minecraft/tags/blocks/logs.json similarity index 100% rename from src/main/resources/data/minecraft/tags/blocks/logs.json rename to src/generated/resources/data/minecraft/tags/blocks/logs.json diff --git a/src/main/resources/data/minecraft/tags/blocks/planks.json b/src/generated/resources/data/minecraft/tags/blocks/planks.json similarity index 100% rename from src/main/resources/data/minecraft/tags/blocks/planks.json rename to src/generated/resources/data/minecraft/tags/blocks/planks.json diff --git a/src/main/resources/data/minecraft/tags/blocks/slabs.json b/src/generated/resources/data/minecraft/tags/blocks/slabs.json similarity index 100% rename from src/main/resources/data/minecraft/tags/blocks/slabs.json rename to src/generated/resources/data/minecraft/tags/blocks/slabs.json diff --git a/src/main/resources/data/extendedmushrooms/tags/blocks/infested_flowers.json b/src/generated/resources/data/minecraft/tags/blocks/small_flowers.json similarity index 100% rename from src/main/resources/data/extendedmushrooms/tags/blocks/infested_flowers.json rename to src/generated/resources/data/minecraft/tags/blocks/small_flowers.json diff --git a/src/main/resources/data/minecraft/tags/blocks/stairs.json b/src/generated/resources/data/minecraft/tags/blocks/stairs.json similarity index 100% rename from src/main/resources/data/minecraft/tags/blocks/stairs.json rename to src/generated/resources/data/minecraft/tags/blocks/stairs.json diff --git a/src/main/resources/data/minecraft/tags/blocks/trapdoors.json b/src/generated/resources/data/minecraft/tags/blocks/trapdoors.json similarity index 100% rename from src/main/resources/data/minecraft/tags/blocks/trapdoors.json rename to src/generated/resources/data/minecraft/tags/blocks/trapdoors.json diff --git a/src/main/resources/data/minecraft/tags/blocks/wooden_buttons.json b/src/generated/resources/data/minecraft/tags/blocks/wooden_buttons.json similarity index 100% rename from src/main/resources/data/minecraft/tags/blocks/wooden_buttons.json rename to src/generated/resources/data/minecraft/tags/blocks/wooden_buttons.json diff --git a/src/main/resources/data/minecraft/tags/blocks/wooden_doors.json b/src/generated/resources/data/minecraft/tags/blocks/wooden_doors.json similarity index 100% rename from src/main/resources/data/minecraft/tags/blocks/wooden_doors.json rename to src/generated/resources/data/minecraft/tags/blocks/wooden_doors.json diff --git a/src/main/resources/data/minecraft/tags/blocks/wooden_fences.json b/src/generated/resources/data/minecraft/tags/blocks/wooden_fences.json similarity index 100% rename from src/main/resources/data/minecraft/tags/blocks/wooden_fences.json rename to src/generated/resources/data/minecraft/tags/blocks/wooden_fences.json diff --git a/src/main/resources/data/minecraft/tags/blocks/wooden_pressure_plates.json b/src/generated/resources/data/minecraft/tags/blocks/wooden_pressure_plates.json similarity index 100% rename from src/main/resources/data/minecraft/tags/blocks/wooden_pressure_plates.json rename to src/generated/resources/data/minecraft/tags/blocks/wooden_pressure_plates.json diff --git a/src/main/resources/data/minecraft/tags/blocks/wooden_slabs.json b/src/generated/resources/data/minecraft/tags/blocks/wooden_slabs.json similarity index 100% rename from src/main/resources/data/minecraft/tags/blocks/wooden_slabs.json rename to src/generated/resources/data/minecraft/tags/blocks/wooden_slabs.json diff --git a/src/main/resources/data/minecraft/tags/blocks/wooden_stairs.json b/src/generated/resources/data/minecraft/tags/blocks/wooden_stairs.json similarity index 100% rename from src/main/resources/data/minecraft/tags/blocks/wooden_stairs.json rename to src/generated/resources/data/minecraft/tags/blocks/wooden_stairs.json diff --git a/src/main/resources/data/minecraft/tags/blocks/wooden_trapdoors.json b/src/generated/resources/data/minecraft/tags/blocks/wooden_trapdoors.json similarity index 100% rename from src/main/resources/data/minecraft/tags/blocks/wooden_trapdoors.json rename to src/generated/resources/data/minecraft/tags/blocks/wooden_trapdoors.json diff --git a/src/main/resources/data/minecraft/tags/blocks/wool.json b/src/generated/resources/data/minecraft/tags/blocks/wool.json similarity index 100% rename from src/main/resources/data/minecraft/tags/blocks/wool.json rename to src/generated/resources/data/minecraft/tags/blocks/wool.json diff --git a/src/main/resources/data/minecraft/tags/items/boats.json b/src/generated/resources/data/minecraft/tags/items/boats.json similarity index 100% rename from src/main/resources/data/minecraft/tags/items/boats.json rename to src/generated/resources/data/minecraft/tags/items/boats.json diff --git a/src/main/resources/data/minecraft/tags/items/buttons.json b/src/generated/resources/data/minecraft/tags/items/buttons.json similarity index 100% rename from src/main/resources/data/minecraft/tags/items/buttons.json rename to src/generated/resources/data/minecraft/tags/items/buttons.json diff --git a/src/main/resources/data/minecraft/tags/items/carpets.json b/src/generated/resources/data/minecraft/tags/items/carpets.json similarity index 100% rename from src/main/resources/data/minecraft/tags/items/carpets.json rename to src/generated/resources/data/minecraft/tags/items/carpets.json diff --git a/src/main/resources/data/minecraft/tags/items/doors.json b/src/generated/resources/data/minecraft/tags/items/doors.json similarity index 100% rename from src/main/resources/data/minecraft/tags/items/doors.json rename to src/generated/resources/data/minecraft/tags/items/doors.json diff --git a/src/main/resources/data/minecraft/tags/items/fences.json b/src/generated/resources/data/minecraft/tags/items/fences.json similarity index 100% rename from src/main/resources/data/minecraft/tags/items/fences.json rename to src/generated/resources/data/minecraft/tags/items/fences.json diff --git a/src/main/resources/data/minecraft/tags/items/logs.json b/src/generated/resources/data/minecraft/tags/items/logs.json similarity index 100% rename from src/main/resources/data/minecraft/tags/items/logs.json rename to src/generated/resources/data/minecraft/tags/items/logs.json diff --git a/src/main/resources/data/minecraft/tags/items/planks.json b/src/generated/resources/data/minecraft/tags/items/planks.json similarity index 100% rename from src/main/resources/data/minecraft/tags/items/planks.json rename to src/generated/resources/data/minecraft/tags/items/planks.json diff --git a/src/main/resources/data/minecraft/tags/items/slabs.json b/src/generated/resources/data/minecraft/tags/items/slabs.json similarity index 100% rename from src/main/resources/data/minecraft/tags/items/slabs.json rename to src/generated/resources/data/minecraft/tags/items/slabs.json diff --git a/src/main/resources/data/extendedmushrooms/tags/items/infested_flowers.json b/src/generated/resources/data/minecraft/tags/items/small_flowers.json similarity index 100% rename from src/main/resources/data/extendedmushrooms/tags/items/infested_flowers.json rename to src/generated/resources/data/minecraft/tags/items/small_flowers.json diff --git a/src/main/resources/data/minecraft/tags/items/stairs.json b/src/generated/resources/data/minecraft/tags/items/stairs.json similarity index 100% rename from src/main/resources/data/minecraft/tags/items/stairs.json rename to src/generated/resources/data/minecraft/tags/items/stairs.json diff --git a/src/main/resources/data/minecraft/tags/items/trapdoors.json b/src/generated/resources/data/minecraft/tags/items/trapdoors.json similarity index 100% rename from src/main/resources/data/minecraft/tags/items/trapdoors.json rename to src/generated/resources/data/minecraft/tags/items/trapdoors.json diff --git a/src/main/resources/data/minecraft/tags/items/wooden_buttons.json b/src/generated/resources/data/minecraft/tags/items/wooden_buttons.json similarity index 100% rename from src/main/resources/data/minecraft/tags/items/wooden_buttons.json rename to src/generated/resources/data/minecraft/tags/items/wooden_buttons.json diff --git a/src/main/resources/data/minecraft/tags/items/wooden_doors.json b/src/generated/resources/data/minecraft/tags/items/wooden_doors.json similarity index 100% rename from src/main/resources/data/minecraft/tags/items/wooden_doors.json rename to src/generated/resources/data/minecraft/tags/items/wooden_doors.json diff --git a/src/main/resources/data/minecraft/tags/items/wooden_fences.json b/src/generated/resources/data/minecraft/tags/items/wooden_fences.json similarity index 100% rename from src/main/resources/data/minecraft/tags/items/wooden_fences.json rename to src/generated/resources/data/minecraft/tags/items/wooden_fences.json diff --git a/src/main/resources/data/minecraft/tags/items/wooden_pressure_plates.json b/src/generated/resources/data/minecraft/tags/items/wooden_pressure_plates.json similarity index 100% rename from src/main/resources/data/minecraft/tags/items/wooden_pressure_plates.json rename to src/generated/resources/data/minecraft/tags/items/wooden_pressure_plates.json diff --git a/src/main/resources/data/minecraft/tags/items/wooden_slabs.json b/src/generated/resources/data/minecraft/tags/items/wooden_slabs.json similarity index 100% rename from src/main/resources/data/minecraft/tags/items/wooden_slabs.json rename to src/generated/resources/data/minecraft/tags/items/wooden_slabs.json diff --git a/src/main/resources/data/minecraft/tags/items/wooden_stairs.json b/src/generated/resources/data/minecraft/tags/items/wooden_stairs.json similarity index 100% rename from src/main/resources/data/minecraft/tags/items/wooden_stairs.json rename to src/generated/resources/data/minecraft/tags/items/wooden_stairs.json diff --git a/src/main/resources/data/minecraft/tags/items/wooden_trapdoors.json b/src/generated/resources/data/minecraft/tags/items/wooden_trapdoors.json similarity index 100% rename from src/main/resources/data/minecraft/tags/items/wooden_trapdoors.json rename to src/generated/resources/data/minecraft/tags/items/wooden_trapdoors.json diff --git a/src/main/resources/data/minecraft/tags/items/wool.json b/src/generated/resources/data/minecraft/tags/items/wool.json similarity index 100% rename from src/main/resources/data/minecraft/tags/items/wool.json rename to src/generated/resources/data/minecraft/tags/items/wool.json diff --git a/src/main/resources/data/woolplates/tags/blocks/woolplates.json b/src/generated/resources/data/woolplates/tags/blocks/woolplates.json similarity index 100% rename from src/main/resources/data/woolplates/tags/blocks/woolplates.json rename to src/generated/resources/data/woolplates/tags/blocks/woolplates.json diff --git a/src/main/resources/data/woolplates/tags/items/woolplates.json b/src/generated/resources/data/woolplates/tags/items/woolplates.json similarity index 100% rename from src/main/resources/data/woolplates/tags/items/woolplates.json rename to src/generated/resources/data/woolplates/tags/items/woolplates.json diff --git a/src/main/java/cech12/extendedmushrooms/api/tags/ExtendedMushroomsTags.java b/src/main/java/cech12/extendedmushrooms/api/tags/ExtendedMushroomsTags.java deleted file mode 100644 index f5b1182f..00000000 --- a/src/main/java/cech12/extendedmushrooms/api/tags/ExtendedMushroomsTags.java +++ /dev/null @@ -1,70 +0,0 @@ -package cech12.extendedmushrooms.api.tags; - -import cech12.extendedmushrooms.ExtendedMushrooms; -import net.minecraft.block.Block; -import net.minecraft.item.Item; -import net.minecraft.tags.BlockTags; -import net.minecraft.tags.ItemTags; -import net.minecraft.tags.Tag; -import net.minecraft.util.ResourceLocation; - -import javax.annotation.Nonnull; - -public class ExtendedMushroomsTags { - - public static class ForgeBlocks { - - public static final Tag EDIBLE_MUSHROOMS = tag("edible_mushrooms"); //all edible mushrooms - public static final Tag MUSHROOMS = tag("mushrooms"); //all mushrooms - - public static final Tag MUSHROOM_CAPS = tag("mushroom_caps"); //all mushroom caps - public static final Tag MUSHROOM_STEMS = tag("mushroom_stems"); //all mushroom stems - - private static Tag tag(@Nonnull String name) { - return new BlockTags.Wrapper(new ResourceLocation("forge", name)); - } - } - - public static class Blocks { - - public static final Tag MUSHROOM_GROWING_BLOCKS = tag("mushroom_growing_blocks"); - public static final Tag MUSHROOM_GROWING_BLOCKS_LIGHTLEVEL = tag("mushroom_growing_blocks_lightlevel"); - public static final Tag MUSHROOM_VALID_BLOCKS = tag("mushroom_valid_blocks"); - - public static final Tag EDIBLE_MUSHROOMS = tag("edible_mushrooms"); //edible mushrooms of mod (without red & brown mushrooms) - public static final Tag MUSHROOMS = tag("mushrooms"); //all mushrooms of mod (without red & brown mushrooms) - public static final Tag POISONOUS_MUSHROOMS = tag("poisonous_mushrooms"); //all poisonous mushrooms of mod - - private static Tag tag(@Nonnull String name) { - return new BlockTags.Wrapper(new ResourceLocation(ExtendedMushrooms.MOD_ID, name)); - } - } - - public static class ForgeItems { - - public static final Tag EDIBLE_MUSHROOMS = tag("edible_mushrooms"); //all edible mushrooms - //public static final Tag MUSHROOMS = tag("mushrooms"); //already in Tags class - - public static final Tag MUSHROOM_CAPS = tag("mushroom_caps"); //all mushroom caps - public static final Tag MUSHROOM_STEMS = tag("mushroom_stems"); //all mushroom stems - - public static final Tag SHEARS = tag("shears"); - - private static Tag tag(@Nonnull String name) { - return new ItemTags.Wrapper(new ResourceLocation("forge", name)); - } - } - - public static class Items { - - public static final Tag EDIBLE_MUSHROOMS = tag("edible_mushrooms"); //edible mushrooms of mod (without red & brown mushrooms) - public static final Tag MUSHROOMS = tag("mushrooms"); //all mushrooms of mod (without red & brown mushrooms) - public static final Tag POISONOUS_MUSHROOMS = tag("poisonous_mushrooms"); //all poisonous mushrooms of mod - - private static Tag tag(@Nonnull String name) { - return new ItemTags.Wrapper(new ResourceLocation(ExtendedMushrooms.MOD_ID, name)); - } - - } - -} diff --git a/src/main/java/cech12/extendedmushrooms/data/BlockLootProvider.java b/src/main/java/cech12/extendedmushrooms/data/BlockLootProvider.java index 1f269d06..7b0d807a 100644 --- a/src/main/java/cech12/extendedmushrooms/data/BlockLootProvider.java +++ b/src/main/java/cech12/extendedmushrooms/data/BlockLootProvider.java @@ -3,7 +3,7 @@ import cech12.extendedmushrooms.ExtendedMushrooms; import cech12.extendedmushrooms.api.block.ExtendedMushroomsBlocks; import cech12.extendedmushrooms.api.item.ExtendedMushroomsItems; -import cech12.extendedmushrooms.api.tags.ExtendedMushroomsTags; +import cech12.extendedmushrooms.init.ModTags; import cech12.extendedmushrooms.block.mushroomblocks.MushroomStemBlock; import com.google.gson.Gson; import com.google.gson.GsonBuilder; @@ -100,7 +100,7 @@ private static LootTable.Builder dropItself(Block block) { private static LootTable.Builder dropOnlyWithShears(Block block) { LootEntry.Builder entry = AlternativesLootEntry.builder(ItemLootEntry.builder(block) - .acceptCondition(MatchTool.builder(ItemPredicate.Builder.create().tag(ExtendedMushroomsTags.ForgeItems.SHEARS)))); + .acceptCondition(MatchTool.builder(ItemPredicate.Builder.create().tag(ModTags.ForgeItems.SHEARS)))); return LootTable.builder().addLootPool(LootPool.builder().name("main").rolls(ConstantRange.of(1)).addEntry(entry)); } diff --git a/src/main/java/cech12/extendedmushrooms/data/BlockTagProvider.java b/src/main/java/cech12/extendedmushrooms/data/BlockTagProvider.java new file mode 100644 index 00000000..6a6d3ed6 --- /dev/null +++ b/src/main/java/cech12/extendedmushrooms/data/BlockTagProvider.java @@ -0,0 +1,166 @@ +package cech12.extendedmushrooms.data; + +import cech12.extendedmushrooms.ExtendedMushrooms; +import cech12.extendedmushrooms.api.block.ExtendedMushroomsBlocks; +import cech12.extendedmushrooms.block.MushroomCapButtonBlock; +import cech12.extendedmushrooms.block.MushroomCapPressurePlateBlock; +import cech12.extendedmushrooms.block.MushroomWoodButtonBlock; +import cech12.extendedmushrooms.block.MushroomWoodPressurePlateBlock; +import cech12.extendedmushrooms.init.ModTags; +import net.minecraft.block.Block; +import net.minecraft.block.Blocks; +import net.minecraft.block.CarpetBlock; +import net.minecraft.block.DoorBlock; +import net.minecraft.block.FenceBlock; +import net.minecraft.block.SlabBlock; +import net.minecraft.block.StairsBlock; +import net.minecraft.block.TrapDoorBlock; +import net.minecraft.data.BlockTagsProvider; +import net.minecraft.data.DataGenerator; +import net.minecraft.tags.BlockTags; + +import javax.annotation.Nonnull; +import java.util.Comparator; +import java.util.function.Predicate; + +public class BlockTagProvider extends BlockTagsProvider { + + public BlockTagProvider(DataGenerator generatorIn) { + super(generatorIn); + } + + @Override + protected void registerTags() { + Predicate extendedMushrooms = block -> ExtendedMushrooms.MOD_ID.equals(block.getRegistryName().getNamespace()); + + //generate mod intern tags + getBuilder(ModTags.Blocks.MUSHROOM_BUTTONS_WOOD).add(registry.stream().filter(extendedMushrooms) + .filter(block -> block instanceof MushroomWoodButtonBlock) + .sorted(Comparator.comparing(Block::getRegistryName)) + .toArray(Block[]::new)); + getBuilder(ModTags.Blocks.MUSHROOM_BUTTONS_WOOL).add(registry.stream().filter(extendedMushrooms) + .filter(block -> block instanceof MushroomCapButtonBlock) + .sorted(Comparator.comparing(Block::getRegistryName)) + .toArray(Block[]::new)); + getBuilder(ModTags.Blocks.MUSHROOM_BUTTONS) + .add(ModTags.Blocks.MUSHROOM_BUTTONS_WOOD) + .add(ModTags.Blocks.MUSHROOM_BUTTONS_WOOL); + getBuilder(ModTags.Blocks.MUSHROOM_CARPETS).add(registry.stream().filter(extendedMushrooms) + .filter(block -> block instanceof CarpetBlock) + .sorted(Comparator.comparing(Block::getRegistryName)) + .toArray(Block[]::new)); + getBuilder(ModTags.Blocks.MUSHROOM_DOORS).add(registry.stream().filter(extendedMushrooms) + .filter(block -> block instanceof DoorBlock) + .sorted(Comparator.comparing(Block::getRegistryName)) + .toArray(Block[]::new)); + getBuilder(ModTags.Blocks.MUSHROOM_FENCES).add(registry.stream().filter(extendedMushrooms) + .filter(block -> block instanceof FenceBlock) + .sorted(Comparator.comparing(Block::getRegistryName)) + .toArray(Block[]::new)); + getBuilder(ModTags.Blocks.MUSHROOM_PLANKS).add(registry.stream().filter(extendedMushrooms) + .filter(block -> block.getRegistryName().getPath().contains("_planks")) + .sorted(Comparator.comparing(Block::getRegistryName)) + .toArray(Block[]::new)); + getBuilder(ModTags.Blocks.MUSHROOM_PRESSURE_PLATES_WOOD).add(registry.stream().filter(extendedMushrooms) + .filter(block -> block instanceof MushroomWoodPressurePlateBlock) + .sorted(Comparator.comparing(Block::getRegistryName)) + .toArray(Block[]::new)); + getBuilder(ModTags.Blocks.MUSHROOM_PRESSURE_PLATES_WOOL).add(registry.stream().filter(extendedMushrooms) + .filter(block -> block instanceof MushroomCapPressurePlateBlock) + .sorted(Comparator.comparing(Block::getRegistryName)) + .toArray(Block[]::new)); + getBuilder(ModTags.Blocks.MUSHROOM_PRESSURE_PLATES) + .add(ModTags.Blocks.MUSHROOM_PRESSURE_PLATES_WOOD) + .add(ModTags.Blocks.MUSHROOM_PRESSURE_PLATES_WOOL); + getBuilder(ModTags.Blocks.MUSHROOM_SLABS).add(registry.stream().filter(extendedMushrooms) + .filter(block -> block instanceof SlabBlock) + .sorted(Comparator.comparing(Block::getRegistryName)) + .toArray(Block[]::new)); + getBuilder(ModTags.Blocks.MUSHROOM_STAIRS).add(registry.stream().filter(extendedMushrooms) + .filter(block -> block instanceof StairsBlock) + .sorted(Comparator.comparing(Block::getRegistryName)) + .toArray(Block[]::new)); + getBuilder(ModTags.Blocks.MUSHROOM_TRAPDOORS).add(registry.stream().filter(extendedMushrooms) + .filter(block -> block instanceof TrapDoorBlock) + .sorted(Comparator.comparing(Block::getRegistryName)) + .toArray(Block[]::new)); + //generate block categories + getBuilder(ModTags.Blocks.MUSHROOM_GROWING_BLOCKS).add(Blocks.MYCELIUM).add(Blocks.PODZOL); + getBuilder(ModTags.Blocks.MUSHROOM_GROWING_BLOCKS_LIGHTLEVEL).add(Blocks.DIRT).add(Blocks.GRASS_BLOCK); + getBuilder(ModTags.Blocks.MUSHROOM_VALID_BLOCKS).add(Blocks.MYCELIUM).add(Blocks.PODZOL); + + //generate forge tags + getBuilder(ModTags.ForgeBlocks.MUSHROOM_CAPS_BROWN).add(Blocks.BROWN_MUSHROOM_BLOCK); + getBuilder(ModTags.ForgeBlocks.MUSHROOM_CAPS_RED).add(Blocks.RED_MUSHROOM_BLOCK); + getBuilder(ModTags.ForgeBlocks.MUSHROOM_CAPS_GLOWSHROOM).add(ExtendedMushroomsBlocks.GLOWSHROOM_CAP); + getBuilder(ModTags.ForgeBlocks.MUSHROOM_CAPS_PURPLE).add(ExtendedMushroomsBlocks.POISONOUS_MUSHROOM_CAP); + getBuilder(ModTags.ForgeBlocks.MUSHROOM_CAPS) + .add(ModTags.ForgeBlocks.MUSHROOM_CAPS_BROWN) + .add(ModTags.ForgeBlocks.MUSHROOM_CAPS_RED) + .add(ModTags.ForgeBlocks.MUSHROOM_CAPS_GLOWSHROOM) + .add(ModTags.ForgeBlocks.MUSHROOM_CAPS_PURPLE); + + getBuilder(ModTags.ForgeBlocks.MUSHROOM_STEMS_COLORLESS) + .add(Blocks.MUSHROOM_STEM) + .add(ExtendedMushroomsBlocks.STRIPPED_MUSHROOM_STEM); + getBuilder(ModTags.ForgeBlocks.MUSHROOM_STEMS_GLOWSHROOM) + .add(ExtendedMushroomsBlocks.GLOWSHROOM_STEM) + .add(ExtendedMushroomsBlocks.GLOWSHROOM_STEM_STRIPPED); + getBuilder(ModTags.ForgeBlocks.MUSHROOM_STEMS_GREEN) + .add(ExtendedMushroomsBlocks.POISONOUS_MUSHROOM_STEM) + .add(ExtendedMushroomsBlocks.POISONOUS_MUSHROOM_STEM_STRIPPED); + getBuilder(ModTags.ForgeBlocks.MUSHROOM_STEMS) + .add(ModTags.ForgeBlocks.MUSHROOM_STEMS_COLORLESS) + .add(ModTags.ForgeBlocks.MUSHROOM_STEMS_GLOWSHROOM) + .add(ModTags.ForgeBlocks.MUSHROOM_STEMS_GREEN); + + getBuilder(ModTags.ForgeBlocks.MUSHROOMS_BROWN).add(Blocks.BROWN_MUSHROOM); + getBuilder(ModTags.ForgeBlocks.MUSHROOMS_RED).add(Blocks.RED_MUSHROOM); + getBuilder(ModTags.ForgeBlocks.MUSHROOMS_BLUE).add(ExtendedMushroomsBlocks.GLOWSHROOM); + getBuilder(ModTags.ForgeBlocks.MUSHROOMS_PURPLE).add(ExtendedMushroomsBlocks.POISONOUS_MUSHROOM); + getBuilder(ModTags.ForgeBlocks.MUSHROOMS) + .add(ModTags.ForgeBlocks.MUSHROOMS_BROWN) + .add(ModTags.ForgeBlocks.MUSHROOMS_RED) + .add(ModTags.ForgeBlocks.MUSHROOMS_BLUE) + .add(ModTags.ForgeBlocks.MUSHROOMS_PURPLE); + getBuilder(ModTags.Blocks.MUSHROOMS_EDIBLE) // add mod intern edible mushrooms + .add(ExtendedMushroomsBlocks.GLOWSHROOM); + getBuilder(ModTags.ForgeBlocks.MUSHROOMS_EDIBLE) + .add(Blocks.BROWN_MUSHROOM) + .add(Blocks.RED_MUSHROOM) + .add(ModTags.Blocks.MUSHROOMS_EDIBLE); + getBuilder(ModTags.ForgeBlocks.MUSHROOMS_POISONOUS) + .add(ExtendedMushroomsBlocks.POISONOUS_MUSHROOM); + + //generate minecraft tags + getBuilder(BlockTags.BUTTONS).add(ModTags.Blocks.MUSHROOM_BUTTONS); + getBuilder(BlockTags.CARPETS).add(ModTags.Blocks.MUSHROOM_CARPETS); + getBuilder(BlockTags.DOORS).add(ModTags.Blocks.MUSHROOM_DOORS); + getBuilder(BlockTags.FENCES).add(ModTags.Blocks.MUSHROOM_FENCES); + getBuilder(BlockTags.LOGS).add(ModTags.ForgeBlocks.MUSHROOM_STEMS); + getBuilder(BlockTags.PLANKS).add(ModTags.Blocks.MUSHROOM_PLANKS); + getBuilder(BlockTags.SLABS).add(ModTags.Blocks.MUSHROOM_SLABS); + getBuilder(BlockTags.SMALL_FLOWERS).add(ExtendedMushroomsBlocks.INFESTED_FLOWER); + getBuilder(BlockTags.STAIRS).add(ModTags.Blocks.MUSHROOM_STAIRS); + getBuilder(BlockTags.TRAPDOORS).add(ModTags.Blocks.MUSHROOM_TRAPDOORS); + getBuilder(BlockTags.WOODEN_BUTTONS).add(ModTags.Blocks.MUSHROOM_BUTTONS); + getBuilder(BlockTags.WOODEN_DOORS).add(ModTags.Blocks.MUSHROOM_DOORS); + getBuilder(BlockTags.WOODEN_FENCES).add(ModTags.Blocks.MUSHROOM_FENCES); + getBuilder(BlockTags.WOODEN_PRESSURE_PLATES).add(ModTags.Blocks.MUSHROOM_PRESSURE_PLATES); + getBuilder(BlockTags.WOODEN_SLABS).add(ModTags.Blocks.MUSHROOM_SLABS); + getBuilder(BlockTags.WOODEN_STAIRS).add(ModTags.Blocks.MUSHROOM_STAIRS); + getBuilder(BlockTags.WOODEN_TRAPDOORS).add(ModTags.Blocks.MUSHROOM_TRAPDOORS); + getBuilder(BlockTags.WOOL).add(ModTags.ForgeBlocks.MUSHROOM_CAPS); + + //generate tags for mod compatibility + getBuilder(ModTags.OtherModBlocks.WOOLPLATES_WOOLPLATES).add(ModTags.Blocks.MUSHROOM_PRESSURE_PLATES_WOOL); + + } + + @Nonnull + @Override + public String getName() { + return "Extended Mushrooms Block Tags"; + } + +} diff --git a/src/main/java/cech12/extendedmushrooms/data/ItemTagProvider.java b/src/main/java/cech12/extendedmushrooms/data/ItemTagProvider.java new file mode 100644 index 00000000..e621ef34 --- /dev/null +++ b/src/main/java/cech12/extendedmushrooms/data/ItemTagProvider.java @@ -0,0 +1,105 @@ +package cech12.extendedmushrooms.data; + +import cech12.extendedmushrooms.ExtendedMushrooms; +import cech12.extendedmushrooms.api.item.ExtendedMushroomsItems; +import cech12.extendedmushrooms.init.ModTags; +import cech12.extendedmushrooms.item.MushroomBoatItem; +import net.minecraft.data.DataGenerator; +import net.minecraft.data.ItemTagsProvider; +import net.minecraft.item.Item; +import net.minecraft.item.Items; +import net.minecraft.tags.BlockTags; +import net.minecraft.tags.ItemTags; +import net.minecraftforge.common.Tags; + +import javax.annotation.Nonnull; +import java.util.Comparator; +import java.util.function.Predicate; + +public class ItemTagProvider extends ItemTagsProvider { + + public ItemTagProvider(DataGenerator generatorIn) { + super(generatorIn); + } + + @Override + protected void registerTags() { + Predicate extendedMushrooms = item -> ExtendedMushrooms.MOD_ID.equals(item.getRegistryName().getNamespace()); + + //generate mod intern tags + getBuilder(ModTags.Items.MUSHROOM_BOATS).add(registry.stream().filter(extendedMushrooms) + .filter(item -> item instanceof MushroomBoatItem) + .sorted(Comparator.comparing(Item::getRegistryName)) + .toArray(Item[]::new)); + copy(ModTags.Blocks.MUSHROOM_BUTTONS_WOOD, ModTags.Items.MUSHROOM_BUTTONS_WOOD); + copy(ModTags.Blocks.MUSHROOM_BUTTONS_WOOL, ModTags.Items.MUSHROOM_BUTTONS_WOOL); + copy(ModTags.Blocks.MUSHROOM_BUTTONS, ModTags.Items.MUSHROOM_BUTTONS); + copy(ModTags.Blocks.MUSHROOM_CARPETS, ModTags.Items.MUSHROOM_CARPETS); + copy(ModTags.Blocks.MUSHROOM_DOORS, ModTags.Items.MUSHROOM_DOORS); + copy(ModTags.Blocks.MUSHROOM_FENCES, ModTags.Items.MUSHROOM_FENCES); + copy(ModTags.Blocks.MUSHROOM_PLANKS, ModTags.Items.MUSHROOM_PLANKS); + copy(ModTags.Blocks.MUSHROOM_PRESSURE_PLATES_WOOD, ModTags.Items.MUSHROOM_PRESSURE_PLATES_WOOD); + copy(ModTags.Blocks.MUSHROOM_PRESSURE_PLATES_WOOL, ModTags.Items.MUSHROOM_PRESSURE_PLATES_WOOL); + copy(ModTags.Blocks.MUSHROOM_PRESSURE_PLATES, ModTags.Items.MUSHROOM_PRESSURE_PLATES); + copy(ModTags.Blocks.MUSHROOM_SLABS, ModTags.Items.MUSHROOM_SLABS); + copy(ModTags.Blocks.MUSHROOM_STAIRS, ModTags.Items.MUSHROOM_STAIRS); + copy(ModTags.Blocks.MUSHROOM_TRAPDOORS, ModTags.Items.MUSHROOM_TRAPDOORS); + + //generate forge tags + copy(ModTags.ForgeBlocks.MUSHROOM_CAPS_BROWN, ModTags.ForgeItems.MUSHROOM_CAPS_BROWN); + copy(ModTags.ForgeBlocks.MUSHROOM_CAPS_RED, ModTags.ForgeItems.MUSHROOM_CAPS_RED); + copy(ModTags.ForgeBlocks.MUSHROOM_CAPS_GLOWSHROOM, ModTags.ForgeItems.MUSHROOM_CAPS_GLOWSHROOM); + copy(ModTags.ForgeBlocks.MUSHROOM_CAPS_PURPLE, ModTags.ForgeItems.MUSHROOM_CAPS_PURPLE); + copy(ModTags.ForgeBlocks.MUSHROOM_CAPS, ModTags.ForgeItems.MUSHROOM_CAPS); + copy(ModTags.ForgeBlocks.MUSHROOM_STEMS_COLORLESS, ModTags.ForgeItems.MUSHROOM_STEMS_COLORLESS); + copy(ModTags.ForgeBlocks.MUSHROOM_STEMS_GLOWSHROOM, ModTags.ForgeItems.MUSHROOM_STEMS_GLOWSHROOM); + copy(ModTags.ForgeBlocks.MUSHROOM_STEMS_GREEN, ModTags.ForgeItems.MUSHROOM_STEMS_GREEN); + copy(ModTags.ForgeBlocks.MUSHROOM_STEMS, ModTags.ForgeItems.MUSHROOM_STEMS); + copy(ModTags.ForgeBlocks.MUSHROOMS_BROWN, ModTags.ForgeItems.MUSHROOMS_BROWN); + copy(ModTags.ForgeBlocks.MUSHROOMS_RED, ModTags.ForgeItems.MUSHROOMS_RED); + copy(ModTags.ForgeBlocks.MUSHROOMS_BLUE, ModTags.ForgeItems.MUSHROOMS_BLUE); + copy(ModTags.ForgeBlocks.MUSHROOMS_PURPLE, ModTags.ForgeItems.MUSHROOMS_PURPLE); + copy(ModTags.ForgeBlocks.MUSHROOMS, Tags.Items.MUSHROOMS); + copy(ModTags.Blocks.MUSHROOMS_EDIBLE, ModTags.Items.MUSHROOMS_EDIBLE); // add mod intern edible mushrooms + copy(ModTags.ForgeBlocks.MUSHROOMS_EDIBLE, ModTags.ForgeItems.MUSHROOMS_EDIBLE); + copy(ModTags.ForgeBlocks.MUSHROOMS_POISONOUS, ModTags.ForgeItems.MUSHROOMS_POISONOUS); + + getBuilder(ModTags.ForgeItems.BREAD).add(ExtendedMushroomsItems.MUSHROOM_BREAD); + getBuilder(ModTags.ForgeItems.SHEARS).add(Items.SHEARS); + + //generate minecraft tags + getBuilder(ItemTags.BOATS).add(ModTags.Items.MUSHROOM_BOATS); + copy(BlockTags.BUTTONS, ItemTags.BUTTONS); + copy(BlockTags.CARPETS, ItemTags.CARPETS); + copy(BlockTags.DOORS, ItemTags.DOORS); + copy(BlockTags.FENCES, ItemTags.FENCES); + copy(BlockTags.LOGS, ItemTags.LOGS); + copy(BlockTags.PLANKS, ItemTags.PLANKS); + copy(BlockTags.SLABS, ItemTags.SLABS); + copy(BlockTags.SMALL_FLOWERS, ItemTags.SMALL_FLOWERS); + copy(BlockTags.STAIRS, ItemTags.STAIRS); + copy(BlockTags.TRAPDOORS, ItemTags.TRAPDOORS); + copy(BlockTags.WOODEN_BUTTONS, ItemTags.WOODEN_BUTTONS); + copy(BlockTags.WOODEN_DOORS, ItemTags.WOODEN_DOORS); + copy(BlockTags.WOODEN_FENCES, ItemTags.WOODEN_FENCES); + copy(BlockTags.WOODEN_PRESSURE_PLATES, ItemTags.WOODEN_PRESSURE_PLATES); + copy(BlockTags.WOODEN_SLABS, ItemTags.WOODEN_SLABS); + copy(BlockTags.WOODEN_STAIRS, ItemTags.WOODEN_STAIRS); + copy(BlockTags.WOODEN_TRAPDOORS, ItemTags.WOODEN_TRAPDOORS); + copy(BlockTags.WOOL, ItemTags.WOOL); + + //generate tags for mod compatibility + copy(ModTags.OtherModBlocks.WOOLPLATES_WOOLPLATES, ModTags.OtherModItems.WOOLPLATES_WOOLPLATES); + getBuilder(ModTags.OtherModItems.CORAIL_WOODCUTTER_ALLOWED_ITEMS) + .add(ModTags.ForgeItems.MUSHROOM_STEMS) + .add(ModTags.Items.MUSHROOM_PLANKS); + + } + + @Nonnull + @Override + public String getName() { + return "Extended Mushrooms Block Tags"; + } + +} diff --git a/src/main/java/cech12/extendedmushrooms/data/ModDataGenerator.java b/src/main/java/cech12/extendedmushrooms/data/ModDataGenerator.java index 1a1c54a7..d20889cb 100644 --- a/src/main/java/cech12/extendedmushrooms/data/ModDataGenerator.java +++ b/src/main/java/cech12/extendedmushrooms/data/ModDataGenerator.java @@ -15,12 +15,10 @@ public static void gatherData(GatherDataEvent evt) { evt.getGenerator().addProvider(new BlockModelProvider(evt.getGenerator(), evt.getExistingFileHelper())); evt.getGenerator().addProvider(new BlockStateProvider(evt.getGenerator(), evt.getExistingFileHelper())); evt.getGenerator().addProvider(new BlockStateProvider.BugFixer(evt.getGenerator(), evt.getExistingFileHelper())); //fixes the AttachFace-Capslock bug - evt.getGenerator().addProvider(new ItemModelProvider(evt.getGenerator(), evt.getExistingFileHelper())); - /* evt.getGenerator().addProvider(new BlockTagProvider(evt.getGenerator())); + evt.getGenerator().addProvider(new ItemModelProvider(evt.getGenerator(), evt.getExistingFileHelper())); evt.getGenerator().addProvider(new ItemTagProvider(evt.getGenerator())); evt.getGenerator().addProvider(new RecipeProvider(evt.getGenerator())); - */ } } diff --git a/src/main/java/cech12/extendedmushrooms/data/RecipeProvider.java b/src/main/java/cech12/extendedmushrooms/data/RecipeProvider.java new file mode 100644 index 00000000..df0882fb --- /dev/null +++ b/src/main/java/cech12/extendedmushrooms/data/RecipeProvider.java @@ -0,0 +1,297 @@ +package cech12.extendedmushrooms.data; + +import cech12.extendedmushrooms.ExtendedMushrooms; +import cech12.extendedmushrooms.api.block.ExtendedMushroomsBlocks; +import cech12.extendedmushrooms.api.item.ExtendedMushroomsItems; +import cech12.extendedmushrooms.init.ModTags; +import net.minecraft.block.Blocks; +import net.minecraft.data.CookingRecipeBuilder; +import net.minecraft.data.DataGenerator; +import net.minecraft.data.IFinishedRecipe; +import net.minecraft.data.ShapedRecipeBuilder; +import net.minecraft.data.ShapelessRecipeBuilder; +import net.minecraft.item.Item; +import net.minecraft.item.Items; +import net.minecraft.item.crafting.IRecipeSerializer; +import net.minecraft.item.crafting.Ingredient; +import net.minecraft.tags.ItemTags; +import net.minecraft.tags.Tag; +import net.minecraft.util.ResourceLocation; +import net.minecraftforge.common.Tags; + +import javax.annotation.Nonnull; +import javax.annotation.Nullable; +import java.util.function.Consumer; + +public class RecipeProvider extends net.minecraft.data.RecipeProvider { + + public RecipeProvider(DataGenerator generatorIn) { + super(generatorIn); + } + + private static ResourceLocation getResourceLocation(String directory, @Nullable ResourceLocation name) { + return new ResourceLocation(name.getNamespace(), directory + name.getPath()); + } + + private static ResourceLocation getResourceLocation(String directory, String path) { + return new ResourceLocation(ExtendedMushrooms.MOD_ID, directory + path); + } + + private static ResourceLocation getResourceLocation(String path) { + return new ResourceLocation(ExtendedMushrooms.MOD_ID, path); + } + + @Override + protected void registerRecipes(@Nonnull Consumer consumer) { + + //grilled mushroom + String name = ExtendedMushroomsItems.GRILLED_MUSHROOM.getRegistryName().getPath(); + CookingRecipeBuilder + .smeltingRecipe(Ingredient.fromTag(ModTags.ForgeItems.MUSHROOMS_EDIBLE), ExtendedMushroomsItems.GRILLED_MUSHROOM, 0.15F, 150) + .addCriterion("has_mushroom", this.hasItem(ModTags.ForgeItems.MUSHROOMS_EDIBLE)).build(consumer); + CookingRecipeBuilder + .cookingRecipe(Ingredient.fromTag(ModTags.ForgeItems.MUSHROOMS_EDIBLE), ExtendedMushroomsItems.GRILLED_MUSHROOM, 0.15F, 450, IRecipeSerializer.CAMPFIRE_COOKING) + .addCriterion("has_mushroom", this.hasItem(ModTags.ForgeItems.MUSHROOMS_EDIBLE)).build(consumer, getResourceLocation(name + "_from_campfire_cooking")); + CookingRecipeBuilder + .cookingRecipe(Ingredient.fromTag(ModTags.ForgeItems.MUSHROOMS_EDIBLE), ExtendedMushroomsItems.GRILLED_MUSHROOM, 0.15F, 75, IRecipeSerializer.SMOKING) + .addCriterion("has_mushroom", this.hasItem(ModTags.ForgeItems.MUSHROOMS_EDIBLE)).build(consumer, getResourceLocation(name + "_from_smoking")); + + //mushroom bread + ShapedRecipeBuilder.shapedRecipe(ExtendedMushroomsItems.MUSHROOM_BREAD) + .key('#', ModTags.ForgeItems.MUSHROOMS_EDIBLE) + .patternLine("###") + .setGroup("bread") + .addCriterion("has_mushroom", this.hasItem(ModTags.ForgeItems.MUSHROOMS_EDIBLE)) + .build(consumer); + + //rabbit stew + ShapelessRecipeBuilder.shapelessRecipe(Items.RABBIT_STEW) + .addIngredient(Items.BAKED_POTATO) + .addIngredient(Items.COOKED_RABBIT) + .addIngredient(Items.BOWL) + .addIngredient(Items.CARROT) + .addIngredient(ModTags.Items.MUSHROOMS_EDIBLE) //only mod intern edible mushrooms + .setGroup("rabbit_stew") + .addCriterion("has_cooked_rabbit", hasItem(Items.COOKED_RABBIT)) + .build(consumer, getResourceLocation(Items.RABBIT_STEW.getRegistryName().getPath() + "_from_edible_mushroom")); + + //brown dye from infested flower + ShapelessRecipeBuilder.shapelessRecipe(Items.BROWN_DYE) + .addIngredient(ExtendedMushroomsBlocks.INFESTED_FLOWER) + .addCriterion("has_flower", hasItem(ExtendedMushroomsBlocks.INFESTED_FLOWER)) + .build(consumer, getResourceLocation(Items.BROWN_DYE.getRegistryName().getPath() + "_from_infested_flower")); + + //mushroom spores + ShapelessRecipeBuilder.shapelessRecipe(ExtendedMushroomsItems.MUSHROOM_SPORES, 2) + .addIngredient(Tags.Items.MUSHROOMS) + .addCriterion("has_mushroom", hasItem(Tags.Items.MUSHROOMS)) + .build(consumer); + + mushroomWoodRecipes(consumer, "colorless", + ModTags.ForgeItems.MUSHROOM_STEMS_COLORLESS, + ExtendedMushroomsItems.MUSHROOM_BOAT.asItem(), + ExtendedMushroomsBlocks.MUSHROOM_BUTTON.asItem(), + ExtendedMushroomsBlocks.MUSHROOM_DOOR.asItem(), + ExtendedMushroomsBlocks.MUSHROOM_FENCE.asItem(), + ExtendedMushroomsBlocks.MUSHROOM_FENCE_GATE.asItem(), + ExtendedMushroomsBlocks.MUSHROOM_PLANKS.asItem(), + ExtendedMushroomsBlocks.MUSHROOM_PRESSURE_PLATE.asItem(), + ExtendedMushroomsBlocks.MUSHROOM_SLAB.asItem(), + ExtendedMushroomsBlocks.MUSHROOM_STAIRS.asItem(), + ExtendedMushroomsBlocks.MUSHROOM_TRAPDOOR.asItem()); + mushroomCapRecipes(consumer, "brown", + ModTags.ForgeItems.MUSHROOM_CAPS_BROWN, + Items.BROWN_BANNER, + Items.BROWN_BED, + ExtendedMushroomsBlocks.BROWN_MUSHROOM_BUTTON.asItem(), + ExtendedMushroomsBlocks.BROWN_MUSHROOM_CARPET.asItem(), + ExtendedMushroomsBlocks.BROWN_MUSHROOM_PRESSURE_PLATE.asItem()); + mushroomCapRecipes(consumer, "red", + ModTags.ForgeItems.MUSHROOM_CAPS_RED, + Items.RED_BANNER, + Items.RED_BED, + ExtendedMushroomsBlocks.RED_MUSHROOM_BUTTON.asItem(), + ExtendedMushroomsBlocks.RED_MUSHROOM_CARPET.asItem(), + ExtendedMushroomsBlocks.RED_MUSHROOM_PRESSURE_PLATE.asItem()); + + mushroomWoodRecipes(consumer, "glowshroom", + ModTags.ForgeItems.MUSHROOM_STEMS_GLOWSHROOM, + ExtendedMushroomsItems.GLOWSHROOM_BOAT.asItem(), + ExtendedMushroomsBlocks.GLOWSHROOM_BUTTON.asItem(), + ExtendedMushroomsBlocks.GLOWSHROOM_DOOR.asItem(), + ExtendedMushroomsBlocks.GLOWSHROOM_FENCE.asItem(), + ExtendedMushroomsBlocks.GLOWSHROOM_FENCE_GATE.asItem(), + ExtendedMushroomsBlocks.GLOWSHROOM_PLANKS.asItem(), + ExtendedMushroomsBlocks.GLOWSHROOM_PRESSURE_PLATE.asItem(), + ExtendedMushroomsBlocks.GLOWSHROOM_SLAB.asItem(), + ExtendedMushroomsBlocks.GLOWSHROOM_STAIRS.asItem(), + ExtendedMushroomsBlocks.GLOWSHROOM_TRAPDOOR.asItem()); + mushroomCapRecipes(consumer, "glowshroom", + ModTags.ForgeItems.MUSHROOM_CAPS_GLOWSHROOM, + Items.BLUE_BANNER, + Items.BLUE_BED, + ExtendedMushroomsBlocks.GLOWSHROOM_CAP_BUTTON.asItem(), + ExtendedMushroomsBlocks.GLOWSHROOM_CAP_CARPET.asItem(), + ExtendedMushroomsBlocks.GLOWSHROOM_CAP_PRESSURE_PLATE.asItem()); + //glowstone crumbs recipes + ShapedRecipeBuilder.shapedRecipe(Items.GLOWSTONE_DUST) + .key('#', ExtendedMushroomsItems.GLOWSTONE_CRUMBS) + .patternLine("##") + .patternLine("##") + .addCriterion("has_crumbs", this.hasItem(ExtendedMushroomsItems.GLOWSTONE_CRUMBS)) + .build(consumer, getResourceLocation(Items.GLOWSTONE_DUST.getRegistryName().getPath())); + ShapelessRecipeBuilder.shapelessRecipe(ExtendedMushroomsItems.GLOWSTONE_CRUMBS, 4) + .addIngredient(Items.GLOWSTONE_DUST) + .addCriterion("has_dust", hasItem(Items.GLOWSTONE_DUST)) + .build(consumer); + + mushroomWoodRecipes(consumer, "poisonous_mushroom", + ModTags.ForgeItems.MUSHROOM_STEMS_GREEN, + ExtendedMushroomsItems.POISONOUS_MUSHROOM_BOAT.asItem(), + ExtendedMushroomsBlocks.POISONOUS_MUSHROOM_BUTTON.asItem(), + ExtendedMushroomsBlocks.POISONOUS_MUSHROOM_DOOR.asItem(), + ExtendedMushroomsBlocks.POISONOUS_MUSHROOM_FENCE.asItem(), + ExtendedMushroomsBlocks.POISONOUS_MUSHROOM_FENCE_GATE.asItem(), + ExtendedMushroomsBlocks.POISONOUS_MUSHROOM_PLANKS.asItem(), + ExtendedMushroomsBlocks.POISONOUS_MUSHROOM_PRESSURE_PLATE.asItem(), + ExtendedMushroomsBlocks.POISONOUS_MUSHROOM_SLAB.asItem(), + ExtendedMushroomsBlocks.POISONOUS_MUSHROOM_STAIRS.asItem(), + ExtendedMushroomsBlocks.POISONOUS_MUSHROOM_TRAPDOOR.asItem()); + mushroomCapRecipes(consumer, "poisonous_mushroom", + ModTags.ForgeItems.MUSHROOM_CAPS_PURPLE, + Items.PURPLE_BANNER, + Items.PURPLE_BED, + ExtendedMushroomsBlocks.POISONOUS_MUSHROOM_CAP_BUTTON.asItem(), + ExtendedMushroomsBlocks.POISONOUS_MUSHROOM_CAP_CARPET.asItem(), + ExtendedMushroomsBlocks.POISONOUS_MUSHROOM_CAP_PRESSURE_PLATE.asItem()); + + //oak sign + ShapedRecipeBuilder.shapedRecipe(Items.OAK_SIGN, 3) + .key('#', ModTags.Items.MUSHROOM_PLANKS) + .key('|', Tags.Items.RODS_WOODEN) + .patternLine("###") + .patternLine("###") + .patternLine(" | ") + .addCriterion("has_planks", hasItem(ModTags.Items.MUSHROOM_PLANKS)) + .build(consumer, getResourceLocation(Items.OAK_SIGN.getRegistryName().getPath())); + //TODO woodcutting + + } + + + private void mushroomWoodRecipes(Consumer consumer, String name, Tag stems, Item boat, + Item button, Item door, Item fence, Item fence_gate, Item planks, + Item pressure_plate, Item slab, Item stairs, Item trapdoor) { + String directory = "mushroom_wood/" + name + "/"; + ShapedRecipeBuilder.shapedRecipe(boat) + .key('#', planks) + .patternLine("# #") + .patternLine("###") + .setGroup("boat") + .addCriterion("in_water", enteredBlock(Blocks.WATER)) + .build(consumer, getResourceLocation(directory, boat.getRegistryName())); + ShapelessRecipeBuilder.shapelessRecipe(button) + .addIngredient(planks) + .setGroup("wooden_button") + .addCriterion("has_planks", hasItem(planks)) + .build(consumer, getResourceLocation(directory, button.getRegistryName())); + ShapedRecipeBuilder.shapedRecipe(door, 3) + .key('#', planks) + .patternLine("##") + .patternLine("##") + .patternLine("##") + .setGroup("wooden_door") + .addCriterion("has_planks", hasItem(planks)) + .build(consumer, getResourceLocation(directory, door.getRegistryName())); + ShapedRecipeBuilder.shapedRecipe(fence, 3) + .key('#', Tags.Items.RODS_WOODEN) + .key('W', planks) + .patternLine("W#W") + .patternLine("W#W") + .setGroup("wooden_fence") + .addCriterion("has_planks", hasItem(planks)) + .build(consumer, getResourceLocation(directory, fence.getRegistryName())); + ShapedRecipeBuilder.shapedRecipe(fence_gate) + .key('#', Tags.Items.RODS_WOODEN) + .key('W', planks) + .patternLine("#W#") + .patternLine("#W#") + .setGroup("wooden_fence_gate") + .addCriterion("has_planks", hasItem(planks)) + .build(consumer, getResourceLocation(directory, fence_gate.getRegistryName())); + ShapelessRecipeBuilder.shapelessRecipe(planks, 4) + .addIngredient(stems) + .setGroup("planks") + .addCriterion("has_logs", hasItem(stems)) + .build(consumer, getResourceLocation(directory, planks.getRegistryName())); + ShapedRecipeBuilder.shapedRecipe(pressure_plate) + .key('#', planks) + .patternLine("##") + .setGroup("wooden_pressure_plate") + .addCriterion("has_planks", hasItem(planks)) + .build(consumer, getResourceLocation(directory, pressure_plate.getRegistryName())); + ShapedRecipeBuilder.shapedRecipe(slab, 6) + .key('#', planks) + .patternLine("###") + .setGroup("wooden_slab") + .addCriterion("has_planks", hasItem(planks)) + .build(consumer, getResourceLocation(directory, slab.getRegistryName())); + ShapedRecipeBuilder.shapedRecipe(stairs, 4) + .key('#', planks) + .patternLine("# ") + .patternLine("## ") + .patternLine("###") + .setGroup("wooden_stairs") + .addCriterion("has_planks", hasItem(planks)) + .build(consumer, getResourceLocation(directory, stairs.getRegistryName())); + ShapedRecipeBuilder.shapedRecipe(trapdoor, 2) + .key('#', planks) + .patternLine("###") + .patternLine("###") + .setGroup("wooden_trapdoor") + .addCriterion("has_planks", hasItem(planks)) + .build(consumer, getResourceLocation(directory, trapdoor.getRegistryName())); + + //TODO wood cutting + } + + private void mushroomCapRecipes(Consumer consumer, String name, Tag caps, Item banner, + Item bed, Item button, Item carpet, Item pressure_plate) { + String directory = "mushroom_cap/" + name + "/"; + ShapedRecipeBuilder.shapedRecipe(banner) + .key('#', caps) + .key('|', Tags.Items.RODS_WOODEN) + .patternLine("###") + .patternLine("###") + .patternLine(" | ") + .setGroup("banner") + .addCriterion("has_cap", hasItem(caps)) + .build(consumer, getResourceLocation(directory, banner.getRegistryName().getPath())); + ShapedRecipeBuilder.shapedRecipe(bed) + .key('#', caps) + .key('W', ItemTags.PLANKS) + .patternLine("###") + .patternLine("WWW") + .setGroup("bed") + .addCriterion("has_cap", hasItem(caps)) + .build(consumer, getResourceLocation(directory, bed.getRegistryName().getPath())); + ShapelessRecipeBuilder.shapelessRecipe(button) + .addIngredient(caps) + .setGroup("wool_buttons") + .addCriterion("has_cap", hasItem(caps)) + .build(consumer, getResourceLocation(directory, button.getRegistryName())); + ShapedRecipeBuilder.shapedRecipe(carpet, 3) + .key('#', caps) + .patternLine("##") + .setGroup("carpet") + .addCriterion("has_cap", hasItem(caps)) + .build(consumer, getResourceLocation(directory, carpet.getRegistryName())); + ShapelessRecipeBuilder.shapelessRecipe(pressure_plate) + .addIngredient(ItemTags.WOODEN_PRESSURE_PLATES) + .addIngredient(caps) + .setGroup("wool_plates") + .addCriterion("has_cap", hasItem(caps)) + .build(consumer, getResourceLocation(directory, pressure_plate.getRegistryName())); + } + +} diff --git a/src/main/java/cech12/extendedmushrooms/entity/passive/MushroomSheepEntity.java b/src/main/java/cech12/extendedmushrooms/entity/passive/MushroomSheepEntity.java index ca206f3f..325e5630 100644 --- a/src/main/java/cech12/extendedmushrooms/entity/passive/MushroomSheepEntity.java +++ b/src/main/java/cech12/extendedmushrooms/entity/passive/MushroomSheepEntity.java @@ -1,7 +1,7 @@ package cech12.extendedmushrooms.entity.passive; import cech12.extendedmushrooms.api.entity.ExtendedMushroomsEntityTypes; -import cech12.extendedmushrooms.api.tags.ExtendedMushroomsTags; +import cech12.extendedmushrooms.init.ModTags; import cech12.extendedmushrooms.config.Config; import cech12.extendedmushrooms.entity.ai.goal.EatMyceliumGoal; import cech12.extendedmushrooms.item.MushroomType; @@ -197,7 +197,7 @@ public boolean processInteract(PlayerEntity player, @Nonnull Hand hand) { * When a given MushroomType has no effect, nothing happens. */ public void activateMushroomEffect(MushroomType mushroomType) { - if (mushroomType.getItem().isIn(ExtendedMushroomsTags.Items.POISONOUS_MUSHROOMS)) { + if (mushroomType.getItem().isIn(ModTags.ForgeItems.MUSHROOMS_POISONOUS)) { this.addPotionEffect(new EffectInstance(Effects.POISON, 200)); } } diff --git a/src/main/java/cech12/extendedmushrooms/init/ModTags.java b/src/main/java/cech12/extendedmushrooms/init/ModTags.java new file mode 100644 index 00000000..89002c60 --- /dev/null +++ b/src/main/java/cech12/extendedmushrooms/init/ModTags.java @@ -0,0 +1,141 @@ +package cech12.extendedmushrooms.init; + +import cech12.extendedmushrooms.ExtendedMushrooms; +import net.minecraft.block.Block; +import net.minecraft.item.Item; +import net.minecraft.tags.BlockTags; +import net.minecraft.tags.ItemTags; +import net.minecraft.tags.Tag; +import net.minecraft.util.ResourceLocation; + +import javax.annotation.Nonnull; + +public class ModTags { + + public static class ForgeBlocks { + + public static final Tag MUSHROOM_CAPS = tag("mushroom_caps"); + public static final Tag MUSHROOM_CAPS_BROWN = tag("mushroom_caps/brown"); + public static final Tag MUSHROOM_CAPS_RED = tag("mushroom_caps/red"); + public static final Tag MUSHROOM_CAPS_GLOWSHROOM = tag("mushroom_caps/glowshroom"); + public static final Tag MUSHROOM_CAPS_PURPLE = tag("mushroom_caps/purple"); + + public static final Tag MUSHROOM_STEMS = tag("mushroom_stems"); + public static final Tag MUSHROOM_STEMS_COLORLESS = tag("mushroom_stems/colorless"); + public static final Tag MUSHROOM_STEMS_GLOWSHROOM = tag("mushroom_stems/glowshroom"); + public static final Tag MUSHROOM_STEMS_GREEN = tag("mushroom_stems/green"); + + public static final Tag MUSHROOMS = tag("mushrooms"); + public static final Tag MUSHROOMS_BROWN = tag("mushrooms/brown"); + public static final Tag MUSHROOMS_RED = tag("mushrooms/red"); + public static final Tag MUSHROOMS_BLUE = tag("mushrooms/blue"); + public static final Tag MUSHROOMS_PURPLE = tag("mushrooms/purple"); + public static final Tag MUSHROOMS_EDIBLE = tag("mushrooms/edible"); + public static final Tag MUSHROOMS_POISONOUS = tag("mushrooms/poisonous"); + + private static Tag tag(@Nonnull String name) { + return new BlockTags.Wrapper(new ResourceLocation("forge", name)); + } + } + + public static class Blocks { + + public static final Tag MUSHROOM_BUTTONS_WOOD = tag("mushroom_buttons/wood"); + public static final Tag MUSHROOM_BUTTONS_WOOL = tag("mushroom_buttons/wool"); + public static final Tag MUSHROOM_BUTTONS = tag("mushroom_buttons"); + public static final Tag MUSHROOM_CARPETS = tag("mushroom_carpets"); + public static final Tag MUSHROOM_DOORS = tag("mushroom_doors"); + public static final Tag MUSHROOM_FENCES = tag("mushroom_fences"); + public static final Tag MUSHROOM_PLANKS = tag("mushroom_planks"); + public static final Tag MUSHROOM_PRESSURE_PLATES_WOOD = tag("mushroom_pressure_plates/wood"); + public static final Tag MUSHROOM_PRESSURE_PLATES_WOOL = tag("mushroom_pressure_plates/wool"); + public static final Tag MUSHROOM_PRESSURE_PLATES = tag("mushroom_pressure_plates"); + public static final Tag MUSHROOM_SLABS = tag("mushroom_slabs"); + public static final Tag MUSHROOM_STAIRS = tag("mushroom_stairs"); + public static final Tag MUSHROOM_TRAPDOORS = tag("mushroom_trapdoors"); + + public static final Tag MUSHROOMS_EDIBLE = tag("mushrooms/edible"); // only mod intern edible mushrooms + + public static final Tag MUSHROOM_GROWING_BLOCKS = tag("mushroom_growing_blocks"); + public static final Tag MUSHROOM_GROWING_BLOCKS_LIGHTLEVEL = tag("mushroom_growing_blocks_lightlevel"); + public static final Tag MUSHROOM_VALID_BLOCKS = tag("mushroom_valid_blocks"); + + private static Tag tag(@Nonnull String name) { + return new BlockTags.Wrapper(new ResourceLocation(ExtendedMushrooms.MOD_ID, name)); + } + } + + public static class OtherModBlocks { + + public static final Tag WOOLPLATES_WOOLPLATES = tag("woolplates", "woolplates"); + + private static Tag tag(@Nonnull String mod, @Nonnull String name) { + return new BlockTags.Wrapper(new ResourceLocation(mod, name)); + } + } + + public static class ForgeItems { + + public static final Tag MUSHROOM_CAPS = tag("mushroom_caps"); + public static final Tag MUSHROOM_CAPS_BROWN = tag("mushroom_caps/brown"); + public static final Tag MUSHROOM_CAPS_RED = tag("mushroom_caps/red"); + public static final Tag MUSHROOM_CAPS_GLOWSHROOM = tag("mushroom_caps/glowshroom"); + public static final Tag MUSHROOM_CAPS_PURPLE = tag("mushroom_caps/purple"); + + public static final Tag MUSHROOM_STEMS = tag("mushroom_stems"); + public static final Tag MUSHROOM_STEMS_COLORLESS = tag("mushroom_stems/colorless"); + public static final Tag MUSHROOM_STEMS_GLOWSHROOM = tag("mushroom_stems/glowshroom"); + public static final Tag MUSHROOM_STEMS_GREEN = tag("mushroom_stems/green"); + + // public static final Tag MUSHROOMS = tag("mushrooms"); // already there! + public static final Tag MUSHROOMS_BROWN = tag("mushrooms/brown"); + public static final Tag MUSHROOMS_RED = tag("mushrooms/red"); + public static final Tag MUSHROOMS_BLUE = tag("mushrooms/blue"); + public static final Tag MUSHROOMS_PURPLE = tag("mushrooms/purple"); + public static final Tag MUSHROOMS_EDIBLE = tag("mushrooms/edible"); + public static final Tag MUSHROOMS_POISONOUS = tag("mushrooms/poisonous"); + + public static final Tag BREAD = tag("bread"); + public static final Tag SHEARS = tag("shears"); + + private static Tag tag(@Nonnull String name) { + return new ItemTags.Wrapper(new ResourceLocation("forge", name)); + } + } + + public static class Items { + + public static final Tag MUSHROOM_BOATS = tag("mushroom_boats"); + public static final Tag MUSHROOM_BUTTONS_WOOD = tag("mushroom_buttons/wood"); + public static final Tag MUSHROOM_BUTTONS_WOOL = tag("mushroom_buttons/wool"); + public static final Tag MUSHROOM_BUTTONS = tag("mushroom_buttons"); + public static final Tag MUSHROOM_CARPETS = tag("mushroom_carpets"); + public static final Tag MUSHROOM_DOORS = tag("mushroom_doors"); + public static final Tag MUSHROOM_FENCES = tag("mushroom_fences"); + public static final Tag MUSHROOM_PLANKS = tag("mushroom_planks"); + public static final Tag MUSHROOM_PRESSURE_PLATES_WOOD = tag("mushroom_pressure_plates/wood"); + public static final Tag MUSHROOM_PRESSURE_PLATES_WOOL = tag("mushroom_pressure_plates/wool"); + public static final Tag MUSHROOM_PRESSURE_PLATES = tag("mushroom_pressure_plates"); + public static final Tag MUSHROOM_SLABS = tag("mushroom_slabs"); + public static final Tag MUSHROOM_STAIRS = tag("mushroom_stairs"); + public static final Tag MUSHROOM_TRAPDOORS = tag("mushroom_trapdoors"); + + public static final Tag MUSHROOMS_EDIBLE = tag("mushrooms/edible"); // only mod intern edible mushrooms + + private static Tag tag(@Nonnull String name) { + return new ItemTags.Wrapper(new ResourceLocation(ExtendedMushrooms.MOD_ID, name)); + } + + } + + public static class OtherModItems { + + public static final Tag CORAIL_WOODCUTTER_ALLOWED_ITEMS = tag("corail_woodcutter", "allowed_items"); + public static final Tag WOOLPLATES_WOOLPLATES = tag("woolplates", "woolplates"); + + private static Tag tag(@Nonnull String mod, @Nonnull String name) { + return new ItemTags.Wrapper(new ResourceLocation(mod, name)); + } + } + +} diff --git a/src/main/java/cech12/extendedmushrooms/loot_modifiers/MushroomCapLootModifier.java b/src/main/java/cech12/extendedmushrooms/loot_modifiers/MushroomCapLootModifier.java index 76757348..a47f057b 100644 --- a/src/main/java/cech12/extendedmushrooms/loot_modifiers/MushroomCapLootModifier.java +++ b/src/main/java/cech12/extendedmushrooms/loot_modifiers/MushroomCapLootModifier.java @@ -1,6 +1,6 @@ package cech12.extendedmushrooms.loot_modifiers; -import cech12.extendedmushrooms.api.tags.ExtendedMushroomsTags; +import cech12.extendedmushrooms.init.ModTags; import cech12.extendedmushrooms.config.Config; import com.google.gson.JsonObject; import net.minecraft.block.BlockState; @@ -31,7 +31,7 @@ protected List doApply(List generatedLoot, LootContext con //only called when shears are used if (Config.MUSHROOM_CAPS_WITH_SHEARS_ENABLED.getValue()) { BlockState blockState = context.get(LootParameters.BLOCK_STATE); - if (blockState != null && blockState.isIn(ExtendedMushroomsTags.ForgeBlocks.MUSHROOM_CAPS)) { + if (blockState != null && blockState.isIn(ModTags.ForgeBlocks.MUSHROOM_CAPS)) { ItemStack tool = context.get(LootParameters.TOOL); //to avoid endless loop: test for silk touch enchantment if (tool != null && EnchantmentHelper.getEnchantmentLevel(Enchantments.SILK_TOUCH, tool) <= 0) { diff --git a/src/main/java/cech12/extendedmushrooms/loot_modifiers/MushroomStemLootModifier.java b/src/main/java/cech12/extendedmushrooms/loot_modifiers/MushroomStemLootModifier.java index c3e6b463..01c54bd7 100644 --- a/src/main/java/cech12/extendedmushrooms/loot_modifiers/MushroomStemLootModifier.java +++ b/src/main/java/cech12/extendedmushrooms/loot_modifiers/MushroomStemLootModifier.java @@ -1,6 +1,6 @@ package cech12.extendedmushrooms.loot_modifiers; -import cech12.extendedmushrooms.api.tags.ExtendedMushroomsTags; +import cech12.extendedmushrooms.init.ModTags; import cech12.extendedmushrooms.config.Config; import com.google.gson.JsonObject; import net.minecraft.block.BlockState; @@ -31,7 +31,7 @@ protected MushroomStemLootModifier(ILootCondition[] conditionsIn) { protected List doApply(List generatedLoot, LootContext context) { if (Config.MUSHROOM_STEMS_WITHOUT_SILK_TOUCH_ENABLED.getValue()) { BlockState blockState = context.get(LootParameters.BLOCK_STATE); - if (blockState != null && blockState.isIn(ExtendedMushroomsTags.ForgeBlocks.MUSHROOM_STEMS)) { + if (blockState != null && blockState.isIn(ModTags.ForgeBlocks.MUSHROOM_STEMS)) { ItemStack tool = context.get(LootParameters.TOOL); //to avoid endless loop: test for silk touch enchantment if (tool == null || EnchantmentHelper.getEnchantmentLevel(Enchantments.SILK_TOUCH, tool) <= 0) { diff --git a/src/main/java/cech12/extendedmushrooms/mixin/MixinAbstractBigMushroomFeature.java b/src/main/java/cech12/extendedmushrooms/mixin/MixinAbstractBigMushroomFeature.java index da523e6f..4703ca68 100644 --- a/src/main/java/cech12/extendedmushrooms/mixin/MixinAbstractBigMushroomFeature.java +++ b/src/main/java/cech12/extendedmushrooms/mixin/MixinAbstractBigMushroomFeature.java @@ -1,6 +1,6 @@ package cech12.extendedmushrooms.mixin; -import cech12.extendedmushrooms.api.tags.ExtendedMushroomsTags; +import cech12.extendedmushrooms.init.ModTags; import net.minecraft.block.Block; import net.minecraft.block.BlockState; import net.minecraft.tags.BlockTags; @@ -25,7 +25,7 @@ public void placeProxy(IWorld world, BlockPos pos, int p_227209_3_, BlockPos.Mut int i = pos.getY(); if (i >= 1 && i + p_227209_3_ + 1 < world.getMaxHeight()) { Block block = world.getBlockState(pos.down()).getBlock(); - if (block.isIn(ExtendedMushroomsTags.Blocks.MUSHROOM_GROWING_BLOCKS) || block.isIn(ExtendedMushroomsTags.Blocks.MUSHROOM_GROWING_BLOCKS_LIGHTLEVEL)) { + if (block.isIn(ModTags.Blocks.MUSHROOM_GROWING_BLOCKS) || block.isIn(ModTags.Blocks.MUSHROOM_GROWING_BLOCKS_LIGHTLEVEL)) { for(int j = 0; j <= p_227209_3_; ++j) { //int k = this.func_225563_a_(-1, -1, p_227209_5_.field_227274_c_, j); int k = j <= 3 ? 0 : p_227209_5_.field_227274_c_; diff --git a/src/main/java/cech12/extendedmushrooms/mixin/MixinMushroomBlock.java b/src/main/java/cech12/extendedmushrooms/mixin/MixinMushroomBlock.java index af0d7584..02babc40 100644 --- a/src/main/java/cech12/extendedmushrooms/mixin/MixinMushroomBlock.java +++ b/src/main/java/cech12/extendedmushrooms/mixin/MixinMushroomBlock.java @@ -1,6 +1,6 @@ package cech12.extendedmushrooms.mixin; -import cech12.extendedmushrooms.api.tags.ExtendedMushroomsTags; +import cech12.extendedmushrooms.init.ModTags; import cech12.extendedmushrooms.block.mushrooms.BrownMushroom; import cech12.extendedmushrooms.block.mushrooms.RedMushroom; import net.minecraft.block.Block; @@ -33,8 +33,8 @@ public void tickProxy(BlockState state, ServerWorld world, BlockPos pos, Random if (world.isAreaLoaded(pos, 7) && random.nextInt(25) == 0) { if (state.getBlock() instanceof MushroomBlock) { Block blockBeneath = world.getBlockState(pos.down()).getBlock(); - if (blockBeneath.isIn(ExtendedMushroomsTags.Blocks.MUSHROOM_GROWING_BLOCKS) || - (blockBeneath.isIn(ExtendedMushroomsTags.Blocks.MUSHROOM_GROWING_BLOCKS_LIGHTLEVEL) && world.getLightSubtracted(pos, 0) < 13)) { + if (blockBeneath.isIn(ModTags.Blocks.MUSHROOM_GROWING_BLOCKS) || + (blockBeneath.isIn(ModTags.Blocks.MUSHROOM_GROWING_BLOCKS_LIGHTLEVEL) && world.getLightSubtracted(pos, 0) < 13)) { ((MushroomBlock) state.getBlock()).grow(world, random, pos, state); } } @@ -53,7 +53,7 @@ public void isValidPositionProxy(BlockState state, IWorldReader world, BlockPos BlockPos blockpos = pos.down(); BlockState blockstate = world.getBlockState(blockpos); Block block = blockstate.getBlock(); - if (block.isIn(ExtendedMushroomsTags.Blocks.MUSHROOM_VALID_BLOCKS)) { + if (block.isIn(ModTags.Blocks.MUSHROOM_VALID_BLOCKS)) { cir.setReturnValue(true); } else { cir.setReturnValue(world.getLightSubtracted(pos, 0) < 13 && blockstate.canSustainPlant(world, blockpos, net.minecraft.util.Direction.UP, (IPlantable) state.getBlock())); diff --git a/src/main/java/cech12/extendedmushrooms/world/gen/feature/BigMushroomFeature.java b/src/main/java/cech12/extendedmushrooms/world/gen/feature/BigMushroomFeature.java index 4610faaf..c1d4191d 100644 --- a/src/main/java/cech12/extendedmushrooms/world/gen/feature/BigMushroomFeature.java +++ b/src/main/java/cech12/extendedmushrooms/world/gen/feature/BigMushroomFeature.java @@ -1,6 +1,6 @@ package cech12.extendedmushrooms.world.gen.feature; -import cech12.extendedmushrooms.api.tags.ExtendedMushroomsTags; +import cech12.extendedmushrooms.init.ModTags; import com.mojang.datafixers.Dynamic; import net.minecraft.block.Block; import net.minecraft.block.HugeMushroomBlock; @@ -38,7 +38,7 @@ protected boolean isInWorldBounds(IWorld world, BlockPos mushroomPos, int size) protected boolean hasValidGround(IWorld world, BlockPos mushroomPos) { Block block = world.getBlockState(mushroomPos.down()).getBlock(); - return block.isIn(ExtendedMushroomsTags.Blocks.MUSHROOM_GROWING_BLOCKS) || block.isIn(ExtendedMushroomsTags.Blocks.MUSHROOM_GROWING_BLOCKS_LIGHTLEVEL); + return block.isIn(ModTags.Blocks.MUSHROOM_GROWING_BLOCKS) || block.isIn(ModTags.Blocks.MUSHROOM_GROWING_BLOCKS_LIGHTLEVEL); } protected boolean canGrow(IWorld world, BlockPos blockPos, int size, int capRadius, BlockPos.Mutable mutableBlockPos, BigMushroomFeatureConfig config) { diff --git a/src/main/resources/data/extendedmushrooms/tags/blocks/mushroom_stems.json b/src/main/resources/data/extendedmushrooms/tags/blocks/mushroom_stems.json deleted file mode 100644 index 2d63fb66..00000000 --- a/src/main/resources/data/extendedmushrooms/tags/blocks/mushroom_stems.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "replace": false, - "values": [ - "#extendedmushrooms:mushroom_stems/beige", - "#extendedmushrooms:mushroom_stems/glowshroom", - "#extendedmushrooms:mushroom_stems/poisonous_mushroom" - ] -} \ No newline at end of file diff --git a/src/main/resources/data/extendedmushrooms/tags/blocks/mushrooms.json b/src/main/resources/data/extendedmushrooms/tags/blocks/mushrooms.json deleted file mode 100644 index 3cbbfdf8..00000000 --- a/src/main/resources/data/extendedmushrooms/tags/blocks/mushrooms.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "replace": false, - "values": [ - "#extendedmushrooms:edible_mushrooms", - "#extendedmushrooms:poisonous_mushrooms" - ] -} \ No newline at end of file diff --git a/src/main/resources/data/extendedmushrooms/tags/items/mushroom_stems.json b/src/main/resources/data/extendedmushrooms/tags/items/mushroom_stems.json deleted file mode 100644 index 2d63fb66..00000000 --- a/src/main/resources/data/extendedmushrooms/tags/items/mushroom_stems.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "replace": false, - "values": [ - "#extendedmushrooms:mushroom_stems/beige", - "#extendedmushrooms:mushroom_stems/glowshroom", - "#extendedmushrooms:mushroom_stems/poisonous_mushroom" - ] -} \ No newline at end of file diff --git a/src/main/resources/data/extendedmushrooms/tags/items/mushrooms.json b/src/main/resources/data/extendedmushrooms/tags/items/mushrooms.json deleted file mode 100644 index 3cbbfdf8..00000000 --- a/src/main/resources/data/extendedmushrooms/tags/items/mushrooms.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "replace": false, - "values": [ - "#extendedmushrooms:edible_mushrooms", - "#extendedmushrooms:poisonous_mushrooms" - ] -} \ No newline at end of file diff --git a/src/main/resources/data/forge/tags/blocks/edible_mushrooms.json b/src/main/resources/data/forge/tags/blocks/edible_mushrooms.json deleted file mode 100644 index 15fbcf14..00000000 --- a/src/main/resources/data/forge/tags/blocks/edible_mushrooms.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "replace": false, - "values": [ - "minecraft:brown_mushroom", - "minecraft:red_mushroom", - "#extendedmushrooms:edible_mushrooms" - ] -} \ No newline at end of file diff --git a/src/main/resources/data/forge/tags/blocks/mushroom_caps.json b/src/main/resources/data/forge/tags/blocks/mushroom_caps.json deleted file mode 100644 index 13bb3874..00000000 --- a/src/main/resources/data/forge/tags/blocks/mushroom_caps.json +++ /dev/null @@ -1,9 +0,0 @@ -{ - "replace": false, - "values": [ - "minecraft:brown_mushroom_block", - "minecraft:red_mushroom_block", - "extendedmushrooms:glowshroom_cap", - "extendedmushrooms:poisonous_mushroom_cap" - ] -} \ No newline at end of file diff --git a/src/main/resources/data/forge/tags/blocks/mushroom_stems.json b/src/main/resources/data/forge/tags/blocks/mushroom_stems.json deleted file mode 100644 index 588d21f2..00000000 --- a/src/main/resources/data/forge/tags/blocks/mushroom_stems.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "replace": false, - "values": [ - "minecraft:mushroom_stem", - "#extendedmushrooms:mushroom_stems" - ] -} \ No newline at end of file diff --git a/src/main/resources/data/forge/tags/items/mushroom_caps.json b/src/main/resources/data/forge/tags/items/mushroom_caps.json deleted file mode 100644 index 13bb3874..00000000 --- a/src/main/resources/data/forge/tags/items/mushroom_caps.json +++ /dev/null @@ -1,9 +0,0 @@ -{ - "replace": false, - "values": [ - "minecraft:brown_mushroom_block", - "minecraft:red_mushroom_block", - "extendedmushrooms:glowshroom_cap", - "extendedmushrooms:poisonous_mushroom_cap" - ] -} \ No newline at end of file diff --git a/src/main/resources/data/forge/tags/items/mushroom_stems.json b/src/main/resources/data/forge/tags/items/mushroom_stems.json deleted file mode 100644 index 588d21f2..00000000 --- a/src/main/resources/data/forge/tags/items/mushroom_stems.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "replace": false, - "values": [ - "minecraft:mushroom_stem", - "#extendedmushrooms:mushroom_stems" - ] -} \ No newline at end of file diff --git a/src/main/resources/data/minecraft/tags/blocks/small_flowers.json b/src/main/resources/data/minecraft/tags/blocks/small_flowers.json deleted file mode 100644 index 02e604c9..00000000 --- a/src/main/resources/data/minecraft/tags/blocks/small_flowers.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "replace": false, - "values": [ - "#extendedmushrooms:infested_flowers" - ] -} \ No newline at end of file diff --git a/src/main/resources/data/minecraft/tags/items/small_flowers.json b/src/main/resources/data/minecraft/tags/items/small_flowers.json deleted file mode 100644 index 02e604c9..00000000 --- a/src/main/resources/data/minecraft/tags/items/small_flowers.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "replace": false, - "values": [ - "#extendedmushrooms:infested_flowers" - ] -} \ No newline at end of file